activeresource-google_spreadsheets 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c916e1df6f4a1dcd1ce7336b1db3fbb3c5d519a
-  data.tar.gz: 7488857b14462153ebf1e0141fea10f677b8370f
+  metadata.gz: 2c5bcdb99d1d9f0f957e277e28b1ad099c29fd8e
+  data.tar.gz: 0a95a492fa7435a2c50e0b10ed041c07e9f1a351
 SHA512:
-  metadata.gz: d8dfaa0b5c4bfe194aa4bf856c9a362373f5628e02c2f3ec716defcd694c21360b4c81e9ac8ccff9b963bbf4f4c1e959498fb6c015d39d1678da2df9f3255330
-  data.tar.gz: 9277e3fd7ad37c5e3139ac5e92d3490865825d3e698cd8c7f779d2efc0035ad8c3b055a9d6cb537cb2f24bd0c0c64b860f98298509f259715bcd44c01cee7d08
+  metadata.gz: da3e9aaa716cc7a9a40f1f9955f0d539679e60b7980f37ac8db00fe41be2860bd2aa7eddd41d8e9d381cf7fd80083da0d735a0d8ffa545ff7fd0ea2796057f93
+  data.tar.gz: c84889b8eae583ac50d6b1d5e8390bdbbcf8a01308302bb9b0624ba27aef59dee017892aa2af093f48ca54b72104d4d0df0474f8b87edf14733e4501a116e42f

data/lib/google_spreadsheets/enhanced/collection.rb

@@ -24,9 +24,13 @@ module GoogleSpreadsheets
       end
 
       def where(condition_hash)
-        condition_hash.inject(self.to_a) do |array, (attr, value)|
+        conditioned_elements = condition_hash.inject(self.to_a) do |array, (attr, value)|
           array.find_all{|element| element.send(attr) == value }
         end
+        self.class.new(conditioned_elements).tap do |collection|
+          collection.resource_class  = self.resource_class
+          collection.original_params = self.original_params
+        end
       end
     end
   end

data/lib/google_spreadsheets/enhanced/syncing.rb

@@ -18,12 +18,13 @@ module GoogleSpreadsheets
         #   sync_with :user_rows, spreadsheet_id: 'xxxx',
         #                         worksheet_title: 'users'
         #   after_commit :sync_user_row
-        def sync_with(rows_name, options)
+        def sync_with(rows_name, scope = nil, options)
           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
           class_name = opts.delete(:class_name) || rows_name.to_s.classify
+          opts[:scope] = scope
           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
 
@@ -60,19 +61,26 @@ module GoogleSpreadsheets
 
         def all_rows
           reflections = worksheet.class.reflections.values.find_all{|ref| ref.is_a?(LinkRelations::LinkRelationReflection) }
-          if reflection = reflections.find{|ref| ref.klass == row_class }
-            worksheet.send(reflection.name)
-          elsif reflection = reflections.find{|ref| ref.options[:rel] == REL_NAME_ROW }
-            worksheet.send(reflection.name, as: row_class.to_s)
-          else
-            raise "Reflection for #{row_class.to_s} not found."
+          collection =
+            if reflection = reflections.find{|ref| ref.klass == row_class }
+              worksheet.send(reflection.name)
+            elsif reflection = reflections.find{|ref| ref.options[:rel] == REL_NAME_ROW }
+              worksheet.send(reflection.name, as: row_class.to_s)
+            else
+              raise "Reflection for #{row_class.to_s} not found."
+            end
+          if @options[:scope]
+            collection = collection.instance_exec(&@options[:scope])
           end
+          collection
         end
 
-        def sync_with_rows
+        def sync_with_rows(scope = nil)
           reset
           records_to_save = {}
-          all_rows.each do |row|
+          rows = all_rows
+          rows = rows.instance_exec(&scope) if scope
+          rows.each do |row|
             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)

data/lib/google_spreadsheets/version.rb

@@ -1,3 +1,3 @@
 module GoogleSpreadsheets
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeresource-google_spreadsheets
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Chihiro Ito
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-02 00:00:00.000000000 Z
+date: 2017-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -140,3 +140,4 @@ signing_key:
 specification_version: 4
 summary: Google Spreadsheets accessor with ActiveResource
 test_files: []
+has_rdoc: