remarkable_activerecord 3.1.9 → 3.1.10

data/lib/remarkable_activerecord/base.rb

@@ -181,7 +181,11 @@ module Remarkable
         def error_message_from_model(model, attribute, message) #:nodoc:
           if message.is_a? Symbol
             message = if RAILS_I18N # Rails >= 2.2
-              model.errors.generate_message(attribute, message, :count => '12345')
+              if ::ActiveRecord.const_defined?(:Error)
+                ::ActiveRecord::Error.new(model, attribute, message, :count => '12345').to_s
+              else
+                model.errors.generate_message(attribute, message, :count => '12345')
+              end
             else # Rails <= 2.1
               ::ActiveRecord::Errors.default_error_messages[message] % '12345'
             end

data/lib/remarkable_activerecord/describe.rb

@@ -108,7 +108,6 @@ module Remarkable
         def describe(*args, &block)
           if described_class && args.first.is_a?(Hash)
             attributes = args.shift
-
             connector = Remarkable.t "remarkable.active_record.describe.connector", :default => " and "
 
             description = if self.describe_subject_attributes.blank?
@@ -130,7 +129,7 @@ module Remarkable
                                       :key => translated_key.downcase, :value => value.inspect)
             end
 
-            description << pieces.join(connector)
+            description += pieces.join(connector)
             args.unshift(description)
 
             # Creates an example group, set the subject and eval the given block.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: remarkable_activerecord
 version: !ruby/object:Gem::Version 
-  version: 3.1.9
+  version: 3.1.10
 platform: ruby
 authors: 
 - Carlos Brando
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-30 00:00:00 +02:00
+date: 2009-10-01 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.1.9
+        version: 3.1.10
     version: 
 description: "Remarkable ActiveRecord: collection of matchers and macros with I18n for ActiveRecord"
 email: 
@@ -52,26 +52,26 @@ files:
 - LICENSE
 - CHANGELOG
 - lib/remarkable_activerecord/base.rb
-- lib/remarkable_activerecord/human_names.rb
 - lib/remarkable_activerecord/describe.rb
-- lib/remarkable_activerecord/matchers/validate_confirmation_of_matcher.rb
-- lib/remarkable_activerecord/matchers/validate_length_of_matcher.rb
-- lib/remarkable_activerecord/matchers/have_default_scope_matcher.rb
-- lib/remarkable_activerecord/matchers/have_readonly_attributes_matcher.rb
+- lib/remarkable_activerecord/human_names.rb
 - lib/remarkable_activerecord/matchers/accept_nested_attributes_for_matcher.rb
-- lib/remarkable_activerecord/matchers/validate_exclusion_of_matcher.rb
-- lib/remarkable_activerecord/matchers/validate_associated_matcher.rb
-- lib/remarkable_activerecord/matchers/have_column_matcher.rb
-- lib/remarkable_activerecord/matchers/association_matcher.rb
-- lib/remarkable_activerecord/matchers/validate_presence_of_matcher.rb
-- lib/remarkable_activerecord/matchers/have_scope_matcher.rb
+- lib/remarkable_activerecord/matchers/allow_mass_assignment_of_matcher.rb
 - lib/remarkable_activerecord/matchers/allow_values_for_matcher.rb
+- lib/remarkable_activerecord/matchers/association_matcher.rb
+- lib/remarkable_activerecord/matchers/have_column_matcher.rb
+- lib/remarkable_activerecord/matchers/have_default_scope_matcher.rb
 - lib/remarkable_activerecord/matchers/have_index_matcher.rb
-- lib/remarkable_activerecord/matchers/validate_inclusion_of_matcher.rb
+- lib/remarkable_activerecord/matchers/have_readonly_attributes_matcher.rb
+- lib/remarkable_activerecord/matchers/have_scope_matcher.rb
 - lib/remarkable_activerecord/matchers/validate_acceptance_of_matcher.rb
-- lib/remarkable_activerecord/matchers/validate_uniqueness_of_matcher.rb
+- lib/remarkable_activerecord/matchers/validate_associated_matcher.rb
+- lib/remarkable_activerecord/matchers/validate_confirmation_of_matcher.rb
+- lib/remarkable_activerecord/matchers/validate_exclusion_of_matcher.rb
+- lib/remarkable_activerecord/matchers/validate_inclusion_of_matcher.rb
+- lib/remarkable_activerecord/matchers/validate_length_of_matcher.rb
 - lib/remarkable_activerecord/matchers/validate_numericality_of_matcher.rb
-- lib/remarkable_activerecord/matchers/allow_mass_assignment_of_matcher.rb
+- lib/remarkable_activerecord/matchers/validate_presence_of_matcher.rb
+- lib/remarkable_activerecord/matchers/validate_uniqueness_of_matcher.rb
 - lib/remarkable_activerecord.rb
 - locale/en.yml
 has_rdoc: true
