remarkable_activerecord 3.0.1 → 3.0.2

data/CHANGELOG

@@ -1,47 +1,47 @@
 # v3.0.0
-
-[ENHANCEMENT] Added more options to associations matcher. Previously it was
-handling just :dependent and :through options. Now it deals with:
-
-  :through, :class_name, :foreign_key, :dependent, :join_table, :uniq,
-  :readonly, :validate, :autosave, :counter_cache, :polymorphic
-
-And they are much smarter! In :join_table and :through cases, they also test if
-the table exists or not. :counter_cache and :foreign_key also checks if the
-column exists or not.
-
-[COMPATIBILITY] Removed callback, have_instance_method and have_class_method
-matchers. They don't lead to a good TDD since you should test they behavior
-and not wether they exist or not.
-
-[COMPATIBILITY] ActiveRecord matches does not pick the instance variable from
-the spec environment. So we should target only rspec versions that supports
-subjects (>= 1.1.12).
-
-Previously, when we are doing this:
-
-   describe Product
-     before(:each){ @product = Product.new(:tangible => true) }
-     should_validate_presence_of :size
-   end
-
-It was validating the @product instance variable. However this might be not
-clear. The right way to do that (with subjects) is:
-
-   describe Product
-     subject{ Product.new(:tangible => true) }
-     should_validate_presence_of :size
-   end
-
-Is also valid to remember that previous versions of Remarkable were overriding
-subject definitions on rspec. This was also fixed.
-
-# v2.x
-
-[ENHANCEMENT] Added associations, allow_mass_assignment, allow_values_for,
-have_column, have_index, have_scope, have_readonly_attributes,
-validate_acceptance_of, validate_associate, validate_confirmation_of,
-validate_exclusion_of, validate_inclusion_of, validate_length_of,
-validate_numericality_of, validate_presence_of and validate_uniqueness_of
-matchers.
-
+
+[ENHANCEMENT] Added more options to associations matcher. Previously it was
+handling just :dependent and :through options. Now it deals with:
+
+  :through, :class_name, :foreign_key, :dependent, :join_table, :uniq,
+  :readonly, :validate, :autosave, :counter_cache, :polymorphic
+
+And they are much smarter! In :join_table and :through cases, they also test if
+the table exists or not. :counter_cache and :foreign_key also checks if the
+column exists or not.
+
+[COMPATIBILITY] Removed callback, have_instance_method and have_class_method
+matchers. They don't lead to a good TDD since you should test they behavior
+and not wether they exist or not.
+
+[COMPATIBILITY] ActiveRecord matches does not pick the instance variable from
+the spec environment. So we should target only rspec versions that supports
+subjects (>= 1.1.12).
+
+Previously, when we are doing this:
+
+   describe Product
+     before(:each){ @product = Product.new(:tangible => true) }
+     should_validate_presence_of :size
+   end
+
+It was validating the @product instance variable. However this might be not
+clear. The right way to do that (with subjects) is:
+
+   describe Product
+     subject{ Product.new(:tangible => true) }
+     should_validate_presence_of :size
+   end
+
+Is also valid to remember that previous versions of Remarkable were overriding
+subject definitions on rspec. This was also fixed.
+
+# v2.x
+
+[ENHANCEMENT] Added associations, allow_mass_assignment, allow_values_for,
+have_column, have_index, have_scope, have_readonly_attributes,
+validate_acceptance_of, validate_associate, validate_confirmation_of,
+validate_exclusion_of, validate_inclusion_of, validate_length_of,
+validate_numericality_of, validate_presence_of and validate_uniqueness_of
+matchers.
+

data/LICENSE

@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README

