omnis 0.4.2 → 0.5.0

data/lib/omnis/transformer.rb

@@ -65,23 +65,15 @@ module Omnis
     end
 
     module InstanceMethods
-      def __extract(property, source)
-        value = property_value(property, source)
-        if property.format
-          property.format.call(value)
-        else
-          value
-        end
-      end
-
       def property_value(property, source)
-        value = property.extract(source)
-        return property.default if property.default && (value == Nothing || value.nil?)
-        return self.class.apply_to_value(value)
+        raw_value = property.extract(source)
+        raw_value = property.default if property.default && (raw_value == Nothing || raw_value.nil?)
+        applied_value = self.class.apply_to_value(raw_value)
+        property.format ? property.format.call(applied_value) : applied_value
       end
 
       def transform(source)
-        result = Hash[self.class.properties.map do |k, v| [k, __extract(v, source)] end]
+        result = Hash[self.class.properties.map do |k, v| [k, property_value(v, source)] end]
         respond_to?(:to_object) ? to_object(result) : result
       end
 

data/lib/omnis/version.rb

@@ -1,3 +1,3 @@
 module Omnis
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

data/spec/lib/omnis/transformer_spec.rb

@@ -74,14 +74,28 @@ describe Omnis::Transformer do
     xformer.({}).should == {:ref => 'ref_value'}
   end
 
-  it 'use to_value if provided' do
-    class TestToValueTransformer
-      include Omnis::Transformer
-      property(:ref) { 'abc' }
-      to_value {|i| i.upcase }
+  context 'to_value' do
+    it 'use to_value if provided' do
+      class TestToValueTransformer
+        include Omnis::Transformer
+        property(:ref) { 'abc' }
+        to_value {|i| i.upcase }
+      end
+      xformer = TestToValueTransformer.new.to_proc
+      xformer.({}).should == { :ref => 'ABC' }
     end
 
-    xformer = TestToValueTransformer.new.to_proc
-    xformer.({}).should == { :ref => 'ABC' }
+    it 'format is applied after to_value' do
+      class TestToValueFormatTransformer
+        include Omnis::Transformer
+        property(:date, nil, :format => ->v { v.strftime('%Y-%m-%d') })
+
+        def self.date(a); Maybe(a); end
+        to_value {|i| i.fetch(Time.at(0)) }
+      end
+      xformer = TestToValueFormatTransformer.new.to_proc
+      xformer.(Time.local(2012, 11, 24, 21, 34)).should == { :date => "2012-11-24"}
+      xformer.(nil).should == { :date => "1970-01-01"}
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omnis
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors: