rails_validations_hmac 0.0.3 → 0.0.4

data/lib/rails_validations_hmac/support/active_model/validations/hmac_validator.rb

@@ -7,15 +7,24 @@ module ActiveModel
       DEFAULT_ALGORITHM = :sha1
 
       def validate_each(record, attribute, hmac)
-        key       = value_in_context(record, options[:key]) or raise ":key missing"
-        data      = value_in_context(record, options[:data]) or raise ":data missing"
-        algorithm = value_in_context(record, options[:algorithm]) || DEFAULT_ALGORITHM
-        message   = options[:message] or 'HMAC is invalid'
+        raise ArgumentError, "Definition :key is missing" unless options.has_key?(:key)
+        raise ArgumentError, "Definition :data is missing" unless options.has_key?(:data)
 
-        real_hmac = OpenSSL::HMAC.hexdigest("#{algorithm}", key, data)
+        key       = value_in_context(record, options[:key])
+        data      = value_in_context(record, options[:data])
+        algorithm = value_in_context(record, options[:algorithm]) || DEFAULT_ALGORITHM
+        message   = options[:message] or 'HMAC is not matching'
 
-        valid     = real_hmac == hmac
-        record.errors.add(attribute, message) unless valid
+        if key and data and algorithm
+          real_hmac = OpenSSL::HMAC.hexdigest("#{algorithm}", key, data)
+          valid     = real_hmac == hmac
+          record.errors.add(attribute, message) unless valid
+        else
+          record.errors.add(:hmac, 'Comparing key not found') unless key
+          record.errors.add(:hmac, 'Comparing data not found') unless data
+          record.errors.add(:hmac, 'Comparing algorithm not found') unless algorithm
+          valid     = false
+        end
       end
 
       private
@@ -23,9 +32,9 @@ module ActiveModel
       def value_in_context(record, evaluation)
         case evaluation
         when Symbol
-          "#{evaluation}".split('.').inject(record) {|object, method| object.send(method) }
+          "#{evaluation}".split('.').inject(record) {|object, method| object.send(method) } rescue nil
         when Proc
-          record.instance_exec(&evaluation)
+          record.instance_exec(&evaluation) rescue nil
         when Array
           evaluation.collect {|e| value_in_context(record, e) }.join
         else

data/spec/dummy/log/test.log

@@ -1134,3 +1134,54 @@ Connecting to database specified by database.yml
    (0.1ms)  rollback transaction
    (0.1ms)  begin transaction
    (0.1ms)  rollback transaction
+Connecting to database specified by database.yml
+   (8.3ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+Connecting to database specified by database.yml
+   (0.8ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+Connecting to database specified by database.yml
+   (0.8ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_validations_hmac
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -212,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1495700232791925941
+      hash: -877944555676697387
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24