zoho_hub 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d69358949e8262ad9da808101b0bbb2da5d0eae262d2d34ab032e5097d58f5ba
-  data.tar.gz: a0b64a4714925fa5a6392e43ecd991aaf71e9b3991e4505a5d2703bca22f8269
+  metadata.gz: 590738ab95732c8ebb4af350964263e689a583e0b3ebe16be7fcb0cd684f8b3e
+  data.tar.gz: a70d0d3056ae8f66af704bdfbee044e19be5d26f733e948c0c4e48ff0c57c6ee
 SHA512:
-  metadata.gz: d02305e21aae61e11f09a010b8f22dab327af638b036ca075abb47e0943eaad1870355e976c208b00c9a5dfa87f05ff82f60754fd50f1eccee97e37a7e3c8967
-  data.tar.gz: 756fb2bd03d39e70f46fdc04eb34bea1310701b72ba363a3b6c79fab033ccf5defa2b615edcae9af6c86cae45dacf24bcefd59c3c17ff2a4c3b7456f0595b0ed
+  metadata.gz: f5ad05319bc38fdb6dfbbfb6d7e2cd4b6786ad40d5316d6bc0f5864df0d3a500d9d2e5cf6f56d8e3ae52831647c8d1f8723dd32342aa352f91bde909b008e16b
+  data.tar.gz: 3d726019ef9d08ea3e387cb8eb1755e0ac72bda9e72c4cd5f16ba669752e307a9183601d3e6ddab3436a75fd7689c9c25110c9ef28f7faf9b051b603e150121b

data/.github/workflows/ci.yml

@@ -1,6 +1,9 @@
+---
 name: CI
 
-on: [push, pull_request]
+on:
+  - push
+  - pull_request
 
 jobs:
   lint:
@@ -9,7 +12,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.5'
+          ruby-version: '3.4'
           bundler-cache: true
       - name: rubocop version
         timeout-minutes: 1
@@ -17,15 +20,19 @@ jobs:
       - name: rubocop
         timeout-minutes: 5
         run: bundle exec rubocop -c .rubocop.yml
-
   test:
     runs-on: ubuntu-latest
     continue-on-error: ${{ matrix.experimental }}
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['2.5', '2.6', '2.7', '3.0']
-        experimental: [false]
+        ruby:
+          - '3.3'
+          - '3.4'
+          - '3.5'
+          - '4.0'
+        experimental:
+          - false
     steps:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1

data/.rubocop.yml

@@ -1,7 +1,10 @@
-require: rubocop-rspec
+---
+plugins: rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 2.5.1
+  TargetRubyVersion: 3.3
+  NewCops: enable
+  SuggestExtensions: false
 
 Gemspec/RequiredRubyVersion:
   Enabled: false
@@ -19,7 +22,7 @@ Style/SafeNavigation:
   Enabled: false
 
 # A good line length is 100 chars
-Metrics/LineLength:
+Layout/LineLength:
   Max: 100
   AllowURI: true
 

data/.ruby-version

@@ -1 +1 @@
-2.7.6
+3.4.5

data/Gemfile

@@ -6,3 +6,16 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in zoho_hub.gemspec
 gemspec
+
+group :development, :test do
+  gem 'activesupport'
+  gem 'bundler'
+  gem 'dotenv'
+  gem 'pry-byebug'
+  gem 'rake'
+  gem 'rspec'
+  gem 'rubocop'
+  gem 'rubocop-rspec'
+  gem 'simplecov'
+  gem 'webmock'
+end

data/bin/console

@@ -8,16 +8,16 @@ require 'dotenv'
 Dotenv.load
 
 ZohoHub.configure do |config|
-  config.client_id    = ENV['ZOHO_CLIENT_ID']
-  config.secret       = ENV['ZOHO_SECRET']
-  config.redirect_uri = ENV['ZOHO_REDIRECT_URI']
+  config.client_id    = ENV.fetch('ZOHO_CLIENT_ID', nil)
+  config.secret       = ENV.fetch('ZOHO_SECRET', nil)
+  config.redirect_uri = ENV.fetch('ZOHO_REDIRECT_URI', nil)
   config.api_domain   = ENV['ZOHO_API_DOMAIN'] if ENV['ZOHO_API_DOMAIN']
   config.debug        = ENV['ZOHO_DEBUG'] || false
 end
 
 # We assume that we already have a refresh token, to make things easier here.
 puts 'Refreshing token...'
-token_params = ZohoHub::Auth.refresh_token(ENV['ZOHO_REFRESH_TOKEN'])
+token_params = ZohoHub::Auth.refresh_token(ENV.fetch('ZOHO_REFRESH_TOKEN', nil))
 ZohoHub.setup_connection(token_params)
 
 send(:include, ZohoHub)

data/bin/read

@@ -11,14 +11,14 @@ require 'dotenv'
 Dotenv.load
 
 ZohoHub.configure do |config|
-  config.client_id    = ENV['ZOHO_CLIENT_ID']
-  config.secret       = ENV['ZOHO_SECRET']
+  config.client_id    = ENV.fetch('ZOHO_CLIENT_ID', nil)
+  config.secret       = ENV.fetch('ZOHO_SECRET', nil)
 end
 
-token_params = ZohoHub::Auth.refresh_token(ENV['ZOHO_REFRESH_TOKEN'])
+token_params = ZohoHub::Auth.refresh_token(ENV.fetch('ZOHO_REFRESH_TOKEN', nil))
 ZohoHub.setup_connection(token_params)
 
-puts "Reading modules for client ID: #{ENV['ZOHO_CLIENT_ID']}..."
+puts "Reading modules for client ID: #{ENV.fetch('ZOHO_CLIENT_ID', nil)}..."
 
 modules_hashes = ZohoHub::Settings::Module.all_json
 
@@ -31,9 +31,7 @@ modules_hashes.each do |hash|
   FileUtils.mkdir_p(modules_path)
   file_name = File.join(modules_path, "#{hash[:api_name]}.json")
 
-  File.open(file_name, 'w') do |file|
-    file.write(JSON.pretty_generate(hash))
-  end
+  File.write(file_name, JSON.pretty_generate(hash))
 
   next unless hash[:api_supported]
 
@@ -42,7 +40,5 @@ modules_hashes.each do |hash|
   FileUtils.mkdir_p(fields_path)
   file_name = File.join(fields_path, "#{hash[:api_name]}.json")
 
-  File.open(file_name, 'w') do |file|
-    file.write(JSON.pretty_generate(fields_array))
-  end
+  File.write(file_name, JSON.pretty_generate(fields_array))
 end

data/bin/zoho_hub

@@ -31,9 +31,9 @@ end
 
 case command
 when 'callback-server'
-  ZohoHub::Cli::CallbackServer.new.run(ARGV[1..-1])
+  ZohoHub::Cli::CallbackServer.new.run(ARGV[1..])
 when 'read-modules'
-  ZohoHub::Cli::ReadModules.new.run(ARGV[1..-1])
+  ZohoHub::Cli::ReadModules.new.run(ARGV[1..])
 else
   $stdout.puts 'Usage:'
   $stdout.puts "    zoho_hub [command] [options]\n"

data/lib/zoho_hub/auth.rb

@@ -2,7 +2,6 @@
 
 require 'multi_json'
 require 'faraday'
-require 'faraday_middleware'
 require 'addressable'
 
 module ZohoHub

data/lib/zoho_hub/cli/callback_server.rb

@@ -36,7 +36,7 @@ module ZohoHub
       end
 
       def run(argv = ARGV, env = ENV)
-        exit 1 unless good_run(argv, env)
+        exit 1 unless good_run?(argv, env)
 
         ZohoHub::OauthCallbackServer.set(:port, @options[:port]) if @options[:port]
 
@@ -47,8 +47,8 @@ module ZohoHub
         callback_url = "http://#{bind_address}:#{bind_port}/#{callback_path}"
 
         ZohoHub.configure do |config|
-          config.client_id    = @options[:client_id] || ENV['ZOHO_CLIENT_ID']
-          config.secret       = @options[:secret] || ENV['ZOHO_SECRET']
+          config.client_id    = @options[:client_id] || ENV.fetch('ZOHO_CLIENT_ID', nil)
+          config.secret       = @options[:secret] || ENV.fetch('ZOHO_SECRET', nil)
           config.redirect_uri = callback_url
         end
 
@@ -70,7 +70,7 @@ module ZohoHub
         !ZohoHub.configuration.client_id || !ZohoHub.configuration.secret
       end
 
-      def good_run(argv, env)
+      def good_run?(argv, env)
         return false unless parse(argv, env)
 
         true
@@ -81,13 +81,12 @@ module ZohoHub
         true
       rescue OptionParser::ParseError => e
         error_output(e)
+        false
       end
 
       def error_output(error)
         warn "Error: #{error}"
         warn "Try `#{parser.program_name} server --help' for more information"
-
-        false
       end
     end
   end

data/lib/zoho_hub/cli/read_modules.rb

@@ -33,11 +33,11 @@ module ZohoHub
       end
 
       def run(argv = ARGV, env = ENV)
-        exit 1 unless good_run(argv, env)
+        exit 1 unless good_run?(argv, env)
 
         setup_connection
 
-        client_id = @options[:client_id] || ENV['ZOHO_CLIENT_ID']
+        client_id = @options[:client_id] || ENV.fetch('ZOHO_CLIENT_ID', nil)
         puts "Reading modules for client ID: #{client_id}..."
 
         modules_hashes = ZohoHub::Settings::Module.all_json
@@ -50,7 +50,7 @@ module ZohoHub
         end
       end
 
-      def good_run(argv, env)
+      def good_run?(argv, env)
         return false unless parse(argv, env)
 
         true
@@ -58,11 +58,11 @@ module ZohoHub
 
       def setup_connection
         ZohoHub.configure do |config|
-          config.client_id    = @options[:client_id] || ENV['ZOHO_CLIENT_ID']
-          config.secret       = @options[:secret] || ENV['ZOHO_SECRET']
+          config.client_id    = @options[:client_id] || ENV.fetch('ZOHO_CLIENT_ID', nil)
+          config.secret       = @options[:secret] || ENV.fetch('ZOHO_SECRET', nil)
         end
 
-        refresh_token = @options[:refresh_token] || ENV['ZOHO_REFRESH_TOKEN']
+        refresh_token = @options[:refresh_token] || ENV.fetch('ZOHO_REFRESH_TOKEN', nil)
         token_params = ZohoHub::Auth.refresh_token(refresh_token)
 
         if configuration_incomplete?(refresh_token)
@@ -84,9 +84,7 @@ module ZohoHub
         FileUtils.mkdir_p(modules_path)
         file_name = File.join(modules_path, "#{info[:api_name]}.json")
 
-        File.open(file_name, 'w') do |file|
-          file.write(JSON.pretty_generate(info))
-        end
+        File.write(file_name, JSON.pretty_generate(info))
 
         return unless info[:api_supported]
 
@@ -99,9 +97,7 @@ module ZohoHub
         FileUtils.mkdir_p(fields_path)
         file_name = File.join(fields_path, "#{info[:api_name]}.json")
 
-        File.open(file_name, 'w') do |file|
-          file.write(JSON.pretty_generate(fields_array))
-        end
+        File.write(file_name, JSON.pretty_generate(fields_array))
       end
 
       def parse(argv, _env)
@@ -109,13 +105,12 @@ module ZohoHub
         true
       rescue OptionParser::ParseError => e
         error_output(e)
+        false
       end
 
       def error_output(error)
         warn "Error: #{error}"
         warn "Try `#{parser.program_name} server --help' for more information"
-
-        false
       end
     end
   end

data/lib/zoho_hub/connection.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'faraday'
-require 'faraday_middleware'
 require 'rainbow'
 require 'addressable'
 
@@ -116,8 +115,7 @@ module ZohoHub
     def adapter
       Faraday.new(url: base_url) do |conn|
         conn.headers = authorization_header if access_token?
-        conn.use FaradayMiddleware::EncodeJson
-        conn.use FaradayMiddleware::ParseJson
+        conn.request :json
         conn.response :json, parser_options: { symbolize_names: true }
         conn.response :logger if ZohoHub.configuration.debug?
         conn.adapter Faraday.default_adapter

data/lib/zoho_hub/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ZohoHub
-  VERSION = '0.4.2'
+  VERSION = '0.5.0'
 end

data/lib/zoho_hub/with_attributes.rb

@@ -52,7 +52,7 @@ module ZohoHub
       end
 
       def zoho_key_translation
-        @attribute_translation.to_a.map(&:rotate).to_h
+        @attribute_translation.to_a.to_h { |k, v| [v, k] }
       end
     end
 

data/zoho_hub.gemspec

@@ -27,21 +27,11 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'addressable'
   spec.add_dependency 'backports'
-  spec.add_dependency 'faraday'
-  spec.add_dependency 'faraday_middleware'
+  spec.add_dependency 'faraday', '~> 2.0'
   spec.add_dependency 'launchy'
   spec.add_dependency 'multi_json'
   spec.add_dependency 'rainbow'
   spec.add_dependency 'sinatra'
 
-  spec.add_development_dependency 'activesupport'
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'dotenv'
-  spec.add_development_dependency 'pry-byebug'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'rubocop-rspec'
-  spec.add_development_dependency 'simplecov'
-  spec.add_development_dependency 'webmock'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: zoho_hub
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Ricardo Otero
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-30 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -42,30 +41,16 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: faraday_middleware
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
@@ -122,146 +107,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  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: bundler
-  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: 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: pry-byebug
-  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: rake
-  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: rspec
-  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: rubocop
-  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: rubocop-rspec
-  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: simplecov
-  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: webmock
-  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'
 description: Simple gem to connect to Zoho CRM API V2
 email:
 - oterosantos@gmail.com
@@ -315,8 +160,8 @@ files:
 homepage: https://github.com/rikas/zoho_hub
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -331,8 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Simple gem to connect to Zoho CRM API V2
 test_files: []