normalizr 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '068b8f6b2685d273ee884c7a8c0f751da02fd254fe56f0ee6366f304910f81f6'
-  data.tar.gz: 9edd590a85219a2ea44651412e32fced140dad016b3035acadcd1ebc43df2408
+  metadata.gz: 03dfb54450a14ca113c1e45f01f0b7f14356e6f12f6cfa90dddb0d2f49f85635
+  data.tar.gz: d72f8210ab5e58c404efb64e6854de2f48a342f2388cd4ca5d3931fd07b59f47
 SHA512:
-  metadata.gz: eb22312649da1951b0fe9d0d1214851ebeb62d408217156a0427a55b442814505e68786a513898e8ca8b095701cd47d4880e5c82ba943993b1516cbfd8b04774
-  data.tar.gz: 06c555da8af5e30f7527927518e28186577ac1baf2c36b0a0ae9ce3a4596c6cc15eb13c08f9a361e833e84665eb4ed769c9f3ff9d3d4f725db2d8cfa5eb82e37
+  metadata.gz: 2627756373049880c2c048b738354282df325bcdf1e56d875cd702a8ecd5fc73b63fda8f300d0c2ce2738fc0777774e8a5f993a37bd598cfac5016fba76ae292
+  data.tar.gz: 2a9ec23470882aefb1c8a2b85aa2ba280ba1d490cea311eb4986a6f30382a9e73916b008b92aaed4c9ee5b5a8231b4a0a5c2f0bd251c7f9373330c714a885b4a

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 0.3.1 / 2018-03-22
+
+* Fix conditional normalization
+
 ### 0.3.0 / 2018-03-21
 
 * Add a possibility to use if/unless cases for normalizer options (@TheTharin)

data/README.md

@@ -140,8 +140,8 @@ class Book
 
   normalize :author, if: :author_should_be_normalized?
   normalize :description, unless: :description_should_not_be_normalized?
-  
-  normalize :author, if: proc { date.today? }
+
+  normalize :author, if: -> { date.today? }
 end
 ```
 

data/lib/normalizr/concern.rb

@@ -11,8 +11,10 @@ module Normalizr
         prepend Module.new {
           options.attributes.each do |method|
             define_method :"#{method}=" do |value|
-              positive = options.positive_condition.all?  { |condition| instance_eval(&condition) }
-              negative = options.negative_condition.none? { |condition| instance_eval(&condition) }
+              condition_lambda = -> condition { Proc === condition ? instance_exec(&condition) : send(condition) }
+
+              positive = options.positive_condition.all?  &condition_lambda
+              negative = options.negative_condition.none? &condition_lambda
 
               if positive && negative
                 value = Normalizr.normalize(value, *options.before)

data/lib/normalizr/version.rb

@@ -1,3 +1,3 @@
 module Normalizr
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/spec/support/models/user.rb

@@ -3,7 +3,9 @@ class User < Person
 
   normalize :lastname, if: :should_normalize_lastname?
   normalize :maidenname, if: :should_normalize_maidenname_positive?, unless: :should_normalize_maidenname_negative?
-  normalize :favouritebook, if: proc { true }
+  normalize :favouritebook, if: -> { true }
+
+  private
 
   def should_normalize_lastname?
     true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: normalizr
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Dimko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-21 00:00:00.000000000 Z
+date: 2018-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry