sheets_db 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2d95893f24d4f412a3b06e88a90a18332f2e933
-  data.tar.gz: c79d78003dc7a6060c5c99c76b8654fb0aa1dda4
+  metadata.gz: c37bce0986d7a7d4519d7c1de690e5ccd8478b0c
+  data.tar.gz: 463046931944f6c506cdf0513ea57143a5b1a5f1
 SHA512:
-  metadata.gz: 741ac59a7b501a8aaeeaedc19c0c3e0f318a6ff5aebf49a639a3b87b4e7ddf07967ab4b19d9be0a2b0c5f3c23771be507da6ac6a4255ce216fb12f97af6fa759
-  data.tar.gz: 3b190abe406276197261802e98f0b6b701e157a95ed1d5da0abae5df98e2a9224d64aaa9f31111a2b1fa6baeed25c581b161595cd30a4af664a264b94ef2a0b2
+  metadata.gz: 4e20974a3ee065f6ed76aa1aa768f6457bdf609b0841da88ab2a16ae77cc3e255f5bd9c9737c231ba75083d91847f1d4618d1bb5e3bb02e09d75421a25e6ebf9
+  data.tar.gz: 7067fd579b021d5378b7e09d0e1ba77060aadce98c63d6a04ed4664395f0a56e64278fb6afec6552f717628d720d54480c69904e3427cb063792bb3fad769296

data/lib/sheets_db/spreadsheet.rb

@@ -1,19 +1,13 @@
 module SheetsDB
   class Spreadsheet < Resource
     class WorksheetAssociationAlreadyRegisteredError < StandardError; end
+    class WorksheetNotFoundError < StandardError; end
 
     set_resource_type GoogleDrive::Spreadsheet
 
     def self.has_many(resource, worksheet_name:, class_name:)
       register_worksheet_association(resource, worksheet_name: worksheet_name, class_name: class_name)
-      define_method(resource) do
-        @worksheets ||= {}
-        @worksheets[resource] ||= Worksheet.new(
-          spreadsheet: self,
-          google_drive_resource: google_drive_resource.worksheet_by_title(worksheet_name),
-          type: Support.constantize(class_name)
-        )
-      end
+      create_worksheet_association(resource, worksheet_name: worksheet_name, class_name: class_name)
     end
 
     def self.register_worksheet_association(resource, worksheet_name:, class_name:)
@@ -27,6 +21,21 @@ module SheetsDB
       }
     end
 
+    def self.create_worksheet_association(resource, worksheet_name:, class_name:)
+      define_method(resource) do
+        @worksheets ||= {}
+        @worksheets[resource] ||= begin
+          google_drive_worksheet = google_drive_resource.worksheet_by_title(worksheet_name)
+          raise WorksheetNotFoundError, worksheet_name if google_drive_worksheet.nil?
+          Worksheet.new(
+            spreadsheet: self,
+            google_drive_resource: google_drive_worksheet,
+            type: Support.constantize(class_name)
+          )
+        end
+      end
+    end
+
     def find_association_by_id(association_name, id)
       find_associations_by_ids(association_name, [id]).first
     end
@@ -43,4 +52,4 @@ module SheetsDB
       send(association_name).select(&block)
     end
   end
-end
+end

data/lib/sheets_db/version.rb

@@ -1,3 +1,3 @@
 module SheetsDB
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

data/lib/sheets_db/worksheet.rb

@@ -3,6 +3,8 @@ require_relative "worksheet/row"
 
 module SheetsDB
   class Worksheet
+    class ColumnNotFoundError < StandardError; end
+
     include Enumerable
 
     attr_reader :spreadsheet, :google_drive_resource, :type
@@ -43,9 +45,11 @@ module SheetsDB
 
     def get_definition_and_column(attribute_name)
       attribute_definition = attribute_definitions.fetch(attribute_name, {})
+      column_name = attribute_definition.fetch(:column_name, attribute_name.to_s)
+      raise ColumnNotFoundError, column_name if columns[column_name].nil?
       [
         attribute_definition,
-        columns[attribute_definition.fetch(:column_name, attribute_name.to_s)]
+        columns[column_name]
       ]
     end
 
@@ -135,4 +139,4 @@ module SheetsDB
         converted_value
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sheets_db
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Ravi Gadad
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-03 00:00:00.000000000 Z
+date: 2017-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google_drive