Merge branch 'master' of https://github.com/seuros/closure_tree into pr111

Author: mceachen

closure_tree.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'yard'
-  gem.add_development_dependency 'rspec', '~> 2.14.0' # FIXME: migrate to rspec 3 (or, better, ditch rspec and switch to minitest)
+  gem.add_development_dependency 'rspec', '>= 3.0'
   gem.add_development_dependency 'rspec-instafail'
   gem.add_development_dependency 'rspec-rails' # FIXME: for rspec-rails and rspec fixture support
   gem.add_development_dependency 'uuidtools'

lib/closure_tree/hierarchy_maintenance.rb

@@ -25,7 +25,7 @@ def _ct_validate
         changes[_ct.parent_column_name] && # don't validate for cycles if we didn't change our parent
         parent.present? && # don't validate if we're root
         parent.self_and_ancestors.include?(self) # < this is expensive :\
-        errors.add(_ct.parent_column_sym, "You cannot add an ancestor as a descendant")
+        errors.add(_ct.parent_column_sym, I18n.t('closure_tree.loop_error', default: 'You cannot add an ancestor as a descendant'))
       end
     end
 

lib/closure_tree/test/matcher.rb

@@ -7,39 +7,39 @@ def be_a_closure_tree
 
       class ClosureTree
         def matches?(subject)
-          @subject = subject
+          @subject = subject.is_a?(Class) ? subject : subject.class
           # OPTIMIZE
           if @subject.respond_to?(:_ct)
 
             unless @subject.column_names.include?(@subject._ct.parent_column_name)
-              @message = "expected #{@subject.class.name} to respond to #{@subject._ct.parent_column_name}"
+              @message = "expected #{@subject.name} to respond to #{@subject._ct.parent_column_name}"
               return false
             end
 
             # Checking if hierarchy table exists (common error)
             unless  @subject.hierarchy_class.table_exists?
-              @message = "expected #{@subject.class.name}'s hierarchy table '#{@subject.hierarchy_class.table_name}' to exist"
+              @message = "expected #{@subject.name}'s hierarchy table '#{@subject.hierarchy_class.table_name}' to exist"
               return false
             end
 
             if @ordered
               unless  @subject._ct.options.include?(:order)
-                @message = "expected #{@subject.class.name} to be an ordered closure tree"
+                @message = "expected #{@subject.name} to be an ordered closure tree"
                 return false
               end
               unless @subject.column_names.include?(@subject._ct.options[:order].to_s)
-                @message = "expected #{@subject.class.name} to have #{@subject._ct.options[:order]} as column"
+                @message = "expected #{@subject.name} to have #{@subject._ct.options[:order]} as column"
                 return false
               end
             end
 
             if @with_advisory_lock && !@subject._ct.options[:with_advisory_lock]
-                @message = "expected #{@subject.class.name} to have advisory lock"
+                @message = "expected #{@subject.name} to have advisory lock"
                 return false
             end
 
             if @without_advisory_lock && @subject._ct.options[:with_advisory_lock]
-                @message = "expected #{@subject.class.name} to not have advisory lock"
+                @message = "expected #{@subject.name} to not have advisory lock"
                 return false
             end
 
@@ -65,13 +65,13 @@ def without_advisory_lock
         end
 
         def failure_message
-          @message || "expected #{@subject.class.name} to #{description}"
+          @message || "expected #{@subject.name} to #{description}"
         end
 
         alias_method :failure_message_for_should, :failure_message
 
         def failure_message_when_negated
-          "expected #{@subject.class.name} not be a closure tree, but it is."
+          "expected #{@subject.name} not be a closure tree, but it is."
         end
 
         alias_method :failure_message_for_should_not, :failure_message_when_negated
@@ -83,3 +83,7 @@ def description
     end
   end
 end
+
+RSpec.configure do |c|
+  c.include ClosureTree::Test::Matcher, type: :model
+end

spec/cuisine_type_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
 def assert_lineage(e, m)
-  m.parent.should == e
-  m.self_and_ancestors.should == [m, e]
+  expect(m.parent).to eq(e)
+  expect(m.self_and_ancestors).to eq([m, e])
 
   # make sure reloading doesn't affect the self_and_ancestors:
   m.reload
-  m.self_and_ancestors.should == [m, e]
+  expect(m.self_and_ancestors).to eq([m, e])
 end
 
 describe CuisineType do
@@ -25,14 +25,14 @@ def assert_lineage(e, m)
   end
 
   it "sets the table_name of the hierarchy class properly" do
-    CuisineTypeHierarchy.table_name.should == ActiveRecord::Base.table_name_prefix + "cuisine_type_hierarchies" + ActiveRecord::Base.table_name_suffix
+    expect(CuisineTypeHierarchy.table_name).to eq(ActiveRecord::Base.table_name_prefix + "cuisine_type_hierarchies" + ActiveRecord::Base.table_name_suffix)
   end
 
   it 'fixes self_and_ancestors properly on reparenting' do
     a = CuisineType.create! :name => 'a'
     b = CuisineType.create! :name => 'b'
-    b.self_and_ancestors.to_a.should == [b]
+    expect(b.self_and_ancestors.to_a).to eq([b])
     a.children << b
-    b.self_and_ancestors.to_a.should == [b, a]
+    expect(b.self_and_ancestors.to_a).to eq([b, a])
   end
 end