active_attr 0.5.0.alpha2 → 0.5.0

data/spec/functional/active_attr/model_spec.rb

@@ -11,6 +11,7 @@ module ActiveAttr
 
         attribute :first_name
         attribute :last_name
+        attribute :age, :type => Integer
 
         attr_protected :last_name
 
@@ -84,6 +85,11 @@ module ActiveAttr
       model_class.human_attribute_name(:first_name).should == "First name"
     end
 
+    it "typecasts attributes" do
+      subject.age = "29"
+      subject.age.should eql 29
+    end
+
     context "attribute defaults" do
       let :model_class do
         Class.new do

data/spec/functional/active_attr/typecasted_attributes_spec.rb

@@ -1,6 +1,5 @@
 require "spec_helper"
 require "active_attr/typecasted_attributes"
-require "active_attr/mass_assignment"
 
 module ActiveAttr
   describe TypecastedAttributes do
@@ -11,13 +10,14 @@ module ActiveAttr
         include TypecastedAttributes
 
         attribute :typeless
-        attribute :object,    :type => Object
-        attribute :boolean,   :type => Typecasting::Boolean
-        attribute :date,      :type => Date
-        attribute :date_time, :type => DateTime
-        attribute :float,     :type => Float
-        attribute :integer,   :type => Integer
-        attribute :string,    :type => String
+        attribute :object,      :type => Object
+        attribute :big_decimal, :type => BigDecimal
+        attribute :boolean,     :type => Typecasting::Boolean
+        attribute :date,        :type => Date
+        attribute :date_time,   :type => DateTime
+        attribute :float,       :type => Float
+        attribute :integer,     :type => Integer
+        attribute :string,      :type => String
       end
     end
 
@@ -32,6 +32,11 @@ module ActiveAttr
         subject.object.should be_nil
       end
 
+      it "a BigDecimal attribute returns nil" do
+        subject.big_decimal = nil
+        subject.big_decimal.should be_nil
+      end
+
       it "a Boolean attribute returns nil" do
         subject.boolean = nil
         subject.boolean.should be_nil
@@ -76,6 +81,11 @@ module ActiveAttr
         subject.object.should equal value
       end
 
+      it "a BigDecimal attribute returns a BigDecimal" do
+        subject.big_decimal = "1.1"
+        subject.big_decimal.should eql BigDecimal.new("1.1")
+      end
+
       it "a Boolean attribute returns a Boolean" do
         subject.boolean = "false"
         subject.boolean.should eql false

data/spec/unit/active_attr/matchers/have_attribute_matcher_spec.rb

@@ -1,84 +1,37 @@
 require "spec_helper"
-require "active_attr/attributes"
 require "active_attr/matchers/have_attribute_matcher"
 
 module ActiveAttr
-  describe Matchers do
-    let(:dsl) { Object.new.extend described_class }
-    subject { dsl }
-
-    it { should respond_to(:have_attribute).with(1).argument }
-
-    describe "#have_attribute" do
-      subject { dsl.have_attribute(:first_name) }
-
-      it "builds a HaveAttributeMatcher" do
-        should be_a_kind_of Matchers::HaveAttributeMatcher
-      end
-
-      it "uses the given attribute name to construct the matcher" do
-        subject.send(:attribute_name).should == :first_name
-      end
-    end
-  end
-
   module Matchers
     describe HaveAttributeMatcher do
-      let :model_class do
-        Class.new do
-          include Attributes
-          attribute :first_name, :default => "John"
-          attribute :last_name
-          attribute :admin, :default => false
-
-          def self.to_s
-            "Person"
-          end
-        end
+      describe ".class" do
+        it { described_class.should respond_to(:new).with(1).argument }
       end
 
-      subject { positive_matcher }
-      let(:positive_matcher) { described_class.new(:first_name) }
-      let(:negative_matcher) { described_class.new(:age) }
-      let(:positive_matcher_with_default) { described_class.new(:first_name).with_default_value_of("John") }
-      let(:positive_matcher_with_false_default) { described_class.new(:admin).with_default_value_of(false) }
-      let(:negative_matcher_with_wrong_default) { described_class.new(:first_name).with_default_value_of("Doe") }
-      let(:negative_matcher_with_default_no_attribute) { described_class.new(:age).with_default_value_of(21) }
-      let(:negative_matcher_with_nil_default) { described_class.new(:first_name).with_default_value_of(nil) }
-
-      it { described_class.should respond_to(:new).with(1).argument }
-
       describe "#description" do
         it "returns a description appropriate to the expectation" do
-          subject.description.should == "have attribute named first_name"
+          described_class.new(:first_name).description.should == "has attribute named first_name"
         end
 
         it "mentions the default value if set" do
-          positive_matcher_with_default.description.should == %{have attribute named first_name with a default value of "John"}
+          described_class.new(:first_name).with_default_value_of("John").description.should == %{has attribute named first_name with a default value of "John"}
         end
 
-        it "mentions the default value if set to false" do
-          positive_matcher_with_false_default.description.should == %{have attribute named admin with a default value of false}
+        it "mentions the default value if set to nil" do
+          described_class.new(:first_name).with_default_value_of(nil).description.should == %{has attribute named first_name with a default value of nil}
         end
-      end
 
-      describe "#failure_message" do
-        it "returns a failure message appropriate to the expectation and subject" do
-          negative_matcher.tap do |matcher|
-            matcher.matches? model_class
-          end.failure_message.should == "Expected Person to have attribute named age"
+        it "mentions the default value if set to false" do
+          described_class.new(:admin).with_default_value_of(false).description.should == %{has attribute named admin with a default value of false}
         end
 
-        it "mentions the default value if set" do
-          negative_matcher_with_wrong_default.tap do |matcher|
-            matcher.matches? model_class
-          end.failure_message.should == %{Expected Person to have attribute named first_name with a default value of "Doe"}
+        it "mentions the type if set" do
+          described_class.new(:first_name).of_type(String).description.should == %{has attribute named first_name of type String}
         end
 
-        it "mentions the default value if set to false" do
-          negative_matcher_with_nil_default.tap do |matcher|
-            matcher.matches? model_class
-          end.failure_message.should == %{Expected Person to have attribute named first_name with a default value of nil}
+        it "mentions both the type and default if both are set" do
+          description = described_class.new(:first_name).of_type(String).with_default_value_of("John").description
+          description.should == %{has attribute named first_name of type String with a default value of "John"}
         end
       end
 
@@ -88,93 +41,15 @@ module ActiveAttr
         end
       end
 
-      describe "#matches?" do
-        let(:model_instance) { model_class.new }
-
-        it "is true with an instance of a model class that has the attribute" do
-          positive_matcher.matches?(model_instance).should be_true
-        end
-
-        it "is true with a model class that has the attribute" do
-          positive_matcher.matches?(model_class).should be_true
-        end
-
-        it "is false with an instance of a model class that does not have the attribute" do
-          negative_matcher.matches?(model_instance).should be_false
-        end
-
-        it "is false with a model class that does not have the attribute" do
-          negative_matcher.matches?(model_class).should be_false
-        end
-
-        context "when the matcher specifies a default value" do
-          it "is true with an instance of a model class that has the attribute with the default value" do
-            positive_matcher_with_default.matches?(model_class).should be_true
-          end
-
-          it "is true with a model class that has the attribute with the default value" do
-            positive_matcher_with_default.matches?(model_class).should be_true
-          end
-
-          it "is false with an instance of a model class that does not have the attribute" do
-            negative_matcher_with_default_no_attribute.matches?(model_instance).should be_false
-          end
-
-          it "is false with a model class that does not have the attribute" do
-            negative_matcher_with_default_no_attribute.matches?(model_class).should be_false
-          end
-
-          it "is false with an instance of a model class that has the attribute but not with the specified default value" do
-            negative_matcher_with_wrong_default.matches?(model_instance).should be_false
-          end
-
-          it "is false with a model class that has the attribute but not with the specified default value" do
-            negative_matcher_with_wrong_default.matches?(model_class).should be_false
-          end
-
-          it "is true with an instance of a model class that has the attribute with the default value of false" do
-            positive_matcher_with_false_default.matches?(model_class).should be_true
-          end
-
-          it "is true with a model class that has the attribute with the default value where the default value is false" do
-            positive_matcher_with_false_default.matches?(model_class).should be_true
-          end
-
-          it "is true with an instance of a model class that has the attribute with the default value where the default value is false" do
-            positive_matcher_with_false_default.matches?(model_class).should be_true
-          end
-
-          it "is true with a model class that has the attribute with the default value false" do
-            positive_matcher_with_false_default.matches?(model_class).should be_true
-          end
-
-          it "is false with an instance of a model class that has the attribute but not with the specified default value where the specified default value is nil" do
-            negative_matcher_with_nil_default.matches?(model_instance).should be_false
-          end
-
-          it "is false with a model class that has the attribute but not with the specified default value where the specified default value is nil" do
-            negative_matcher_with_nil_default.matches?(model_class).should be_false
-          end
+      describe "#of_type" do
+        it "chains" do
+          described_class.new(:first_name).of_type(String).should be_a_kind_of described_class
         end
       end
 
-      describe "#negative_failure_message" do
-        it "returns a failure message appropriate to the expectation and subject" do
-          positive_matcher.tap do |matcher|
-            matcher.matches? model_class
-          end.negative_failure_message.should == "Expected Person to not have attribute named first_name"
-        end
-
-        it "mentions the default value if set" do
-          positive_matcher_with_default.tap do |matcher|
-            matcher.matches? model_class
-          end.negative_failure_message.should == %{Expected Person to not have attribute named first_name with a default value of "John"}
-        end
-
-        it "mentions the default value if set to false" do
-          positive_matcher_with_false_default.tap do |matcher|
-            matcher.matches? model_class
-          end.negative_failure_message.should == %{Expected Person to not have attribute named admin with a default value of false}
+      describe "#with_default_value_of" do
+        it "chains" do
+          described_class.new(:first_name).with_default_value_of(nil).should be_a_kind_of described_class
         end
       end
     end

data/spec/unit/active_attr/matchers_spec.rb

@@ -0,0 +1,23 @@
+require "spec_helper"
+require "active_attr/matchers"
+
+module ActiveAttr
+  describe Matchers do
+    let(:dsl) { Object.new.extend described_class }
+    subject { dsl }
+
+    it { should respond_to(:have_attribute).with(1).argument }
+
+    describe "#have_attribute" do
+      subject { dsl.have_attribute(:first_name) }
+
+      it "builds a HaveAttributeMatcher" do
+        should be_a_kind_of Matchers::HaveAttributeMatcher
+      end
+
+      it "uses the given attribute name to construct the matcher" do
+        subject.send(:attribute_name).should == :first_name
+      end
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+require "spec_helper"
+require "active_attr/typecasting/big_decimal_typecaster"
+
+module ActiveAttr
+  module Typecasting
+    describe BigDecimalTypecaster do
+      describe "#call" do
+        it "returns the original BigDecimal for a BigDecimal" do
+          value = BigDecimal.new("2.0")
+          subject.call(value).should equal value
+        end
+
+        it "casts nil to a zero BigDecimal" do
+          subject.call(nil).should eql BigDecimal.new("0.0")
+        end
+
+        it "casts a numeric String to a BigDecimal" do
+          subject.call("2").should eql BigDecimal.new("2.0")
+        end
+
+        it "casts a alpha String to a zero BigDecimal" do
+          subject.call("bob").should eql BigDecimal.new("0.0")
+        end
+
+        it "casts a Rational to a BigDecimal" do
+          subject.call(Rational(1, 2)).should eql BigDecimal.new("0.5")
+        end
+
+        it "casts a Float to a BigDecimal" do
+          subject.call(1.2).should eql BigDecimal.new("1.2")
+        end
+
+        it "cases an Integer to a BigDecimal" do
+          subject.call(2).should eql BigDecimal.new("2.0")
+        end
+      end
+    end
+  end
+end

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

@@ -27,8 +27,9 @@ module ActiveAttr
         end
 
         it "casts a local Time to a DateTime with a matching offset" do
-          result = subject.call(Time.local(2012, 1, 1, 12, 0, 0))
-          result.should eql DateTime.new(2012, 1, 1, 12, 0, 0, Rational(Time.now.utc_offset, 86400))
+          value = Time.local(2012, 1, 1, 12, 0, 0)
+          result = subject.call(value)
+          result.should eql DateTime.new(2012, 1, 1, 12, 0, 0, Rational(value.utc_offset, 86400))
           result.should be_instance_of DateTime
         end
 

data/spec/unit/active_attr/typecasting_spec.rb

@@ -48,6 +48,11 @@ module ActiveAttr
       subject { model.typecast_value(type, value) }
       let(:value) { mock }
 
+      it "calls BigDecimalTypecaster when typecasting to BigDecimal" do
+        Typecasting::BigDecimalTypecaster.any_instance.should_receive(:call).with(value)
+        model.typecast_value(BigDecimal, value)
+      end
+
       it "calls BooleanTypecaster when typecasting to Boolean" do
         Typecasting::BooleanTypecaster.any_instance.should_receive(:call).with(value)
         model.typecast_value(Typecasting::Boolean, value)

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: active_attr
 version: !ruby/object:Gem::Version
-  version: 0.5.0.alpha2
-  prerelease: 6
+  version: 0.5.0
+  prerelease: 
 platform: ruby
 authors:
 - Chris Griego
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-02 00:00:00.000000000Z
+date: 2012-03-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70095293529660 !ruby/object:Gem::Requirement
+  requirement: &70109482810160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -25,10 +25,10 @@ dependencies:
         version: '4.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70095293529660
+  version_requirements: *70109482810160
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70095293527620 !ruby/object:Gem::Requirement
+  requirement: &70109482808160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -39,10 +39,10 @@ dependencies:
         version: '4.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70095293527620
+  version_requirements: *70109482808160
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70095293526420 !ruby/object:Gem::Requirement
+  requirement: &70109482806600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -50,10 +50,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70095293526420
+  version_requirements: *70109482806600
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70095293525540 !ruby/object:Gem::Requirement
+  requirement: &70109482805800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -61,10 +61,10 @@ dependencies:
         version: '2.2'
   type: :development
   prerelease: false
-  version_requirements: *70095293525540
+  version_requirements: *70109482805800
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70095293524360 !ruby/object:Gem::Requirement
+  requirement: &70109482804840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -72,10 +72,10 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *70095293524360
+  version_requirements: *70109482804840
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70095293523040 !ruby/object:Gem::Requirement
+  requirement: &70109482803980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -83,10 +83,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70095293523040
+  version_requirements: *70109482803980
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70095293522260 !ruby/object:Gem::Requirement
+  requirement: &70109482803280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -94,7 +94,7 @@ dependencies:
         version: 0.3.29
   type: :development
   prerelease: false
-  version_requirements: *70095293522260
+  version_requirements: *70109482803280
 description: Create plain old ruby models without reinventing the wheel.
 email:
 - cgriego@gmail.com
@@ -137,6 +137,7 @@ files:
 - lib/active_attr/rspec.rb
 - lib/active_attr/typecasted_attributes.rb
 - lib/active_attr/typecasting.rb
+- lib/active_attr/typecasting/big_decimal_typecaster.rb
 - lib/active_attr/typecasting/boolean.rb
 - lib/active_attr/typecasting/boolean_typecaster.rb
 - lib/active_attr/typecasting/date_time_typecaster.rb
@@ -150,6 +151,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/matchers/have_attribute_matcher_spec.rb
 - spec/functional/active_attr/model_spec.rb
 - spec/functional/active_attr/query_attributes_spec.rb
 - spec/functional/active_attr/typecasted_attributes_spec.rb
@@ -168,8 +170,10 @@ files:
 - 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
 - spec/unit/active_attr/query_attributes_spec.rb
 - spec/unit/active_attr/typecasted_attributes_spec.rb
+- spec/unit/active_attr/typecasting/big_decimal_typecaster_spec.rb
 - spec/unit/active_attr/typecasting/boolean_spec.rb
 - spec/unit/active_attr/typecasting/boolean_typecaster_spec.rb
 - spec/unit/active_attr/typecasting/date_time_typecaster_spec.rb
@@ -195,13 +199,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2101862700506728193
+      hash: -2941939635939237766
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: -2941939635939237766
 requirements: []
 rubyforge_project: active_attr
 rubygems_version: 1.8.10
@@ -212,6 +219,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/matchers/have_attribute_matcher_spec.rb
 - spec/functional/active_attr/model_spec.rb
 - spec/functional/active_attr/query_attributes_spec.rb
 - spec/functional/active_attr/typecasted_attributes_spec.rb
@@ -230,8 +238,10 @@ test_files:
 - 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
 - spec/unit/active_attr/query_attributes_spec.rb
 - spec/unit/active_attr/typecasted_attributes_spec.rb
+- spec/unit/active_attr/typecasting/big_decimal_typecaster_spec.rb
 - spec/unit/active_attr/typecasting/boolean_spec.rb
 - spec/unit/active_attr/typecasting/boolean_typecaster_spec.rb
 - spec/unit/active_attr/typecasting/date_time_typecaster_spec.rb