@@ -1,82 +1,82 @@
-= Remarkable ActiveRecord
-
-Remarkable ActiveRecord is a collection of matchers to ActiveRecord. Why use
-Remarkable?
-
-* The only one with matchers for all ActiveRecord validations, with support to
-  all options;
-
-* Matchers for all ActiveRecord associations. The only one which supports all
-  these options:
-
-    :through, :class_name, :foreign_key, :dependent, :join_table, :uniq,
-    :readonly, :validate, :autosave, :counter_cache, :polymorphic
-
-  Besides in Remarkable 3.0 matchers became much smarter. Whenever :join_table
-  or :through is given as option, it checks if the given table exists. Whenever
-  :foreign_key or :counter_cache is given, it checks if the given column exists;
-
-* Tests and more tests. We have a huge tests suite ready to run and tested in
-  ActiveRecord 2.1.2, 2.2.2 and 2.3.2;
-
-* Great documentation;
-
-* I18n.
-
-== Examples
-
+= Remarkable ActiveRecord
+
+Remarkable ActiveRecord is a collection of matchers to ActiveRecord. Why use
+Remarkable?
+
+* The only one with matchers for all ActiveRecord validations, with support to
+  all options;
+
+* Matchers for all ActiveRecord associations. The only one which supports all
+  these options:
+
+    :through, :class_name, :foreign_key, :dependent, :join_table, :uniq,
+    :readonly, :validate, :autosave, :counter_cache, :polymorphic
+
+  Besides in Remarkable 3.0 matchers became much smarter. Whenever :join_table
+  or :through is given as option, it checks if the given table exists. Whenever
+  :foreign_key or :counter_cache is given, it checks if the given column exists;
+
+* Tests and more tests. We have a huge tests suite ready to run and tested in
+  ActiveRecord 2.1.2, 2.2.2 and 2.3.2;
+
+* Great documentation;
+
+* I18n.
+
+== Examples
+
 All Remarkable macros can be accessed in two different ways. For those who prefer the Shoulda style, let’s look at some model tests:
 
   describe Post do
     should_belong_to :user
-    should_have_many :comments
+    should_have_many :comments
     should_have_and_belong_to_many :tags
 
     should_validate_presence_of :body
-    should_validate_presence_of :title
+    should_validate_presence_of :title
     should_validate_uniqueness_of :title, :allow_blank => true
   end
-
+
 For those who likes more the Rspec way can simply do:
 
   describe Post do
     it { should belong_to(:user) }
-    it { should have_many(:comments) }
+    it { should have_many(:comments) }
     it { should have_and_belong_to_many(:tags) }
 
     it { should validate_presence_of(:body) }
-    it { should validate_presence_of(:title) }
+    it { should validate_presence_of(:title) }
     it { should validate_uniqueness_of(:title, :allow_blank => true) }
-  end
-
-== I18n
-
-All matchers come with I18n support. If you want to translate your matchers,
-grab make a copy of locale/en.yml and start to translate it.
-
-Then add your new locale file to Remarkable:
-
-  Remarkable.add_locale 'path/to/my_locale.yml'
-
-And then:
-
-  Remarkable.locale = :my_locale
-
-== Using it outside Rails
-
-If you want to use Remarkable ActiveRecord outside Rails, you have to remember
-a few things:
-
-  1. Internationalization is powered by the I18n gem. If you are using it with Rails,
-     it will use the built in gem, otherwise you will have to install the gem by hand:
-
+  end
+
+== I18n
+
+All matchers come with I18n support. If you want to translate your matchers,
+grab make a copy of locale/en.yml and start to translate it.
+
+Then add your new locale file to Remarkable:
+
+  Remarkable.add_locale 'path/to/my_locale.yml'
+
+And then:
+
+  Remarkable.locale = :my_locale
+
+== Using it outside Rails
+
+If you want to use Remarkable ActiveRecord outside Rails, you have to remember
+a few things:
+
+  1. Internationalization is powered by the I18n gem. If you are using it with Rails,
+     it will use the built in gem, otherwise you will have to install the gem by hand:
+
         gem sources -a http://gems.github.com
-        sudo gem install svenfuchs-i18n
-
-  2. Include the matchers. Remarkable Rails gem is the responsable to add
-     ActiveRecord matchers to rspec. If you are not using it, you have to do:
-
-        Remarkable.include_matchers!(Remarkable::ActiveRecord, Spec::Example::ExampleGroup)
-
-     This will make ActiveRecord matchers available in all rspec example groups.
-
+        sudo gem install svenfuchs-i18n
+
+  2. Include the matchers. Remarkable Rails gem is the responsable to add
+     ActiveRecord matchers to rspec. If you are not using it, you have to do:
+
+        Remarkable.include_matchers!(Remarkable::ActiveRecord, Spec::Example::ExampleGroup)
+
+     This will make ActiveRecord matchers available in all rspec example groups.
+

data/lib/remarkable_activerecord.rb

@@ -12,7 +12,7 @@ end
 # Load Remarkable ActiveRecord files
 dir = File.dirname(__FILE__)
 require File.join(dir, 'remarkable_activerecord', 'base')
-require File.join(dir, 'remarkable_activerecord', 'human_names')
+require File.join(dir, 'remarkable_activerecord', 'human_names')
 
 # Add locale
 Remarkable.add_locale File.join(dir, '..', 'locale', 'en.yml')

data/lib/remarkable_activerecord/base.rb

@@ -1,20 +1,20 @@
 module Remarkable
   module ActiveRecord
     class Base < Remarkable::Base
-
-      # Provides a way to send options to all ActiveRecord matchers.
-      #
-      #   validates_presence_of(:name).with_options(:allow_nil => false)
-      #
-      # Is equivalent to:
-      #
-      #   validates_presence_of(:name, :allow_nil => false)
-      #
+
+      # Provides a way to send options to all ActiveRecord matchers.
+      #
+      #   validates_presence_of(:name).with_options(:allow_nil => false)
+      #
+      # Is equivalent to:
+      #
+      #   validates_presence_of(:name, :allow_nil => false)
+      #
       def with_options(opts={})
         @options.merge!(opts)
         self
-      end
-
+      end
+
       protected
 
         # Checks for the given key in @options, if it exists and it's true,
@@ -63,7 +63,7 @@ module Remarkable
           valid, options = assert_good_or_bad_if_key(:allow_nil, nil, message_key)
 
           unless valid
-            default = Remarkable.t "remarkable.active_record.allow_nil", default_i18n_options.except(:scope).merge(options)
+            default = Remarkable.t "remarkable.active_record.allow_nil", default_i18n_options.except(:scope).merge(options)
             return false, options.merge(:default => default)
           end
 
@@ -181,7 +181,7 @@ module Remarkable
         #   Using the underlying mechanism inside ActiveRecord makes us free from
         #   all thos errors.
         #
-        # We replace {{count}} interpolation for 12345 which later is replaced
+        # We replace {{count}} interpolation for 12345 which later is replaced
         # by a regexp which contains \d+.
         #
         def error_message_from_model(model, attribute, message) #:nodoc:
@@ -208,37 +208,37 @@ module Remarkable
         #
         def assert_does_not_contain(collection, x) #:nodoc:
           !assert_contains(collection, x)
-        end
-
-        # Changes how collection are interpolated to provide localized names
-        # whenever is possible.
-        #
-        def collection_interpolation #:nodoc:
-          described_class = if @subject
-            subject_class
-          elsif @spec
-            @spec.send(:described_class)
-          end
-
-          if RAILS_I18N && described_class.respond_to?(:human_attribute_name) && self.class.matcher_arguments[:collection]
-            options = {}
-
-            collection_name = self.class.matcher_arguments[:collection].to_sym
-            if collection = instance_variable_get("@#{collection_name}")
+        end
+
+        # Changes how collection are interpolated to provide localized names
+        # whenever is possible.
+        #
+        def collection_interpolation #:nodoc:
+          described_class = if @subject
+            subject_class
+          elsif @spec
+            @spec.send(:described_class)
+          end
+
+          if RAILS_I18N && described_class.respond_to?(:human_attribute_name) && self.class.matcher_arguments[:collection]
+            options = {}
+
+            collection_name = self.class.matcher_arguments[:collection].to_sym
+            if collection = instance_variable_get("@#{collection_name}")
               collection.map!{|attr| described_class.human_attribute_name(attr.to_s, :locale => Remarkable.locale).downcase }
-              options[collection_name] = array_to_sentence(collection)
+              options[collection_name] = array_to_sentence(collection)
             end
-
+
             object_name = self.class.matcher_arguments[:as]
-            if object = instance_variable_get("@#{object_name}")
+            if object = instance_variable_get("@#{object_name}")
               object = described_class.human_attribute_name(object.to_s, :locale => Remarkable.locale).downcase
-              options[object_name] = object
-            end
-
-            options
-          else
-            super
-          end
+              options[object_name] = object
+            end
+
+            options
+          else
+            super
+          end
         end
 
     end

data/lib/remarkable_activerecord/human_names.rb

@@ -1,37 +1,37 @@
-if defined?(Spec)
+if defined?(Spec)
   module Spec #:nodoc:
     module Example #:nodoc:
       module ExampleGroupMethods #:nodoc:
 
-        # This allows "describe User" to use the I18n human name of User.
-        #
-        def self.build_description_with_i18n(*args)
+        # This allows "describe User" to use the I18n human name of User.
+        #
+        def self.build_description_with_i18n(*args)
           args.inject("") do |description, arg|
-            arg = if RAILS_I18N && arg.respond_to?(:human_name)
-              arg.human_name(:locale => Remarkable.locale)
-            else
-              arg.to_s
-            end
+            arg = if RAILS_I18N && arg.respond_to?(:human_name)
+              arg.human_name(:locale => Remarkable.locale)
+            else
+              arg.to_s
+            end
 
             description << " " unless (description == "" || arg =~ /^(\s|\.|#)/)
             description << arg
-          end
-        end
-
-        # This is for rspec <= 1.1.12.
+          end
+        end
+
+        # This is for rspec <= 1.1.12.
         #
-        def self.description_text(*args)
+        def self.description_text(*args)
           self.build_description_with_i18n(*args)
-        end
-
-        # This is for rspec >= 1.2.0.
-        #
-        def build_description_from(*args)
-          text = ExampleGroupMethods.build_description_with_i18n(*args)
-          text == "" ? nil : text
-        end
+        end
+
+        # This is for rspec >= 1.2.0.
+        #
+        def build_description_from(*args)
+          text = ExampleGroupMethods.build_description_with_i18n(*args)
+          text == "" ? nil : text
+        end
 
       end
     end
-  end
-end
+  end
+end

data/lib/remarkable_activerecord/matchers/allow_mass_assignment_of_matcher.rb

@@ -1,31 +1,31 @@
 module Remarkable
   module ActiveRecord
     module Matchers
-      class AllowMassAssignmentOfMatcher < Remarkable::ActiveRecord::Base #:nodoc:
-        arguments :collection => :attributes, :as => :attribute
-
+      class AllowMassAssignmentOfMatcher < Remarkable::ActiveRecord::Base #:nodoc:
+        arguments :collection => :attributes, :as => :attribute
+
         collection_assertions :is_protected?, :is_accessible?
 
         protected
 
-          def is_protected?
-            protected = subject_class.protected_attributes || []
-            protected.empty? || !protected.include?(@attribute.to_s)
-          end
-
+          def is_protected?
+            protected = subject_class.protected_attributes || []
+            protected.empty? || !protected.include?(@attribute.to_s)
+          end
+
           def is_accessible?
             accessible = subject_class.accessible_attributes || []
-            accessible.empty? || accessible.include?(@attribute.to_s)
-          end
+            accessible.empty? || accessible.include?(@attribute.to_s)
+          end
       end
 
-      # Ensures that the attribute can be set on mass update.
-      #
+      # Ensures that the attribute can be set on mass update.
+      #
       # == Examples
       #
-      #   should_allow_mass_assignment_of :email, :name
+      #   should_allow_mass_assignment_of :email, :name
       #   it { should allow_mass_assignment_of(:email, :name) }
-      #
+      #
       def allow_mass_assignment_of(*attributes)
         AllowMassAssignmentOfMatcher.new(*attributes).spec(self)
       end