sheets_db 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6eb0913dc274c00619b8de23c709d73676e64e233294469c00c2eb549afcfbb
-  data.tar.gz: ffeaa1616416edd4fa9529c982fce59f39594ec27b6d43eb7da16c5c086824cb
+  metadata.gz: d020639fc0646a740ab9afda00ac3bf8098835cc64c83789a08e323e4021f365
+  data.tar.gz: 6e9eed146d5b2e450f98830a02c6b882a9e415ba04a8c702a4df4757c6d2a1aa
 SHA512:
-  metadata.gz: 06d3c6c10ed9009cfd370de72fd9afc8b4393b77512149fa6043a04c787086822b9c5fd165f21666c3c6612417a77c279ea6fa2023046b6a565dfe7532264f30
-  data.tar.gz: 73b8d7c1d5a7b79061af23414984597a66d1e2accf9e7a59c84a8e58e7e53726e66869dc258f60a74b036993156f14c889583be95cf8eb2f8e18176705113edf
+  metadata.gz: a82534bb2ee225da6656ce6a511e97fc3174376bde01af3c414e37d6336a756f0658b36f6c0b87426ac83bb38fed4874334fdc878ea02adcf7465d217789d223
+  data.tar.gz: 30012de7ca8856ef2b345e6e728585d53fa1e2e1a786424b62ed62053ebae67f1acf2afd0659fc9600f03764e951bf8084bde66eb73df0f392fb04f12ff723cd

data/lib/sheets_db/resource.rb

@@ -16,10 +16,26 @@ module SheetsDB
         @resource_type = resource_type
       end
 
+      def find(id_or_url, session: SheetsDB::Session.default)
+        find_by_url(id_or_url, session: session)
+      rescue SheetsDB::Session::InvalidGoogleDriveUrlError
+        find_by_id(id_or_url, session: session)
+      end
+
+      def find_by_url(url, session: SheetsDB::Session.default)
+        wrap_google_drive_resource(session.raw_file_by_url(url))
+      end
+
       def find_by_id(id, session: SheetsDB::Session.default)
-        google_drive_resource = session.raw_file_by_id(id)
+        wrap_google_drive_resource(session.raw_file_by_id(id))
+      end
+
+      def wrap_google_drive_resource(google_drive_resource)
         if resource_type && !google_drive_resource.is_a?(resource_type)
-          fail(ResourceTypeMismatchError, "The file with id #{id} is not a #{resource_type}")
+          fail(
+            ResourceTypeMismatchError,
+            "The file #{google_drive_resource.human_url} is not a #{resource_type}"
+          )
         end
         new(google_drive_resource)
       end

data/lib/sheets_db/session.rb

@@ -4,6 +4,7 @@ module SheetsDB
   class Session
     class IllegalDefaultError < StandardError; end
     class NoDefaultSetError < StandardError; end
+    class InvalidGoogleDriveUrlError < ArgumentError; end
 
     def self.default=(default)
       unless default.is_a?(self)
@@ -30,5 +31,12 @@ module SheetsDB
     def raw_file_by_id(id)
       @google_drive_session.file_by_id(id)
     end
+
+    def raw_file_by_url(url)
+      @google_drive_session.file_by_url(url)
+    rescue GoogleDrive::Error => e
+      (raise InvalidGoogleDriveUrlError, url) if e.message.match(/not a known Google Drive URL/)
+      raise
+    end
   end
-end
+end

data/lib/sheets_db/version.rb

@@ -1,3 +1,3 @@
 module SheetsDB
-  VERSION = "0.13.0"
+  VERSION = "0.14.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sheets_db
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Ravi Gadad
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-21 00:00:00.000000000 Z
+date: 2024-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google_drive