eapi 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4673ef60bc4acd96d0ae165935fab2e1b901cf53
-  data.tar.gz: d04635f645f8638fdb8a224dc5ae3320e5fe90fd
+  metadata.gz: 8185b8ffb82603d48217ba5da50433b6ed456692
+  data.tar.gz: ec4580aa551539d3dd3954af9370831fa81f8279
 SHA512:
-  metadata.gz: 4da861d047452f5057a2cc1f778ea2073198afab91a926fd7cdc1c36e35222ca6f7e02aa547b5683099d21020d2d1171825562a66a94c47663316f2fcf65240d
-  data.tar.gz: 8d9f6a3d3d5a8e18a07cf03f22b40724acd98a9a736985bf01093e2204f77a633b7d79c3a2603c4ab1ce1e5378dd32d4be47d3d9c82333aed375f4ff86971203
+  metadata.gz: 4e8c053064f3c3ea658a71791ade20c42b1f2b66e6e3ffbe38e8f1bc6d52a33eb191e1d8284b4e050a965f27ff87ad727794ee79797933d56d2bd8c2d82e05e4
+  data.tar.gz: d71bf06c7941f1218c9fa7486b9d7aa3ccae398e4fe4a09f235abe405477267cf4daa5ef8833f49c2c54ef7a246c067fe292fcb306fcf0b0ab8fbac7c56072db

data/README.md

@@ -135,16 +135,16 @@ x = ExampleItem.new.add(1).add(2)
 x.render # => ["1", "2"]
 ```
 
-#### Convert values before validation using `convert_before_validation` option
+#### Prepare values before validation using `prepare_with` option
 
-If `convert_before_validation` option is enabled, then the conversion will occur before validation
+Same as `convert_with` but it is used before validation.
 
 ```ruby
 class ExampleItem
   include Eapi::Item
   
-  property :something, convert_with: :to_i, convert_before_validation: true
-  property :normal, convert_with: :to_i
+  property :something, prepare_with: to_i
+  property :normal,
   
   validates :something, inclusion: { in: [1, 2, 3] }
   validates :normal, inclusion: { in: [1, 2, 3] }
@@ -165,7 +165,7 @@ In `List` it will work on elements.
 class ExampleListConvertBeforeValidationEnabled
   include Eapi::List
 
-  elements convert_with: :to_i, convert_before_validation: true, validate_with: ->(record, attr, value) do
+  elements prepare_with: :to_i, validate_with: ->(record, attr, value) do
     record.errors.add(attr, 'must pass my custom validation') unless value.kind_of?(Fixnum)
   end
 end
@@ -173,7 +173,7 @@ end
 class ExampleListConvertBeforeValidationDisabled
   include Eapi::List
 
-  elements convert_with: :to_i, validate_with: ->(record, attr, value) do
+  elements validate_with: ->(record, attr, value) do
     record.errors.add(attr, 'must pass my custom validation') unless value.kind_of?(Fixnum)
   end
 end

data/lib/eapi/item.rb

@@ -27,8 +27,8 @@ module Eapi
 
     def perform_before_validation
       _properties.each do |property|
-        if self.class.convert_before_validation?(property)
-          self.set(property, converted_value_for(property))
+        if self.class.prepare_value_for?(property)
+          self.set(property, prepare_value_for(property))
         end
       end
     end

data/lib/eapi/list.rb

@@ -80,8 +80,8 @@ module Eapi
     end
 
     def perform_before_validation
-      if self.class.elements_convert_before_validation?
-        _list.map! { |v| convert_value_for_element(v) }
+      if self.class.prepare_value_for_elements?
+        _list.map! { |v| prepare_value_for_element(v) }
       end
     end
 

data/lib/eapi/methods/properties.rb

@@ -18,6 +18,17 @@ module Eapi
           send(setter, value)
         end
 
+        def prepare_value_for(prop)
+          value        = get(prop)
+          prepare_with = self.class.defined_prepare_with_for(prop)
+
+          if prepare_with
+            convert_value(value, prepare_with)
+          else
+            value
+          end
+        end
+
         def converted_value_for(prop)
           convert_value get(prop), self.class.defined_convert_with_for(prop)
         end
@@ -116,8 +127,12 @@ module Eapi
           definition_for(property).fetch(:convert_with, nil)
         end
 
-        def convert_before_validation?(property)
-          definition_for(property).fetch(:convert_before_validation, false)
+        def defined_prepare_with_for(property)
+          definition_for(property).fetch(:prepare_with, nil)
+        end
+
+        def prepare_value_for?(property)
+          !!defined_prepare_with_for(property)
         end
 
         private :_property_allow_raw
@@ -144,6 +159,16 @@ module Eapi
         def convert_value_for_element(value)
           convert_value(value, self.class.elements_defined_convert_with_for)
         end
+
+        def prepare_value_for_element(value)
+          prepare_with = self.class.elements_defined_prepare_with_for
+
+          if prepare_with
+            convert_value(value, prepare_with)
+          else
+            value
+          end
+        end
       end
 
       module ListCLassMethods
@@ -163,19 +188,23 @@ module Eapi
           definition_for_elements.fetch(:ignore, :nil?)
         end
 
-        def elements_convert_before_validation?
-          definition_for_elements.fetch(:convert_before_validation, false)
+        def prepare_value_for_elements?
+          !!elements_defined_prepare_with_for
         end
 
-        def elements(definition)
-          run_list_definition definition
-          store_list_definition definition
+        def elements_defined_prepare_with_for
+          definition_for_elements.fetch(:prepare_with, nil)
         end
 
         def elements_defined_convert_with_for
           definition_for_elements.fetch(:convert_with, nil)
         end
 
+        def elements(definition)
+          run_list_definition definition
+          store_list_definition definition
+        end
+
         def definition_for_elements
           @_list_definition ||= {}
         end

data/lib/eapi/version.rb

@@ -1,3 +1,3 @@
 module Eapi
-  VERSION = "0.6.0"
+  VERSION = '0.7.0'
 end

data/spec/conversion_spec.rb

@@ -60,8 +60,8 @@ RSpec.describe Eapi do
       class ExampleItemConvertBeforeValidation
         include Eapi::Item
 
-        property :something, convert_with: :to_i, convert_before_validation: true
-        property :normal, convert_with: :to_i
+        property :something, prepare_with: :to_i
+        property :normal
 
         validates :something, inclusion: {in: [1, 2, 3]}
         validates :normal, inclusion: {in: [1, 2, 3]}
@@ -86,7 +86,7 @@ RSpec.describe Eapi do
       class ExampleListConvertBeforeValidationEnabled
         include Eapi::List
 
-        elements convert_with: :to_i, convert_before_validation: true, validate_with: ->(record, attr, value) do
+        elements prepare_with: :to_i, validate_with: ->(record, attr, value) do
           record.errors.add(attr, 'must pass my custom validation') unless value.kind_of?(Fixnum)
         end
       end

data/spec/list_spec.rb

@@ -457,5 +457,32 @@ RSpec.describe Eapi do
       end
 
     end
+
+    describe 'render' do
+      class TestListItemRender
+        include Eapi::Item
+
+        property :something
+        property :other
+
+        def perform_render
+          {something => other}
+        end
+      end
+
+      class TestListRender
+        include Eapi::List
+
+        elements type: 'TestListItemRender'
+      end
+
+      let(:item) { TestListItemRender.new something: :f, other: :o }
+      subject { TestListRender.new.add(item) }
+      let(:expected) { [{f: :o}] }
+
+      it 'renders to an array, rendering each element' do
+        expect(subject.render).to eq expected
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eapi
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Eduardo Turiño