nova_poshta 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: baf0a2127bb62c5a4479b4b3f73917aca8607eb3
-  data.tar.gz: f74ec24bbb02caa93c0fbda878449506a0bac600
+  metadata.gz: 0829a4dcc8d7cff1fa73bdc3066bfde04ff1efae
+  data.tar.gz: b3a8ec438420c4bbe0eb808be32bb566912ce765
 SHA512:
-  metadata.gz: db600f9067af16c9f3f1fb78119639fc187352937db4843f5d5265c6a451f0774ad0735a57441da8d483c588ab0454b6955e201deef3433e6a74678197f171a9
-  data.tar.gz: b8b30f998e7e54c83a08b184a875724f9b7df5c80ae7f823dccf9a90cbe9b43ed86bde55d3eb68c3ab52ab3ecb1b165d509758ce03f5af585eec2e42f3415898
+  metadata.gz: f7a0b9db91fc55c075b34198b0ef0874dec4c6550399b27b131bc816311340dfd0c15a3f87263b54820882287f6779a86ef815fcafc951adfc9d164b1b6f3e82
+  data.tar.gz: 5082502f1ab10ac26bf738f856ac464291157256e9f8e76f1d3afa3e895714df9f7934a97a7ef372ca10dab40a3606901b950b3955917f4087cad2e66fd2da70

data/README.md

@@ -1,5 +1,6 @@
 # NovaPoshta
 
+[![Gem Version](https://badge.fury.io/rb/nova_poshta.svg)](https://badge.fury.io/rb/nova_poshta)
 [![Build Status](https://travis-ci.org/gigorok/nova_poshta.svg?branch=master)](https://travis-ci.org/gigorok/nova_poshta)
 
 Ruby-client to novaposhta.ua API2.
@@ -48,8 +49,6 @@ a.areas
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-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).
-
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/gigorok/nova_poshta. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.

data/lib/nova_poshta.rb

@@ -10,6 +10,10 @@ Dir[File.dirname(__FILE__) + '/nova_poshta/model/*.rb'].each { |f| require f }
 
 module NovaPoshta
 
+  def self.api
+    @@api ||= NovaPoshta::Api.new
+  end
+
   def self.configuration
     @configuration ||= Configuration.new
   end

data/lib/nova_poshta/api.rb

@@ -6,19 +6,18 @@ module NovaPoshta
   class Api
     API_URL = 'https://api.novaposhta.ua/v2.0/json/'.freeze
 
-    attr_accessor :api_key, :model_name
+    attr_accessor :api_key
 
-    def initialize(model_name)
+    def initialize
       self.api_key = NovaPoshta.configuration.api_key
-      self.model_name = model_name
     end
 
-    def request(called_method, method_properties={})
-      response = post(request_body(called_method, method_properties))
-      ::NovaPoshta::Result.new(response, called_method, self)
+    def request(model_name, called_method, method_properties={})
+      response = post(request_body(model_name, called_method, method_properties))
+      ::NovaPoshta::Result.new(response, called_method)
     end
 
-    def request_body(called_method, method_props={})
+    def request_body(model_name, called_method, method_props={})
       camelize_keys(
           {
               api_key: api_key,

data/lib/nova_poshta/model/address.rb

@@ -4,15 +4,15 @@ module NovaPoshta
 
       # you can use params as {find_by_string: 'Одесса'} to filter by city_name
       def cities(params={})
-        api.request('getCities', params)
+        request('getCities', params)
       end
 
       def warehouses(city_ref, params={})
-        api.request('getWarehouses', {city_ref: city_ref}.merge(params))
+        request('getWarehouses', {city_ref: city_ref}.merge(params))
       end
 
       def areas(params={})
-        api.request('getAreas', params)
+        request('getAreas', params)
       end
 
     end

data/lib/nova_poshta/model/base.rb

@@ -2,10 +2,14 @@ module NovaPoshta
   module Model
     class Base
 
-      attr_accessor :api
+      protected
 
-      def api
-        @api ||= Api.new(self.class.name.split('::').last)
+      def request(called_method, method_properties={})
+        NovaPoshta.api.request(model_name, called_method, method_properties)
+      end
+
+      def model_name
+        self.class.name.demodulize
       end
 
     end

data/lib/nova_poshta/response/area.rb

@@ -6,9 +6,38 @@ module NovaPoshta
 
       # ugly API do not provide searching by area reference
       def cities(params={})
-        @api.request('getCities', params).select { |city| city.area_ref == self.ref }
+        
+        # return NovaPoshta::Result
+        c = address.cities(params).select { |city| city.area_ref == self.ref }
+        data = c.map do |city|
+          {
+              :'Description' => city.description,
+              :'DescriptionRu' => city.description_ru,
+              :'Ref' => city.ref,
+              :'Delivery1' => city.delivery1,
+              :'Delivery2' => city.delivery2,
+              :'Delivery3' => city.delivery3,
+              :'Delivery4' => city.delivery4,
+              :'Delivery5' => city.delivery5,
+              :'Delivery6' => city.delivery6,
+              :'Delivery7' => city.delivery7,
+              :'Area' => city.area_ref,
+              :'Conglomerates' => city.conglomerates,
+              :'CityID' => city.city_id,
+          }
+        end
+
+        r = {
+            success: true,
+            data: data,
+            errors: [],
+            warnings: [],
+            info: []
+        }
+
+        ::NovaPoshta::Result.new(r.to_json, 'getCities')
       end
 
     end
   end
-end
+end

data/lib/nova_poshta/response/base.rb

@@ -2,7 +2,7 @@ module NovaPoshta
   module Response
     class Base
 
-      attr_accessor :api, :result
+      attr_accessor :result
 
       def initialize(attrs)
         attrs.each do |k, v|
@@ -14,6 +14,10 @@ module NovaPoshta
         yield self if block_given?
       end
 
+      def address
+        @address ||= Model::Address.new
+      end
+
     end
   end
 end

data/lib/nova_poshta/response/city.rb

@@ -6,11 +6,11 @@ module NovaPoshta
                     :delivery5, :delivery6, :delivery7, :area_ref, :conglomerates, :city_id
 
       def warehouses(params={})
-        @api.request('getWarehouses', {city_ref: self.ref}.merge(params))
+        address.warehouses(self.ref, params)
       end
 
       def area(params={})
-        @api.request('getAreas', params).select { |area| area.ref == self.area_ref }.first.result
+        address.areas(params).select { |area| area.ref == self.area_ref }.first.result
       end
 
       # city has area attribute, but it should be area_ref, so next writer will fix this situation

data/lib/nova_poshta/response/warehouse.rb

@@ -9,7 +9,7 @@ module NovaPoshta
 
       # ugly API do not provide searching by city reference
       def city(params={})
-        @api.request('getCities', params).select { |city| city.ref == self.city_ref }.first.result
+        address.cities(params).select { |city| city.ref == self.city_ref }.first.result
       end
 
     end

data/lib/nova_poshta/result.rb

@@ -6,11 +6,10 @@ module NovaPoshta
     attr_accessor :success, :data, :errors, :warnings, :info
     attr_reader :body, :raw_body
 
-    def initialize(raw_body, called_method, api)
+    def initialize(raw_body, called_method)
       @raw_body = raw_body
       @body = JSON.parse(raw_body)
       @called_method = called_method
-      @api = api
     end
 
     def success?
@@ -20,7 +19,6 @@ module NovaPoshta
     def data
       body['data'].map do |attrs|
         response_class.new(attrs) do |r|
-          r.api = @api
           r.result = self
         end
       end if body['data']

data/lib/nova_poshta/version.rb

@@ -1,3 +1,3 @@
 module NovaPoshta
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nova_poshta
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Igor Gonchar
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-28 00:00:00.000000000 Z
+date: 2016-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport