closure_tree 3.6.5 → 3.6.6

data/README.md

@@ -361,9 +361,14 @@ Closure tree is [tested under every combination](http://travis-ci.org/#!/mceache
 
 ## Change log
 
+### 3.6.6
+
+* Added support for Rails 4's [strong parameter](https://github.com/rails/strong_parameters).
+Thanks, [James Miller](https://github.com/bensie)!
+
 ### 3.6.5
 
-* Use ```quote_table_name``` instead of ```quote_column_name```
+* Use ```quote_table_name``` instead of ```quote_column_name```. Addresses
  [issue 29](https://github.com/mceachen/closure_tree/issues/29). Thanks,
  [Marcello Barnaba](https://github.com/vjt)!
 

data/lib/closure_tree/acts_as_tree.rb

@@ -50,7 +50,9 @@ module ClosureTree
         :class_name => ct_class.to_s,
         :foreign_key => parent_column_name
 
-      attr_accessible :parent
+      unless defined?(ActiveModel::ForbiddenAttributesProtection) && ancestors.include?(ActiveModel::ForbiddenAttributesProtection)
+        attr_accessible :parent
+      end
 
       has_many :children, with_order_option(
         :class_name => ct_class.to_s,

data/lib/closure_tree/version.rb

@@ -1,3 +1,3 @@
 module ClosureTree
-  VERSION = "3.6.5" unless defined?(::ClosureTree::VERSION)
+  VERSION = "3.6.6" unless defined?(::ClosureTree::VERSION)
 end

data/spec/tag_spec.rb

@@ -384,15 +384,35 @@ shared_examples_for Tag do
 end
 
 describe Tag do
+  it "should not include ActiveModel::ForbiddenAttributesProtection" do
+    if defined?(ActiveModel::ForbiddenAttributesProtection)
+      Tag.ancestors.should_not include(ActiveModel::ForbiddenAttributesProtection)
+    end
+  end
   it_behaves_like Tag
 end
 
 describe "Tag with AR whitelisted attributes enabled" do
   before(:all) do
     ActiveRecord::Base.attr_accessible(nil) # turn on whitelisted attributes
-    ActiveRecord::Base.descendants.each{|ea|ea.reset_column_information}
+    ActiveRecord::Base.descendants.each { |ea| ea.reset_column_information }
+  end
+  it "should not include ActiveModel::ForbiddenAttributesProtection" do
+    if defined?(ActiveModel::ForbiddenAttributesProtection)
+      Tag.ancestors.should_not include(ActiveModel::ForbiddenAttributesProtection)
+    end
   end
   it_behaves_like Tag
 end
 
+# This has to be the last one, because we include strong parameters into Tag
+describe "Tag with strong parameters" do
+  before(:all) do
+    require 'strong_parameters'
+    class Tag
+      include ActiveModel::ForbiddenAttributesProtection
+    end
+  end
+  it_behaves_like Tag
+end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: closure_tree
 version: !ruby/object:Gem::Version
-  version: 3.6.5
+  version: 3.6.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-01 00:00:00.000000000 Z
+date: 2012-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -155,6 +155,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: strong_parameters
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Easily and efficiently make your ActiveRecord model support hierarchies
 email:
 - matthew-github@mceachen.org
@@ -192,7 +208,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2279521455981476723
+      hash: 2617295587215713218
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -201,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2279521455981476723
+      hash: 2617295587215713218
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23