activeresource-google_spreadsheets 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fab4da8cf2bd56862ad443231e63792fced39e4
-  data.tar.gz: 50f99e28d37b719d2460fbb803fc7ef751bde592
+  metadata.gz: a9fc307a84bd4cc4a57a66f9df28f3d3b5ce460a
+  data.tar.gz: 52a30d70cc2357bf3e7b453ffee1d13ca441c9d8
 SHA512:
-  metadata.gz: bba764383492d89a8e64b1d6aab8117f162afbeb42cd9290dc06014e495f7f1d7b5f491488a5f50cfa268eb9c827b21559949f240933674577693efb29958e3c
-  data.tar.gz: a8db6ca3c03781c425faaf96b673dde4485a37f6ce0bef47eca3c625a6d4e2c8eaa8bf045d38200d36828defaf454eeff81769d0535f0e791d89420fc30c74bb
+  metadata.gz: 4bb50b09aac1eb0f9edf45f7ab5a93faf0f091defb84e3dee046c79a5c95901c29d0576894b08a2cb16b50cf18e7018f893b59acfb2785bd109aa90d7c853d45
+  data.tar.gz: ff50e9299126eea1661bf4129e649dd7378a7a474b36e6a025278c46a0b24cab87d4acaee88057fd2e67677f50d19c40b33b381dbd8d10cb54fb9b8c6d5a8e75

data/lib/google_spreadsheets/enhanced/syncing.rb

@@ -19,7 +19,7 @@ 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, :assigner, :include_blank)
+          options.assert_valid_keys(:spreadsheet_id, :worksheet_title, :class_name, :assigner, :include_blank, :ignore_blank_id)
           opts = options.dup
           spreadsheet_id = opts.delete(:spreadsheet_id)
           worksheet_title = opts.delete(:worksheet_title) || rows_name.to_s
@@ -73,12 +73,19 @@ module GoogleSpreadsheets
           reset
           records_to_save = {}
           all_rows.each do |row|
-            record_id = row.id.to_i
-            record = records_to_save[record_id] || record_class.find_or_initialize_by(id: record_id)
+            if row.id.present?
+              record_id = row.id.to_i
+              record = records_to_save[record_id] || record_class.find_or_initialize_by(id: record_id)
+            elsif !@options[:ignore_blank_id]
+              record_id = SecureRandom.hex(8) # dummy id
+              record = record_class.new
+            else
+              next
+            end
             if row.all_values_empty?
               # Due to destroy if exists
-              record.instance_variable_set(:@due_to_destroy, true)
-              records_to_save[row.id.to_i] = record
+              record.mark_for_destruction
+              records_to_save[record_id] = record
               next
             end
             row_attributes = Hash[row.aliased_attributes.map{|attr| [attr, row.send(attr)] }]
@@ -88,12 +95,12 @@ module GoogleSpreadsheets
             else
               assign_row_attributes(record, row_attributes)
             end
-            records_to_save[row.id.to_i] = record
+            records_to_save[record_id] = record
           end
           skipping_outbound_sync_of(records_to_save.values) do |records_with_skipped_outbound|
             transaction_if_possible(record_class) do
               records_with_skipped_outbound.each do |record|
-                if record.instance_variable_get(:@due_to_destroy)
+                if record.marked_for_destruction?
                   record.destroy
                 else
                   record.save

data/lib/google_spreadsheets/version.rb

@@ -1,3 +1,3 @@
 module GoogleSpreadsheets
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeresource-google_spreadsheets
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Chihiro Ito
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-04 00:00:00.000000000 Z
+date: 2015-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource