pec_calc_client 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1649565b1eb9a909a3317eefd280cc6b77c436c
-  data.tar.gz: 9aafc336b1a3c22e01278971e3c50a28dd8c75d2
+  metadata.gz: ac26ccc8942f900194dd2382978196f9dea74bf7
+  data.tar.gz: 6d27386f092e3518130b29d71718e3854396ea07
 SHA512:
-  metadata.gz: b5a19004f6e6267cc2f96f096c5b8fc16199fe27df1d82a600ffa7ff3c036071ac2708e590d2e854218c431e66d5e5de1132cec25b5d82bf7ebc691c0441fc1b
-  data.tar.gz: 910a1abf359bdc9b343c9c9981204f70f4d8f0c6b8175fac3cae28679fa29ee996f7f965d27f756e2e377cd141a3dbe8b7e18d68ef75a12542ec1ff3d6dc224a
+  metadata.gz: 186f65e3ff0ebc6602fd7d076a41dcb624a08061b4ca230c6e4211c7dc8c339bbd59407d4419830818a5676021afa2c948730ff30b6aa26bf69421af87cc2242
+  data.tar.gz: 3440513627f187a9a3817729f656b6cd0892861848e47ec2ac6f55eabf81519a523f58faf4a50334d2541f07a144722e3429b8eada157702ef1956539c8d3a2a

data/Gemfile.lock

@@ -1,32 +1,31 @@
 PATH
   remote: .
   specs:
-    pec_calc_client (1.0.0)
+    pec_calc_client (0.1.2)
       json (~> 1.8)
-      rack (~> 1.6)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.2.5)
-    faker (1.5.0)
+    faker (1.6.1)
       i18n (~> 0.5)
     i18n (0.7.0)
     json (1.8.3)
     rack (1.6.4)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.2)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.1)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.1)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.2)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
 
 PLATFORMS
   ruby
@@ -39,4 +38,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

data/README.md

@@ -23,14 +23,14 @@ Or install it yourself as:
 
 ## Usage
 
-Get Delivery Regions:
+Get Delivery Regions: 
 
 ```ruby
 require 'pec_calc_client'
 
 PecCalcClient::Region.all
 ```
-Extract Delivery Cities by region:
+Extract Delivery Cities by region: 
 
 ```ruby
 require 'pec_calc_client'

data/bin/console

@@ -7,7 +7,7 @@ require 'pec/calc/client'
 # with your gem easier. You can also use a different console, if you like.
 
 # (If you use this, don't forget to add pry to your Gemfile!)
-# require 'pry'
+# require "pry"
 # Pry.start
 
 require 'irb'

data/lib/pec_calc_client/calc.rb

@@ -1,5 +1,4 @@
 module PecCalcClient
-  # Calculator container
   class Calc
     extend RequestClass
     include RequestObject
@@ -25,9 +24,7 @@ module PecCalcClient
       out = to_h
       out[:deliver] = @delivery.to_h
       out[:take] = @take.to_h
-      out[:places] = @places.each_with_index.map do |place, i|
-        [i, place.to_a]
-      end.to_h
+      out[:places] = @places.each_with_index.map { |place, i| [i, place.to_a] }.to_h
       out
     end
 

data/lib/pec_calc_client/connector.rb

@@ -2,7 +2,6 @@ require 'net/http'
 require 'rack/utils'
 
 module PecCalcClient
-  # HTTP Connector
   class Connector
     def initialize(url)
       @url = url.to_s
@@ -21,10 +20,7 @@ module PecCalcClient
     private
 
     def prepare_params(params)
-      @params_string = Rack::Utils.build_nested_query(params).gsub(
-        /[\[\]\.\-]/,
-        '[' => '%5B', ']' => '%5D', '.' => '%2E', '-' => '%2D'
-      )
+      @params_string = Rack::Utils.build_nested_query(params).gsub(/[\[\]\.\-]/, '[' => '%5B', ']' => '%5D', '.' => '%2E', '-' => '%2D')
     end
 
     def url_with_params

data/lib/pec_calc_client/place.rb

@@ -1,22 +1,11 @@
 module PecCalcClient
-  # Delivery Place
   class Place
-    PLACE_PARAMS = %w(
-      width
-      length
-      height
-      volume
-      weight
-      oversized
-      sturdy_packaging
-    )
+    PLACE_PARAMS = %w( width length height volume weight oversized sturdy_packaging )
 
     PLACE_PARAMS.each { |param_name| attr_reader param_name }
 
     def initialize(params)
-      params.each do |k, v|
-        instance_variable_set("@#{k}", v) if PLACE_PARAMS.include? k.to_s
-      end
+      params.each { |k, v| instance_variable_set("@#{k}", v) if PLACE_PARAMS.include? k.to_s }
     end
 
     def to_a

data/lib/pec_calc_client/region.rb

@@ -1,5 +1,4 @@
 module PecCalcClient
-  # Delivery region
   class Region
     URL = 'http://pecom.ru/ru/calc/towns.php'
 
@@ -7,13 +6,12 @@ module PecCalcClient
 
     def initialize(name, towns)
       @name = name
-      @towns = towns.collect { |id, town_name| Town.new id, town_name }
+      @towns = towns.collect { |id, name| Town.new id, name }
     end
 
     def self.all
-      Connector.new(self::URL).request.to_hash.collect do |name, towns|
-        new name, towns
-      end
+      @all = Connector.new(self::URL).request.to_hash.collect { |name, towns| new name, towns } if @all.nil?
+      @all
     end
   end
 end

data/lib/pec_calc_client/town.rb

@@ -1,5 +1,4 @@
 module PecCalcClient
-  # Delivery town
   class Town
     attr_reader :id, :name
 
@@ -9,9 +8,8 @@ module PecCalcClient
     end
 
     def self.all
-      Connector.new(URL).request.to_json.collect do |town|
-        new town
-      end
+      @all = Connector.new(URL).request.to_json.map{ |town| new town } if @all.nil?
+      @all
     end
   end
 end

data/spec/pec_calc_client/calc_spec.rb

@@ -1,37 +1,8 @@
 describe 'Calc' do
-  calc_params = {
-    plombir: 12,
-    strah: 33,
-    ashan: 1,
-    night: 1,
-    pal: 3,
-    pallets: 4
-  }
-  place_params = {
-    width: 0.5,
-    length: 0.3,
-    height: 0.5,
-    volume: 0.2,
-    weight: 0.03,
-    oversized: true,
-    sturdy_packaging: true
-  }
-  delivery_params = {
-    town: 134_104,
-    tent: 1,
-    gidro: 1,
-    manip: 1,
-    speed: 0,
-    moscow: 0
-  }
-  take_params = {
-    town: 175_004,
-    tent: 1,
-    gidro: 1,
-    manip: 1,
-    speed: 1,
-    moscow: 1
-  }
+  calc_params = { plombir: 12, strah: 33, ashan: 1, night: 1, pal: 3, pallets: 4 }
+  place_params = { width: 0.5, length: 0.3, height: 0.5, volume: 0.2, weight: 0.03, oversized: true, sturdy_packaging: true }
+  delivery_params = { town: 134_104, tent: 1, gidro: 1, manip: 1, speed: 0, moscow: 0 }
+  take_params = { town: 175_004, tent: 1, gidro: 1, manip: 1, speed: 1, moscow: 1 }
 
   let! :calc do
     calc = PecCalcClient::Calc.new calc_params
@@ -44,9 +15,7 @@ describe 'Calc' do
   describe '#initialize' do
     it 'Should be initialized' do
       calc = PecCalcClient::Calc.new(calc_params)
-      hash_of_params = PecCalcClient::Calc::PARAMS.map do |k|
-        [k.to_sym, calc.send(k)]
-      end.to_h
+      hash_of_params = PecCalcClient::Calc::PARAMS.map { |k| [k.to_sym, calc.send(k)] }.to_h
       expect(hash_of_params).to eq calc_params
     end
   end

data/spec/pec_calc_client/connector_spec.rb

@@ -18,8 +18,7 @@ describe 'Connector' do
     end
 
     it 'Raise Exception' do
-      expect(-> { bad_connector.request })
-        .to raise_error(PecCalcClient::ConnectionError)
+      expect(-> { bad_connector.request }).to raise_error(PecCalcClient::ConnectionError)
     end
   end
 end

data/spec/pec_calc_client/delivery_spec.rb

@@ -1,19 +1,10 @@
 describe 'Delivery' do
-  delivery_params = {
-    town: 64_883,
-    tent: 1,
-    gidro: 1,
-    manip: 1,
-    speed: 0,
-    moscow: 0
-  }
+  delivery_params = { town: 64_883, tent: 1, gidro: 1, manip: 1, speed: 0, moscow: 0 }
 
   describe '#initialize' do
     it 'Should be initialized' do
       delivery = PecCalcClient::Delivery.new(delivery_params)
-      hash_of_params = PecCalcClient::Delivery::PARAMS.map do |k|
-        [k.to_sym, delivery.send(k)]
-      end.to_h
+      hash_of_params = PecCalcClient::Delivery::PARAMS.map { |k| [k.to_sym, delivery.send(k)] }.to_h
       expect(hash_of_params).to eq delivery_params
     end
   end

data/spec/pec_calc_client/place_spec.rb

@@ -1,27 +1,12 @@
-describe 'Place' do
-  place_params = {
-    width: 0.5,
-    length: 0.3,
-    height: 0.5,
-    volume: 0.2,
-    weight: 0.03,
-    oversized: 1,
-    sturdy_packaging: 1
-  }
+describe do
+  'Place'
+  place_params = { width: 0.5, length: 0.3, height: 0.5, volume: 0.2, weight: 0.03, oversized: 1, sturdy_packaging: 1 }
   let!(:place) { PecCalcClient::Place.new place_params }
 
   describe '#initialize' do
     it 'Should be initialized' do
       place = PecCalcClient::Place.new(place_params)
-      expect([
-        place.width,
-        place.length,
-        place.height,
-        place.volume,
-        place.weight,
-        place.oversized,
-        place.sturdy_packaging
-      ]).to eq place_params.values
+      expect([place.width, place.length, place.height, place.volume, place.weight, place.oversized, place.sturdy_packaging]).to eq place_params.values
     end
   end
 

data/spec/pec_calc_client/region_spec.rb

@@ -1,10 +1,8 @@
+
 describe 'Region' do
   describe '#initialize' do
     it 'Should initialize' do
-      region = PecCalcClient::Region.new(
-        'RegionName',
-        [{ id: 14, name: 'Name1' }, { id: 11, name: 'Name' }]
-      )
+      region = PecCalcClient::Region.new('RegionName', [{ id: 14, name: 'Name1' }, { id: 11, name: 'Name' }])
       expect(region.name).to eq 'RegionName'
       expect(region.towns.first.class.to_s).to eq 'PecCalcClient::Town'
     end

data/spec/pec_calc_client/response_spec.rb

@@ -12,8 +12,7 @@ describe 'Response' do
     end
 
     it 'Raise Exception BadResponse' do
-      expect(-> { not_found_connector.request })
-        .to raise_error(PecCalcClient::BadResponse)
+      expect(-> { not_found_connector.request }).to raise_error(PecCalcClient::BadResponse)
     end
   end
 

data/spec/pec_calc_client/take_spec.rb

@@ -4,9 +4,7 @@ describe 'Take' do
   describe '#initialize' do
     it 'Should be initialized' do
       take = PecCalcClient::Take.new(take_params)
-      hash_of_params = PecCalcClient::Take::PARAMS.map do |k|
-        [k.to_sym, take.send(k)]
-      end.to_h
+      hash_of_params = PecCalcClient::Take::PARAMS.map { |k| [k.to_sym, take.send(k)] }.to_h
       expect(hash_of_params).to eq take_params
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pec_calc_client
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - MAXOPKA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-14 00:00:00.000000000 Z
+date: 2016-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -24,23 +24,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-description: |-
-  Gem for working with public API http://pecom.ru/business/dev
-                      elopers/api_public/
+description: Gem for working with public API http://pecom.ru/business/developers/api_public/
 email: d.n.krivenko@gmail.com
 executables: []
 extensions: []
@@ -62,7 +46,6 @@ files:
 - lib/pec_calc_client/response.rb
 - lib/pec_calc_client/take.rb
 - lib/pec_calc_client/town.rb
-- lib/pec_calc_client/version.rb
 - spec/pec_calc_client/calc_result_spec.rb
 - spec/pec_calc_client/calc_spec.rb
 - spec/pec_calc_client/connector_spec.rb
@@ -94,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Gem for PEC transport Company API

data/lib/pec_calc_client/version.rb

@@ -1,9 +0,0 @@
-module PecCalcClient #:nodoc:
-  module VERSION #:nodoc:
-    MAJOR = 1
-    MINOR = 0
-    TINY  = 0
-
-    STRING = [MAJOR, MINOR, TINY].join('.')
-  end
-end