novaposhta_api 0.1.0 → 0.1.1

data/lib/novaposhta_api/client.rb

@@ -2,11 +2,12 @@
 
 module NovaposhtaApi
   class Client
-    attr_reader :api_url, :api_key
+    API_URL = 'https://api.novaposhta.ua/v2.0/json/'
 
-    def initialize(api_url: nil, api_key:)
-      @api_url = api_url || ENV['NOVAPOSHTA_URL']
-      @api_key = api_key || delivery_member_api_key || ENV['NOVAPOSHTA_KEY']
+    attr_reader :api_key
+
+    def initialize(api_key: nil)
+      @api_key = api_key
     end
 
     def self.resources
@@ -20,7 +21,7 @@ module NovaposhtaApi
     end
 
     def method_missing(name, *args, &block)
-      if self.class.resources.keys.include?(name)
+      if with_resource?(name)
         resources[name] ||= self.class.resources[name].new(connection: connection)
         resources[name]
       else
@@ -29,7 +30,11 @@ module NovaposhtaApi
     end
 
     def respond_to_missing?(method_name, include_private = false)
-      self.class.resources.keys.include?(method_name) || super
+      with_resource?(method_name) || super
+    end
+
+    def with_resource?(resource_name)
+      self.class.resources.keys.include?(resource_name)
     end
 
     def resources
@@ -38,13 +43,9 @@ module NovaposhtaApi
 
     def connection
       @connection ||= NovaposhtaApi::HttpClient.new(
-        uri: api_url,
+        uri: API_URL,
         api_key: api_key
       )
     end
-
-    def delivery_member_api_key
-      @delivery_member_api_key ||= Delivery::Member.select(:api_key).primary&.api_key
-    end
   end
 end

data/lib/novaposhta_api/http_client.rb

@@ -22,8 +22,7 @@ module NovaposhtaApi
     end
 
     def request(http_method, path, params = {})
-      options = build_options(path).merge!(methodProperties: transform_keys(params))
-
+      options = build_options(path).merge(methodProperties: transform_keys(params))
       response = connection.public_send(http_method, '', options.to_json)
       response.body
     end
@@ -55,9 +54,8 @@ module NovaposhtaApi
     def connection
       @connection ||= Faraday.new(connection_options) do |client|
         client.adapter Faraday.default_adapter
-        client.use NovaposhtaApi::Middlewares::ErrorHandling
+        client.response :error_handling
         client.response :json
-        client.response :logger if Rails.env.development?
       end
     end
 

data/lib/novaposhta_api/middlewares/error_handling.rb

@@ -18,7 +18,7 @@ module NovaposhtaApi
       def from_codes(codes = [])
         return nil if codes.blank?
 
-        codes.map { |code| I18n.t(code, scope: %i[NovaposhtaApi errors]) }
+        codes.map { |code| I18n.t(code, scope: %i[novaposhta errors]) }
       end
     end
   end

data/lib/novaposhta_api/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NovaposhtaApi
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: novaposhta_api
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - venet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-22 00:00:00.000000000 Z
+date: 2020-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -75,6 +75,9 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- config/locales/novaposhta.en.yml
+- config/locales/novaposhta.ru.yml
+- config/locales/novaposhta.uk.yml
 - lib/novaposhta_api.rb
 - lib/novaposhta_api/client.rb
 - lib/novaposhta_api/collection.rb