undrive_google 1.0.3 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0081f9e7ae701e26550ffe3e37cf522a2b10d5a907abb62445e386e0940c1a25'
-  data.tar.gz: c7d6711773d08db4e5069662f232b05fdeb7e49c0a885bd98723067ff8541101
+  metadata.gz: e9fb5d9dbad9a6e4a820430436b8e5f733e2ab11fa1c75c47f31345e13acef8e
+  data.tar.gz: de4747adb16f2359ff0fc1ecd745a9805d3d65aa01c060e747b4a28affbb7dfb
 SHA512:
-  metadata.gz: 530ded67ba7e198d26904929375a07f1bb09b66442abbccc287187f14f68a7b098ed6da4f4388c1b2b1114fd8768dd14fb7b1a1dbc19962d6176190b982ec3c1
-  data.tar.gz: 8cf1db466b609713de60873ff2622b3c1f647e8a9f1c8fdb4d5bdc207b59e890ab55f77ec0fe1c594f3eaac7d71df796aa92c5b4ed4fd1382c9354f919eb735e
+  metadata.gz: a8d2057ed2476b2259dfbf4c9fb81f2722d1fc157c5ceaf49ec7273510e1fe331d7afa9f82fe2820fae728326fedfa5f066191360938eb9206f45d34a3843ea6
+  data.tar.gz: c82cfd0486539c4ed20ac2c53b181368ebf1e49ef87edd205ccfa87e252b6f835e921186e3ab35dc099cf6f5e90a5dd5ad16399ca5396f3de33a139a254438aa

data/CHANGELOG.md

@@ -10,6 +10,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 ### Removed
 
+## 1.1.1 - 2022-11-29
+### Fixed
+- Support renaming of HTML zip archives that have assets (e.g. /images/*)
+
+## 1.1.0 - 2022-11-29
+### Added
+- Integration test for unzip transformation with complex zip file (Peter's Resume!)
+### Changed
+- rename_proc now defaults to `nil` (meaning not renaming)
+  - Set it you need files renamed according to a pattern
+### Fixed
+- Support HTML zip archives that have assets (e.g. /images/*)
+
 ## 1.0.3 - 2022-11-01
 ### Added
 - Support for sweep option

data/README.md

@@ -36,7 +36,11 @@ gem "rubyzip", github: "rubyzip/rubyzip", branch: "master"
 When liberating your files, ensure the script will use the Gemfile if it isn't in the same directory where you are running the `undrive_google` command:
 ```shell
 BUNDLE_GEMFILE=path/to/Gemfile bundle update
-BUNDLE_GEMFILE=path/to/Gemfile undrive_google -c path/to/config
+BUNDLE_GEMFILE=path/to/Gemfile bundle exec undrive_google -c path/to/config
+```
+NOTE: If the Gemfile and the config are in the same, current, directory, you can simply run:
+```shell
+bundle exec undrive_google
 ```
 
 My complete `Gemfile` looks like this:
@@ -48,7 +52,7 @@ source "https://rubygems.org"
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" }
 
-gem "undrive_google", "~> 1.0.3"
+gem "undrive_google", "~> 1.1"
 
 # See: https://github.com/gimite/google-drive-ruby/pull/427
 gem "google_drive", github: "pboling/google-drive-ruby", branch: "pboling-epub-mimetype"
@@ -57,7 +61,7 @@ gem "google_drive", github: "pboling/google-drive-ruby", branch: "pboling-epub-m
 gem "rubyzip", github: "rubyzip/rubyzip", branch: "master"
 ```
 
-My config file looks like this (sanitized a bit):
+My `undrive_google.yml` config file looks like this (sanitized a bit):
 ```yaml
 file_id: "the-key-to-my-google-drive-file(find-in-the-url)" 
 key_file: serviceid-1234567890.json
@@ -181,9 +185,10 @@ keep_zip: true
 # Only applies to files not explicitly specified with rename-<type>
 # Will never apply to the html file unzipped from the .zip
 # Used as: file_name.gsub(rename_pattern[0], rename_pattern[1])
-rename_pattern:
-  - "_"
-  - " "
+# By default, no renaming, must be specified
+# rename_pattern:
+#   - "_"
+#   - " "
 
 # [PATH]
 dir: '' # defaults to current working directory

data/lib/undrive_google/actions/liberate.rb

@@ -41,6 +41,7 @@ module UndriveGoogle
       def rename
         exact_name = Options.instance.rename[extension]
         return exact_name if exact_name
+        return file.title unless Options.instance.rename_proc
 
         Options.instance.rename[extension] = Options.instance.rename_proc.call(file.title)
       end

data/lib/undrive_google/options.rb

@@ -151,7 +151,7 @@ module UndriveGoogle
         self.unzip = true
         self.keep_zip = true
         self.rename = {}
-        self.rename_proc = RENAME_PROC
+        self.rename_proc = nil
         self.title = nil
         self.dir = nil
         self.lang = "en"

data/lib/undrive_google/transformations/unzip.rb

@@ -4,10 +4,11 @@ module UndriveGoogle
   module Transformations
     # Download a particular version of the file.
     class Unzip
-      attr_accessor :file_path, :html_path
+      attr_accessor :file_path, :html_path, :destination
 
-      def initialize(file_path)
+      def initialize(file_path, destination = nil)
         @file_path = file_path
+        @destination = destination || File.dirname(file_path)
       end
 
       # @return nil
@@ -23,17 +24,13 @@ module UndriveGoogle
 
       private
 
-      def destination
-        File.dirname(file_path)
-      end
-
       def extract_zip(file, destination)
-        FileUtils.mkdir_p(destination)
-
         Zip::File.open(file) do |zip_file|
           zip_file.each do |f|
-            @html_path = File.join(destination, f.name)
-            zip_file.extract(f, @html_path) unless File.exist?(@html_path)
+            path = File.join(destination, f.name)
+            FileUtils.mkdir_p(File.dirname(path))
+            zip_file.extract(f, path) unless File.exist?(path)
+            @html_path = path if File.extname(path) == ".html"
           end
         end
       end

data/lib/undrive_google/version.rb

@@ -2,6 +2,6 @@
 
 module UndriveGoogle
   module Version
-    VERSION = "1.0.3"
+    VERSION = "1.1.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: undrive_google
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.1
 platform: ruby
 authors:
 - Peter Boling
@@ -36,7 +36,7 @@ cert_chain:
   gwGrEXGQGDZ0NIgBcmvMOqlXjkGQwQvugKycJ024z89+fz2332vdZIKTrSxJrXGk
   4/bR9A==
   -----END CERTIFICATE-----
-date: 2022-11-01 00:00:00.000000000 Z
+date: 2022-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google_drive
@@ -139,7 +139,7 @@ metadata:
   source_code_uri: https://git.sr.ht/~galtzo/undrive_google
   changelog_uri: https://git.sr.ht/~galtzo/undrive_google
   bug_tracker_uri: https://todo.sr.ht/~galtzo/undrive_google
-  documentation_uri: https://www.rubydoc.info/gems/undrive_google/1.0.3
+  documentation_uri: https://www.rubydoc.info/gems/undrive_google/1.1.1
   wiki_uri: https://man.sr.ht/~galtzo/undrive_google/
   funding_uri: https://liberapay.com/pboling
   mailing_list_uri: https://lists.sr.ht/~galtzo/undrive_google-devel
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.24
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: "\U0001F3F4 Liberate files from your Google Drive"