activeresource-google_spreadsheets 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3dca8fdf8c0b4b8098cb273093e2105e1787f7d1
-  data.tar.gz: 1ef5641b07c1e1396382a8fcd8e7a4b2237588e1
+  metadata.gz: 626c5911caadf7c19fbdd573adfbc1b9ae543086
+  data.tar.gz: a248679186714cddcd97a03e3fbe0dbee0059f70
 SHA512:
-  metadata.gz: 18622284721fdc4bbdbffb035f26bc00567acc21c877085e13cae44253973843fd097872faad4eee3e15709cc927ecf56a26f52580f42a80d68d6a4edcfd2d7f
-  data.tar.gz: df53e2409d044333c83fd7d0c94911c69a1749b111a1e8eaacf1cb03cd06198ec28b2277aeec3a13b8308c0639dfb789738a20820305b3ad2124f7622353877d
+  metadata.gz: 1d9420f2494b146e3da65248c05eec4fdb1c7d32f6142b2f23f987ef8cfbe2c004954cc36666f0caeada9478431046c7513d2998b87b3b1a226b34933d6bfa31
+  data.tar.gz: c7e8afd0c1ab9e86f8a074eb7c30e7b6230a6223fd5bb4c11c2e839f92668b406f151180c514169f977a60de8e8e0aba86df11c62a8359fbc806e6a6fec2b78f

data/lib/google_spreadsheets/enhanced/syncing.rb

@@ -19,10 +19,12 @@ module GoogleSpreadsheets
         #                         worksheet_title: 'users'
         #   after_commit :sync_user_row
         def sync_with(rows_name, options)
-          options.assert_valid_keys(:spreadsheet_id, :worksheet_title, :class_name)
-          options[:worksheet_title] ||= rows_name.to_s
-          options[:class_name] ||= rows_name.to_s.classify
-          synchronizer = Synchronizer.new(self, options[:class_name].safe_constantize, options[:spreadsheet_id], options[:worksheet_title])
+          options.assert_valid_keys(:spreadsheet_id, :worksheet_title, :class_name, :assigner, :include_blank)
+          opts = options.dup
+          spreadsheet_id = opts.delete(:spreadsheet_id)
+          worksheet_title = opts.delete(:worksheet_title) || rows_name.to_s
+          class_name = opts.delete(:class_name) || rows_name.to_s.classify
+          synchronizer = Synchronizer.new(self, class_name.safe_constantize, spreadsheet_id, worksheet_title, opts)
           self.synchronizers = self.synchronizers.merge(rows_name => synchronizer) # not share parent class attrs
 
           # rows accessor
@@ -32,9 +34,9 @@ module GoogleSpreadsheets
           end
 
           # inbound sync all (import)
-          define_singleton_method("sync_with_#{rows_name}") do |options = {}|
+          define_singleton_method("sync_with_#{rows_name}") do
             synchronizer = self.synchronizers[rows_name]
-            synchronizer.sync_with_rows(options)
+            synchronizer.sync_with_rows
           end
 
           # outbound sync one (export)
@@ -48,11 +50,12 @@ module GoogleSpreadsheets
       class Synchronizer
         attr_reader :record_class, :row_class, :spreadsheet_id, :worksheet_title
 
-        def initialize(record_class, row_class, spreadsheet_id, worksheet_title)
+        def initialize(record_class, row_class, spreadsheet_id, worksheet_title, options = {})
           @record_class = record_class
           @row_class = row_class || default_class_for(REL_NAME_ROW)
           @spreadsheet_id = spreadsheet_id
           @worksheet_title = worksheet_title
+          @options = options
         end
 
         def all_rows
@@ -66,20 +69,22 @@ module GoogleSpreadsheets
           end
         end
 
-        def sync_with_rows(options)
+        def sync_with_rows
           reset
           records = all_rows.map do |row|
             record_class.find_or_initialize_by(id: row.id).tap do |record|
               if row.all_values_empty?
                 # Due to destroy if exists
                 record.instance_variable_set(:@due_to_destroy, true)
+                next
+              end
+
+              row_attributes = Hash[row.aliased_attributes.map{|attr| [attr, row.send(attr)] }]
+              row_attributes.reject!{|_, v| v.blank? } unless @options[:include_blank]
+              if @options[:assigner]
+                record.send(@options[:assigner], row_attributes)
               else
-                row.aliased_attributes.each do |attr|
-                  value = row.send(attr)
-                  if options[:include_blank] || value.present?
-                    record.send("#{attr}=", value)
-                  end
-                end
+                assign_row_attributes(record, row_attributes)
               end
             end
           end
@@ -126,10 +131,17 @@ module GoogleSpreadsheets
         end
 
         private
+
         def default_class_for(rel_name)
           LinkRelations.class_name_mappings[rel_name].classify.constantize
         end
 
+        def assign_row_attributes(record, row_attributes)
+          row_attributes.each do |attr, value|
+            record.public_send("#{attr}=", value)
+          end
+        end
+
         def transaction_if_possible(origin = self, &block)
           if origin.respond_to?(:transaction)
             origin.transaction(&block)

data/lib/google_spreadsheets/version.rb

@@ -1,3 +1,3 @@
 module GoogleSpreadsheets
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeresource-google_spreadsheets
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Chihiro Ito
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2014-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource