Merge pull request #2 from mcorp/validations-0.6.0

Update to supports new version of hanami-validations

.travis.yml

@@ -1,21 +1,13 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.0
-  - 2.1.1
-  - 2.1.2
-  - 2.1.3
-  - 2.1.4
-  - 2.1.5
-  - 2.1.6
-  - 2.1.7
-  - 2.1.8
   - 2.2.0
   - 2.2.1
   - 2.2.2
   - 2.2.3
   - 2.2.4
+  - 2.2.5
   - 2.3.0
+  - 2.3.1
   - rbx-2
   - jruby-9000
   - jruby-9.0.1.0

README.md

@@ -18,7 +18,7 @@ And then execute:
 Or install it yourself as:
 
     $ gem install shoulda-hanami
-    
+
 ## Configure
 
 Create file `spec/support/shoulda_hanami.rb` with:
@@ -38,17 +38,18 @@ end
 class Person
   include Hanami::Validations
 
-  attribute :email,      type: String, presence: true, format: /@/
-  attribute :name,       type: String, size: 5..50
-  attribute :password,   type: String, size: 10
-  attribute :birthday,   type: Date
-  attribute :created_at, type: DateTime
-  attribute :state,      type: String,  inclusion: %w(PR SC SP)
-  attribute :year,       type: Integer, inclusion: 1979..1990
+  validations do
+    required(:email)    { format?(/@/) }
+    required(:name)     { size?(5..50) }
+    required(:password) { size?(10) }
+    required(:state)    { included_in?(%w(PR SC SP)) }
+    required(:year)     { included_in?(1979..1990) }
+  end
 end
 ```
 
 ### Spec
+
 ```ruby
 # allow_value
 it { is_expected.to allow_value("[email protected]").for(:email) }
@@ -61,13 +62,6 @@ it { is_expected.to validate_presence_of(:email) }
 it { is_expected.to validate_length_of(:name).is_at_least(5).is_at_most(50) }
 it { is_expected.to validate_length_of(:password).is_equal_to(10) }
 
-# coerces
-it { is_expected.to coerce_attribute(:email).to(String) }
-it { is_expected.to coerce_attribute(:name).to(String) }
-it { is_expected.to coerce_attribute(:password).to(String) }
-it { is_expected.to coerce_attribute(:birthday).to(Date) }
-it { is_expected.to coerce_attribute(:created_at).to(DateTime) }
-
 # inclusion
 it { is_expected.to validate_inclusion_of(:state).in_array(%w(PR SC SP)) }
 it { is_expected.to validate_inclusion_of(:year).in_array(1979..1990) }

lib/shoulda/hanami/matchers.rb

@@ -1,4 +1,3 @@
-require 'shoulda/hanami/matchers/coerce_attribute_matcher'
 require 'shoulda/hanami/matchers/allow_value_matcher'
 require 'shoulda/hanami/matchers/validate_inclusion_of_matcher'
 require 'shoulda/hanami/matchers/validate_length_of_matcher'
@@ -8,15 +7,23 @@ module Shoulda
   module Hanami
     module Matchers
       class Matcher
+        ERRORS = {
+          format:    'is in invalid format',
+          inclusion: 'must be one of:',
+          size:      'length must be',
+          presence:  'must be filled'
+        }
+
         def initialize(target, attribute, validation)
-          @target = target
-          @attribute = attribute
+          @target     = target
+          @attribute  = attribute
           @validation = validation
         end
 
         def matches?
-          @target.valid?
-          @target.errors.for(@attribute).select { |error| error.attribute == @attribute.to_s && error.validation == @validation }.size > 0
+          result = @target.validate
+          result.failure? &&
+            result.messages.fetch(@attribute).select { |msg| msg.include?(ERRORS[@validation]) }.size > 0
         end
       end
     end

lib/shoulda/hanami/matchers/allow_value_matcher.rb

@@ -11,8 +11,7 @@ def initialize(value)
         end
 
         def matches?(target)
-          target.send("#{@attribute}=", @value)
-          !Matcher.new(target, @attribute, :format).matches?
+          !Matcher.new(target.class.new(@attribute => @value), @attribute, :format).matches?
         end
 
         def description

lib/shoulda/hanami/matchers/validate_inclusion_of_matcher.rb

@@ -18,8 +18,7 @@ def matches?(target)
             break unless @values.include? value
           end
 
-          target.send("#{@attribute}=", value)
-          Matcher.new(target, @attribute, :inclusion).matches?
+          Matcher.new(target.class.new(@attribute => value), @attribute, :inclusion).matches?
         end
 
         def description

lib/shoulda/hanami/matchers/validate_length_of_matcher.rb

@@ -13,11 +13,9 @@ def initialize(attribute)
         def matches?(target)
           errors = []
 
-          target.send("#{@attribute}=", '*' * (minimum - 1))
-          errors << Matcher.new(target, @attribute, :size).matches?
+          errors << Matcher.new(target.class.new(@attribute => '*' * (minimum - 1)), @attribute, :size).matches?
 
-          target.send("#{@attribute}=", '*' * (maximum + 1))
-          errors << Matcher.new(target, @attribute, :size).matches?
+          errors << Matcher.new(target.class.new(@attribute => '*' * (maximum + 1)), @attribute, :size).matches?
 
           errors.all? { |error| error }
         end

lib/shoulda/hanami/matchers/validate_presence_of_matcher.rb

@@ -11,7 +11,7 @@ def initialize(attribute)
         end
 
         def matches?(target)
-          Matcher.new(target, @attribute, :presence).matches?
+          Matcher.new(target.class.new(@attribute => nil), @attribute, :presence).matches?
         end
 
         def description

lib/shoulda/hanami/version.rb

@@ -1,5 +1,5 @@
 module Shoulda
   module Hanami
-    VERSION = '0.1.0'.freeze
+    VERSION = '0.2.0'.freeze
   end
 end

shoulda-hanami.gemspec

@@ -22,5 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.4.0'
 
-  spec.add_dependency 'hanami-validations', '~> 0.5.0'
+  spec.add_dependency 'hanami-validations', '~> 0.6.0'
 end

spec/fixtures/with_validation_format_model.rb

@@ -1,5 +1,7 @@
 class WithValidationFormatModel
   include Hanami::Validations
 
-  attribute :email, format: /@/
+  validations do
+    optional(:email) { format?(/@/) }
+  end
 end

spec/fixtures/with_validation_inclusion_model.rb

@@ -1,5 +1,7 @@
 class WithValidationInclusionModel
   include Hanami::Validations
 
-  attribute :state, inclusion: %w(PR SC SP)
+  validations do
+    optional(:state).filled(inclusion?: %w(PR SC SP))
+  end
 end

spec/fixtures/with_validation_length_model.rb

@@ -1,6 +1,8 @@
 class WithValidationLengthModel
   include Hanami::Validations
 
-  attribute :name_equal_10,     size: 10
-  attribute :name_between_2_10, size: 2..10
+  validations do
+    optional(:name_equal_10).filled(size?: 10)
+    optional(:name_between_2_10).filled(size?: 2..10)
+  end
 end

spec/fixtures/with_validation_presence_model.rb

@@ -1,5 +1,7 @@
 class WithValidationPresenceModel
   include Hanami::Validations
 
-  attribute :email, presence: true
+  validations do
+    required(:email).filled
+  end
 end

spec/fixtures/with_validation_type_model.rb

@@ -1,17 +1,19 @@
 class WithValidationTypeModel
   include Hanami::Validations
 
-  attribute :attr_array,      type: Array
-  attribute :attr_bigdecimal, type: BigDecimal
-  attribute :attr_boolean,    type: Boolean
-  attribute :attr_date,       type: Date
-  attribute :attr_datetime,   type: DateTime
-  attribute :attr_float,      type: Float
-  attribute :attr_hash,       type: Hash
-  attribute :attr_integer,    type: Integer
-  attribute :attr_pathname,   type: Pathname
-  attribute :attr_set,        type: Set
-  attribute :attr_string,     type: String
-  attribute :attr_symbol,     type: Symbol
-  attribute :attr_time,       type: Time
+  validations do
+    optional(:attr_array) { array? }
+    optional(:attr_bigdecimal) { decimal? }
+    optional(:attr_boolean) { bool? }
+    optional(:attr_date) { date? }
+    optional(:attr_datetime).filled(type?: DateTime)
+    optional(:attr_float) { float? }
+    optional(:attr_hash) { hash? }
+    optional(:attr_integer) { int? }
+    optional(:attr_pathname).filled(type?: Pathname)
+    optional(:attr_set).filled(type?: Set)
+    optional(:attr_string) { str? }
+    optional(:attr_symbol).filled(type?: Symbol)
+    optional(:attr_time) { time? }
+  end
 end

spec/fixtures/without_validation_model.rb

@@ -1,5 +1,7 @@
 class WithoutValidationModel
   include Hanami::Validations
 
-  attribute :email
+  validations do
+    optional(:email)
+  end
 end