active_attr 0.7.0 → 0.8.0

data/spec/unit/active_attr/typecasting/object_typecaster_spec.rb

@@ -4,10 +4,12 @@ require "active_attr/typecasting/object_typecaster"
 module ActiveAttr
   module Typecasting
     describe ObjectTypecaster do
+      subject(:typecaster) { described_class.new }
+
       describe "#call" do
         it "returns the original object for any object" do
           value = mock
-          subject.call(value).should equal value
+          typecaster.call(value).should equal value
         end
       end
     end

data/spec/unit/active_attr/typecasting/string_typecaster_spec.rb

@@ -5,18 +5,20 @@ require "active_support/basic_object"
 module ActiveAttr
   module Typecasting
     describe StringTypecaster do
+      subject(:typecaster) { described_class.new }
+
       describe "#call" do
         it "returns the original string for a String" do
           value = "abc"
-          subject.call(value).should equal value
+          typecaster.call(value).should equal value
         end
 
         it "casts nil to an empty String" do
-          subject.call(nil).should eql ""
+          typecaster.call(nil).should eql ""
         end
 
         it "returns the string version of a Symbol" do
-          subject.call(:value).should eql "value"
+          typecaster.call(:value).should eql "value"
         end
       end
     end

data/spec/unit/active_attr/typecasting_spec.rb

@@ -3,7 +3,7 @@ require "active_attr/typecasting"
 
 module ActiveAttr
   describe Typecasting do
-    subject { model_class.new }
+    subject(:model) { model_class.new }
 
     let :model_class do
       Class.new do
@@ -13,11 +13,11 @@ module ActiveAttr
 
     describe "#typecast_attribute" do
       it "raises an ArgumentError when a nil type is given" do
-        expect { subject.typecast_attribute(nil, "foo") }.to raise_error(ArgumentError, "a typecaster must be given")
+        expect { model.typecast_attribute(nil, "foo") }.to raise_error(ArgumentError, "a typecaster must be given")
       end
 
       it "raises an ArgumentError when the given typecaster argument does not respond to #call" do
-        expect { subject.typecast_attribute(Object.new, "foo") }.to raise_error(ArgumentError, "a typecaster must be given")
+        expect { model.typecast_attribute(Object.new, "foo") }.to raise_error(ArgumentError, "a typecaster must be given")
       end
 
       it "returns the original value when the value is nil" do
@@ -26,8 +26,6 @@ module ActiveAttr
     end
 
     describe "#typecaster_for" do
-      let(:model) { model_class.new }
-
       it "returns BigDecimalTypecaster for BigDecimal" do
         model.typecaster_for(BigDecimal).should be_a_kind_of Typecasting::BigDecimalTypecaster
       end

data/spec/unit/active_attr/version_spec.rb

@@ -9,10 +9,10 @@ module ActiveAttr
 
     describe "is compliant with Semantic Versioning <http://semver.org/>" do
       let(:gem_version) { Gem::Version.new VERSION }
-      subject { gem_version }
+      subject(:version) { gem_version }
 
-      it { subject.should have_at_least(3).segments }
-      it { subject.should have_at_most(5).segments }
+      it { version.should have_at_least(3).segments }
+      it { version.should have_at_most(5).segments }
 
       describe "major version" do
         subject { gem_version.segments[0] }
@@ -33,10 +33,10 @@ module ActiveAttr
       end
 
       describe "pre-release version" do
-        subject { VERSION.split(".")[3] }
+        subject(:pre_release_version) { VERSION.split(".")[3] }
 
         it "is nil or starts with a letter and is alphanumeric" do
-          (subject.nil? || subject =~ /^[A-Za-z][0-9A-Za-z]*?/).should be_true
+          (pre_release_version.nil? || pre_release_version =~ /^[A-Za-z][0-9A-Za-z]*?/).should be_true
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_attr
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-16 00:00:00.000000000 Z
+date: 2013-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -82,7 +82,7 @@ dependencies:
         version: '2.2'
     - - <
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -93,23 +93,29 @@ dependencies:
         version: '2.2'
     - - <
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '10.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -117,7 +123,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -125,7 +131,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.11'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +170,7 @@ files:
 - active_attr.gemspec
 - gemfiles/rails_3_0.gemfile
 - gemfiles/rails_3_1.gemfile
