transcriber 0.0.15 → 0.0.16

data/examples/embeds_many/with_array.rb

@@ -3,7 +3,7 @@ require 'json'
 $:.push 'lib'; require 'transcriber'
 
 class Root < Transcriber::Resource
-  embeds_many :items, class_name: "Array"
+  embeds_many :items, class_name: :array
 end
 
 @root = Root.new

data/examples/embeds_many/with_fields.rb

@@ -0,0 +1,10 @@
+$:.push 'lib'; require 'transcriber'
+
+class Root < Transcriber::Resource
+  embeds_many :items, fields: [:item1, :item2, :item3]
+end
+
+@root = Root.parse({item1: "i1", item2: "i2", item3: "i3"}).first
+
+puts "root:     #{@root.inspect}"
+puts "resource: #{@root.resource}"

data/examples/initialize/embeds_many_array.rb

@@ -2,7 +2,7 @@ $:.push 'lib'; require 'transcriber'
 
 class Customer < Transcriber::Resource
   property :name
-  embeds_many :phones, class_name: "Array"
+  embeds_many :phones, class_name: :array
 end
 
 @root = Customer.new({name: "Jackie Chan", phones: ["1391938", "893271984"]})

data/examples/to_input/embeds_many.rb

@@ -26,4 +26,4 @@ puts "root.to_input: #{@root.to_input}"
 
 
 puts "root:     #{@root.inspect}"
-puts "resource: #{@root.resource}"
+puts "resource: #{@root.resource}"

data/examples/to_input/with_fields.rb

@@ -0,0 +1,9 @@
+$:.push 'lib'; require 'transcriber'
+
+class Root < Transcriber::Resource
+  embeds_many :items, fields: [:item1, :item2, :item3]
+end
+
+@root = Root.new(items: %w(i1 i2 i3))
+
+puts "input:     #{@root.to_input}"

data/lib/transcriber/resource/input_parser.rb

@@ -4,17 +4,8 @@ module Transcriber
       def to_input(options = {})
         input = {}
         keys_to_input(options).each do |key|
-          value = __send__("#{key.name}")
-          parsed_value = key.to_input(value, options.fetch(key.name, {}))
-          path = key.input_path
-
-          if path.any?
-            last = path.pop
-            key_input = path.inject(input) {|buffer, key| buffer[key] = {}; buffer[key]}
-            key_input[last] = parsed_value
-          else
-            input.merge!(parsed_value)
-          end
+          value = __send__(key.name)
+          input.merge! key.to_input(value, options.fetch(key.name, {}))
         end
         input.with_indifferent_access
       end
@@ -23,7 +14,7 @@ module Transcriber
 
       def keys_to_input(options)
         self.class.keys.clone.tap do |keys|
-          keys.reject! {|k| k.kind_of?(Relation)} unless options.fetch(:relations, true)
+          keys.reject! {|k| k.kind_of?(Relation)}
           keys.reject! {|k| Array(options[:without]).include?(k.name)}
         end
       end

data/lib/transcriber/resource/key.rb

@@ -1,10 +1,7 @@
 module Transcriber
   class Resource
     class Key
-      attr_accessor :name
-      attr_accessor :model
-      attr_accessor :options
-      attr_accessor :summarize
+      attr_accessor :name, :model, :options, :summarize
 
       def initialize(name, options = {})
         @name    = name
@@ -12,29 +9,26 @@ module Transcriber
       end
 
       def present?(resource)
-        return true unless options[:if]
-        resource.instance_eval &options[:if]
+        !options[:if] ? true : resource.instance_eval(&options[:if])
       end
 
       def visible?(resource)
-        if present? resource
-          return true if options[:visible].nil?
-          return options[:visible] unless options[:visible].kind_of?(Proc)
-          return resource.instance_eval &options[:visible]
-        end
-        false
+        !present?(resource) ? false : case visible = options[:visible]
+                                      when nil  then true
+                                      when Proc then resource.instance_eval(&visible)
+                                      else visible
+                                      end
       end
 
       def input_path
         return @input_path.clone if @input_path
 
-        path = InputPath.resolve(options, convert_input_keys)
+        @input_path = InputPath.resolve(options, convert_input_keys)
 
-        if path.empty? and !root_path?
-          path = convert_input_keys.call([name])
+        if @input_path.empty? and !root_path?
+          @input_path = convert_input_keys.call([name])
         end
 
-        @input_path = path
         @input_path.clone
       end
 

data/lib/transcriber/resource/key/association.rb

@@ -22,7 +22,7 @@ module Transcriber
       end
 
       def resource_class
-        @class_name.constantize
+        @class_name.to_s.camelize.constantize
       end
 
       def from_hash(attrs)
@@ -30,11 +30,6 @@ module Transcriber
         one? ? resource_class.new(attrs)
              : Array(attrs).map {|item| resource_class.new(item)}
       end
-
-      def to_input(value, options = {})
-        return nil if value.nil?
-        one? ? value.to_input(options) : value.map {|item| item.to_input(options)}
-      end
     end
   end
 end

data/lib/transcriber/resource/key/embeddable.rb

@@ -4,18 +4,19 @@ module Transcriber
       include Parser::Embeddable
       include Response::Embeddable
 
-      def raw?
-        [Hash, Array].include?(resource_class)
-      end
+      attr_accessor :fields
 
-      def from_hash(attrs)
-        return attrs if raw?
+      def initialize(name, options = {})
         super
+
+        if fields = options[:fields]
+          @class_name = :array
+          @fields = fields
+        end
       end
 
-      def to_input(value, options = {})
-        return value if raw?
-        super
+      def raw?
+        [Hash, Array].include?(resource_class)
       end
     end
   end

data/lib/transcriber/resource/key/property.rb

@@ -4,22 +4,15 @@ module Transcriber
       include Parser::Property
       include Response::Property
 
-      attr_accessor :serializer
-      attr_accessor :translations
+      attr_accessor :serializer, :translations
 
       def initialize(name, options = {})
         super
         @serializer   = options.fetch(:type, Serialization::String)
-        @translations = options[:values]        if options[:values].kind_of?(Proc)
-        @translations = options[:values].invert if options[:values].kind_of?(Hash)
-      end
-
-      def from_hash(value)
-        value
-      end
-
-      def to_input(value, options = {})
-        value
+        @translations = case values = options[:values]
+                        when Proc then values
+                        when Hash then values.invert
+                        end
       end
     end
   end

data/lib/transcriber/resource/parser.rb

@@ -21,9 +21,8 @@ module Transcriber
       def parse_item(item, options)
         self.new.tap do |resource|
           keys.each do |key|
-            value = digg(item, key.input_path)
             begin
-              resource.__send__("#{key.name}=", key.parse(value, resource)) if key.present?(resource)
+              resource.__send__("#{key.name}=", key.parse(item, resource)) if key.present?(resource)
             rescue => exception
               raise exception if options[:fail]
             end

data/lib/transcriber/resource/parser/embeddable.rb

@@ -2,9 +2,51 @@ module Transcriber
   class Resource
     module Parser
       module Embeddable
-        def parse(value, resource = nil)
-          parsed_value = raw? ? value : resource_class.parse(value)
-          one? ? parsed_value.first : parsed_value
+        def parse(item, resource = nil)
+          value = nil
+          if fields
+            value = convert_input_keys.call(fields).map {|field| item[field]}
+          else
+            value = digg(item)
+            parsed_value = raw? ? value : resource_class.parse(value)
+            value = one? ? parsed_value.first : parsed_value
+          end
+        end
+
+        def digg(input)
+          input_path.inject(input) {|buffer, key| buffer = buffer[key]}
+        end
+
+        def from_hash(attrs)
+          raw? ? attrs : super
+        end
+
+        def to_input(value, options = {})
+          input = {}
+          return input if value.nil?
+
+          path = input_path
+
+          if path.any?
+            last = path.pop
+            key_input = path.inject(input) {|buffer, key| buffer[key] = {}; buffer[key]}
+
+            if fields
+              convert_input_keys.call(fields).each_with_index do |field, index|
+                input[field] = value[index]
+              end
+            elsif raw?
+              key_input[last] = value
+            elsif one?
+              key_input[last] = value.to_input(options)
+            else
+              key_input[last] = value.map {|item| item.to_input(options)}
+            end
+          else
+            input.merge!(value.to_input(options))
+          end
+
+          input
         end
       end
     end

data/lib/transcriber/resource/parser/property.rb

@@ -2,20 +2,41 @@ module Transcriber
   class Resource
     module Parser
       module Property
-        def parse(value, resource = nil)
+        def parse(item, resource = nil)
+          value = digg(item)
           translate(serializer.serialize(value), resource)
         end
 
+        def digg(input)
+          input_path.inject(input) {|buffer, key| buffer = buffer[key]}
+        end
+
         def translate(value, resource)
           case translations
-          when nil
-            value
-          when Hash
-            translations[value]
-          when Proc
-            resource.instance_eval &translations
+          when nil  then value
+          when Hash then translations[value]
+          when Proc then resource.instance_eval(&translations)
           end
         end
