spreadsheet_model 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10ca8544a607a5f34299e84df3f5468ee6d0f714
-  data.tar.gz: d0d6ba02cc33e9067a88b8cc5dbc9ef2469dbfe7
+  metadata.gz: 40c78687dd4fe2890ef78cc3129d1d936c9d0e42
+  data.tar.gz: 304e156c682b03a717e8e10cf4f4b538f42e6319
 SHA512:
-  metadata.gz: fc36b3fdc2c616ee43c09ec88c07f6ff586e9a7129aacaf24e64c6ee5c0a8a70f9df5c6bcfe846101a499c84eef1bc8a22800c5ff730ebc62fd7a9789e76c66d
-  data.tar.gz: 4d549beaa0740591711690b173a84b3adc3a71bce8dfc5072e1fdbeac8334713dba20148df71c92c5e3d84a7e15a9d8415ef270e35f208507cc5c23a28e52a89
+  metadata.gz: bbf58b4a25aec6f0ffadb7288a86bb8e59c15d8c5c142b01171856bfa4747ebcd2700c8764c8f904fa5b544a46a579cb7ab2986fb0e91c64ea71677d33c6cb2b
+  data.tar.gz: eaa7c50ad7e5e7da5c4590c14a8cc0b0cd470144a94fafea88fd8f6f3c5bb236f82223f9b6afc0b86f80aa89fcb41d03a39380bc39f77ffc6d1ce6565ca0c86d

data/Gemfile.lock

@@ -24,6 +24,7 @@ GEM
       extlib (>= 0.9.15)
       multi_json (>= 1.0.0)
     builder (3.2.2)
+    coderay (1.1.1)
     extlib (0.9.16)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
@@ -61,6 +62,7 @@ GEM
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
     memoist (0.14.0)
+    method_source (0.8.2)
     mini_portile2 (2.0.0)
     minitest (5.8.4)
     multi_json (1.11.2)
@@ -76,6 +78,10 @@ GEM
       multi_xml (~> 0.5)
       rack (~> 1.2)
     os (0.9.6)
+    pry (0.10.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
     rack (1.6.4)
     rake (10.5.0)
     retriable (1.4.1)
@@ -84,6 +90,7 @@ GEM
       faraday (~> 0.9)
       jwt (~> 1.5)
       multi_json (~> 1.10)
+    slop (3.6.0)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
@@ -94,6 +101,7 @@ PLATFORMS
 DEPENDENCIES
   bundler
   minitest (~> 5.0)
+  pry
   rake (~> 10.0)
   spreadsheet_model!
 

data/lib/spreadsheet_model.rb

@@ -1,9 +1,9 @@
 require "spreadsheet_model/version"
-require 'google/api_client'
 require 'google_drive'
 require 'active_support'
 require 'active_support/core_ext'
 require 'active_model'
+require 'google/api_client'
 
 module SpreadsheetModel
   extend ActiveSupport::Concern
@@ -43,25 +43,18 @@ module SpreadsheetModel
         rows.each do |row|
           row_hash = Hash[*header.zip(row).flatten]
           row_hash = @import_callback.call(row_hash) if @import_callback
-          write_cache(row[0], row_hash) if row_hash.is_a? Hash
+          write_rows = [read_cache(row[0]), row_hash].compact.flatten
+          write_cache(row[0], write_rows)
         end
       end
       write_cache('__cached', true)
     end
 
-    def self.find(key)
+    # inspired by:
+    # https://github.com/rails/rails/blob/4-2-stable/activerecord/lib/active_record/relation/finder_methods.rb#L66
+    def self.find(*args)
       import unless cached?
-      row = read_cache(key)
-      return nil unless row
-      attributes = row.select { |key, _| @@column_names.include?(key.to_sym) }
-
-      if attributes['type'].to_s.present?
-        instance = attributes['type'].constantize.new(attributes)
-      else
-        instance = self.new(attributes)
-      end
-      instance.instance_variable_set(:@__row, row)
-      instance
+      find_with_ids(*args)
     end
 
     def self.cached?
@@ -70,6 +63,46 @@ module SpreadsheetModel
 
     private
 
+    # inspired by:
+    # https://github.com/rails/rails/blob/4-2-stable/activerecord/lib/active_record/relation/finder_methods.rb#L411
+    def self.find_with_ids(*ids)
+      expects_array = ids.first.kind_of?(Array)
+      ids = ids.flatten.compact.uniq
+
+      case ids.size
+      when 0
+        raise RecordNotFound
+      when 1
+        if expects_array
+          result = find_some([ids.first])
+        else
+          result = find_one(ids.first)
+        end
+      else
+        find_some(ids)
+      end
+
+    end
+
+    # inspired by:
+    # https://github.com/rails/rails/blob/4-2-stable/activerecord/lib/active_record/relation/finder_methods.rb#L432
+    def self.find_one(id)
+      rows = read_cache(id)
+      return nil unless rows
+
+      row_to_instance(rows[0])
+    end
+
+    # inspired by:
+    # https://github.com/rails/rails/blob/4-2-stable/activerecord/lib/active_record/relation/finder_methods.rb#L449
+    def self.find_some(ids)
+      records = ids.map do |id|
+        read_cache(id).map do |row|
+          row_to_instance(row)
+        end
+      end.flatten
+    end
+
     def self.cache
       @@cache = Rails.cache if defined? Rails
       @@cache ||= ActiveSupport::Cache::MemoryStore.new
@@ -100,5 +133,19 @@ module SpreadsheetModel
       session = ::GoogleDrive.login_with_oauth(auth_token.token)
       session.spreadsheet_by_key(sheet_key).worksheets
     end
+
+    def self.row_to_instance(row)
+      attributes = row.select { |key, _| @@column_names.include?(key.to_sym) }
+
+      if attributes['type'].to_s.present?
+        instance = attributes['type'].constantize.new(attributes)
+      else
+        instance = self.new(attributes)
+      end
+
+      instance.instance_variable_set(:@__row, row)
+      instance
+    end
+
   end
 end

data/lib/spreadsheet_model/version.rb

@@ -1,3 +1,3 @@
 module SpreadsheetModel
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/spreadsheet_model.gemspec

@@ -22,7 +22,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'google_drive', '~> 1.0'
   spec.add_dependency 'activesupport'
   spec.add_dependency 'activemodel'
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'minitest', '~> 5.0'
+  spec.add_development_dependency 'pry'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spreadsheet_model
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - zucay
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-25 00:00:00.000000000 Z
+date: 2016-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google_drive
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: model-like class without database using google spreadsheet
 email:
 - y.kawarazuka@gmail.com
@@ -134,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: model-like class without database using google spreadsheet