carlosbrando-remarkable 2.2.7 → 2.2.8

data/Manifest.txt

@@ -48,6 +48,7 @@ lib/remarkable/controller/macros/set_the_flash_to_matcher.rb
 lib/remarkable/dsl.rb
 lib/remarkable/example/example_methods.rb
 lib/remarkable/helpers.rb
+lib/remarkable/inflections.rb
 lib/remarkable/matcher_base.rb
 lib/remarkable/private_helpers.rb
 lib/remarkable/rails.rb

data/lib/remarkable.rb

@@ -2,7 +2,7 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module Remarkable
-  VERSION = '2.2.7'
+  VERSION = '2.2.8'
 end
 
 if ENV['RAILS_ENV'] == 'test'
@@ -19,3 +19,4 @@ require 'remarkable/example/example_methods'
 require 'remarkable/active_record/active_record' if defined?(ActiveRecord::Base)
 require 'remarkable/controller/controller' if defined?(ActionController::Base)
 require 'remarkable/rails' if defined?(RAILS_ROOT)
+require 'remarkable/inflections'

data/lib/remarkable/active_record/README.markdown

@@ -50,10 +50,10 @@ h3. have_db_column
 
 Ensure that the given column is defined on the models backing SQL table. The options are the same as the instance variables defined on the column definition: :precision, :limit, :default, :null, :primary, :type, :scale, and :sql_type.
 
-<pre><code>  should_have_db_column :email, :type => "string", :default  => nil, :precision => nil, :limit => 255,
+<pre><code>  should_have_db_column :email, :type => "string", :default  => nil, :precision => nil, :limit => 255, 		
                         :null => true, :primary => false, :scale => nil, :sql_type => 'varchar(255)'
 
-  it { should have_db_column(:email, :type => "string", :default  => nil, :precision => nil, :limit => 255,
+  it { should have_db_column(:email, :type => "string", :default  => nil, :precision => nil, :limit => 255, 		
                              :null => true, :primary => false, :scale => nil, :sql_type => 'varchar(255)') }</code></pre>
 
 h3. have_db_columns
@@ -229,20 +229,21 @@ Ensures that given values are not valid for the attribute. If a range is given,
 Note: this matcher accepts at once just one attribute to test.
 
 Options:
+* :in - values to ensure exclusion
 * :allow_nil - when supplied, validates if it allows nil or not.
 * :allow_blank - when supplied, validates if it allows blank or not.
 * :message - value the test expects to find in errors.on(:attribute).
   Regexp, string or symbol. Default = I18n.translate('activerecord.errors.messages.exclusion')
 
-<pre><code>  should_validate_exclusion_of :age, 30..60
-  should_validate_exclusion_of :username, "admin", "user"
-  should_not validate_exclusion_of :username, "clark_kent", "peter_park"
+<pre><code>  should_validate_exclusion_of :age, :in => 30..60
+  should_validate_exclusion_of :username, :in => ["admin", "user"]
+  should_not validate_exclusion_of :username, :in => ["clark_kent", "peter_park"]
 
-  it { should validate_exclusion_of(:age, 30..60) }
-  it { should validate_exclusion_of(:username, "admin", "user") }
-  it { should_not validate_exclusion_of(:username, "clark_kent", "peter_park") }</code></pre>
+  it { should validate_exclusion_of(:age, :in => 30..60) }
+  it { should validate_exclusion_of(:username, :in => ["admin", "user"]) }
+  it { should_not validate_exclusion_of(:username, :in => ["clark_kent", "peter_park"]) }</code></pre>
 
-h3. validate_format_of
+h3. validate_format_of 
 
 Ensures that the attribute can be set to the given values.
 
@@ -269,16 +270,17 @@ Ensures that given values are valid for the attribute. If a range is given, ensu
 Note: this matcher accepts at once just one attribute to test.
 
 Options:
+* :in - values to ensure inclusion
 * :allow_nil - when supplied, validates if it allows nil or not.
 * :allow_blank - when supplied, validates if it allows blank or not.
 * :message - value the test expects to find in errors.on(:attribute).
   Regexp, string or symbol. Default = I18n.translate('activerecord.errors.messages.inclusion')
 
-<pre><code>
-  it { should validate_inclusion_of(:age, 18..100) }
-  it { should validate_inclusion_of(:isbn, "isbn 1 2345 6789 0", "ISBN 1-2345-6789-0") }
+<pre><code>  should_validate_inclusion_of :age, :in => 18..100
+  should_validate_inclusion_of :size :in => ['S', 'M', 'L', 'XL']
 
-  it { should_not validate_inclusion_of(:isbn, "bad 1", "bad 2") }
+  it { should validate_inclusion_of(:age, :in => 18..100) }
+  it { should validate_inclusion_of(:size :in => ['S', 'M', 'L', 'XL']) }
 </code></pre>
 
 h3. validate_length_of

data/lib/remarkable/active_record/macros/validations/validate_length_of_matcher.rb

@@ -78,7 +78,7 @@ module Remarkable # :nodoc:
         end
 
         def less_than_min_length?
-          return true if @behavior == :maximum || @options[:minimum] <= 0
+          return true if @behavior == :maximum || @options[:minimum] <= 1
           return true if bad?(value_for_length(@options[:minimum] - 1), :short_message)
 
           @missing = "allow #{@attribute} to be less than #{@options[:minimum]} chars long"

data/lib/remarkable/inflections.rb

@@ -0,0 +1,7 @@
+# Add new inflection rules to avoid those rules from being overwriten.
+if defined?(ActiveSupport::Inflector)
+  ActiveSupport::Inflector.inflections do |inflect|
+    inflect.irregular 'attribute', 'attributes'
+    inflect.irregular 'good_value', 'good_values'
+  end
+end

data/remarkable.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{remarkable}
-  s.version = "2.2.7"
+  s.version = "2.2.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Carlos Brando", "Jos\303\251 Valim", "Diego Carrion"]
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.description = %q{}
   s.email = ["eduardobrando@gmail.com", "jose.valim@gmail.com", "dc.rec1@gmail.com"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc"]
-  s.files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc", "Rakefile", "init.rb", "lib/remarkable.rb", "lib/remarkable/active_record/README.markdown", "lib/remarkable/active_record/active_record.rb", "lib/remarkable/active_record/helpers.rb", "lib/remarkable/active_record/macros.rb", "lib/remarkable/active_record/macros/associations/association_matcher.rb", "lib/remarkable/active_record/macros/callbacks/callback_matcher.rb", "lib/remarkable/active_record/macros/database/have_db_column_matcher.rb", "lib/remarkable/active_record/macros/database/index_matcher.rb", "lib/remarkable/active_record/macros/validations/allow_mass_assignment_of_matcher.rb", "lib/remarkable/active_record/macros/validations/ensure_value_in_list_matcher.rb", "lib/remarkable/active_record/macros/validations/ensure_value_in_range_matcher.rb", "lib/remarkable/active_record/macros/validations/have_class_methods_matcher.rb", "lib/remarkable/active_record/macros/validations/have_instance_methods_matcher.rb", "lib/remarkable/active_record/macros/validations/have_named_scope_matcher.rb", "lib/remarkable/active_record/macros/validations/have_readonly_attributes_matcher.rb", "lib/remarkable/active_record/macros/validations/protect_attributes_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_acceptance_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_associated_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_confirmation_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_exclusion_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_format_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_inclusion_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_length_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_numericality_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_presence_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_uniqueness_of_matcher.rb", "lib/remarkable/assertions.rb", "lib/remarkable/controller/README.markdown", "lib/remarkable/controller/controller.rb", "lib/remarkable/controller/helpers.rb", "lib/remarkable/controller/macros.rb", "lib/remarkable/controller/macros/assign_matcher.rb", "lib/remarkable/controller/macros/filter_params_matcher.rb", "lib/remarkable/controller/macros/metadata_matcher.rb", "lib/remarkable/controller/macros/render_with_layout_matcher.rb", "lib/remarkable/controller/macros/respond_with_content_type_matcher.rb", "lib/remarkable/controller/macros/respond_with_matcher.rb", "lib/remarkable/controller/macros/set_session_matcher.rb", "lib/remarkable/controller/macros/route_matcher.rb", "lib/remarkable/controller/macros/set_the_flash_to_matcher.rb", "lib/remarkable/dsl.rb", "lib/remarkable/example/example_methods.rb", "lib/remarkable/helpers.rb", "lib/remarkable/matcher_base.rb", "lib/remarkable/private_helpers.rb", "lib/remarkable/rails.rb", "lib/remarkable/rails/extract_options.rb", "rails/init.rb", "remarkable.gemspec", "script/console", "script/destroy", "script/generate", "tasks/rspec.rake"]
+  s.files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc", "Rakefile", "init.rb", "lib/remarkable.rb", "lib/remarkable/active_record/README.markdown", "lib/remarkable/active_record/active_record.rb", "lib/remarkable/active_record/helpers.rb", "lib/remarkable/active_record/macros.rb", "lib/remarkable/active_record/macros/associations/association_matcher.rb", "lib/remarkable/active_record/macros/callbacks/callback_matcher.rb", "lib/remarkable/active_record/macros/database/have_db_column_matcher.rb", "lib/remarkable/active_record/macros/database/index_matcher.rb", "lib/remarkable/active_record/macros/validations/allow_mass_assignment_of_matcher.rb", "lib/remarkable/active_record/macros/validations/ensure_value_in_list_matcher.rb", "lib/remarkable/active_record/macros/validations/ensure_value_in_range_matcher.rb", "lib/remarkable/active_record/macros/validations/have_class_methods_matcher.rb", "lib/remarkable/active_record/macros/validations/have_instance_methods_matcher.rb", "lib/remarkable/active_record/macros/validations/have_named_scope_matcher.rb", "lib/remarkable/active_record/macros/validations/have_readonly_attributes_matcher.rb", "lib/remarkable/active_record/macros/validations/protect_attributes_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_acceptance_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_associated_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_confirmation_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_exclusion_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_format_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_inclusion_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_length_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_numericality_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_presence_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_uniqueness_of_matcher.rb", "lib/remarkable/assertions.rb", "lib/remarkable/controller/README.markdown", "lib/remarkable/controller/controller.rb", "lib/remarkable/controller/helpers.rb", "lib/remarkable/controller/macros.rb", "lib/remarkable/controller/macros/assign_matcher.rb", "lib/remarkable/controller/macros/filter_params_matcher.rb", "lib/remarkable/controller/macros/metadata_matcher.rb", "lib/remarkable/controller/macros/render_with_layout_matcher.rb", "lib/remarkable/controller/macros/respond_with_content_type_matcher.rb", "lib/remarkable/controller/macros/respond_with_matcher.rb", "lib/remarkable/controller/macros/set_session_matcher.rb", "lib/remarkable/controller/macros/route_matcher.rb", "lib/remarkable/controller/macros/set_the_flash_to_matcher.rb", "lib/remarkable/dsl.rb", "lib/remarkable/example/example_methods.rb", "lib/remarkable/helpers.rb", "lib/remarkable/inflections.rb", "lib/remarkable/matcher_base.rb", "lib/remarkable/private_helpers.rb", "lib/remarkable/rails.rb", "lib/remarkable/rails/extract_options.rb", "rails/init.rb", "remarkable.gemspec", "script/console", "script/destroy", "script/generate", "tasks/rspec.rake"]
   s.has_rdoc = true
   s.homepage = %q{http://www.nomedojogo.com/2008/11/18/shoulda-for-rspec-is-remarkable/}
   s.post_install_message = %q{PostInstall.txt}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: carlosbrando-remarkable
 version: !ruby/object:Gem::Version 
-  version: 2.2.7
+  version: 2.2.8
 platform: ruby
 authors: 
 - Carlos Brando
@@ -119,6 +119,7 @@ files:
 - lib/remarkable/dsl.rb
 - lib/remarkable/example/example_methods.rb
 - lib/remarkable/helpers.rb
+- lib/remarkable/inflections.rb
 - lib/remarkable/matcher_base.rb
 - lib/remarkable/private_helpers.rb
 - lib/remarkable/rails.rb