pec_calc_client 0.1.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 061c7195b4134e7398830f60428628c237ea35e6
-  data.tar.gz: 355d4faabba4869da2d6b03314f9033e77ad8739
+  metadata.gz: 1f8e024637ff9ea194e3506a0c4136ee40f4925c
+  data.tar.gz: ed9b333c2e543865d30173cc07145ca1c41b0e0b
 SHA512:
-  metadata.gz: a396004dfbb4c6e4c5fe85ae98f6866aee5589bebda8b7ac7778125ae832605151b17a1395036d11d7560a670d66abd2019f0d0fe6ca9fc5e69792e98bf79879
-  data.tar.gz: 5392fcb455cc9d3b26ad88fe3e99e1743e745525d2fb564ee5a7e3cb24d186e3db2b54e2ee9319062f3aaf052fa81b07a82f2b178480e0a457faffb9530314a3
+  metadata.gz: a2e2c8563ef730037e0f96f39e4929723cc444d1dbf2791ec75d6f757333dba1295a99eedc10ce8189d376bd60c46918aa0f169ca8898c113bde45498820bb09
+  data.tar.gz: 8efe7beee275daa3df819d053f26ec30b632b0d2a53ead28c40eb2552a0a8adbab3067e9f9908ba7cf54f0320427e0a3ed964ed53fa3be9b7310e1cf2bf158a9

data/Gemfile

@@ -8,4 +8,5 @@ group :development do
   gem 'faker'
 end
 
+gem 'rack'
 gem 'json'

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    pec_calc_client (0.1.0)
+    pec_calc_client (0.1.2)
+      json (~> 1.8)
 
 GEM
   remote: https://rubygems.org/
@@ -11,6 +12,7 @@ GEM
       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)
@@ -32,6 +34,7 @@ DEPENDENCIES
   faker
   json
   pec_calc_client!
+  rack
   rspec
 
 BUNDLED WITH

data/README.md

@@ -4,6 +4,7 @@ Gem for integration with API transport company PEC
 
 [API description](http://pecom.ru/business/developers/api_public/)
 
+[![Gem Version](https://badge.fury.io/rb/pec_calc_client.svg)](https://badge.fury.io/rb/pec_calc_client)
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/pec_calc_client/calc.rb

@@ -0,0 +1,39 @@
+module PecCalcClient
+  class Calc
+
+    extend RequestClass
+    include RequestObject
+
+    URL = 'http://pecom.ru/bitrix/components/pecom/calc/ajax.php'
+
+    PARAMS = %w{ plombir strah ashan night pal pallets }
+
+    set_readers
+
+    attr_accessor :delivery, :take, :places
+
+    def initialize(params)
+      set_params params
+    end
+
+    def calc
+      result = Connector.new(URL).request(prepare_params)
+      prepare_result result.to_hash
+    end
+
+    def prepare_params
+      out = to_h
+      out[:deliver] = @delivery.to_h
+      out[:take] = @take.to_h
+      out[:places] = @places.each_with_index.map{ |place, i| [ i, place.to_a ] }.to_h
+      out
+    end
+
+    private
+
+    def prepare_result(result)
+      CalcResult.new result.to_hash
+    end
+
+  end
+end

data/lib/pec_calc_client/calc_result.rb

@@ -0,0 +1,11 @@
+module PecCalcClient
+  class CalcResult
+
+    attr_reader :result
+
+    def initialize(params)
+      @result = params
+    end
+
+  end
+end

data/lib/pec_calc_client/connector.rb

@@ -1,4 +1,5 @@
 require 'net/http'
+require 'rack/utils'
 
 module PecCalcClient
   class Connector
@@ -6,13 +7,24 @@ module PecCalcClient
       @url = url.to_s
     end
 
-    def request
+    def request(params = {})
+      prepare_params params
       begin
-        response = Net::HTTP.get_response(URI(@url))
+        response = Net::HTTP.get_response(URI(url_with_params))
       rescue
         raise PecCalcClient::ConnectionError, 'Bad connection'
       end
-      @response = Response.new response
+      Response.new response
+    end
+
+    private
+
+    def prepare_params(params)
+      @params_string = Rack::Utils.build_nested_query(params).gsub(/[\[\]\.\-]/, '[' => '%5B', ']' => '%5D', '.' => '%2E', '-' => '%2D')
+    end
+
+    def url_with_params
+      "#{@url}?#{@params_string}"
     end
   end
 end

data/lib/pec_calc_client/delivery.rb

@@ -0,0 +1,15 @@
+module PecCalcClient
+  class Delivery
+
+    extend RequestClass
+    include RequestObject
+
+    PARAMS = %w{ town tent gidro manip speed moscow }
+
+    set_readers
+
+    def initialize(params)
+      set_params params
+    end
+  end
+end

data/lib/pec_calc_client/place.rb

@@ -0,0 +1,16 @@
+module PecCalcClient
+  class Place
+
+    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{ |k, v| instance_variable_set("@#{ k }", v) if PLACE_PARAMS.include? k.to_s }
+    end
+
+    def to_a
+      PLACE_PARAMS.map{ |k| instance_variable_get("@#{ k }") }
+    end
+  end
+end

data/lib/pec_calc_client/response.rb

@@ -4,11 +4,11 @@ module PecCalcClient
   class Response
     def initialize(response)
       @response = response
-      raise BadResponse, 'Respons Code not 200' if response.code != '200'
+      raise BadResponse, 'Respons Code not 200' if @response.code != '200'
     end
 
     def to_hash
-      JSON.parse @response.body
+      JSON.parse @response.body if @response.body.to_s != ''
     end
   end
 end

data/lib/pec_calc_client/take.rb

@@ -0,0 +1,16 @@
+module PecCalcClient
+  class Take
+
+    extend RequestClass
+    include RequestObject
+
+    PARAMS = %w{ town tent gidro manip speed moscow }
+
+    set_readers
+
+    def initialize(params)
+      set_params params
+    end
+
+  end
+end

data/lib/pec_calc_client/version.rb

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

data/lib/pec_calc_client.rb

@@ -1,8 +1,22 @@
-# require 'pec/calc/client/version'
-
-Dir["#{ File.dirname(__FILE__) }/pec_calc_client/*.rb"].each {|file| require file }
-
 module PecCalcClient
   class ConnectionError < Exception; end
   class BadResponse < Exception; end
+
+  module RequestClass
+    def set_readers
+      self::PARAMS.each{ |param_name| attr_reader param_name }
+    end
+  end
+
+  module RequestObject
+    def set_params(params)
+      params.each{ |k, v| instance_variable_set("@#{ k }", v) if self.class::PARAMS.include? k.to_s }
+    end
+
+    def to_h
+      self.class::PARAMS.map{ |k| [k, instance_variable_get("@#{ k }") ] }.to_h
+    end
+  end
 end
+
+Dir["#{ File.dirname(__FILE__) }/pec_calc_client/*.rb"].each {|file| require file }

data/spec/pec_calc_client/calc_result_spec.rb

@@ -0,0 +1,8 @@
+describe 'CalcResult' do
+  describe '#initialize' do
+    it 'Should be initialized' do
+      calc_result = PecCalcClient::CalcResult.new(Hash.new)
+      expect(calc_result.result.class).to eq Hash
+    end
+  end
+end

data/spec/pec_calc_client/calc_spec.rb

@@ -0,0 +1,30 @@
+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: 134104, tent: 1, gidro: 1, manip: 1, speed: 0, moscow: 0 }
+  take_params = { town: 175004, tent: 1, gidro: 1, manip: 1, speed: 1, moscow: 1 }
+
+  let! :calc do
+    calc = PecCalcClient::Calc.new calc_params
+    calc.places = (1..3).map{ PecCalcClient::Place.new place_params }
+    calc.delivery = PecCalcClient::Delivery.new delivery_params
+    calc.take = PecCalcClient::Take.new take_params
+    calc
+  end
+
+  describe '#initialize' do
+    it 'Should be initialized' do
+      calc = PecCalcClient::Calc.new(calc_params)
+      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
+
+  describe '#calc' do
+    it 'Should return result' do
+      result = calc.calc
+      expect(result.class.to_s).to eq 'PecCalcClient::CalcResult'
+    end
+  end
+end

data/spec/pec_calc_client/delivery_spec.rb

@@ -0,0 +1,12 @@
+describe 'Delivery' do
+
+  delivery_params = { town: 64883, 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{ |k| [ k.to_sym, delivery.send(k) ] }.to_h
+      expect(hash_of_params).to eq delivery_params
+    end
+  end
+end

data/spec/pec_calc_client/place_spec.rb

@@ -0,0 +1,18 @@
+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
+    end
+  end
+
+  describe '#to_a' do
+    it 'Shold return correctly string' do
+      expect(place.to_a).to eq place_params.values
+    end
+  end
+end

data/spec/pec_calc_client/take_spec.rb

@@ -0,0 +1,12 @@
+describe 'Take' do
+
+  take_params = { town: -457, tent: 1, gidro: 1, manip: 1, speed: 1, moscow: 1 }
+
+  describe '#initialize' do
+    it 'Should be initialized' do
+      take = PecCalcClient::Take.new(take_params)
+      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
+end

data/spec/pec_calc_client_spec.rb

@@ -1,2 +1 @@
 require 'spec_helper'
-

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: pec_calc_client
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 1.0.0
 platform: ruby
 authors:
 - MAXOPKA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-06 00:00:00.000000000 Z
+date: 2015-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !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/developers/api_public/
 email: d.n.krivenko@gmail.com
 executables: []
@@ -37,14 +51,24 @@ files:
 - bin/console
 - bin/setup
 - lib/pec_calc_client.rb
+- lib/pec_calc_client/calc.rb
+- lib/pec_calc_client/calc_result.rb
 - lib/pec_calc_client/connector.rb
+- lib/pec_calc_client/delivery.rb
+- lib/pec_calc_client/place.rb
 - lib/pec_calc_client/region.rb
 - 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
+- spec/pec_calc_client/delivery_spec.rb
+- spec/pec_calc_client/place_spec.rb
 - spec/pec_calc_client/region_spec.rb
 - spec/pec_calc_client/response_spec.rb
+- spec/pec_calc_client/take_spec.rb
 - spec/pec_calc_client/town_spec.rb
 - spec/pec_calc_client_spec.rb
 - spec/spec_helper.rb
@@ -58,17 +82,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Gem for PEC transport Company API