remarkable_activerecord 3.1.3 → 3.1.4

data/CHANGELOG

@@ -1,5 +1,7 @@
+* Added :token and :separator to deal with :tokenizer in validates_length_of [#77]
+
 * Deprecated validate_format_of. It does not have the same API as the respective
-  ActiveRecord macro, raising questions frequentely about its usage. [#76]
+  ActiveRecord macro, raising questions frequentely about its usage [#76]
 
 * allow_mass_assignment_of when called without arguments checks if any mass
   assignment is possible [#80]

data/lib/remarkable_activerecord/matchers/allow_mass_assignment_of_matcher.rb

@@ -26,8 +26,7 @@ module Remarkable
 
           def interpolation_options
             if @subject
-              array = protected_attributes.to_a
-              { :protected_attributes => array.empty? ? "[]" : array_to_sentence(array) }
+              { :protected_attributes => array_to_sentence(protected_attributes.to_a, false, '[]') }
             else
               {}
             end

data/lib/remarkable_activerecord/matchers/allow_values_for_matcher.rb

@@ -53,7 +53,7 @@ module Remarkable
             options = if @in_range
               { :in => (@options[:in].first..@options[:in].last).inspect }
             elsif @options[:in].is_a?(Array)
-              { :in => array_to_sentence(@options[:in].map{|i| i.inspect}) }
+              { :in => array_to_sentence(@options[:in], true, '[]') }
             else
               { :in => @options[:in].inspect }
             end

data/lib/remarkable_activerecord/matchers/association_matcher.rb

@@ -125,7 +125,9 @@ module Remarkable
           end
 
           def interpolation_options
-            options = { :macro => Remarkable.t(@macro, :scope => matcher_i18n_scope, :default => @macro.to_s), :options => @options.inspect }
+            options = {}
+            options[:macro]   = Remarkable.t(@macro, :scope => matcher_i18n_scope, :default => @macro.to_s.gsub("_", ""))
+            options[:options] = @options.inspect
 
             if @subject && reflection
               options.merge!(

data/lib/remarkable_activerecord/matchers/validate_length_of_matcher.rb

@@ -6,7 +6,7 @@ module Remarkable
 
         optional :within, :alias => :in
         optional :minimum, :maximum, :is
-        optional :with_kind_of
+        optional :token, :separator, :with_kind_of
         optional :allow_nil, :allow_blank, :default => true
         optional :message, :too_short, :too_long, :wrong_length
 
@@ -57,13 +57,11 @@ module Remarkable
           end
 
           def value_for_length(value)
-            repeatable = if @options[:with_kind_of]
-              [ @options[:with_kind_of].new ]
+            if @options[:with_kind_of]
+              [@options[:with_kind_of].new] * value
             else
-              "x"
+              ([@options.fetch(:token, 'x')] * value).join(@options.fetch(:separator, ''))
             end
-
-            repeatable * value
           end
 
           def interpolation_options
@@ -109,7 +107,17 @@ module Remarkable
       # being validated. For example, if your post accepts maximum 10 comments, you
       # can do:
       #
-      #   validate_length_of :comments, :maximum => 10, :with_kind_of => Comment
+      #   should_validate_length_of :comments, :maximum => 10, :with_kind_of => Comment
+      #
+      # Finally, it also accepts :token and :separator, to specify how the
+      # tokenizer should work. For example, if you are splitting the attribute
+      # per word:
+      #
+      #   validates_length_of :essay, :minimum => 100, :tokenizer => lambda {|str| str.scan(/\w+/) }
+      #
+      # You could do this:
+      #
+      #   should_validate_length_of :essay, :minimum => 100, :token => "word", :separator => " "
       #
       # == Gotcha
       #

data/spec/validate_length_of_matcher_spec.rb

@@ -143,6 +143,31 @@ describe 'validate_length_of' do
       it { should define_and_validate(:is => 3).is(3)     }
       it { should_not define_and_validate(:is => 3).is(2) }
       it { should_not define_and_validate(:is => 3).is(4) }
+    end
+
+    describe "with token and separator options" do
+      describe "and words as tokens" do
+        before(:each) do
+          @matcher = define_and_validate(:within => 3..5, :tokenizer => lambda { |str| str.scan(/\w+/) })
+        end
+
+        it { should @matcher.within(3..5).token("word").separator(" ") }
+        it { should_not @matcher.within(2..5).token("word").separator(" ") }
+        it { should_not @matcher.within(4..5).token("word").separator(" ") }
+        it { should_not @matcher.within(3..4).token("word").separator(" ") }
+        it { should_not @matcher.within(3..6).token("word").separator(" ") }
+        it { should_not @matcher.within(3..5).token("word").separator("") }
+        it { should_not @matcher.within(3..5).token("word").separator(" a ") }
+      end
+
+      describe "and digits as tokens" do
+        before(:each) do
+          @matcher = define_and_validate(:within => 3..5, :tokenizer => lambda { |str| str.scan(/\d+/) })
+        end
+
+        it { should @matcher.within(3..5).token("1").separator(" ") }
+        it { should_not @matcher.within(3..5).token("a").separator("") }
+      end
     end
 
     describe "with with kind of" do

data/spec/validate_uniqueness_of_matcher_spec.rb

@@ -136,7 +136,7 @@ describe 'validate_uniqueness_of' do
           User.new(:username => 'jose')
         end
       end
-      proc { @matcher.matches?(@model) }.should raise_error(ScriptError)
+      lambda { @matcher.matches?(@model) }.should raise_error(ScriptError)
 
       User.stub!(:find).and_return do |many, conditions|
         if many == :all
@@ -145,7 +145,7 @@ describe 'validate_uniqueness_of' do
           User.new(:username => 'jose')
         end
       end
-      proc { @matcher.matches?(@model) }.should_not raise_error(ScriptError)
+      lambda { @matcher.matches?(@model) }.should_not raise_error(ScriptError)
     end
 
     describe 'when null or blank values are not allowed' do
@@ -154,7 +154,6 @@ describe 'validate_uniqueness_of' do
           validates_uniqueness_of :username, options
         end
 
-        # Create a model
         User.create(:username => 'jose')
         validate_uniqueness_of(:username)
       end
@@ -163,7 +162,7 @@ describe 'validate_uniqueness_of' do
       it { should define_and_validate(:allow_nil => false).allow_nil(false) }
 
       it 'should raise an error if allow nil is true but we cannot save nil values in the database'do
-        proc { should define_and_validate.allow_nil }.should raise_error(ScriptError, /You declared that username accepts nil values in validate_uniqueness_of, but I cannot save nil values in the database, got/)
+        lambda { should define_and_validate.allow_nil }.should raise_error(ScriptError, /You declared that username accepts nil values in validate_uniqueness_of, but I cannot save nil values in the database, got/)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: remarkable_activerecord
 version: !ruby/object:Gem::Version 
-  version: 3.1.3
+  version: 3.1.4
 platform: ruby
 authors: 
 - Carlos Brando
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-28 00:00:00 +02:00
+date: 2009-05-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.1.3
+        version: 3.1.4
     version: 
 description: "Remarkable ActiveRecord: collection of matchers and macros with I18n for ActiveRecord"
 email: