sheets_db 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45b4476491dc99a617979e6a3de7a0ecdf92505b
-  data.tar.gz: 63b96089d34abe4b12ec2bced19f9f634f0e4a84
+  metadata.gz: 57c88ea7accbfcd532ec5ebb0c5f6a368588d95d
+  data.tar.gz: 5ee07c422165ecad53924dd85bba824a9befc2a0
 SHA512:
-  metadata.gz: e7736d676c52d70438455f844902a05dde151f83b341e888bb793b86c79018c70d859b0bda862921b96f8b6206419d830c64d4dc93407f3bad0bbc1e182a777e
-  data.tar.gz: 83a80a42108a28d05a98b66e94fbc9a196e5f7f75615538293997ba4e86f92a1e150e9d7f45d0fad09f63f1140c7557ebe4660fbae6fd5a30ac11abc539aa67a
+  metadata.gz: 3775f93d578a0d5e99d0a1617753120f1ee771d37bbed6263b946261f1c8de8ba3f0b2dab651c3bf67865d010d5a04dc1cdbe604aa701d7a38bbeeec58293391
+  data.tar.gz: 621875e63bfc9bb6f65c72b95704099a8825e2bb9a72d7fc3567e26d5fc8ba832d6ae2a1dee557868048e69ea917a86f2361c099aa45bdb3d39c1328239e50ce

data/documentation/example_models/user.rb

@@ -1,7 +1,7 @@
 class User < SheetsDB::Worksheet::Row
   attribute :id, type: Integer
   attribute :first_name
-  attribute :last_name
+  attribute :last_name, column_name: "Last Name"
   attribute :pet_ids, multiple: true
 
   has_many :pets, from_collection: :pets, key: :pet_ids

data/documentation/usage.md

@@ -148,7 +148,7 @@ end
 class User < SheetsDB::Worksheet::Row
   attribute :id, type: Integer
   attribute :first_name
-  attribute :last_name
+  attribute :last_name, column_name: "Last Name"
   attribute :pet_ids, multiple: true
 
   has_many :pets, from_collection: :pets, key: :pet_ids
@@ -175,6 +175,8 @@ The only required argument to the `attribute` class method is the name of the co
 
 `transform`: If you supply a Proc (or lambda) to the `transform` option, reading this column from the spreadsheet will cause it to first be sent through this transformation Proc.  For `multiple` columns, each element will be transformed independently.
 
+`column_name`: By default, SheetsDB will use the attribute name as the name of the column to look for in the header row (first row) of the worksheet.  You can override this, however, by specifying the `column_name` option.
+
 ##### `has_many` and `has_one` associations
 
 For associations in which the key exists in the specifying row, use `has_many` or `has_one`.  The `from_collection` parameter should reference the `has_many` entry on the Spreadsheet model that maps to the target worksheet, and the `key` parameter is the name of the local column that maps to the foreign worksheet's `id` column.

data/lib/sheets_db/resource.rb

@@ -56,6 +56,12 @@ module SheetsDB
         other.google_drive_resource == google_drive_resource
     end
 
+    alias_method :eql?, :==
+
+    def hash
+      [self.class, google_drive_resource].hash
+    end
+
     def base_attributes
       {
         id: id,

data/lib/sheets_db/version.rb

@@ -1,3 +1,3 @@
 module SheetsDB
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/lib/sheets_db/worksheet/row.rb

@@ -13,8 +13,8 @@ module SheetsDB
           subclass.instance_variable_set(:@association_definitions, @association_definitions)
         end
 
-        def attribute(name, type: String, multiple: false, transform: nil)
-          register_attribute(name, type: type, multiple: multiple, transform: transform, association: false)
+        def attribute(name, type: String, multiple: false, transform: nil, column_name: nil)
+          register_attribute(name, type: type, multiple: multiple, transform: transform, column_name: column_name || name.to_s, association: false)
 
           define_method(name) do
             begin
@@ -227,6 +227,18 @@ module SheetsDB
         end
         attributes.merge(hashed_associations)
       end
+
+      def ==(other)
+        other.is_a?(self.class) &&
+          other.worksheet == worksheet &&
+          other.row_position == row_position
+      end
+
+      alias_method :eql?, :==
+
+      def hash
+        [self.class, worksheet, row_position].hash
+      end
     end
   end
 end

data/lib/sheets_db/worksheet.rb

@@ -19,12 +19,18 @@ module SheetsDB
         other.type == type
     end
 
+    alias_method :eql?, :==
+
+    def hash
+      [self.class, google_drive_resource, type].hash
+    end
+
     def columns
       @columns ||= begin
         {}.tap { |directory|
           google_drive_resource.rows.first.each_with_index do |name, i|
             unless name == ""
-              directory[name.to_sym] = Column.new(name: name.to_sym, column_position: i + 1)
+              directory[name] = Column.new(name: name, column_position: i + 1)
             end
           end
         }
@@ -35,9 +41,16 @@ module SheetsDB
       type.attribute_definitions
     end
 
-    def attribute_at_row_position(column_name, row_position)
-      attribute_definition = attribute_definitions.fetch(column_name, {})
-      column = columns[column_name]
+    def get_definition_and_column(attribute_name)
+      attribute_definition = attribute_definitions.fetch(attribute_name, {})
+      [
+        attribute_definition,
+        columns[attribute_definition.fetch(:column_name, attribute_name.to_s)]
+      ]
+    end
+
+    def attribute_at_row_position(attribute_name, row_position)
+      attribute_definition, column = get_definition_and_column(attribute_name)
       raw_value = read_value_from_google_drive_resource(
         dimensions: [row_position, column.column_position],
         attribute_definition: attribute_definition
@@ -59,10 +72,9 @@ module SheetsDB
     end
 
     def update_attributes_at_row_position(staged_attributes, row_position:)
-      staged_attributes.each do |name, value|
-        column = columns[name]
-        definition = attribute_definitions[name]
-        assignment_value = definition[:multiple] ? value.join(",") : value
+      staged_attributes.each do |attribute_name, value|
+        attribute_definition, column = get_definition_and_column(attribute_name)
+        assignment_value = attribute_definition[:multiple] ? value.join(",") : value
         google_drive_resource[row_position, column.column_position] = assignment_value
       end
       google_drive_resource.synchronize

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sheets_db
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Ravi Gadad
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-04 00:00:00.000000000 Z
+date: 2017-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google_drive