@@ -98,31 +98,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: remarkable
-rubygems_version: 1.3.5
+rubygems_version: 1.3.4
 signing_key: 
 specification_version: 3
 summary: "Remarkable ActiveRecord: collection of matchers and macros with I18n for ActiveRecord"
-test_files: 
-- spec/validate_associated_matcher_spec.rb
-- spec/validate_length_of_matcher_spec.rb
-- spec/rcov.opts
-- spec/spec_helper.rb
-- spec/validate_acceptance_of_matcher_spec.rb
-- spec/accept_nested_attributes_for_matcher_spec.rb
-- spec/describe_spec.rb
-- spec/allow_mass_assignment_of_matcher_spec.rb
-- spec/have_scope_matcher_spec.rb
-- spec/validate_inclusion_of_matcher_spec.rb
-- spec/spec.opts
-- spec/have_readonly_attributes_matcher_spec.rb
-- spec/validate_confirmation_of_matcher_spec.rb
-- spec/allow_values_for_matcher_spec.rb
-- spec/validate_uniqueness_of_matcher_spec.rb
-- spec/have_column_matcher_spec.rb
-- spec/have_default_scope_matcher_spec.rb
-- spec/have_index_matcher_spec.rb
-- spec/association_matcher_spec.rb
-- spec/validate_exclusion_of_matcher_spec.rb
-- spec/model_builder.rb
-- spec/validate_numericality_of_matcher_spec.rb
-- spec/validate_presence_of_matcher_spec.rb
+test_files: []
+

data/spec/accept_nested_attributes_for_matcher_spec.rb

@@ -1,130 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-if RAILS_VERSION == '2.3.3'
-  describe 'accept_nested_attributes_for' do
-    include ModelBuilder
-
-    def define_and_validate(default=:category, options={})
-      @model = define_model :product do
-        has_one :category
-        has_many :orders
-        has_many :labels
-        has_many :tags, :autosave => true
-
-        accepts_nested_attributes_for :category, options
-        accepts_nested_attributes_for :orders, options
-      end
-
-      accept_nested_attributes_for *default
-    end
-
-    describe 'messages' do
-
-      it 'should contain a description' do
-        matcher = define_and_validate
-        matcher.description.should == 'accept nested attributes for category'
-
-        matcher.allow_destroy
-        matcher.description.should == 'accept nested attributes for category allowing destroy'
-
-        matcher.accept(:name => 'jose')
-        matcher.accept(:name => 'maria')
-        matcher.description.should == 'accept nested attributes for category allowing destroy and accepting {:name=>"jose"} and {:name=>"maria"}'
-      end
-
-      it 'should set association_match? message' do
-        matcher = define_and_validate(:nothing)
-        matcher.matches?(@model)
-        matcher.failure_message.should == 'Expected Product to have association nothing, but does not'
-      end
-
-      it 'should set is_autosave? message' do
-        matcher = define_and_validate(:labels)
-        matcher.matches?(@model)
-        matcher.failure_message.should == 'Expected Product to have association labels with autosave true, got false'
-      end
-
-      it 'should set responds_to_attributes? message' do
-        matcher = define_and_validate(:tags)
-        matcher.matches?(@model)
-        matcher.failure_message.should == 'Expected Product to respond to :tags_attributes=, but does not'
-      end
-
-      it 'should set allows_destroy? message' do
-        matcher = define_and_validate(:category, :allow_destroy => false)
-        matcher.allow_destroy.matches?(@model)
-        matcher.failure_message.should == 'Expected Product with allow destroy equals to true, got false'
-      end
-
-      it 'should set accepts? message' do
-        matcher = define_and_validate(:category, :reject_if => proc{|a| true })
-        matcher.accept({}).matches?(@model)
-        matcher.failure_message.should == 'Expected Product to accept attributes {} for category, but does not'
-      end
-
-      it 'should set rejects? message' do
-        matcher = define_and_validate(:category, :reject_if => proc{|a| false })
-        matcher.reject({}).matches?(@model)
-        matcher.failure_message.should == 'Expected Product to reject attributes {} for category, but does not'
-      end
-
-    end
-
-    describe 'matchers' do
-      it { should define_and_validate(:category) }
-      it { should define_and_validate(:orders) }
-
-      it { should_not define_and_validate(:nothing) }
-      it { should_not define_and_validate(:labels) }
-      it { should_not define_and_validate(:tags) }
-
-      describe 'with allow destroy as option' do
-        it { should define_and_validate(:category, :allow_destroy => true).allow_destroy }
-        it { should define_and_validate(:category, :allow_destroy => false).allow_destroy(false) }
-        it { should_not define_and_validate(:category, :allow_destroy => false).allow_destroy }
-        it { should_not define_and_validate(:category, :allow_destroy => true).allow_destroy(false) }
-
-        it { should define_and_validate(:orders, :allow_destroy => true).allow_destroy }
-        it { should define_and_validate(:orders, :allow_destroy => false).allow_destroy(false) }
-        it { should_not define_and_validate(:orders, :allow_destroy => false).allow_destroy }
-        it { should_not define_and_validate(:orders, :allow_destroy => true).allow_destroy(false) }
-      end
-
-      describe 'with accept as option' do
-        it { should define_and_validate(:category, :reject_if => proc{ |a| a[:name].blank? }).accept({ :name => 'Jose' }) }
-        it { should define_and_validate(:category, :reject_if => proc{ |a| a[:name].blank? }).accept({ :name => 'Jose' }, { :name => 'Maria' }) }
-        it { should_not define_and_validate(:category, :reject_if => proc{ |a| a[:name].blank? }).accept({ :name => '' }) }
-      end
-
-      describe 'with reject as option' do
-        it { should define_and_validate(:category, :reject_if => proc{ |a| !a[:name].blank? }).reject({ :name => 'Jose' }) }
-        it { should define_and_validate(:category, :reject_if => proc{ |a| !a[:name].blank? }).reject({ :name => 'Jose' }, { :name => 'Maria' }) }
-        it { should_not define_and_validate(:category, :reject_if => proc{ |a| !a[:name].blank? }).reject({ :name => '' }) }
-      end
-    end
-
-    describe 'macros' do
-      before(:each){ define_and_validate(:category, :allow_destroy => true, :reject_if => proc{ |a| a[:name].blank? }) }
-
-      should_accept_nested_attributes_for :category
-      should_accept_nested_attributes_for :category, :allow_destroy => true
-      should_accept_nested_attributes_for :category, :accept => { :name => 'Jose' }
-      should_accept_nested_attributes_for :category, :accept => [ { :name => 'Jose' }, { :name => 'Maria' } ]
-      should_accept_nested_attributes_for :category, :reject => [ { :name => '' } ]
-
-      should_accept_nested_attributes_for :category do |m|
-        m.allow_destroy
-        m.accept :name => "Jose"
-        m.accept :name => "Maria"
-        m.reject :name => ""
-      end
-
-      should_not_accept_nested_attributes_for :nothing
-      should_not_accept_nested_attributes_for :labels
-      should_not_accept_nested_attributes_for :tags
-      should_not_accept_nested_attributes_for :category, :allow_destroy => false
-      should_not_accept_nested_attributes_for :category, :accept => [ { :name => '' } ]
-      should_not_accept_nested_attributes_for :category, :reject => [ { :name => 'Jose' }, { :name => 'Maria' } ]
-    end
-  end
-end

data/spec/allow_mass_assignment_of_matcher_spec.rb

@@ -1,106 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe 'allow_mass_assignment_of' do
-  include ModelBuilder
-
-  def define_and_validate(options={})
-    @model = define_model :product, :title => :string, :category => :string do
-      attr_protected  :title, :category     if options[:protected]
-
-      attr_accessible :title, :category     if options[:accessible] == true
-      attr_accessible *options[:accessible] if options[:accessible].is_a?(Array)
-    end
-
-    allow_mass_assignment_of(:title, :category)
-  end
-
-  describe 'messages' do
-
-    it 'should contain a description' do
-      @matcher = allow_mass_assignment_of(:title, :category)
-      @matcher.description.should == 'allow mass assignment of title and category'
-    end
-
-    it 'should set allows? message' do
-      define_and_validate(:protected => true)
-      @matcher = allow_mass_assignment_of
-      @matcher.matches?(@model)
-      @matcher.failure_message.should == 'Expected Product to allow mass assignment (Product is protecting category and title)'
-    end
-
-    it 'should set is_protected? message' do
-      @matcher = define_and_validate(:protected => true)
-      @matcher.matches?(@model)
-      @matcher.failure_message.should == 'Expected Product to allow mass assignment of title (Product is protecting title)'
-    end
-
-    it 'should set is_accessible? message' do
-      @matcher = define_and_validate(:accessible => [:another])
-      @matcher.matches?(@model)
-      @matcher.failure_message.should == 'Expected Product to allow mass assignment of title (Product has not made title accessible)'
-    end
-
-  end
-
-  describe 'matchers' do
-    it { should define_and_validate }
-    it { should define_and_validate(:accessible => true) }
-
-    it { should_not define_and_validate(:protected => true) }
-    it { should_not define_and_validate(:accessible => [:another]) }
-
-    describe 'with no argument' do
-      it 'should allow mass assignment if no attribute is accessible or protected' do
-        define_and_validate
-        should allow_mass_assignment_of
-      end
-
-      it 'should allow mass assignment if attributes are accessible' do
-        define_and_validate(:accessible => true)
-        should allow_mass_assignment_of
-      end
-
-      it 'should not allow mass assignment if attributes are protected' do
-        define_and_validate(:protected => true)
-        should_not allow_mass_assignment_of
-      end
-    end
-  end
-
-  describe 'macros' do
-    before(:each){ define_and_validate(:accessible => true) }
-
-    should_allow_mass_assignment_of :title
-    should_allow_mass_assignment_of :category
-    should_allow_mass_assignment_of :title, :category
-
-    should_not_allow_mass_assignment_of :another
-  end
-
-  describe 'failures' do
-    it "should fail if some attribute is accessible when it shuold be protected" do
-      define_and_validate(:accessible => true)
-
-      lambda {
-        should_not allow_mass_assignment_of :title, :another
-      }.should raise_error(Spec::Expectations::ExpectationNotMetError, /Product has made title accessible/)
-    end
-
-    it "should fail if attributes are accessible when none should" do
-      define_and_validate(:accessible => true)
-
-      lambda {
-        should_not allow_mass_assignment_of
-      }.should raise_error(Spec::Expectations::ExpectationNotMetError, /Product made category and title accessible/)
-    end
-
-    it "should fail if nothing was declared but expected to be protected" do
-      define_and_validate
-
-      lambda {
-        should_not allow_mass_assignment_of(:title)
-      }.should raise_error(Spec::Expectations::ExpectationNotMetError, /Did not expect Product to allow mass assignment of title/)
-    end
-  end
-end
-

