remarkable_activerecord 3.1.8 → 3.1.9

data/lib/remarkable_activerecord/describe.rb

@@ -1,9 +1,9 @@
-module Remarkable
+module Remarkable
   module ActiveRecord
 
     def self.after_include(target) #:nodoc:
       target.class_inheritable_reader :describe_subject_attributes, :default_subject_attributes
-      target.send :include, Describe
+      target.send :include, Describe
     end
 
     # Overwrites describe to provide quick way to configure your subject:
@@ -14,7 +14,7 @@ module Remarkable
     #     describe :published => true do
     #       should_validate_presence_of :published_at
     #     end
-    #   end
+    #   end
     #
     # This is the same as:
     #
@@ -27,11 +27,11 @@ module Remarkable
     #     end
     #   end
     #
-    # The string can be localized using I18n. An example yml file is:
-    #
-    #   locale:
-    #     remarkable:
-    #       active_record:
+    # The string can be localized using I18n. An example yml file is:
+    #
+    #   locale:
+    #     remarkable:
+    #       active_record:
     #         describe:
     #           each: "{{key}} is {{value}}"
     #           prepend: "when "
@@ -67,7 +67,7 @@ module Remarkable
 
       def self.included(base) #:nodoc:
         base.extend ClassMethods
-      end
+      end
 
       module ClassMethods
 
@@ -79,7 +79,7 @@ module Remarkable
         #     describe :published => true do
         #       should_validate_presence_of :published_at
         #     end
-        #   end
+        #   end
         #
         # This is the same as:
         #
@@ -92,11 +92,11 @@ module Remarkable
         #     end
         #   end
         #
-        # The string can be localized using I18n. An example yml file is:
-        #
-        #   locale:
-        #     remarkable:
-        #       active_record:
+        # The string can be localized using I18n. An example yml file is:
+        #
+        #   locale:
+        #     remarkable:
+        #       active_record:
         #         describe:
         #           each: "{{key}} is {{value}}"
         #           prepend: "when "
@@ -104,7 +104,7 @@ module Remarkable
         #
         # See also subject_attributes instance and class methods for more
         # information.
-        #
+        #
         def describe(*args, &block)
           if described_class && args.first.is_a?(Hash)
             attributes = args.shift
@@ -133,16 +133,16 @@ module Remarkable
             description << pieces.join(connector)
             args.unshift(description)
 
-            # Creates an example group, set the subject and eval the given block.
-            #
+            # Creates an example group, set the subject and eval the given block.
+            #
             example_group = super(*args) do
-              write_inheritable_hash(:describe_subject_attributes, attributes)
-              set_described_subject!
-              instance_eval(&block)
-            end
-          else
-            super(*args, &block)
-          end
+              write_inheritable_hash(:describe_subject_attributes, attributes)
+              set_described_subject!
+              instance_eval(&block)
+            end
+          else
+            super(*args, &block)
+          end
         end
 
         # Sets default attributes for the subject. You can use this to set up
@@ -195,5 +195,5 @@ module Remarkable
       end
 
     end
-  end
-end
+  end
+end

data/lib/remarkable_activerecord/human_names.rb

@@ -1,37 +1,37 @@
-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)
-          args.inject("") do |description, arg|
-            arg = if 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.
-        #
-        def self.description_text(*args)
-          self.build_description_with_i18n(*args)
-        end
-
-        # This is for rspec >= 1.2.0.
-        #
+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)
+          args.inject("") do |description, arg|
+            arg = if 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.
+        #
+        def self.description_text(*args)
+          self.build_description_with_i18n(*args)
+        end
+
+        # This is for rspec >= 1.2.0.
+        #
         def self.build_description_from(*args)
-          text = ExampleGroupMethods.build_description_with_i18n(*args)
-          text == "" ? nil : text
-        end
-
-      end
-    end
-  end
-end
+          text = ExampleGroupMethods.build_description_with_i18n(*args)
+          text == "" ? nil : text
+        end
+
+      end
+    end
+  end
+end

data/lib/remarkable_activerecord/matchers/accept_nested_attributes_for_matcher.rb

@@ -1,19 +1,19 @@
-module Remarkable
-  module ActiveRecord
-    module Matchers
-      class AcceptNestedAttributesForMatcher < Remarkable::ActiveRecord::Base #:nodoc:
+module Remarkable
+  module ActiveRecord
+    module Matchers
+      class AcceptNestedAttributesForMatcher < Remarkable::ActiveRecord::Base #:nodoc:
         arguments :collection => :associations, :as => :association
-
+
         collection_assertions :association_exists?, :is_autosave?, :responds_to_attributes?,
-                              :allows_destroy?, :accepts?, :rejects?
-
+                              :allows_destroy?, :accepts?, :rejects?
+
         optionals :allow_destroy, :default => true
         optionals :accept, :reject, :splat => true
-
-        protected
-
-          def association_exists?
-            reflection
+
+        protected
+
+          def association_exists?
+            reflection
           end
 
           def is_autosave?
@@ -59,8 +59,8 @@ module Remarkable
 
         private
 
-          def reflection
-            @reflection ||= subject_class.reflect_on_association(@association.to_sym)
+          def reflection
+            @reflection ||= subject_class.reflect_on_association(@association.to_sym)
           end
 
           def reflection_type
@@ -75,17 +75,17 @@ module Remarkable
           def reject_if_proc
             subject_class.reject_new_nested_attributes_procs[@association.to_sym]
           end
-
-      end
-
+
+      end
+
       # Ensures that the model accepts nested attributes for the given associations.
-      #
-      # == Options
-      #
+      #
+      # == Options
+      #
       # * <tt>allow_destroy</tt> - When true allows the association to be destroyed
       # * <tt>accept</tt> - attributes that should be accepted by the :reject_if proc
-      # * <tt>reject</tt> - attributes that should be rejected by the :reject_if proc
-      #
+      # * <tt>reject</tt> - attributes that should be rejected by the :reject_if proc
+      #
       # == Examples
       #
       #   should_accept_nested_attributes_for :tasks
@@ -120,11 +120,11 @@ module Remarkable
       #     m.reject :title => nil
       #     m.reject :title => ''
       #   end
-      #
-      def accept_nested_attributes_for(*args, &block)
-        AcceptNestedAttributesForMatcher.new(*args, &block).spec(self)
-      end
-
-    end
-  end
-end
+      #
+      def accept_nested_attributes_for(*args, &block)
+        AcceptNestedAttributesForMatcher.new(*args, &block).spec(self)
+      end
+
+    end
+  end
+end

data/lib/remarkable_activerecord/matchers/allow_mass_assignment_of_matcher.rb

@@ -1,66 +1,66 @@
-module Remarkable
-  module ActiveRecord
-    module Matchers
+module Remarkable
+  module ActiveRecord
+    module Matchers
       class AllowMassAssignmentOfMatcher < Remarkable::ActiveRecord::Base #:nodoc:
-        include Remarkable::Negative
-        arguments :collection => :attributes, :as => :attribute
-
-        assertion :allows?
-        collection_assertions :is_accessible?, :is_protected?
-
-        protected
-
-          # If no attribute is given, check if no attribute is being protected,
-          # otherwise it fails.
-          #
+        include Remarkable::Negative
+        arguments :collection => :attributes, :as => :attribute
+
+        assertion :allows?
+        collection_assertions :is_accessible?, :is_protected?
+
+        protected
+
+          # If no attribute is given, check if no attribute is being protected,
+          # otherwise it fails.
+          #
           def allows?
-            return positive? unless @attributes.empty?
-            protected_attributes.empty?
-          end
-
-          def is_protected?
-            return positive? if protected_attributes.empty?
-            !protected_attributes.include?(@attribute.to_s)
-          end
-
+            return positive? unless @attributes.empty?
+            protected_attributes.empty?
+          end
+
           def is_accessible?
-            return positive? if accessible_attributes.empty?
-            accessible_attributes.include?(@attribute.to_s)
-          end
-
-          def interpolation_options
+            return positive? if accessible_attributes.empty?
+            accessible_attributes.include?(@attribute.to_s)
+          end
+
+          def is_protected?
+            return accessible_attributes.empty? || positive? if protected_attributes.empty?
+            !protected_attributes.include?(@attribute.to_s)
+          end
+
+          def interpolation_options
             if @subject
-              if positive?
+              if positive?
                 { :protected_attributes => array_to_sentence(protected_attributes.to_a, false, '[]') }
               else
                 { :accessible_attributes => array_to_sentence(accessible_attributes.to_a, false, '[]') }
-              end
-            else
-              {}
-            end
-          end
-
-        private
-
-          def accessible_attributes
-            @accessible_attributes ||= subject_class.accessible_attributes || []
-          end
-
-          def protected_attributes
-            @protected_attributes ||= subject_class.protected_attributes || []
-          end
-      end
-
-      # Ensures that the attribute can be set on mass update.
-      #
-      # == Examples
-      #
-      #   should_allow_mass_assignment_of :email, :name
-      #   it { should allow_mass_assignment_of(:email, :name) }
-      #
-      def allow_mass_assignment_of(*attributes, &block)
-        AllowMassAssignmentOfMatcher.new(*attributes, &block).spec(self)
-      end
-    end
-  end
-end
+              end
+            else
+              {}
+            end
+          end
+
+        private
+
+          def accessible_attributes
+            @accessible_attributes ||= subject_class.accessible_attributes || []
+          end
+
+          def protected_attributes
+            @protected_attributes ||= subject_class.protected_attributes || []
+          end
+      end
+
+      # Ensures that the attribute can be set on mass update.
+      #
+      # == Examples
+      #
+      #   should_allow_mass_assignment_of :email, :name
+      #   it { should allow_mass_assignment_of(:email, :name) }
+      #
+      def allow_mass_assignment_of(*attributes, &block)
+        AllowMassAssignmentOfMatcher.new(*attributes, &block).spec(self)
+      end
+    end
+  end
+end

data/lib/remarkable_activerecord/matchers/allow_values_for_matcher.rb

@@ -1,97 +1,88 @@
-module Remarkable
-  module ActiveRecord
-    module Matchers
+module Remarkable
+  module ActiveRecord
+    module Matchers
       class AllowValuesForMatcher < Remarkable::ActiveRecord::Base #:nodoc:
-        include Remarkable::Negative
-        arguments :collection => :attributes, :as => :attribute
-
-        optional :message
-        optional :in, :splat => true
-        optional :allow_nil, :allow_blank, :default => true
-
-        collection_assertions :is_valid?, :is_invalid?, :allow_nil?, :allow_blank?
-
-        default_options :message => :invalid
-
-        before_assert do
-          first_value = @options[:in].is_a?(Array) ? @options[:in].first : @options[:in]
-          @in_range = first_value.is_a?(Range)
-
-          @options[:in] = if @in_range
-            first_value.to_a[0,2] + first_value.to_a[-2,2]
-          else
-            [*@options[:in]].compact
-          end
-
-          @options[:in].uniq!
-        end
-
-        protected
-
+        include Remarkable::Negative
+        arguments :collection => :attributes, :as => :attribute
+
+        optional :message
+        optional :in, :splat => true
+        optional :allow_nil, :allow_blank, :default => true
+
+        collection_assertions :is_valid?, :is_invalid?, :allow_nil?, :allow_blank?
+
+        default_options :message => /.*/
+
+        before_assert do
+          first_value = @options[:in].is_a?(Array) ? @options[:in].first : @options[:in]
+          @in_range = first_value.is_a?(Range)
+
+          @options[:in] = if @in_range
+            first_value.to_a[0,2] + first_value.to_a[-2,2]
+          else
+            [*@options[:in]].compact
+          end
+
+          @options[:in].uniq!
+        end
+
+        protected
+
           def is_valid?
-            assert_collection :value, valid_values do |value|
-              good?(value)
-            end
-          end
-
+            assert_collection :value, valid_values do |value|
+              good?(value)
+            end
+          end
+
           def is_invalid?
-            assert_collection :value, invalid_values do |value|
-              bad?(value)
-            end
-          end
-
-          def valid_values
-            @options[:in]
-          end
-
-          def invalid_values
-            []
-          end
-
-          def interpolation_options
-            options = if @in_range
-              { :in => (@options[:in].first..@options[:in].last).inspect }
-            elsif @options[:in].is_a?(Array)
-              { :in => array_to_sentence(@options[:in], true, '[]') }
-            else
-              { :in => @options[:in].inspect }
-            end
-
-            options.merge!(:behavior => @behavior.to_s)
-          end
-
-      end
-
-      # Ensures that the attribute can be set to the given values.
-      #
-      # == Options
-      #
-      # * <tt>:allow_nil</tt> - when supplied, validates if it allows nil or not.
-      # * <tt>:allow_blank</tt> - when supplied, validates if it allows blank or not.
-      # * <tt>:message</tt> - value the test expects to find in <tt>errors.on(:attribute)</tt>.
-      #   Regexp, string or symbol.  Default = <tt>I18n.translate('activerecord.errors.messages.invalid')</tt>
-      #
-      # == Examples
-      #
-      #   should_allow_values_for :isbn, "isbn 1 2345 6789 0", "ISBN 1-2345-6789-0"
-      #   it { should allow_values_for(:isbn, "isbn 1 2345 6789 0", "ISBN 1-2345-6789-0") }
-      #
-      def allow_values_for(attribute, *args, &block)
-        options = args.extract_options!
-        AllowValuesForMatcher.new(attribute, options.merge!(:in => args), &block).spec(self)
-      end
-
-      # Deprecated. Use allow_values_for instead.
-      #
-      def validate_format_of(*args)
-        if caller[0] =~ /\macros.rb/
-          warn "[DEPRECATION] should_validate_format_of is deprecated, use should_allow_values_for instead."
-        else
-          warn "[DEPRECATION] validate_format_of is deprecated, use allow_values_for instead. Called from #{caller[0]}."
-        end
-        allow_values_for(*args)
-      end
-
-    end
-  end
-end
+            assert_collection :value, invalid_values do |value|
+              bad?(value)
+            end
+          end
+
+          def valid_values
+            @options[:in]
+          end
+
+          def invalid_values
+            []
+          end
+
+          def interpolation_options
+            options = if @in_range
+              { :in => (@options[:in].first..@options[:in].last).inspect }
+            elsif @options[:in].is_a?(Array)
+              { :in => array_to_sentence(@options[:in], true, '[]') }
+            else
+              { :in => @options[:in].inspect }
+            end
+
+            options.merge!(:behavior => @behavior.to_s)
+          end
+
+      end
+
+      # Ensures that the attribute can be set to the given values. It checks
+      # for any message in the given attribute unless a :message is explicitely
+      # given.
+      #
+      # == Options
+      #
+      # * <tt>:allow_nil</tt> - when supplied, validates if it allows nil or not.
+      # * <tt>:allow_blank</tt> - when supplied, validates if it allows blank or not.
+      # * <tt>:message</tt> - value the test expects to find in <tt>errors.on(:attribute)</tt>.
+      #   Regexp, string or symbol.  Default = <tt>/.*/</tt>
+      #
+      # == Examples
+      #
+      #   should_allow_values_for :isbn, "isbn 1 2345 6789 0", "ISBN 1-2345-6789-0"
+      #   it { should allow_values_for(:isbn, "isbn 1 2345 6789 0", "ISBN 1-2345-6789-0") }
+      #
+      def allow_values_for(attribute, *args, &block)
+        options = args.extract_options!
+        AllowValuesForMatcher.new(attribute, options.merge!(:in => args), &block).spec(self)
+      end
+
+    end
+  end
+end