lokalise_manager 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49d525043d80bf4643208f1de37d06bdd12826c04b01cbde07ae566e5ab1e056
-  data.tar.gz: a3f7ea97ae346b93220677342e771f2e916112572d4c54c779664c7a0651f2b3
+  metadata.gz: 33815f129df22f7a27f91689cad944193aca9b992f14e7115a2737088785d3b3
+  data.tar.gz: 1fc5a893bb917bac5afd39f2b35dbbb54286b878dce42f0805135105490520b5
 SHA512:
-  metadata.gz: 59b08352f934330e07762d73066afadcb440478ef3548686b1ef32ab6ae3a0fb645a4da55cb7c75c02ff42d49ea73c82728f8247a6e78531de1154c40573f002
-  data.tar.gz: 98337218aa0519ab6d2982b38ce7582276301692c6cde59f5d2d75039a1951b1d8b7769584d6884ae3994286998299826cedadd8eba9ae3a5f65d87a1a9dabc9
+  metadata.gz: 7fecf43ac4f105be85fe2e4548643849b78a239ec523a79b37fec4b6acbeddf319dd4ac594e5caf28e4b174fed76e05b18d3bf6d6343d055daa2115d661b41c4
+  data.tar.gz: 85f6c703a1ee2107cfe165b7c652cc81d2c2f0a0ae2a02af44cfb0e0cf31a185e5cbe3cbe27c8c53d411a8dd4f3046a98b02dadde3d983855e02cead3347cfb4

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.2.1 (26-Nov-21)
+
+* Use refinements instead of monkey patching to add hash methods
+* Don't use `OpenStruct` anymore to store config opts
+* Minor fixes
+
 ## 1.2.0 (26-Oct-21)
 
 * Add a new option `:silent_mode` which is `false` by default. When silent mode is enabled, no debug info will be printed out to `$stdout`. The only exception are the "safe mode" messages — you'll still be prompted to continue if the target directory is not empty.

data/lib/lokalise_manager/task_definitions/base.rb

@@ -2,11 +2,12 @@
 
 require 'ruby-lokalise-api'
 require 'pathname'
-require 'ostruct'
 
 module LokaliseManager
   module TaskDefinitions
     class Base
+      using LokaliseManager::Utils::HashUtils
+
       attr_accessor :config
 
       # Creates a new importer or exporter. It accepts custom config and merges it
@@ -23,7 +24,11 @@ module LokaliseManager
           opts[reader.to_sym] = global_config.send(reader)
         end
 
-        @config = OpenStruct.new primary_opts.deep_merge(custom_opts)
+        all_opts = primary_opts.deep_merge(custom_opts)
+
+        config_klass = Struct.new(*all_opts.keys, keyword_init: true)
+
+        @config = config_klass.new all_opts
       end
 
       # Creates a Lokalise API client

data/lib/lokalise_manager/utils/hash_utils.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+# Taken from https://github.com/rails/rails/blob/83217025a171593547d1268651b446d3533e2019/activesupport/lib/active_support/core_ext/hash/deep_merge.rb
+
+module LokaliseManager
+  module Utils
+    module HashUtils
+      refine Hash do
+        def deep_merge(other_hash, &block)
+          dup.deep_merge!(other_hash, &block)
+        end
+
+        # Same as +deep_merge+, but modifies +self+.
+        def deep_merge!(other_hash, &block)
+          merge!(other_hash) do |key, this_val, other_val|
+            if this_val.is_a?(Hash) && other_val.is_a?(Hash)
+              this_val.deep_merge(other_val, &block)
+            elsif block
+              yield(key, this_val, other_val)
+            else
+              other_val
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/lokalise_manager/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LokaliseManager
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

data/lib/lokalise_manager.rb

@@ -2,7 +2,7 @@
 
 require 'yaml'
 
-require 'ext/hash'
+require 'lokalise_manager/utils/hash_utils'
 
 require 'lokalise_manager/version'
 require 'lokalise_manager/error'

data/lokalise_manager.gemspec

@@ -32,7 +32,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.6'
   spec.add_development_dependency 'rubocop', '~> 1.0'
   spec.add_development_dependency 'rubocop-performance', '~> 1.5'
-  spec.add_development_dependency 'rubocop-rspec', '~> 2.5.0'
+  spec.add_development_dependency 'rubocop-rspec', '~> 2.6.0'
   spec.add_development_dependency 'simplecov', '~> 0.16'
   spec.add_development_dependency 'vcr', '~> 6.0'
+  spec.metadata = {
+    'rubygems_mfa_required' => 'true'
+  }
 end

data/spec/lib/lokalise_manager/task_definitions/base_spec.rb

@@ -19,11 +19,6 @@ describe LokaliseManager::TaskDefinitions::Base do
       expect(obj.config.project_id).to eq('345')
       expect(obj.config.token).to eq('fake')
     end
-
-    it 'tes' do
-      obj = described_class.new import_opts: {filter_langs: ['fr']}
-      puts obj.config
-    end
   end
 
   specify '.reset_client!' do

data/spec/lib/{ext/hash_spec.rb → utils/hash_utils_spec.rb}

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-describe Hash do
+describe LokaliseManager::Utils::HashUtils do
+  using described_class
   let(:h1) { {a: 100, b: 200, c: {c1: 100}} }
   let(:h2) { {b: 250, c: {c1: 200}} }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lokalise_manager
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Ilya Bodrov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-26 00:00:00.000000000 Z
+date: 2021-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-lokalise-api
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -181,21 +181,21 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- lib/ext/hash.rb
 - lib/lokalise_manager.rb
 - lib/lokalise_manager/error.rb
 - lib/lokalise_manager/global_config.rb
 - lib/lokalise_manager/task_definitions/base.rb
 - lib/lokalise_manager/task_definitions/exporter.rb
 - lib/lokalise_manager/task_definitions/importer.rb
+- lib/lokalise_manager/utils/hash_utils.rb
 - lib/lokalise_manager/version.rb
 - lokalise_manager.gemspec
-- spec/lib/ext/hash_spec.rb
 - spec/lib/lokalise_manager/global_config_spec.rb
 - spec/lib/lokalise_manager/task_definitions/base_spec.rb
 - spec/lib/lokalise_manager/task_definitions/exporter_spec.rb
 - spec/lib/lokalise_manager/task_definitions/importer_spec.rb
 - spec/lib/lokalise_manager_spec.rb
+- spec/lib/utils/hash_utils_spec.rb
 - spec/spec_helper.rb
 - spec/support/file_manager.rb
 - spec/support/spec_addons.rb
@@ -203,7 +203,8 @@ files:
 homepage: https://github.com/bodrovis/lokalise_manager
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -219,17 +220,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.29
+rubygems_version: 3.2.31
 signing_key:
 specification_version: 4
 summary: Lokalise integration for Ruby
 test_files:
-- spec/lib/ext/hash_spec.rb
 - spec/lib/lokalise_manager/global_config_spec.rb
 - spec/lib/lokalise_manager/task_definitions/base_spec.rb
 - spec/lib/lokalise_manager/task_definitions/exporter_spec.rb
 - spec/lib/lokalise_manager/task_definitions/importer_spec.rb
 - spec/lib/lokalise_manager_spec.rb
+- spec/lib/utils/hash_utils_spec.rb
 - spec/spec_helper.rb
 - spec/support/file_manager.rb
 - spec/support/spec_addons.rb

data/lib/ext/hash.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-# Taken from https://github.com/rails/rails/blob/83217025a171593547d1268651b446d3533e2019/activesupport/lib/active_support/core_ext/hash/deep_merge.rb
-
-class Hash
-  def deep_merge(other_hash, &block)
-    dup.deep_merge!(other_hash, &block)
-  end
-
-  # Same as +deep_merge+, but modifies +self+.
-  def deep_merge!(other_hash, &block)
-    merge!(other_hash) do |key, this_val, other_val|
-      if this_val.is_a?(Hash) && other_val.is_a?(Hash)
-        this_val.deep_merge(other_val, &block)
-      elsif block
-        yield(key, this_val, other_val)
-      else
-        other_val
-      end
-    end
-  end
-end