dpd_api 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: babe69db95fe1be702cd44dee772659e0a13eeaf
-  data.tar.gz: 4c43ed756134fb57e1f290693a0ee24155d9f659
+  metadata.gz: 1c1ccaffe0337bc75523c4da9c7faccab238e4fb
+  data.tar.gz: 6884ac90c938972fdb4488b46ef039b17f6fd5a7
 SHA512:
-  metadata.gz: 618d8cabd267b33ed0c85ca3fdddf73d2f2c5116328b536528f77e2a90130f7b3cf806438e9318267365feb986c4cd0cd71c0f52bfab5d552c9ad08147220d92
-  data.tar.gz: 4e4db970d67dc2cb6393e44c846a867b704218f62005242e3066c054b83519336c75d662cddbf447e496ab00eb90df365f9f676e0280d5bc0c3302c66734f58b
+  metadata.gz: b31b595ca5d239701d50563b3267fdd6f7496fb94ce0c14576023dcd6be3ff113bfb2766183f3612be33dd45500ee2ea94532a31019e344bb90e6518e0016ba4
+  data.tar.gz: 6f08d0af33e3b955b3909a656b3b3dc1ee9024884dd73a165390d5467c4f515c4f33dcf091cdd519ac9eaabbd0bf91d89b163f313f76d534f83d982814c7ad61

data/.env.example

@@ -0,0 +1,2 @@
+DPD_CLIENT_KEY=123
+DPD_CLIENT_NUMBER=234

data/.gitignore

@@ -12,3 +12,4 @@
 *.o
 *.a
 mkmf.log
+.env

data/dpd_api.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "dotenv"
 end

data/lib/dpd_api/client/response.rb

@@ -19,20 +19,21 @@ module DpdApi
         rescue Savon::SOAPFault => error
           { errors: error.to_s }
         end
-        notify_observers(@url, builder.merged_params, builder.response_body, result)
+        notify_observers(@url, builder.request_params, builder.response_body, result)
         result
       end
 
       private
 
       class ResourceBuilder
-        attr_reader :merged_params, :response_body
+        attr_reader :merged_params, :response_body, :request_params
 
         def initialize(client, method, params = {}, options = {})
           @client  = client
           @method  = method
+          @params  = params
           @namespace = options.delete(:namespace)
-          @merged_params = merge_auth_params(params)
+          @merged_params = merge_auth_params
         end
 
         def resources
@@ -44,9 +45,9 @@ module DpdApi
 
         private
 
-        def merge_auth_params(params = {})
+        def merge_auth_params
           auth_params = DpdApi.configuration.auth_params.clone
-          auth_params.deep_merge!(params)
+          auth_params.deep_merge!(@params)
         end
 
         def response
@@ -55,7 +56,7 @@ module DpdApi
 
         def request
           namespace = @namespace || :request
-          @merged_params.blank? ? @merged_params : { namespace => @merged_params  }
+          @request_params ||= @params.blank? ? @merged_params : { namespace => @merged_params  }
         end
       end
     end

data/lib/dpd_api/configuration.rb

@@ -1,5 +1,10 @@
 # encoding: utf-8
 
+begin
+  require 'dotenv'
+  Dotenv.load
+end
+
 module DpdApi
   class << self
     attr_accessor :configuration
@@ -19,8 +24,8 @@ module DpdApi
     attr_reader :auth_params
 
     def initialize
-      @client_key    = '123'
-      @client_number = '234'
+      @client_key    = ENV['DPD_CLIENT_KEY']    || '123'
+      @client_number = ENV['DPD_CLIENT_NUMBER'] || '234'
       @base_url      = 'http://wstest.dpd.ru'
       @debug         = false
     end

data/lib/dpd_api/debug/inspector.rb

@@ -6,11 +6,11 @@ module Debug
       client.add_observer(self)
     end
 
-    def update(url, params, response_body, result)
+    def update(url, request, response, result)
       p '--------------------------'
       p "SENDING REQUEST TO: #{url}"
-      p "WITH PARAMS:        #{params}"
-      p "GETTING RESPONSE:   #{response_body}"
+      p "WITH PARAMS:        #{request}"
+      p "GETTING RESPONSE:   #{response}"
       p "RESULT:             #{result}"
       p '--------------------------'
     end

data/lib/dpd_api/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module DpdApi
-  VERSION = "0.1.3"
+  VERSION = "0.1.5"
 end

data/spec/lib/dpd_api/calculator_spec.rb

@@ -10,8 +10,8 @@ describe DpdApi::Calculator do
   let(:auth) do
     { request: {
       auth: {
-        client_number: "234",
-        client_key:    "123"
+        client_number: ENV['DPD_CLIENT_NUMBER'] || '234',
+        client_key:    ENV['DPD_CLIENT_KEY']    || '123'
       } } }
   end
   let(:message) { auth.clone.deep_merge!({ request: params }) }

data/spec/lib/dpd_api/configuration_spec.rb

@@ -3,8 +3,8 @@
 require 'spec_helper'
 
 describe DpdApi do
-  let(:client_key)    { '123' }
-  let(:client_number) { '234' }
+  let(:client_key)    { ENV['DPD_CLIENT_KEY']    || '123' }
+  let(:client_number) { ENV['DPD_CLIENT_NUMBER'] || '234' }
   let(:base_url)      { 'http://wstest.dpd.ru' }
   let(:auth_params) do
     {

data/spec/lib/dpd_api/geography_spec.rb

@@ -8,11 +8,10 @@ describe DpdApi::Geography do
   after(:all)  { savon.unmock! }
 
   let(:auth) do
-    { request: {
-      auth: {
-        client_number: "234",
-        client_key:    "123"
-      } } }
+    { auth: {
+      client_number: ENV['DPD_CLIENT_NUMBER'] || '234',
+      client_key:    ENV['DPD_CLIENT_KEY']    || '123'
+    } }
   end
   let(:message) { auth }
 

data/spec/lib/dpd_api/order_spec.rb

@@ -10,8 +10,8 @@ describe DpdApi::Order do
   let(:auth) do
     { request: {
       auth: {
-        client_number: "234",
-        client_key:    "123"
+        client_number: ENV['DPD_CLIENT_NUMBER'] || '234',
+        client_key:    ENV['DPD_CLIENT_KEY']    || '123'
       } } }
   end
   let(:message) { auth.clone.deep_merge!({ request: params }) }

data/spec/lib/dpd_api/tracing_spec.rb

@@ -10,8 +10,8 @@ describe DpdApi::Order do
   let(:auth) do
     { request: {
       auth: {
-        client_number: "234",
-        client_key:    "123"
+        client_number: ENV['DPD_CLIENT_NUMBER'] || '234',
+        client_key:    ENV['DPD_CLIENT_KEY']    || '123'
       } } }
   end
   let(:message) { auth.clone.deep_merge!({ request: params }) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dpd_api
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Ponomarev Nikolay
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dotenv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby / Rails wrapper for Dpd's SOAP API
 email:
 - itsnikolay@gmail.com
@@ -73,6 +87,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".env.example"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"