salesforce_record 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ad16d2a059b16aff6a15262ab0552d83d3d12f9
-  data.tar.gz: 48123ec4187661eae7f4cd93c20bebbd9e5c4ead
+  metadata.gz: a953ac9865b62a867d452be1cd9753b12aef5d2f
+  data.tar.gz: 1c4766debc25075c6dc6eff5d968c3e736e87ec5
 SHA512:
-  metadata.gz: feea79ba0c8a43da14fa76a52c2cfc253357be6ab6d480f5b3373cea59fa7f99a4f24979e244687a693e1435cbdad23a31cbadf087929f53a182e2015f29677b
-  data.tar.gz: 577b8ab8cec74c6834298afdb5173443d3b8c3d4f9f03dda8f1d44ca58623eb18163bba24ca5e52a9f5711777aa82ff415b2d8360f2caf990e67bc3d6884d998
+  metadata.gz: 2be6072868e2b2c6d38aa7df5ef724d569d122ed4f15fcb38947f62a2deceebaeb0d288bf66ee0e4d6d2a59618ea6ecab84c66c55420f30fb15fe87fc52c678a
+  data.tar.gz: 0b0e764afb74998afffa6a64e29426b1572d15f48ef359ad2b97dcbc6db577e423b4a041401ffb6e23e46bd059feaf3281560234a892fe2a2f2b51c90f7789c1

data/README.md

@@ -1,6 +1,6 @@
 # SalesforceRecord
 
-[![Build Status](https://travis-ci.org/mru2/salesforce_record.png?branch=master)](https://travis-ci.org/mru2/salesforce_record) [![Coverage Status](https://coveralls.io/repos/mru2/salesforce_record/badge.png)](https://coveralls.io/r/mru2/salesforce_record) [![Code Climate](https://codeclimate.com/github/mru2/salesforce_record.png)](https://codeclimate.com/github/mru2/salesforce_record)
+[![Gem Version](https://badge.fury.io/rb/salesforce_record.png)](http://badge.fury.io/rb/salesforce_record) [![Build Status](https://travis-ci.org/mru2/salesforce_record.png?branch=master)](https://travis-ci.org/mru2/salesforce_record) [![Coverage Status](https://coveralls.io/repos/mru2/salesforce_record/badge.png)](https://coveralls.io/r/mru2/salesforce_record) [![Code Climate](https://codeclimate.com/github/mru2/salesforce_record.png)](https://codeclimate.com/github/mru2/salesforce_record)
 
 ActiveRecord-like mixin for querying, fetching and updating Salesforce models
 

data/lib/salesforce_record/attributes.rb

@@ -63,13 +63,13 @@ module SalesforceRecord
       end
 
       # Parse fields coming from salesforce
-      def parse_salesforce_fields(sf_fields)
-        {}.tap do |parsed_fields|
-          sf_fields.each do |name, value|
-            parsed_field = parse_salesforce_field(name, value) unless value.nil?
-            parsed_fields.merge! parsed_field if !parsed_field.nil?
-          end
+      def parse_salesforce_fields(sf_response)
+        res = {}
+        self.salesforce_fields.each do |_, field|
+          value = field.find_value_in(sf_response)
+          res[field.local_name] = value if !value.nil?
         end
+        res
       end
 
       # Encode fields for salesforce
@@ -82,18 +82,6 @@ module SalesforceRecord
         end
       end
 
-      # Parse a field coming from salesforce (type)
-      def parse_salesforce_field(name, value)
-        # If existing, parse it depending on type
-        if (field = get_field name)
-          { field.local_name => field.parse(value) }
-
-        # Else, try to find if it is an alias
-        else
-          find_matching_alias(name => value)
-        end
-      end
-
       # Encode a field from salesforce
       def encode_salesforce_field(name, value)
         # If existing, encode it depending on type and alias
@@ -118,17 +106,6 @@ module SalesforceRecord
         has_field?(name) && self.salesforce_fields[name].remote_name
       end
 
-
-      # Tries to find a salesforce alias matching a nested hash. Returns the alias name and corresponding value if found
-      def find_matching_alias(nested_hash)
-        self.salesforce_fields.each do |name, field|
-          if (value = field.is_alias_of(nested_hash))
-            return parse_salesforce_field(name, value)
-          end
-        end
-        return nil
-      end
-
     end
 
 

data/lib/salesforce_record/fields.rb

@@ -33,18 +33,21 @@ module SalesforceRecord
         !!@remote_name
       end
 
-      # Check if matching nested hash
-      def is_alias_of(nested_hash)
-        return false unless @remote_name
-        deep_fetch(nested_hash, remote_name.split('.').map(&:to_sym))
+      # Find the value in a hash, handling nesting and aliases
+      def find_value_in(hash)
+        value = hash[remote_name] || deep_fetch(hash)
+
+        value.nil? ? nil : parse(value)
       end
 
+
       private
 
-      # Helper : fetch deep value from a hash
-      def deep_fetch(hash, keys)
+      # Helper : fetch the value deep in a hash
+      def deep_fetch(hash)
+        keys = remote_name.to_s.split('.').map(&:to_sym)
         keys.inject(hash){|subhash, key| subhash.is_a?(Hash) && subhash[key] }
-      end      
+      end
     end
 
 

data/lib/salesforce_record/version.rb

@@ -1,3 +1,3 @@
 module SalesforceRecord
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: salesforce_record
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - ClicRDV
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-28 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: salesforce_adapter
@@ -87,9 +87,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: ActiveRecord-like mixin for querying, fetching and updating Salesforce models
 test_files: []
-has_rdoc: