rest_model 0.1.4 → 0.1.5

data/examples/embeds_many/invisible.rb

@@ -6,7 +6,7 @@ class Root < RestModel
   property    :key,    id: true
   property    :locale, visible: false
   embeds_many :names,  class_name: 'Hash', visible: false
-  property    :name,   values: proc {names[locale]}
+  property    :name,   from_source: proc {names[locale]}, to_source: proc {names[locale]}
 end
 
 names = {'en' => 'Woot', 'pt-BR' => 'Úia', 'es' => 'Me gusta'}

data/lib/rest_model/key/property/retriever.rb

@@ -3,22 +3,12 @@ class RestModel
     module Retriever
       def from_source(item, resource = nil)
         value = digg(item)
-        translate_from_source(serializer.serialize(value), resource)
+        translation.translate_from_source(serializer.serialize(value), resource)
       end
 
       def digg(input)
         source_path.inject(input) {|buffer, key| buffer = buffer[key]}
       end
-
-      def translate_from_source(value, resource)
-        case translations
-        when nil  then value
-        when Proc then resource.instance_eval(&translations)
-        when Hash
-          fail "from input error" unless translations.has_value?(value)
-          translations.key(value)
-        end
-      end
     end
   end
 end

data/lib/rest_model/key/property/sender.rb

@@ -2,14 +2,8 @@ class RestModel
   class Property
     module Sender
       def to_source!(value, resource, options = {})
-        source_value = nil
-
-        begin
-          if translations
-            source_value = translate_to_source(value, resource)
-          else
-            source_value = serializer.desserialize(value)
-          end
+        source_value = begin
+          translation.translate_to_source(serializer.desserialize(value), resource)
         rescue => exception
           raise exception if options[:fail]
         end
@@ -27,15 +21,6 @@ class RestModel
 
         source
       end
-
-      def translate_to_source(value, resource)
-        case translations
-        when Proc then resource.instance_eval(&translations)
-        when Hash
-          fail "to input error" unless translations.has_key?(value)
-          translations[value]
-        end
-      end
     end
   end
 end

data/lib/rest_model/key/property.rb

@@ -7,12 +7,12 @@ class RestModel
     include   Retriever
     include   Response
 
-    attr_accessor :serializer, :translations
+    attr_accessor :serializer, :translation
 
     def initialize(name, options = {})
       super
-      @serializer   = options.fetch(:type, Serialization::String)
-      @translations = options[:values]
+      @serializer  = options.fetch(:type, Serialization::String)
+      @translation = Source::Translation.new(options)
     end
 
     def from_hash(value, resource = nil)

data/lib/rest_model/source/translation.rb

@@ -0,0 +1,35 @@
+class RestModel
+  module Source
+    class Translation
+      attr_accessor :values, :from_source, :to_source
+
+      def initialize(attrs = {})
+        @values      = attrs[:values]
+        @from_source = attrs[:from_source]
+        @to_source   = attrs[:to_source]
+      end
+
+      def translate_from_source(value, resource)
+        if from_source
+          resource.instance_exec(value, &from_source)
+        elsif values
+          fail "from source error" unless values.has_value?(value)
+          values.key(value)
+        else
+          value
+        end
+      end
+
+      def translate_to_source(value, resource)
+        if to_source
+          resource.instance_exec(value, &to_source)
+        elsif values
+          fail "to source error" unless values.has_key?(value)
+          values[value]
+        else
+          value
+        end
+      end
+    end
+  end
+end

data/lib/rest_model/version.rb

@@ -1,3 +1,3 @@
 class RestModel
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/lib/rest_model.rb

@@ -9,6 +9,7 @@ require "active_support/core_ext/hash/slice"
 require "active_support/core_ext/hash/indifferent_access"
 
 require "rest_model/source/path"
+require "rest_model/source/translation"
 require "rest_model/source/retriever"
 require "rest_model/source/sender"
 require "rest_model/response"

data/spec/unit/key/property_spec.rb

@@ -32,7 +32,8 @@ describe RestModel::Property do
       end
 
       it "configures values" do
-        subject.translations.should == values
+        subject.translation.should be_a(RestModel::Source::Translation)
+        subject.translation.values.should == values
       end
     end
   end

data/spec/unit/source/retriever_spec.rb

@@ -72,13 +72,21 @@ describe RestModel::Source::Retriever do
       end
 
       it "returns key when value was mapped" do
-        models = Example.parse({status: '02'})
+        models = Example.from_source!({status: '02'})
         models.first.status.should == :unpaid
       end
 
-      it "returns nil when value wasn't mapped" do
-        models = Example.parse({status: '03'})
-        models.first.status.should be_nil
+      context "when calling from_source" do
+        it "returns nil when value wasn't mapped" do
+          models = Example.from_source({status: '03'})
+          models.first.status.should be_nil
+        end
+      end
+
+      context "when calling from_source!" do
+        it "fails when value wasn't mapped" do
+          expect {Example.from_source!({status: '03'})}.to raise_error("from source error")
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest_model
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-20 00:00:00.000000000Z
+date: 2011-10-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70223287802460 !ruby/object:Gem::Requirement
+  requirement: &70331537727740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70223287802460
+  version_requirements: *70331537727740
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70223287801960 !ruby/object:Gem::Requirement
+  requirement: &70331537727160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70223287801960
+  version_requirements: *70331537727160
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70223287801500 !ruby/object:Gem::Requirement
+  requirement: &70331537726680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70223287801500
+  version_requirements: *70331537726680
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70223287801040 !ruby/object:Gem::Requirement
+  requirement: &70331537726100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: '0.5'
   type: :development
   prerelease: false
-  version_requirements: *70223287801040
+  version_requirements: *70331537726100
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70223287800580 !ruby/object:Gem::Requirement
+  requirement: &70331537725580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *70223287800580
+  version_requirements: *70331537725580
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70223287800120 !ruby/object:Gem::Requirement
+  requirement: &70331537725060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,7 +78,7 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70223287800120
+  version_requirements: *70331537725060
 description: ''
 email:
 - victorcrodrigues@gmail.com
@@ -171,6 +171,7 @@ files:
 - lib/rest_model/source/path.rb
 - lib/rest_model/source/retriever.rb
 - lib/rest_model/source/sender.rb
+- lib/rest_model/source/translation.rb
 - lib/rest_model/version.rb
 - rest_model.gemspec
 - spec/.DS_Store