ledger_sync 1.5.2 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2b28cb8266fdd627c4c7b19166f0fae7c65742556662e5fdb4150aa6d73a297
-  data.tar.gz: 5184d055660ead3e05e63dc4e3ad6bff063d79af1e9571311d62ca1ad67acfab
+  metadata.gz: a222c327386f4dc5ec093f20d1396a77f4cb65e62bd46e13896f5f9a160c3cc3
+  data.tar.gz: 4545a5d71b699d92afc1d7a5f226a646965011e97cfe85b142f742920d28abf5
 SHA512:
-  metadata.gz: f937d553df677636512d4e8345b2c188f0533a9cc7e8f74911b90b258646c206ed9f5c3172f422a4c31a32724d9d58086aa362ada77526f113cb733fe7554ad7
-  data.tar.gz: 267bf6cefa55aa03de38086666917e852d865e7045c68bc923648fd2c237e26fdf71a1a700bba239c4afa15430283b6748ed8b61b334b923d56c99c43c5f6c3f
+  metadata.gz: 6fa511fac28518775882d9b4644a3f5becea15a8529f4c44a59a7e758908a020d10741a1377afb0dfac6ff6d10ee0ca678bd8aef928b547b7d805145203cda2f
+  data.tar.gz: 6a38f96c0bbb00606c5d4521f48103e29dcb60fea339e1a6c6133e45d9293760c39e16b80ac143e28686a05431ccc998b00dc348929276d5d78f2915bcc91035

data/.gitignore

@@ -24,6 +24,7 @@ _site/
 
 # dotenv
 .env
+*.local
 
 .tool-versions
 .ruby-version

data/.travis.yml

@@ -9,7 +9,6 @@ rvm:
 before_install:
   - gem update --system
   - gem install bundler
-  - rm Gemfile.lock
   - bundle install
 script:
   - bundle exec rspec --order rand

data/Gemfile.lock

@@ -1,10 +1,9 @@
 PATH
   remote: .
   specs:
-    ledger_sync (1.5.2)
+    ledger_sync (1.6.0)
       activemodel
       colorize
-      dotenv (~> 2.7.6)
       dry-schema (~> 1.5.4)
       dry-validation (~> 1.5.6)
       faraday
@@ -41,6 +40,7 @@ GEM
     bump (0.9.0)
     byebug (11.1.3)
     childprocess (4.0.0)
+    climate_control (0.2.0)
     colorator (1.1.0)
     colorize (0.8.1)
     concurrent-ruby (1.1.7)
@@ -186,19 +186,19 @@ GEM
     resonad (1.3.0)
     rexml (3.2.4)
     rouge (3.24.0)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.3)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.3)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.0)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.4)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.0)
     rubocop (1.0.0)
       parallel (~> 1.10)
       parser (>= 2.7.1.5)
@@ -208,7 +208,7 @@ GEM
       rubocop-ast (>= 0.6.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.1.0)
+    rubocop-ast (1.1.1)
       parser (>= 2.7.1.5)
     ruby-progressbar (1.10.1)
     ruby2_keywords (0.0.2)
@@ -250,11 +250,11 @@ GEM
       addressable
       httpi (~> 2.0)
       nokogiri (>= 1.4.2)
-    webmock (3.9.3)
+    webmock (3.9.4)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.4.0)
+    zeitwerk (2.4.1)
 
 PLATFORMS
   ruby
@@ -264,7 +264,9 @@ DEPENDENCIES
   bump (~> 0.9.0)
   bundler (~> 2.1)
   byebug
+  climate_control
   coveralls (~> 0.8.23)
+  dotenv
   factory_bot (~> 6.1.0)
   jekyll (~> 3.8.4)
   jekyll-menus (~> 0.6.0)
@@ -274,7 +276,7 @@ DEPENDENCIES
   overcommit (~> 0.57.0)
   rake (~> 13.0)
   rspec (~> 3.2)
-  rubocop
+  rubocop (= 1.0.0)
   vcr
   webmock
 

data/ledger_sync.gemspec

@@ -34,7 +34,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency('bump', '~> 0.9.0')
   spec.add_development_dependency('bundler', '~> 2.1')
   spec.add_development_dependency('byebug', '>= 0')
+  spec.add_development_dependency('climate_control')
   spec.add_development_dependency('coveralls', '~> 0.8.23')
+  spec.add_development_dependency('dotenv')
   spec.add_development_dependency('factory_bot', '~> 6.1.0')
   spec.add_development_dependency('jekyll', '~> 3.8.4')
   spec.add_development_dependency('jekyll-menus', '~> 0.6.0')
@@ -43,12 +45,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency('overcommit', '~> 0.57.0')
   spec.add_development_dependency('rake', '~> 13.0')
   spec.add_development_dependency('rspec', '~> 3.2')
-  spec.add_development_dependency('rubocop', '>= 0')
+  spec.add_development_dependency('rubocop', '1.0.0')
   spec.add_development_dependency('vcr', '>= 0')
   spec.add_development_dependency('webmock', '>= 0')
   spec.add_runtime_dependency('activemodel', '>= 0')
   spec.add_runtime_dependency('colorize', '>= 0')
-  spec.add_runtime_dependency('dotenv', '~> 2.7.6')
   spec.add_runtime_dependency('dry-schema', '~> 1.5.4')
   spec.add_runtime_dependency('dry-validation', '~> 1.5.6')
   spec.add_runtime_dependency('faraday', '>= 0')

data/lib/ledger_sync.rb

@@ -16,10 +16,6 @@ require 'oauth2'
 require 'tempfile'
 require 'pd_ruby'
 
-# Dotenv
-require 'dotenv'
-Dotenv.load
-
 # Version
 require 'ledger_sync/version'
 
@@ -40,6 +36,7 @@ require 'ledger_sync/util/signer'
 require 'ledger_sync/util/hash_helpers'
 require 'ledger_sync/util/read_only_object'
 require 'ledger_sync/util/resources_builder'
+require 'ledger_sync/util/dotenv_updator'
 require 'ledger_sync/ledger_configuration'
 require 'ledger_sync/ledger_configuration_store'
 require 'ledger_sync/util/performer'

data/lib/ledger_sync/ledgers/client.rb

@@ -13,14 +13,20 @@ module LedgerSync
 
       module Mixin
         module InstanceMethods
-          def ledger_configuration
-            self.class.config
-          end
-
           def base_module
             self.class.base_module
           end
 
+          def update_secrets_in_dotenv
+            return if ENV['TEST_ENV'] && !ENV['USE_DOTENV_ADAPTOR_SECRETS']
+
+            Util::DotenvUpdator.new.update(client: self)
+          end
+
+          def ledger_configuration
+            self.class.config
+          end
+
           def ledger_attributes_to_save
             return {} if self.class.ledger_attributes_to_save.nil?
 

data/lib/ledger_sync/ledgers/mixins/infer_config_mixin.rb

@@ -6,9 +6,9 @@ module LedgerSync
       module InferConfigMixin
         module ClassMethods
           def inferred_config
-            @inferred_config ||= begin
-              return if name.nil?
+            return if name.nil?
 
+            @inferred_config ||= begin
               name_parts = name.split('::')
               name_parts_length = name_parts.count
 
@@ -17,7 +17,7 @@ module LedgerSync
               name_parts_length.times do |i|
                 config = LedgerSync.ledgers.config_from_base_module(
                   base_module: Object.const_get(
-                    name_parts[0..(name_parts_length - i)].join('::')
+                    name_parts[0..(name_parts_length - 1 - i)].join('::')
                   )
                 )
                 break if config.present?

data/lib/ledger_sync/ledgers/mixins/infer_resource_class_mixin.rb

@@ -10,8 +10,11 @@ module LedgerSync
           def inferred_resource_class
             @inferred_resource_class ||= begin
               base_module = inferred_config.base_module
-
-              base_module.const_get(name.split(base_module.name).last.split('::')[1])
+              if name.include?('::Operations::')
+                base_module.const_get(name.split('::Operations::').first)
+              else
+                base_module.const_get(name.split(base_module.name).last.split('::')[1])
+              end
             end
           end
         end

data/lib/ledger_sync/ledgers/mixins/infer_serializer_mixin.rb

@@ -9,24 +9,30 @@ module LedgerSync
       module InferSerializerMixin
         module ClassMethods
           def inferred_deserializer_class
-            @inferred_deserializer_class ||= inferred_config.base_module.const_get(
-              inferred_deserializer_class_name
-            )
+            @inferred_deserializer_class ||= begin
+              inferred_config.base_module.const_get(
+                inferred_deserializer_class_name
+              )
+            end
           end
 
           def inferred_deserializer_class_name
-            @inferred_deserializer_class_name ||= "#{inferred_resource_class.resource_module_str}::Deserializer"
+            @inferred_deserializer_class_name ||= begin
+              "#{inferred_resource_class}::Deserializer"
+            end
           end
 
           def inferred_searcher_deserializer_class
-            @inferred_searcher_deserializer_class ||= inferred_config.base_module.const_get(
-              inferred_searcher_deserializer_class_name
-            )
+            @inferred_searcher_deserializer_class ||= begin
+              inferred_config.base_module.const_get(
+                inferred_searcher_deserializer_class_name
+              )
+            end
           end
 
           def inferred_searcher_deserializer_class_name
             @inferred_searcher_deserializer_class_name ||= begin
-              "#{inferred_resource_class.resource_module_str}::SearcherDeserializer"
+              "#{inferred_resource_class}::SearcherDeserializer"
             end
           end
 
@@ -39,7 +45,9 @@ module LedgerSync
           end
 
           def inferred_serializer_class_name
-            @inferred_serializer_class_name ||= "#{inferred_resource_class.resource_module_str}::Serializer"
+            @inferred_serializer_class_name ||= begin
+              "#{inferred_resource_class}::Serializer"
+            end
           end
         end
 

data/lib/ledger_sync/ledgers/mixins/serialization_mixin.rb

@@ -13,7 +13,7 @@ module LedgerSync
             type = args.fetch(:type)
 
             inferred_config.base_module.const_get(
-              "#{inferred_resource_class.resource_module_str}::#{type.camelcase}"
+              "#{inferred_resource_class}::#{type.camelcase}"
             )
           end
 

data/lib/ledger_sync/ledgers/netsuite/record/metadata.rb

@@ -98,6 +98,10 @@ module LedgerSync
           def upsert
             @upsert ||= http_methods.find { |e| e.key == "put /#{record}/{id}" }
           end
+
+          def self.config
+            Client.config
+          end
         end
       end
     end

data/lib/ledger_sync/ledgers/quickbooks_online/client.rb

@@ -148,39 +148,6 @@ module LedgerSync
           oauth_token
         end
 
-        def update_secrets_in_dotenv # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
-          return if ENV['TEST_ENV'] && !ENV['USE_DOTENV_ADAPTOR_SECRETS']
-
-          filename = File.join(Dir.pwd, '.env')
-          return unless File.exist?(filename)
-
-          prefix = 'QUICKBOOKS_ONLINE_'
-
-          Tempfile.open(".#{File.basename(filename)}", File.dirname(filename)) do |tempfile|
-            File.open(filename).each do |line|
-              env_key = line.split('=').first
-              client_method = env_key.split(prefix).last.downcase
-
-              if line =~ /\A#{prefix}/ && respond_to?(client_method)
-                env_value = ENV[env_key]
-                new_value = send(client_method)
-                tempfile.puts "#{env_key}=#{new_value}"
-                next if env_value == new_value
-
-                ENV[env_key] = new_value
-                tempfile.puts "# #{env_key}=#{env_value} # Updated on #{Time.now}"
-              else
-                tempfile.puts line
-              end
-            end
-
-            tempfile.close
-            FileUtils.mv tempfile.path, filename
-          end
-
-          Dotenv.load
-        end
-
         def url_for(resource:)
           DashboardURLHelper.new(
             resource: resource,

data/lib/ledger_sync/ledgers/quickbooks_online/operation.rb

@@ -46,6 +46,8 @@ module LedgerSync
               super
             rescue LedgerSync::Error::OperationError, OAuth2::Error => e
               failure(e)
+            ensure
+              client.update_secrets_in_dotenv
             end
 
             def quickbooks_online_resource_type

data/lib/ledger_sync/test/support.rb

@@ -28,6 +28,15 @@ module LedgerSync
   module Test
     module Support
       def self.setup(*paths_to_require)
+        # Dotenv
+        require 'dotenv'
+        Dotenv.load(
+          '.env.test.local',
+          '.env.test',
+          '.env'
+        )
+        require 'climate_control'
+
         require 'webmock/rspec'
         require 'simplecov'
         require 'coveralls'

data/lib/ledger_sync/test/support/qa/ledger_support_setup.rb

@@ -1,26 +1,47 @@
 # frozen_string_literal: true
 
-def setup_client_qa_support(*clients, keyed: false)
-  clients.each do |client|
+def setup_client_qa_support(*clients, keyed: false) # rubocop:disable Metrics/PerceivedComplexity
+  qa_clients = Hash[clients.uniq.map do |client|
     key = client.config.root_key
 
     qa_support "#{key}_helpers"
-    helpers_module  = Object.const_get("QA::#{client.base_module.name.split('::').last}Helpers")
-    env_key         = "#{key}_qa".upcase
 
-    RSpec.configure do |config|
+    [
+      client,
+      {
+        env_key: "#{key}_qa".upcase,
+        helpers_module: Object.const_get("QA::#{client.base_module.name.split('::').last}Helpers"),
+        key: key
+      }
+    ]
+  end]
+
+  RSpec.configure do |config|
+    qa_clients.each_value do |data|
       if keyed
-        config.include helpers_module, qa: true, client: key
+        config.include data[:helpers_module], qa: true, client: data[:key]
       else
-        config.include helpers_module, qa: true
+        config.include data[:helpers_module], qa: true
       end
+    end
+
+    config.around(:each, qa: true) do |example|
+      described_class = example.metadata[:described_class]
+      config = if described_class.respond_to?(:config)
+                 described_class.config
+               else
+                 described_class.inferred_config
+               end
+      client_key = example.metadata.fetch(:client, config.root_key)
 
-      config.around(:each, qa: true) do |example|
-        if ENV.fetch(env_key, nil) == '1'
+      env_key = "#{client_key}_QA".upcase
+
+      if ENV.fetch(env_key, nil) == '1'
+        ClimateControl.modify(Dotenv.parse(ENV.fetch('LOCAL_DOTENV_PATH', '.env.local'))) do
           example.run
-        else
-          skip "Set #{env_key}=1 to run #{key} QA tests"
         end
+      else
+        skip "Set #{env_key}=1 to run #{client_key} QA tests"
       end
     end
   end

data/lib/ledger_sync/util/dotenv_updator.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module LedgerSync
+  module Util
+    class DotenvUpdator
+      attr_reader :file_path
+
+      def initialize(args = {})
+        @file_path = args.fetch(:file_path, File.join(Dir.pwd, '.env.local'))
+      end
+
+      def update(args = {})
+        client = args.fetch(:client)
+        prefix = args.fetch(:prefix, "#{client.class.config.root_key.upcase}_")
+
+        to_save = client.ledger_attributes_to_save.dup.stringify_keys
+
+        Tempfile.open(".#{File.basename(file_path)}", File.dirname(file_path)) do |tempfile|
+          File.open(file_path).each do |line|
+            env_key = line.split('=').first
+            client_method = env_key.split(prefix).last.downcase
+
+            if line =~ /\A#{prefix}/ && to_save.key?(client_method)
+              env_value = ENV[env_key]
+              new_value = to_save.delete(client_method)
+              tempfile.puts "#{env_key}=#{new_value}"
+              next if env_value == new_value.to_s
+
+              ENV[env_key] = new_value.to_s
+              tempfile.puts "# #{env_key}=#{env_value} # Updated on #{Time.now}"
+            else
+              tempfile.puts line
+            end
+          end
+
+          to_save.each { |k, v| tempfile.puts(["#{prefix}#{k}".upcase, v].map(&:to_s).join('=')) }
+
+          tempfile.close
+          FileUtils.mv tempfile.path, file_path
+        end
+
+        Dotenv.load
+      end
+    end
+  end
+end

data/lib/ledger_sync/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module LedgerSync
-  VERSION = '1.5.2'
+  VERSION = '1.6.0'
 
   def self.version
     if !ENV['TRAVIS'] || ENV.fetch('TRAVIS_TAG', '') != ''

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ledger_sync
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.6.0
 platform: ruby
 authors:
 - Ryan Jackson
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: climate_control
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.23
+- !ruby/object:Gem::Dependency
+  name: dotenv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_bot
   requirement: !ruby/object:Gem::Requirement
@@ -196,16 +224,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -262,20 +290,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: dotenv
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.7.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.7.6
 - !ruby/object:Gem::Dependency
   name: dry-schema
   requirement: !ruby/object:Gem::Requirement
@@ -1113,6 +1127,7 @@ files:
 - lib/ledger_sync/type/string_from_set.rb
 - lib/ledger_sync/type/value.rb
 - lib/ledger_sync/type/value_mixin.rb
+- lib/ledger_sync/util/dotenv_updator.rb
 - lib/ledger_sync/util/hash_helpers.rb
 - lib/ledger_sync/util/mixins/delegate_iterable_methods_mixin.rb
 - lib/ledger_sync/util/mixins/dupable_mixin.rb