data/spec/allow_values_for_matcher_spec.rb

@@ -1,80 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe 'allow_values_for' do
-  include ModelBuilder
-
-  # Defines a model, create a validation and returns a raw matcher
-  def define_and_validate(options={})
-    @model = define_model :product, :title => :string, :category => :string do
-      validates_format_of :title, options
-    end
-
-    allow_values_for(:title)
-  end
-
-  describe 'messages' do
-    before(:each){ @matcher = define_and_validate(:with => /X|Y|Z/) }
-
-    it 'should contain a description' do
-      @matcher = allow_values_for(:title, "X", "Y", "Z")
-      @matcher.description.should == 'allow "X", "Y", and "Z" as values for title'
-    end
-
-    it 'should set is_valid? message' do
-      @matcher.in("A").matches?(@model)
-      @matcher.failure_message.should == 'Expected Product to be valid when title is set to "A"'
-    end
-
-    it 'should set allow_nil? message' do
-      @matcher.allow_nil.matches?(@model)
-      @matcher.failure_message.should == 'Expected Product to allow nil values for title'
-    end
-
-    it 'should set allow_blank? message' do
-      @matcher.allow_blank.matches?(@model)
-      @matcher.failure_message.should == 'Expected Product to allow blank values for title'
-    end
-  end
-
-  describe 'matchers' do
-    it { should define_and_validate(:with => /X|Y|Z/).in('X', 'Y', 'Z') }
-
-    it { should_not define_and_validate(:with => /X|Y|Z/).in('A') }
-    it { should_not define_and_validate(:with => /X|Y|Z/, :message => 'invalid').in('A') }
-
-    create_optional_boolean_specs(:allow_nil, self, :with => /X|Y|Z/)
-    create_optional_boolean_specs(:allow_blank, self, :with => /X|Y|Z/)
-  end
-
-  describe 'macros' do
-    before(:each){ define_and_validate(:with => /X|Y|Z/) }
-
-    should_allow_values_for :title, 'X'
-    should_not_allow_values_for :title, 'A'
-  end
-
-  describe 'failures' do
-    before(:each) do
-      define_and_validate(:with => /X|Y|Z/)
-    end
-
-    it "should fail if any of the values are valid on invalid cases" do
-      lambda {
-        should_not allow_values_for :title, 'A', 'X', 'B'
-      }.should raise_error(Spec::Expectations::ExpectationNotMetError, /Did not expect Product to be valid/)
-    end
-
-    it "should also fail if all values are valid" do
-      lambda {
-        should_not allow_values_for :title, 'X', 'Y', 'Z'
-      }.should raise_error(Spec::Expectations::ExpectationNotMetError, /Did not expect Product to be valid/)
-    end
-
-    it "should not fail if all values are invalid" do
-      lambda {
-        should_not allow_values_for :title, 'A', 'B', 'C'
-      }.should_not raise_error
-    end
-  end
-end
-