novaposhta_api 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27b5e088bffd8d40473377c7f1a385845da0bd2e927e6dabccf1768bc8e082ac
-  data.tar.gz: b372fdda387d3624bb89af76741fdd340901b33684b26c00a6ad3906c965eb3b
+  metadata.gz: 979e8503642e0311557adf2f503d6fea346d15bde8fc638f1fcdac4ab1b41b6a
+  data.tar.gz: 9f787311d1bac8896aa7db12033a6868797ee86455b49ae99895508fef586847
 SHA512:
-  metadata.gz: 11af93b86668497b2984bc84ad23248800a8627fd6851e363a6a7c6587b96b73f92664063b90b06e1d257dda71c0fa5115eb6cc86bfeae3ced4cf24242e5cff4
-  data.tar.gz: 55eaee4db23d4cf22d3d332aa0109e32c27eab888c9b0920422ff9ad4afb7c6a978a5ec1a4e34d31ae12195f17aca2b6b487b2530fd54cfcc5569fcef1817ca1
+  metadata.gz: 3c02d4ce41f85b731e55e1271653d4679c3a36a06a677221017a1c7d70d9ea025340c764c7c34f42a6395f1754b079e67c52caeed1ba39468f32f431b3f13b92
+  data.tar.gz: 9522235cb31bb5ff29ed162c5a0630dfa60fe64363efa49353172d909b6d8fec1963b0f16c48a3e1f76f56ed5633d55bb3b8db7255602b8348d531d4cf1dbe25

data/README.md

@@ -1,8 +1,6 @@
 # NovaposhtaApi
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/novaposhta_api`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+Simple Novaposhta API 2.0 Ruby client. API documentation by link https://devcenter.novaposhta.ua/docs/services/
 
 ## Installation
 
@@ -20,19 +18,47 @@ Or install it yourself as:
 
     $ gem install novaposhta_api
 
+## Setup
+
+```
+NovaposhtaApi.setup do |config|
+  config.api_url = 'https://api.novaposhta.ua/v2.0/json/'
+  config.api_key = 'KEY'
+end
+```
+
 ## Usage
 
-TODO: Write usage instructions here
+Define API client:
+```
+client = NovaposhtaApi::Client.new
+```
 
-## Development
+Cities:
+```
+client.cities.all
+```
 
-After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+Settlements:
+```
+client.settlements.all
+```
+
+Warehouses:
+```
+client.warehouses.all
+```
+
+Create internet document:
+```
+client.internet_documents.create(params)
+```
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+TODO
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/novaposhta_api. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/novaposhta_api/blob/master/CODE_OF_CONDUCT.md).
+Bug reports and pull requests are welcome on GitHub at https://github.com/venethub/novaposhta_api. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/venethub/novaposhta_api/blob/master/CODE_OF_CONDUCT.md).
 
 
 ## License
@@ -41,4 +67,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the NovaposhtaApi project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/novaposhta_api/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the NovaposhtaApi project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/venethub/novaposhta_api/blob/master/CODE_OF_CONDUCT.md).

data/lib/novaposhta_api.rb

@@ -52,7 +52,7 @@ module NovaposhtaApi
 
   # @example
   #   NovaposhtaApi.setup do |config|
-  #     config.api_url = "https://api.novaposhta.ua/v2.0/json/"
+  #     config.api_url = 'https://api.novaposhta.ua/v2.0/json/'
   #   end
   #
   def self.setup

data/lib/novaposhta_api/client.rb

@@ -6,6 +6,8 @@ module NovaposhtaApi
 
     def initialize(api_key: nil)
       @api_key = api_key
+
+      yield(http.connection) if block_given?
     end
 
     def self.resources
@@ -21,7 +23,7 @@ module NovaposhtaApi
 
     def method_missing(name, *args, &block)
       if with_resource?(name)
-        resources[name] ||= self.class.resources[name].new(connection: connection)
+        resources[name] ||= self.class.resources[name].new(http: http)
         resources[name]
       else
         super
@@ -40,8 +42,8 @@ module NovaposhtaApi
       @resources ||= {}
     end
 
-    def connection
-      @connection ||= NovaposhtaApi::HttpClient.new(
+    def http
+      @http ||= NovaposhtaApi::HttpClient.new(
         uri: NovaposhtaApi.configuration.api_url,
         api_key: api_key || NovaposhtaApi.configuration.api_key
       )

data/lib/novaposhta_api/http_client.rb

@@ -11,6 +11,8 @@ module NovaposhtaApi
 
     def initialize(config)
       @config = config.with_indifferent_access
+
+      yield(connection) if block_given?
     end
 
     def uri
@@ -27,20 +29,16 @@ module NovaposhtaApi
       response.body
     end
 
-    private
-
-    def transform_keys(params)
-      convert_params_to_hash(params).deep_transform_keys { |key| key.to_s.camelcase }
-    end
-
-    def convert_params_to_hash(params)
-      if params.respond_to?(:to_unsafe_h)
-        params.to_unsafe_h
-      else
-        params
+    def connection
+      @connection ||= Faraday.new(connection_options) do |client|
+        client.adapter Faraday.default_adapter
+        client.response :error_handling
+        client.response :json
       end
     end
 
+    private
+
     def build_options(path)
       paths = path.split('/')
 
@@ -51,19 +49,23 @@ module NovaposhtaApi
       }
     end
 
-    def connection
-      @connection ||= Faraday.new(connection_options) do |client|
-        client.adapter Faraday.default_adapter
-        client.response :error_handling
-        client.response :json
-      end
-    end
-
     def connection_options
       {
         url: uri,
         headers: DEFAULT_HEADERS
       }
     end
+
+    def transform_keys(params)
+      convert_params_to_hash(params).deep_transform_keys { |key| key.to_s.camelcase }
+    end
+
+    def convert_params_to_hash(params)
+      if params.respond_to?(:to_unsafe_h)
+        params.to_unsafe_h
+      else
+        params
+      end
+    end
   end
 end

data/lib/novaposhta_api/models/city.rb

@@ -7,6 +7,9 @@ module NovaposhtaApi
       property :city_id, from: :CityID
       property :area, from: :Area
       property :description, from: :Description
+      property :description_ru, from: :DescriptionRu
+      property :settlement_type_description, from: :SettlementTypeDescription
+      property :settlement_type_description_ru, from: :SettlementTypeDescriptionRu
     end
   end
 end

data/lib/novaposhta_api/models/warehouse.rb

@@ -6,7 +6,9 @@ module NovaposhtaApi
       property :ref, from: :Ref
       property :city_ref, from: :CityRef
       property :city_description, from: :CityDescription
+      property :city_description_ru, from: :CityDescriptionRu
       property :description, from: :Description
+      property :description_ru, from: :DescriptionRu
       property :short_address, from: :ShortAddress
       property :longitude, from: :Longitude
       property :latitude, from: :Latitude

data/lib/novaposhta_api/resource.rb

@@ -2,18 +2,17 @@
 
 module NovaposhtaApi
   class Resource
-    attr_reader :connection
+    attr_reader :http
 
     HTTP_METHODS = %i[get post patch put delete].freeze
-    CACHE_OPTIONS = {expires_in: 1.day}.freeze
 
-    def initialize(connection: nil)
-      @connection = connection
+    def initialize(http: nil)
+      @http = http
     end
 
     HTTP_METHODS.each do |http_method|
       define_method http_method do |*args|
-        response = connection.request(http_method, *args)
+        response = http.request(http_method, *args)
         response['data']
       end
     end

data/lib/novaposhta_api/resources/city_resource.rb

@@ -4,9 +4,7 @@ module NovaposhtaApi
   module Resources
     class CityResource < Resource
       def all(params = {})
-        response = Rails.cache.fetch("cities/#{params}", CACHE_OPTIONS) do
-          post('Address/getCities', params)
-        end
+        response = post('Address/getCities', params)
 
         NovaposhtaApi::Models::City.extract_collection(response)
       end

data/lib/novaposhta_api/resources/settlement_resource.rb

@@ -4,9 +4,7 @@ module NovaposhtaApi
   module Resources
     class SettlementResource < Resource
       def all(params = {})
-        response = Rails.cache.fetch("settlements/#{params}", CACHE_OPTIONS) do
-          post('Address/searchSettlements', params)
-        end
+        response = post('Address/searchSettlements', params)
 
         NovaposhtaApi::Models::Settlement.extract_collection(response[0]['Addresses'])
       end

data/lib/novaposhta_api/resources/warehouse_resource.rb

@@ -4,9 +4,7 @@ module NovaposhtaApi
   module Resources
     class WarehouseResource < Resource
       def all(params = {})
-        response = Rails.cache.fetch("warehouses/#{params}", CACHE_OPTIONS) do
-          post('Address/getWarehouses', params)
-        end
+        response = post('Address/getWarehouses', params)
 
         NovaposhtaApi::Models::Warehouse.extract_collection(response)
       end

data/lib/novaposhta_api/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: novaposhta_api
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - venet
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-27 00:00:00.000000000 Z
+date: 2021-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -108,7 +108,7 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/venethub/novaposhta_api
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -123,9 +123,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: Novaposhta API 2.0 client
 test_files: []