spreadsheet_model 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab22b5aedfa5a23f20869f244cd27568eff44ff2
-  data.tar.gz: c6ae62f88094e37d7709756f9e1b9466bf79c2ab
+  metadata.gz: c3e070f2046ee50b44e4a6301f25a6dd1c388f1e
+  data.tar.gz: 13cc25e164d755b421360288d8697aba3a8f3420
 SHA512:
-  metadata.gz: 441cd0cbd0346f8842e859a0be71ae7d6c22a60ae4d040b1336d6666ae8df046a1e8f16c0ac381d6419c1dacd694f1d91752db76bda5f85fcb668e13be292abc
-  data.tar.gz: 9db6360d48bde8db19a16209b5ba7a7a30fe8d2a78477b35c014065af6d80418b4876fe85a3d5cdf309a0f5e0542a5d29446b3c08b2f45595ceb38f55a1c33b0
+  metadata.gz: 50debcdb408d4d3756ef04e279723edf730a8d5ded37d18a9462bab6e4b82bbb1b2e24991bf929366fa9542a7275fb4b45ef490fc8c07b5519cec35e8d38e919
+  data.tar.gz: 78f441d134db3ab0b2a10959ea0b7e42e85c0fb4e5c3ada72620a6527b876f8c8b65a527bb0281515dcdf94747216334e249c1bd3c6524a7a7d5794506bca9c4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spreadsheet_model (0.3.4)
+    spreadsheet_model (0.4.0)
       activemodel
       activesupport
       google_drive (~> 1.0)
@@ -106,4 +106,4 @@ DEPENDENCIES
   spreadsheet_model!
 
 BUNDLED WITH
-   1.11.2
+   1.12.5

data/lib/spreadsheet_model/version.rb

@@ -1,3 +1,3 @@
 module SpreadsheetModel
-  VERSION = "0.3.4"
+  VERSION = "0.4.0"
 end

data/lib/spreadsheet_model.rb

@@ -16,7 +16,8 @@ module SpreadsheetModel
 
     def self.attr_accessor(*args)
       super
-      @column_names = args
+      @column_names ||= []
+      @column_names.concat(args.map(&:to_s))
     end
 
     def [](name)
@@ -27,9 +28,13 @@ module SpreadsheetModel
       @__row[name] = value
     end
 
-    def self.import
+    def self.sheet_key
       sheet_key = ENV["GOOGLE_DRIVE_#{name.demodulize.underscore.upcase}_SHEET_KEY"]
       sheet_key = self::SHEET_KEY if defined? self::SHEET_KEY
+      sheet_key
+    end
+
+    def self.import
       title_regexp = /.*/
       title_regexp = self::SHEET_TITLE_REGEXP if defined? self::SHEET_TITLE_REGEXP
 
@@ -37,9 +42,10 @@ module SpreadsheetModel
         sheet.title =~ title_regexp
       end
 
-      sheets.each do |sheet|
+      keys = sheets.each_with_object([]) do |sheet, keys|
         rows = sheet.rows.dup
         header = rows.shift
+        @column_names ||= header
 
         store_hash = rows.each_with_object({}) do |row, store_hash|
           row_hash = Hash[*header.zip(row).flatten]
@@ -51,8 +57,11 @@ module SpreadsheetModel
 
         store_hash.each do |k, v|
           write_cache(k, v)
+          keys << k
         end
+        keys
       end
+      write_cache('__keys', keys)
       write_cache('__cached', true)
     end
 
@@ -67,6 +76,11 @@ module SpreadsheetModel
       !!read_cache('__cached')
     end
 
+    def self.keys
+      import unless cached?
+      read_cache('__keys')
+    end
+
     private
 
     # inspired by:
@@ -141,7 +155,7 @@ module SpreadsheetModel
 
     def self.row_to_instance(row)
       return nil unless row
-      attributes = row.select { |key, _| @column_names.include?(key.to_sym) }
+      attributes = row.select { |key, _| @column_names.include?(key.to_s) }
 
       if attributes['type'].to_s.present?
         instance = attributes['type'].constantize.new(attributes)
@@ -153,5 +167,9 @@ module SpreadsheetModel
       instance
     end
 
+    def self.column_names
+      import unless cached?
+      @column_names
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spreadsheet_model
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - zucay
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-21 00:00:00.000000000 Z
+date: 2016-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google_drive
@@ -153,3 +153,4 @@ signing_key:
 specification_version: 4
 summary: model-like class without database using google spreadsheet
 test_files: []
+has_rdoc: