transcriber 0.0.17 → 0.0.18

data/lib/transcriber/resource/input_parser.rb

@@ -3,10 +3,12 @@ module Transcriber
     module InputParser
       def to_input(options = {})
         input = {}
+
         keys_to_input(options).each do |key|
           value = __send__(key.name)
           input.merge! key.to_input(value, options.fetch(key.name, {}))
         end
+
         input.with_indifferent_access
       end
 

data/lib/transcriber/resource/key.rb

@@ -8,16 +8,9 @@ module Transcriber
         @options = options
       end
 
-      def present?(resource)
-        !options[:if] ? true : resource.instance_eval(&options[:if])
-      end
-
-      def visible?(resource)
-        !present?(resource) ? false : case visible = options[:visible]
-                                      when nil  then true
-                                      when Proc then resource.instance_eval(&visible)
-                                      else visible
-                                      end
+      def convert_input_keys
+        options.fetch(:convert_input_keys, model.try(:convert_input_keys) ||
+                      Transcriber.configuration.convert_input_keys)
       end
 
       def input_path
@@ -37,9 +30,16 @@ module Transcriber
         path_definition.any? and path_definition.first[1].empty?
       end
 
-      def convert_input_keys
-        options.fetch(:convert_input_keys, model.try(:convert_input_keys) ||
-                      Transcriber.configuration.convert_input_keys)
+      def present?(resource)
+        !options[:if] ? true : resource.instance_eval(&options[:if])
+      end
+
+      def visible?(resource)
+        !present?(resource) ? false : case visible = options[:visible]
+                                      when nil  then true
+                                      when Proc then resource.instance_eval(&visible)
+                                      else visible
+                                      end
       end
     end
   end

data/lib/transcriber/resource/parser.rb

@@ -2,10 +2,13 @@ module Transcriber
   class Resource
     module Parser
       def parse!(input, options = {})
+        fail "invalid input" unless input.kind_of?(Enumerable)
         parse(input, options.merge(fail: true))
       end
 
       def parse(input, options = {})
+        return [] unless input.kind_of?(Enumerable)
+
         prepare_entries(input, options).collect do |item|
           parse_item(HashWithIndifferentAccess.new(item), options)
         end

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

@@ -3,14 +3,14 @@ module Transcriber
     module Parser
       module Embeddable
         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
+          return parse_fields(item) if fields
+          value = digg(item)
+          parsed_value = raw? ? value : resource_class.parse(value)
+          one? ? parsed_value.first : parsed_value
+        end
+
+        def parse_fields(item)
+          convert_input_keys.call(fields).map {|field| item[field]}
         end
 
         def digg(input)
@@ -22,33 +22,40 @@ module Transcriber
         end
 
         def to_input(value, options = {})
-          input = {}
-          return input if value.nil?
+          return {} if value.nil?
+          fields ? to_multiple_input(value, options)
+                 : to_single_input(value)
+        end
 
+        private
+
+        def to_single_input(value)
+          input = {}
           path = input_path
 
           if path.any?
             last = path.pop
             key_input = path.inject(input) {|buffer, key| buffer[key] = {}; buffer[key]}
-
-            if fields
-              mapped_fields = convert_input_keys.call(fields)
-              value.each_with_index do |item, index|
-                input[mapped_fields[index]] = item
-              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
+            key_input[last] = raw? ? value
+                                   : one? ? value.to_input(options)
+                                          : value.map {|item| item.to_input(options)}
           else
             input.merge!(value.to_input(options))
           end
 
           input
         end
+
+        def to_multiple_input(value, options)
+          input = {}
+          mapped_fields = convert_input_keys.call(fields)
+
+          value.each_with_index do |item, index|
+            input[mapped_fields[index]] = item
+          end
+
+          input
+        end
       end
     end
   end

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

@@ -27,6 +27,7 @@ module Transcriber
           input = {}
 
           path = input_path
+
           if path.any?
             last = path.pop
             key_input = path.inject(input) {|buffer, key| buffer[key] = {}; buffer[key]}

data/lib/transcriber/resource/response.rb

@@ -5,10 +5,12 @@ module Transcriber
 
       def resource(options = {})
         root = options.fetch(:root, true)
+
         {}.tap do |resource|
           resource_keys(options).inject(resource) do |buffer, key|
             buffer.merge!(key.to_resource(self))
           end
+
           resource.merge!({link: link}) if root and self.class.relations.any?
         end
       end
@@ -18,8 +20,8 @@ module Transcriber
       end
 
       def resource_keys(options)
-        return self.class.keys unless summarize?(options)
-        self.class.summarized_keys + [Resource::Href.new]
+        summarize?(options) ? self.class.summarized_keys + [Resource::Href.new]
+                            : self.class.keys
       end
 
       def summarize?(options)

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

@@ -4,7 +4,6 @@ module Transcriber
       module Embeddable
         def to_resource(parent)
           return {} unless visible?(parent)
-
           resource = nil
 
           if embedded = parent.__send__(name)

data/lib/transcriber/version.rb

@@ -1,3 +1,3 @@
 module Transcriber
-  VERSION = "0.0.17"
+  VERSION = "0.0.18"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: transcriber
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-12 00:00:00.000000000Z
+date: 2011-09-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70190180161240 !ruby/object:Gem::Requirement
+  requirement: &70227590133480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70190180161240
+  version_requirements: *70227590133480
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70190180160520 !ruby/object:Gem::Requirement
+  requirement: &70227590132980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70190180160520
+  version_requirements: *70227590132980
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70190180160000 !ruby/object:Gem::Requirement
+  requirement: &70227590132520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70190180160000
+  version_requirements: *70227590132520
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70190180159300 !ruby/object:Gem::Requirement
+  requirement: &70227590132060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: '0.5'
   type: :development
   prerelease: false
-  version_requirements: *70190180159300
+  version_requirements: *70227590132060
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70190180158520 !ruby/object:Gem::Requirement
+  requirement: &70227590131580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *70190180158520
+  version_requirements: *70227590131580
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70190180157940 !ruby/object:Gem::Requirement
+  requirement: &70227590131060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,7 +78,7 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70190180157940
+  version_requirements: *70227590131060
 description: ''
 email:
 - victorcrodrigues@gmail.com