spreadsheet_model 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02d4fa24c86f08983bccbaf240e6d4a4f11527e5
-  data.tar.gz: 2b29f375c6aeaee0d5d4ef5101f16b2fb37f6b19
+  metadata.gz: d09161b7b5fcffe4de869aac0423e9ac33c9c076
+  data.tar.gz: 72c3314f35164008ec9a7262f08acd7f29f1fe8b
 SHA512:
-  metadata.gz: b2804ccfc22cee0d723f0104880b15c76103a81f349d762c6246e3d54d641bef64802318a71f4eb19592309e2a790f3537891709a2fd1d3bc7b8b39c08af3029
-  data.tar.gz: 1dc3f81ab3fcf08308d3d8e3725800145fd43d9ea7109f75e04cedf35e08732200f0d5dca2afdfc722f153c9ed6c6620dc65ddc6d4c7179cca8d6f505316908a
+  metadata.gz: 981501879576d9d01b6690c7b0467b6faea43b1ed8d59a86f4bde6d2638dc36b3097a4e36ac79c4a3e173ce33b08a1d000c4b115518650d114bb8fe95e85165e
+  data.tar.gz: 5520b8db3c9c8b368b4d3015b4e02c203702f05ba26191d4abc2a64d1779864c3ca71657aec95ef83e8a7639a35d7bc59d525311eab7698f9f4bdde8d759790a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spreadsheet_model (0.4.2)
+    spreadsheet_model (0.4.3)
       activemodel
       activesupport
       google_drive

data/lib/spreadsheet_model.rb

@@ -15,8 +15,7 @@ module SpreadsheetModel
 
     def self.attr_accessor(*args)
       super
-      @column_names ||= []
-      @column_names.concat(args.map(&:to_s))
+      @accessors = args
     end
 
     def [](name)
@@ -43,11 +42,10 @@ module SpreadsheetModel
 
       keys = sheets.each_with_object([]) do |sheet, keys|
         rows = sheet.rows.dup
-        header = rows.shift
-        @column_names ||= header
+        @column_names = rows.shift
 
         store_hash = rows.each_with_object({}) do |row, store_hash|
-          row_hash = Hash[*header.zip(row).flatten]
+          row_hash = Hash[*@column_names.zip(row).flatten]
           row_hash = @import_callback.call(row_hash) if @import_callback
           write_rows = [store_hash[row[0]], row_hash].compact.flatten
           store_hash[row[0]] = write_rows
@@ -60,8 +58,8 @@ module SpreadsheetModel
         end
         keys
       end
-      write_cache('__keys', keys)
-      write_cache('__cached', true)
+      write_cache('__spreadsheetmodel_keys', keys)
+      write_cache('__spreadsheetmodel_cached', true)
     end
 
     # inspired by:
@@ -72,12 +70,17 @@ module SpreadsheetModel
     end
 
     def self.cached?
-      !!read_cache('__cached')
+      !!read_cache('__spreadsheetmodel_cached')
     end
 
     def self.keys
       import unless cached?
-      read_cache('__keys')
+      read_cache('__spreadsheetmodel_keys')
+    end
+
+    def self.column_names
+      import unless cached?
+      @column_names
     end
 
     private
@@ -106,8 +109,8 @@ module SpreadsheetModel
     # 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
 
+      return nil unless rows
       row_to_instance(rows[0])
     end
 
@@ -154,9 +157,8 @@ module SpreadsheetModel
 
     def self.row_to_instance(row)
       return nil unless row
-      attributes = row.select { |key, _| @column_names.include?(key.to_s) }
-
-      if attributes['type'].to_s.present?
+      attributes = row.select { |key, _| @accessors.try(:include?, key.to_sym) }
+      if row['type'].to_s.present?
         instance = attributes['type'].constantize.new(attributes)
       else
         instance = self.new(attributes)
@@ -165,10 +167,5 @@ module SpreadsheetModel
       instance.instance_variable_set(:@__row, row)
       instance
     end
-
-    def self.column_names
-      import unless cached?
-      @column_names
-    end
   end
 end

data/lib/spreadsheet_model/version.rb

@@ -1,3 +1,3 @@
 module SpreadsheetModel
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spreadsheet_model
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - zucay