synced 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac4ba6fd11df9ce17296c4afbfb4740cfb919035
-  data.tar.gz: 390c0578545827b5a88169ae09535c917897196a
+  metadata.gz: d2786ec502b4ef2aba2596f7928997723db04afa
+  data.tar.gz: ef2db43fbd30aa1b8be1e4705a3fbf126879b820
 SHA512:
-  metadata.gz: f3109f17e56fbd5fa37ffeb6655a963ffd584e0af775bf5b7bfe98c1b64f99785e47892d2b57b775774d1e6bfc909e19a0d9881349e5d6a15e6df5fa587d1ad3
-  data.tar.gz: c94a411274efb0e4f94c03675dc66bbdcc4caef474ad108b0759be7f79f50e1289f4ae6ece55ce16324e700f443cd21e9203302f84ed223714c7fbd4d03e6b22
+  metadata.gz: 74cde200cbe7d2cc2f26ff015f4be75c491c27c81599099f09bd262196c91e5cfaf941d69498ac73dd94c0e99ff534288c8ed5994608dba74e94adb936e3b2ee
+  data.tar.gz: e86f5074aab4550788db4454a64254e7858fe2e8ed7edce07166a42c8299284420b1cdedfd3fb4e36f6758432b4a2b9b7a7e7a829e0dd3221f334665fc3b7d8b

data/lib/synced/model.rb

@@ -20,14 +20,17 @@ module Synced
     #   object which will be mapped to local object attributes.
     def synced(options = {})
       class_attribute :synced_id_key, :synced_all_at_key, :synced_data_key,
-        :synced_local_attributes, :synced_associations, :synced_only_updated
+        :synced_local_attributes, :synced_associations, :synced_only_updated,
+        :synced_mapper_module
       self.synced_id_key           = options.fetch(:id_key, :synced_id)
       self.synced_all_at_key       = options.fetch(:synced_all_at_key,
-        :synced_all_at)
-      self.synced_data_key         = options.fetch(:data_key, :synced_data)
+        synced_column_presence(:synced_all_at))
+      self.synced_data_key         = options.fetch(:data_key,
+        synced_column_presence(:synced_data))
       self.synced_local_attributes = options.fetch(:local_attributes, [])
       self.synced_associations     = options.fetch(:associations, [])
       self.synced_only_updated     = options.fetch(:only_updated, false)
+      self.synced_mapper_module    = options.fetch(:mapper, nil)
       include Synced::HasSyncedData
     end
 
@@ -71,10 +74,17 @@ module Synced
         associations: synced_associations,
         only_updated: synced_only_updated,
         include: include,
-        api: api
+        api: api,
+        mapper: synced_mapper_module
       }
       synchronizer = Synced::Synchronizer.new(remote, model_class, options)
       synchronizer.perform
     end
+
+    private
+
+    def synced_column_presence(name)
+      name if column_names.include?(name.to_s)
+    end
   end
 end

data/lib/synced/synchronizer.rb

@@ -35,6 +35,8 @@ module Synced
     # @option options [Boolean] only_updated: If true requests to API will take
     #   advantage of updated_since param and fetch only created/changed/deleted
     #   remote objects
+    # @option options [Module] mapper: Module class which will be used for
+    #   mapping remote objects attributes into local object attributes
     def initialize(remote_objects, model_class, options = {})
       @model_class       = model_class
       @scope             = options[:scope]
@@ -46,6 +48,7 @@ module Synced
       @include           = options[:include]
       @local_attributes  = options[:local_attributes]
       @api               = options[:api]
+      @mapper            = options[:mapper]
       @associations      = Array(options[:associations])
       @remote_objects    = Array(remote_objects) if remote_objects
       @request_performed = false
@@ -56,6 +59,7 @@ module Synced
         remove_relation.send(remove_strategy) if @remove
 
         remote_objects.map do |remote|
+          remote.extend(@mapper) if @mapper
           local_object = local_object_by_remote_id(remote.id) || relation_scope.new
           local_object.attributes = default_attributes_mapping(remote)
           local_object.attributes = local_attributes_mapping(remote)
@@ -81,11 +85,11 @@ module Synced
       if @local_attributes.is_a?(Hash)
         Hash[
           @local_attributes.map do |k, v|
-            [k, v.respond_to?(:call) ? v.call(remote) : remote[v]]
+            [k, v.respond_to?(:call) ? v.call(remote) : remote.send(v)]
           end
         ]
       else
-        Hash[Array(@local_attributes).map { |k| [k, remote[k]] }]
+        Hash[Array(@local_attributes).map { |k| [k, remote.send(k)] }]
       end
     end
 

data/lib/synced/version.rb

@@ -1,3 +1,3 @@
 module Synced
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: synced
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Sebastien Grosjean
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-30 00:00:00.000000000 Z
+date: 2014-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails