active_attr 0.5.0 → 0.5.1

data/.travis.yml

@@ -6,6 +6,7 @@ rvm:
 bundler_args: --without development
 gemfile:
   - Gemfile
+  - gemfiles/rails_3_0.gemfile
   - gemfiles/rails_3_1.gemfile
   - gemfiles/rails_head.gemfile
 matrix:

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# ActiveAttr 0.5.1 (March 16, 2012) #
+
+* ActiveAttr now supports Rails 3.0.2+ (Egor Baranov)
+
 # ActiveAttr 0.5.0 (March 11, 2012) #
 
 * ActiveAttr is now Ruby warning free

data/active_attr.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency "activemodel",   ">= 3.1", "< 4.1"
-  s.add_runtime_dependency "activesupport", ">= 3.1", "< 4.1"
+  s.add_runtime_dependency "activemodel",   ">= 3.0.2", "< 4.1"
+  s.add_runtime_dependency "activesupport", ">= 3.0.2", "< 4.1"
 
   s.add_development_dependency "bundler",      "~> 1.0"
   s.add_development_dependency "factory_girl", "~> 2.2"

data/gemfiles/rails_3_0.gemfile

@@ -0,0 +1,6 @@
+source "http://rubygems.org"
+
+gemspec :development_group => :test, :path => ".."
+
+gem "activemodel",   "~> 3.0.2"
+gem "activesupport", "~> 3.0.2"

data/lib/active_attr/attribute_definition.rb

@@ -1,6 +1,3 @@
-require 'active_support/core_ext/hash/reverse_merge'
-require 'active_support/core_ext/string/inflections'
-
 module ActiveAttr
   # Represents an attribute for reflection
   #

data/lib/active_attr/attributes.rb

@@ -165,7 +165,9 @@ module ActiveAttr
       def attribute(name, options={})
         AttributeDefinition.new(name, options).tap do |attribute_definition|
           attribute_name = attribute_definition.name.to_s
-          define_attribute_method attribute_definition.name unless attribute_names.include? attribute_name
+          # Force active model to generate attribute methods
+          remove_instance_variable("@attribute_methods_generated") if instance_variable_defined?("@attribute_methods_generated")
+          define_attribute_methods([attribute_definition.name]) unless attribute_names.include? attribute_name
           attributes[attribute_name] = attribute_definition
         end
       end

data/lib/active_attr/mass_assignment_security.rb

@@ -32,8 +32,13 @@ module ActiveAttr
     # @since 0.3.0
     def assign_attributes(new_attributes, options={})
       if new_attributes && !options[:without_protection]
-        mass_assignment_role = options[:as] || :default
-        new_attributes = sanitize_for_mass_assignment new_attributes, mass_assignment_role
+        if method(:sanitize_for_mass_assignment).arity.abs > 1
+          mass_assignment_role = options[:as] || :default
+          new_attributes = sanitize_for_mass_assignment new_attributes, mass_assignment_role
+        else
+          # Rails 3.0 has no roles support in mass assignment
+          new_attributes = sanitize_for_mass_assignment new_attributes
+        end
       end
 
       super

data/lib/active_attr/typecasting/big_decimal_typecaster.rb

@@ -25,7 +25,9 @@ module ActiveAttr
       #
       # @since 0.5.0
       def call(value)
-        if value.respond_to? :to_d
+        if value.is_a? BigDecimal
+          value
+        elsif value.respond_to? :to_d
           value.to_d
         else
           BigDecimal.new value.to_s

data/lib/active_attr/version.rb

@@ -1,5 +1,5 @@
 module ActiveAttr
   # Complete version string
   # @since 0.1.0
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/spec/functional/active_attr/attribute_defaults_spec.rb

@@ -9,8 +9,10 @@ module ActiveAttr
     subject { model_class.new }
 
     let :model_class do
-      Class.new do
-        include ActiveAttr::AttributeDefaults
+      Class.new.tap do |model_class|
+        model_class.class_eval do
+          include ActiveAttr::AttributeDefaults
+        end
       end
     end
 

data/spec/functional/active_attr/attributes_spec.rb

@@ -5,6 +5,31 @@ require "factory_girl"
 
 module ActiveAttr
   describe Attributes do
+    context "defining multiple attributes" do
+      let :model_class do
+        Class.new do
+          include Attributes
+
+          attribute :name
+          attribute :id
+
+          def id
+            if defined?(super)
+              super
+            else
+              object_id
+            end
+          end unless instance_methods(false).include?("id")
+        end
+      end
+
+      subject { model_class.new }
+
+      it "correctly defines methods for the attributes instead of relying on method_missing" do
+        subject.id.should be_nil
+      end
+    end
+
     context "subclassing a model" do
       let :parent_class do
         Class.new do
@@ -17,7 +42,7 @@ module ActiveAttr
 
       let! :child_class do
         Class.new(parent_class).tap do |child_class|
-          child_class.instance_eval do
+          child_class.class_eval do
             attribute :child
             attribute :redefined, :type => String
           end
@@ -171,7 +196,7 @@ module ActiveAttr
         end
 
         it "defining an attribute that conflicts with ActiveModel::AttributeMethods raises DangerousAttributeError" do
-          expect { model_class.attribute(:attribute_method_matchers) }.to raise_error DangerousAttributeError, %{an attribute method named "attribute_method_matchers" would conflict with an existing method}
+          expect { model_class.attribute(:inspect) }.to raise_error DangerousAttributeError, %{an attribute method named "inspect" would conflict with an existing method}
         end
 
         it "defining an :id attribute does not raise" do
@@ -204,19 +229,21 @@ module ActiveAttr
       end
 
       let :dangerous_model_class do
-        Class.new do
-          include Attributes
+        Class.new.tap do |dangerous_model_class|
+          dangerous_model_class.class_eval do
+            include Attributes
 
-          def method_missing(method_name, *)
-            super if %w(my_proper_missing_method my_less_proper_missing_method).include? method_name.to_s
-          end
+            def method_missing(method_name, *)
+              super if %w(my_proper_missing_method my_less_proper_missing_method).include? method_name.to_s
+            end
 
-          def respond_to_missing?(method_name, *)
-            method_name.to_s == "my_proper_missing_method" || super
-          end
+            def respond_to_missing?(method_name, *)
+              method_name.to_s == "my_proper_missing_method" || super
+            end
 
-          def respond_to?(method_name, include_private=false)
-            super || method_name.to_s == "my_less_proper_missing_method" || (RUBY_VERSION < "1.9" && respond_to_missing?(method_name, include_private))
+            def respond_to?(method_name, include_private=false)
+              super || method_name.to_s == "my_less_proper_missing_method" || (RUBY_VERSION < "1.9" && respond_to_missing?(method_name, include_private))
+            end
           end
         end
       end

data/spec/functional/active_attr/query_attributes_spec.rb

@@ -4,6 +4,14 @@ require "active_attr/query_attributes"
 module ActiveAttr
   describe QueryAttributes do
     context "defining dangerous attributes" do
+      let :parent_class do
+        Class.new.tap do |parent_class|
+          parent_class.class_eval do
+            include QueryAttributes
+          end
+        end
+      end
+
       shared_examples "defining a dangerous queryable attribute" do
         it "defining an attribute that conflicts with ActiveModel::AttributeMethods raises DangerousAttributeError" do
           expect { model_class.attribute(:attribute_method) }.to raise_error DangerousAttributeError, %{an attribute method named "attribute_method?" would conflict with an existing method}
@@ -19,12 +27,12 @@ module ActiveAttr
       end
 
       context "on a model class" do
-        let(:model_class) { Class.new { include QueryAttributes } }
+        let(:model_class) { parent_class }
         include_examples "defining a dangerous queryable attribute"
       end
 
       context "on a child class" do
-        let(:model_class) { Class.new(Class.new { include QueryAttributes }) }
+        let(:model_class) { Class.new(parent_class) }
         include_examples "defining a dangerous queryable attribute"
       end
     end

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require "bundler/setup"
 require "rspec/autorun"
