closure_tree 4.2.7 → 4.2.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWUwYTFjNDQ4ZDI3ZDhkZTc0MWU1ZmY4MDZkZmMxZDdjZjY3MmFjMw==
+    NzZlMDU1MWEzOWIyM2RlMDAxNWQwNmE3YjZiMDU0NTY3ZmE5YzQ5Mw==
   data.tar.gz: !binary |-
-    YzdmYTU0ZDNkODUyOGNkNTMyZDE4YTQ4ZTg3MzY4ZTRhMzhjZTllZA==
-!binary "U0hBNTEy":
+    ODc3MzBlMDhlZDY2YTk0OWY5YzZhODkxZmExNDRiMDBiMDE0ODdkMA==
+SHA512:
   metadata.gz: !binary |-
-    ZDMxNjQxNjYxZGYyNDMxNjM5MDhmZGQ0MzMyYTI4ZDU3ZWUwZmIwYjk1NTBj
-    ZTQ0N2YwYTIwMWYzNGQ2MDAwYTQ1MjBiM2MyMmNjZTY3ZTNiNTJkNWI1NWE2
-    NzQ4MDMxODYzMGQ1YTkxN2VkNTE3YjU2NTI0ZDQ0ODZkOGNlODE=
+    MzJjMjU5Zjc0MzhmNThmNTI1YmQ4MTAyNGRkMGE4NTk4NGYyZWUyY2ZhNDE2
+    ZDc3OTdlNGI4NzMzMDBjZjJjY2VkZDY3ZmI5MmJiNzk1ZWZkYTUxZTEyOTVi
+    YjM0MmZjNDQ5NDEzNjk1NTgzNGQ1ZTk1MDI1ZGI3MzQ4YzMyMjU=
   data.tar.gz: !binary |-
-    MzBjNmRmYmVlYWUzZjEyYjBlNjViNDEwYWVmOWU0ZTBmZGQwMWI2YTIzNGE4
-    OWE3ZTcxNTBiMzk0OWYzZjliMzcxNzg0M2YxZWJiNzQ4OTYwYTFhN2ZjMjU3
-    M2M1ZmUzOWVmMmFhMzgyZmIzNmVlNjgyNjExMjUyMzBkNDhkYmM=
+    NDgyZjg5MTU5NzAyNmIwZDMyZWI5N2QyYmZhYjhjZTVjNWQ4NGY5MWMyMjY5
+    ZDc2M2QwNzcxOTkzYjE4MWQzZTYxYjllNDQ2ZjUyZTY3Y2ZkYjRlMTZkNGVk
+    YTNhNGFiNTM4ZGNjMzVlMmU0ZTM1NTVhZjNiNWIxZTEwMzUxNjU=

data/README.md

@@ -59,7 +59,10 @@ Note that closure_tree only supports Rails 3.0 and later, and has test coverage
 
 2.  Run ```bundle install```
 
-3.  Add ```acts_as_tree``` to your hierarchical model(s). There are a number of [options](#available-options) you can pass in, too.
+3.  Add ```acts_as_tree``` to your hierarchical model(s).
+    Make sure you add ```acts_as_tree``` *after any ```attr_accessible``` and ```self.table_name =```
+    lines in your model.
+    Please review the [available options](#available-options) you can provide.
 
 4.  Add a migration to add a ```parent_id``` column to the model you want to act_as_tree.
     You may want to also [add a column for deterministic ordering of children](#sort_order), but that's optional.
@@ -93,7 +96,7 @@ Note that closure_tree only supports Rails 3.0 and later, and has test coverage
           :unique => true, :name => "tag_anc_desc_udx"
 
         # For "all ancestors of…" selects,
-        add_index :tag_hierarchies, [:descendant_id]
+        add_index :tag_hierarchies, [:descendant_id],
           :name => "tag_desc_idx"
       end
     end

data/lib/closure_tree/support.rb

@@ -68,7 +68,11 @@ module ClosureTree
     end
 
     def scope_with_order(scope, additional_order_by = nil)
-      order_option? ? scope.order(*([additional_order_by, order_by].compact)) : scope
+      if order_option?
+        scope.order(*([additional_order_by, order_by].compact))
+      else
+        additional_order_by ? scope.order(additional_order_by) : scope
+      end
     end
 
     # lambda-ize the order, but don't apply the default order_option

data/lib/closure_tree/support_flags.rb

@@ -4,7 +4,7 @@ module ClosureTree
     def use_attr_accessible?
       defined?(ActiveModel::MassAssignmentSecurity) &&
         model_class.respond_to?(:accessible_attributes) &&
-        model_class.accessible_attributes.present?
+        ! model_class.accessible_attributes.nil?
     end
 
     def include_forbidden_attributes_protection?

data/lib/closure_tree/version.rb

@@ -1,3 +1,3 @@
 module ClosureTree
-  VERSION = Gem::Version.new("4.2.7") unless defined?(::ClosureTree::VERSION)
+  VERSION = Gem::Version.new('4.2.8') unless defined?(::ClosureTree::VERSION)
 end

data/spec/db/schema.rb

@@ -106,4 +106,17 @@ ActiveRecord::Schema.define(:version => 0) do
     t.integer "descendant_id", :null => false
     t.integer "generations", :null => false
   end
+
+  create_table "metal", :force => true do |t|
+    t.integer "parent_id"
+    t.string "metal_type"
+    t.string "value"
+    t.integer "sort_order"
+  end
+
+  create_table "metal_hierarchies", :id => false, :force => true do |t|
+    t.integer "ancestor_id", :null => false
+    t.integer "descendant_id", :null => false
+    t.integer "generations", :null => false
+  end
 end

data/spec/metal_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe Metal do
+  it "creates" do
+    s = Metal.create(:value => 'System')
+    s.reload
+    s.should_not be_new_record
+  end
+end

data/spec/support/models.rb

@@ -93,3 +93,9 @@ module Namespace
     attr_accessible :name if _ct.use_attr_accessible?
   end
 end
+
+class Metal < ActiveRecord::Base
+  self.table_name = 'metal'
+  acts_as_tree :order => 'sort_order'
+  self.inheritance_column = 'metal_type'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: closure_tree
 version: !ruby/object:Gem::Version
-  version: 4.2.7
+  version: 4.2.8
 platform: ruby
 authors:
 - Matthew McEachen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-21 00:00:00.000000000 Z
+date: 2013-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -207,6 +207,7 @@ files:
 - spec/db/schema.rb
 - spec/fixtures/tags.yml
 - spec/label_spec.rb
+- spec/metal_spec.rb
 - spec/namespace_type_spec.rb
 - spec/parallel_prepend_sibling_spec.rb
 - spec/parallel_spec.rb
@@ -237,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: Easily and efficiently make your ActiveRecord model support hierarchies
@@ -247,6 +248,7 @@ test_files:
 - spec/db/schema.rb
 - spec/fixtures/tags.yml
 - spec/label_spec.rb
+- spec/metal_spec.rb
 - spec/namespace_type_spec.rb
 - spec/parallel_prepend_sibling_spec.rb
 - spec/parallel_spec.rb