+- gemfiles/rails_3_2.gemfile
 - gemfiles/rails_head.gemfile
 - lib/active_attr.rb
 - lib/active_attr/attribute_defaults.rb
@@ -176,7 +183,6 @@ files:
 - lib/active_attr/error.rb
 - lib/active_attr/logger.rb
 - lib/active_attr/mass_assignment.rb
-- lib/active_attr/mass_assignment_security.rb
 - lib/active_attr/matchers.rb
 - lib/active_attr/matchers/have_attribute_matcher.rb
 - lib/active_attr/model.rb
@@ -201,7 +207,7 @@ files:
 - spec/functional/active_attr/attribute_defaults_spec.rb
 - spec/functional/active_attr/attributes_spec.rb
 - spec/functional/active_attr/chainable_initialization_spec.rb
-- spec/functional/active_attr/mass_assignment_security_spec.rb
+- spec/functional/active_attr/mass_assignment_spec.rb
 - spec/functional/active_attr/matchers/have_attribute_matcher_spec.rb
 - spec/functional/active_attr/model_spec.rb
 - spec/functional/active_attr/query_attributes_spec.rb
@@ -220,7 +226,6 @@ files:
 - spec/unit/active_attr/dangerous_attribute_error_spec.rb
 - spec/unit/active_attr/error_spec.rb
 - spec/unit/active_attr/logger_spec.rb
-- spec/unit/active_attr/mass_assignment_security_spec.rb
 - spec/unit/active_attr/mass_assignment_spec.rb
 - spec/unit/active_attr/matchers/have_attribute_matcher_spec.rb
 - spec/unit/active_attr/matchers_spec.rb
@@ -253,7 +258,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 158822626383359135
+      hash: 712620086539529581
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -262,10 +267,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 158822626383359135
+      hash: 712620086539529581
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: What ActiveModel left out
@@ -273,7 +278,7 @@ test_files:
 - spec/functional/active_attr/attribute_defaults_spec.rb
 - spec/functional/active_attr/attributes_spec.rb
 - spec/functional/active_attr/chainable_initialization_spec.rb
-- spec/functional/active_attr/mass_assignment_security_spec.rb
+- spec/functional/active_attr/mass_assignment_spec.rb
 - spec/functional/active_attr/matchers/have_attribute_matcher_spec.rb
 - spec/functional/active_attr/model_spec.rb
 - spec/functional/active_attr/query_attributes_spec.rb
@@ -292,7 +297,6 @@ test_files:
 - spec/unit/active_attr/dangerous_attribute_error_spec.rb
 - spec/unit/active_attr/error_spec.rb
 - spec/unit/active_attr/logger_spec.rb
-- spec/unit/active_attr/mass_assignment_security_spec.rb
 - spec/unit/active_attr/mass_assignment_spec.rb
 - spec/unit/active_attr/matchers/have_attribute_matcher_spec.rb
 - spec/unit/active_attr/matchers_spec.rb
@@ -311,4 +315,3 @@ test_files:
 - spec/unit/active_attr/typecasting_spec.rb
 - spec/unit/active_attr/unknown_attribute_error_spec.rb
 - spec/unit/active_attr/version_spec.rb
-has_rdoc: 

data/lib/active_attr/mass_assignment_security.rb

@@ -1,54 +0,0 @@
-require "active_attr/mass_assignment"
-require "active_support/concern"
-require "active_model"
-
-module ActiveAttr
-  # MassAssignmentSecurity allows you to bulk set and update a blacklist or
-  # whitelist of attributes
-  #
-  # Including MassAssignmentSecurity extends all {ActiveAttr::MassAssignment}
-  # methods to honor any declared attribute permissions.
-  #
-  # @example Usage
-  #   class Person
-  #     include ActiveAttr::MassAssignmentSecurity
-  #   end
-  #
-  # @since 0.3.0
-  module MassAssignmentSecurity
-    extend ActiveSupport::Concern
-    include MassAssignment
-    include ActiveModel::MassAssignmentSecurity
-
-    # Mass update a model's attributes, honoring attribute permissions
-    #
-    # @param (see MassAssignment#assign_attributes)
-    # @param [Hash, #[]] options Options that affect mass assignment
-    #
-    # @option options [Symbol] :as (:default) Mass assignment role
-    # @option options [true, false] :without_protection (false) Bypass mass
-    #   assignment security if true
-    #
-    # @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_with_or_without_role new_attributes, mass_assignment_role
-      end
-
-      super
-    end
-
-    private
-
-    # Rails 3.0 has no roles support in mass assignment
-    # @since 0.7.0
-    def sanitize_for_mass_assignment_with_or_without_role(new_attributes, mass_assignment_role)
-      if method(:sanitize_for_mass_assignment).arity.abs > 1
-        sanitize_for_mass_assignment new_attributes, mass_assignment_role
-      else
-        sanitize_for_mass_assignment new_attributes
-      end
-    end
-  end
-end

data/spec/functional/active_attr/mass_assignment_security_spec.rb

@@ -1,45 +0,0 @@
-require "spec_helper"
-require "active_attr/mass_assignment_security"
-
-module ActiveAttr
-  describe MassAssignmentSecurity, :mass_assignment do
-    context "integrating with strong_parameters", :active_model_version => "~> 3.2.0" do
-      subject { model_class }
-
-      before do
-        require "strong_parameters"
-
-        model_class.class_eval do
-          include ActiveAttr::MassAssignmentSecurity
-          include ActiveModel::ForbiddenAttributesProtection
-          attr_accessor :age
-        end
-      end
-
-      shared_examples "strong mass assignment method", :strong_mass_assignment_method => true do
-        it "raises if provided parameters when none are permitted" do
-          expect { mass_assign_attributes(ActionController::Parameters.new(:age => 21)) }.to raise_error ActiveModel::ForbiddenAttributes
-        end
-
-        it "sets a permitted parameter" do
-          person = mass_assign_attributes(ActionController::Parameters.new(:age => 21).permit(:age))
-          person.age.should == 21
-        end
-
-        it "does not set forbidden parameters" do
-          person = mass_assign_attributes(ActionController::Parameters.new(:age => 21).permit(:first_name))
-          person.age.should be_nil
-        end
-
-        it "continues to set normal attributes" do
-          person = mass_assign_attributes(:age => 21)
-          person.age.should == 21
-        end
-      end
-
-      describe "#assign_attributes", :assign_attributes, :strong_mass_assignment_method
-      describe "#attributes=", :attributes=, :strong_mass_assignment_method
-      describe "#initialize", :initialize, :strong_mass_assignment_method
-    end
-  end
-end

data/spec/unit/active_attr/mass_assignment_security_spec.rb

@@ -1,67 +0,0 @@
-require "spec_helper"
-require "active_attr/mass_assignment_security"
-
-module ActiveAttr
-  describe MassAssignmentSecurity, :mass_assignment do
-    subject { model_class }
-
-    before do
-      model_class.class_eval do
-        include MassAssignmentSecurity
-        attr_accessor :age
-      end
-    end
-
-    shared_examples "secure mass assignment method", :secure_mass_assignment_method => true do
-      include_examples "mass assignment method"
-
-      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", :active_model_version => ">= 3.1.0" do
-        person = mass_assign_attributes_with_options({ :age => 21 }, :as => :admin)
-        person.age.should == 21
-      end
-
-      it "skips security if passed the :without_protection option" do
-        person = mass_assign_attributes_with_options({ :age => 21 }, :without_protection => true)
-        person.age.should == 21
-      end
-    end
-
-    context "white listing attributes" do
-      before do
-        model_class.class_eval do
-          attr_accessible :first_name, :last_name, :name
-          attr_accessible :age, :as => :admin
-        end
-      end
-
-      describe "#assign_attributes", :assign_attributes, :secure_mass_assignment_method, :secure_mass_assignment_method_with_options
-      describe "#attributes=", :attributes=, :secure_mass_assignment_method
-      describe "#initialize", :initialize, :secure_mass_assignment_method, :secure_mass_assignment_method_with_options
-    end
-
-    context "black listing attributes" do
-      before do
-        model_class.class_eval do
-          attr_protected :age
-          attr_protected :as => :admin
-        end
-      end
-
-      describe "#assign_attributes", :assign_attributes, :secure_mass_assignment_method, :secure_mass_assignment_method_with_options
-      describe "#attributes=", :attributes=, :secure_mass_assignment_method
-      describe "#initialize", :initialize, :secure_mass_assignment_method, :secure_mass_assignment_method_with_options
-    end
-  end
-end