+require "active_model/version"
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
@@ -8,4 +9,8 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |file| require file }
 RSpec.configure do |config|
   config.mock_framework = :rspec
   config.treat_symbols_as_metadata_keys_with_true_values = true # default in RSpec 3
+
+  config.filter_run_excluding :active_model_version => lambda { |requirement|
+    !Gem::Requirement.create(requirement).satisfied_by?(Gem::Version.new(ActiveModel::VERSION::STRING))
+  }
 end

data/spec/unit/active_attr/attribute_defaults_spec.rb

@@ -26,11 +26,11 @@ module ActiveAttr
 
       it "includes declared nil attribute defaults" do
         subject.should include "age"
-        subject['age'].should be_nil
+        subject["age"].should be_nil
       end
 
       it "includes declared dynamic attribute defaults" do
-        subject['created_at'].should be_a_kind_of Time
+        subject["created_at"].should be_a_kind_of Time
       end
     end
 

data/spec/unit/active_attr/mass_assignment_security_spec.rb

@@ -15,14 +15,19 @@ module ActiveAttr
     shared_examples "secure mass assignment method", :secure_mass_assignment_method => true do
       include_examples "mass assignment method"
 
-      it "ignores assigning a protected attribute" do
+      it "ignores assigning an attribute protected by role-based security", :active_model_version => ">= 3.1.0" do
         person = mass_assign_attributes(:age => 21)
         person.age.should be_nil
       end
+
+      it "ignores assigning a protected attribute" do
+        person = mass_assign_attributes(:first_name => "Chris")
+        person.age.should be_nil
+      end
     end
 
     shared_examples "secure mass assignment method with options", :secure_mass_assignment_method_with_options => true do
-      it "supports role-based mass assignment security" do
+      it "supports role-based mass assignment security", :active_model_version => ">= 3.1.0" do
         person = mass_assign_attributes_with_options({ :age => 21 }, :as => :admin)
         person.age.should == 21
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_attr
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,39 +10,39 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-12 00:00:00.000000000Z
+date: 2012-03-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70109482810160 !ruby/object:Gem::Requirement
+  requirement: &70128915108520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 3.0.2
     - - <
       - !ruby/object:Gem::Version
         version: '4.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70109482810160
+  version_requirements: *70128915108520
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70109482808160 !ruby/object:Gem::Requirement
+  requirement: &70128915106640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 3.0.2
     - - <
       - !ruby/object:Gem::Version
         version: '4.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70109482808160
+  version_requirements: *70128915106640
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70109482806600 !ruby/object:Gem::Requirement
+  requirement: &70128915104720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -50,10 +50,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70109482806600
+  version_requirements: *70128915104720
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70109482805800 !ruby/object:Gem::Requirement
+  requirement: &70128915103800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -61,10 +61,10 @@ dependencies:
         version: '2.2'
   type: :development
   prerelease: false
-  version_requirements: *70109482805800
+  version_requirements: *70128915103800
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70109482804840 !ruby/object:Gem::Requirement
+  requirement: &70128915102820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -72,10 +72,10 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *70109482804840
+  version_requirements: *70128915102820
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70109482803980 !ruby/object:Gem::Requirement
+  requirement: &70128915102080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -83,10 +83,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70109482803980
+  version_requirements: *70128915102080
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70109482803280 !ruby/object:Gem::Requirement
+  requirement: &70128915101040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -94,7 +94,7 @@ dependencies:
         version: 0.3.29
   type: :development
   prerelease: false
-  version_requirements: *70109482803280
+  version_requirements: *70128915101040
 description: Create plain old ruby models without reinventing the wheel.
 email:
 - cgriego@gmail.com
@@ -115,6 +115,7 @@ files:
 - README.md
 - Rakefile
 - active_attr.gemspec
+- gemfiles/rails_3_0.gemfile
 - gemfiles/rails_3_1.gemfile
 - gemfiles/rails_head.gemfile
 - lib/active_attr.rb
@@ -199,7 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2941939635939237766
+      hash: 4554673670402993662
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -208,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2941939635939237766
+      hash: 4554673670402993662
 requirements: []
 rubyforge_project: active_attr
 rubygems_version: 1.8.10