+
+        def from_hash(value)
+          value
+        end
+
+        def to_input(value, options = {})
+          input = {}
+
+          path = input_path
+          if path.any?
+            last = path.pop
+            key_input = path.inject(input) {|buffer, key| buffer[key] = {}; buffer[key]}
+            key_input[last] = value
+          else
+            input.merge!(value)
+          end
+
+          input
+        end
       end
     end
   end

data/lib/transcriber/version.rb

@@ -1,3 +1,3 @@
 module Transcriber
-  VERSION = "0.0.15"
+  VERSION = "0.0.16"
 end

data/spec/unit/resource/parser/embeddable_spec.rb

@@ -10,7 +10,7 @@ describe Resource::Parser::Embeddable do
 
     let(:value) {{id: "7000"}}
 
-    subject {Resource::Embeddable.new(:example_child, many: false)}
+    subject {Resource::Embeddable.new(:example_child, many: false, start_key: "")}
 
     it "parses child" do
       child = subject.parse(value)
@@ -25,7 +25,7 @@ describe Resource::Parser::Embeddable do
       end
     end
 
-    let(:value) {[{id: "7000"}, {id: "7001"}]}
+    let(:value) {{example_children: [{id: "7000"}, {id: "7001"}]}}
 
     subject {Resource::Embeddable.new(:example_children, many: true)}
 

data/spec/unit/resource/parser/property_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Resource::Parser::Property do
   subject {Resource::Property.new(:login)}
 
-  let(:value)           {"jackiechan2010"}
+  let(:item)            {{login: "jackiechan2010"}}
   let(:serializer_mock) {mock :serializer}
 
   before do
@@ -11,8 +11,8 @@ describe Resource::Parser::Property do
   end
 
   it "tries to serialize value" do
-    serializer_mock.should_receive(:serialize).with(value).and_return(value)
-    subject.parse(value)
+    serializer_mock.should_receive(:serialize).with(item[:login]).and_return(item[:login])
+    subject.parse(item)
   end
 
   context "when there is a values map" do
@@ -24,8 +24,8 @@ describe Resource::Parser::Property do
     end
 
     it "maps value" do
-      serializer_mock.should_receive(:serialize).with(value).and_return "02"
-      subject.parse(value).should == :unpaid
+      serializer_mock.should_receive(:serialize).with("02").and_return "02"
+      subject.parse({payment_status: "02"}).should == :unpaid
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: transcriber
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-30 00:00:00.000000000Z
+date: 2011-09-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70237690466580 !ruby/object:Gem::Requirement
+  requirement: &70132365829780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70237690466580
+  version_requirements: *70132365829780
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70237690466060 !ruby/object:Gem::Requirement
+  requirement: &70132365829080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70237690466060
+  version_requirements: *70132365829080
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70237690465600 !ruby/object:Gem::Requirement
+  requirement: &70132365828380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70237690465600
+  version_requirements: *70132365828380
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70237690465000 !ruby/object:Gem::Requirement
+  requirement: &70132365827720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: '0.5'
   type: :development
   prerelease: false
-  version_requirements: *70237690465000
+  version_requirements: *70132365827720
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70237690464520 !ruby/object:Gem::Requirement
+  requirement: &70132365827200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *70237690464520
+  version_requirements: *70132365827200
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70237690463980 !ruby/object:Gem::Requirement
+  requirement: &70132365826720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,7 +78,7 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70237690463980
+  version_requirements: *70132365826720
 description: ''
 email:
 - victorcrodrigues@gmail.com
@@ -98,6 +98,7 @@ files:
 - examples/embeds_many/simple.rb
 - examples/embeds_many/with_array.rb
 - examples/embeds_many/with_class_name.rb
+- examples/embeds_many/with_fields.rb
 - examples/embeds_many/with_if.rb
 - examples/embeds_many/with_nil_value.rb
 - examples/embeds_many/with_start_key.rb
@@ -129,8 +130,8 @@ files:
 - examples/to_input/simple.rb
 - examples/to_input/with_field.rb
 - examples/to_input/with_field_path.rb
+- examples/to_input/with_fields.rb
 - examples/to_input/without_key.rb
-- examples/to_input/without_relations.rb
 - lib/transcriber.rb
 - lib/transcriber/configuration.rb
 - lib/transcriber/resource.rb

data/examples/to_input/without_relations.rb

@@ -1,11 +0,0 @@
-$:.push 'lib'; require 'transcriber'
-
-class Customer < Transcriber::Resource
-  property :login
-  has_one :service
-end
-
-@root = Customer.new(login: 'jackiechan2010')
-
-puts "root.to_input: #{@root.to_input(relations: false)}"
-puts "root:     #{@root.inspect}"