axiomus_api 0.5 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4985a26f843b94c45d279f4ef559d020c331b08f
-  data.tar.gz: 2f5540a9db4576d29180baaedfd0fd1fa9eedc2d
+  metadata.gz: 50bd78448890d4337232f0593a2cbe90dabe7f76
+  data.tar.gz: 325644e61718e860092725ac7dcd9f78e9497186
 SHA512:
-  metadata.gz: d9e05e9f5fe0b42853b6e51a7023b45d169a11367f5dd73ea3970b88564e5bfc3df07eecb4136a390dfcef3a83f6c2758842fe550f1da4a160fdc967b97046e7
-  data.tar.gz: 8c7033b6789cb9ffe8e265fe29dd5524e0e56f43df1278b77dac3ddf9792b606f4c3edb220853c73700bb4c8a03f19281e4311743b93b51593eb058bb495c6bc
+  metadata.gz: c30d1fc0199217f475d7c8baff0e711b4df9727d75a972c80798a4d8fe7b59385197d8e4dc6378c786d2e8f5dbb0e43c49bfc94527c889ca55fad9e771fb48ce
+  data.tar.gz: d5d2d4afb48b2bf91afdc115111ed61846b3d762e6ac4d82545f9c18d38c3f71cf303455534c538e45d91ac18c0cea4de498b4e4512b8020268019c04fc9fd49

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.1.0
+  - 2.1.2
   - 1.9.3
 install: "bundle install --path vendor/bundle"
 cache:

data/Gemfile

@@ -4,6 +4,7 @@ gemspec
 
 group :test do
   gem 'rspec'
+  gem 'rspec-collection_matchers'
   gem 'coveralls', require: false
   gem 'factory_girl', '~> 4.0'
   gem 'faker'

data/Gemfile.lock

@@ -15,7 +15,7 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    barby (0.5.1)
+    barby (0.6.1)
     chunky_png (1.3.1)
     coveralls (0.7.0)
       multi_json (~> 1.3)
@@ -24,29 +24,35 @@ GEM
       term-ansicolor
       thor
     diff-lcs (1.2.5)
-    docile (1.1.3)
+    docile (1.1.5)
     factory_girl (4.4.0)
       activesupport (>= 3.0.0)
     faker (1.3.0)
       i18n (~> 0.5)
     i18n (0.6.9)
     json (1.8.1)
-    mime-types (2.2)
+    mime-types (2.3)
     mini_portile (0.6.0)
-    minitest (5.3.4)
-    multi_json (1.10.0)
+    minitest (5.3.5)
+    multi_json (1.10.1)
     nokogiri (1.6.2.1)
       mini_portile (= 0.6.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-collection_matchers (1.0.0)
+      rspec-expectations (>= 2.99.0.beta1)
+    rspec-core (3.0.1)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.1)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.0)
     simplecov (0.8.2)
       docile (~> 1.1.0)
       multi_json
@@ -55,9 +61,9 @@ GEM
     term-ansicolor (1.3.0)
       tins (~> 1.0)
     thor (0.19.1)
-    thread_safe (0.3.3)
+    thread_safe (0.3.4)
     tins (1.3.0)
-    tzinfo (1.1.0)
+    tzinfo (1.2.1)
       thread_safe (~> 0.1)
 
 PLATFORMS
@@ -69,3 +75,4 @@ DEPENDENCIES
   factory_girl (~> 4.0)
   faker
   rspec
+  rspec-collection_matchers

data/lib/axiomus_api/templates/labels.html.erb

@@ -76,7 +76,11 @@
           <div class="d9"><b><i><%= label.weight.round(1) %></i></b><span class="cu"> кг</span></div>
           <div class="d5"><%= label.type %></div>
           <div class="d6"><%= label.city %></div>
-          <div class="d7"><%= label.place %>/<%= label.places %></div>
+          <div class="d7">
+            <% if label.place && label.places %>
+              <%= label.place %>/<%= label.places %>
+            <% end %>
+          </div>
         </div>
       </div>
     <% end %>

data/lib/axiomus_api/version.rb

@@ -1,3 +1,3 @@
 module AxiomusApi
-  VERSION = '0.5'
+  VERSION = '0.5.1'
 end

data/spec/factories.rb

@@ -273,4 +273,9 @@ FactoryGirl.define do
     city {['Мск', 'СПб'][rand(0..1)]}
   end
 
+  factory :label_without_places, parent: :label do
+    place nil
+    places nil
+  end
+
 end

data/spec/lib/axiomus_api/base_spec.rb

@@ -1,26 +1,23 @@
 require_relative '../../spec_helper'
 
-describe 'AxiomusApi::Base' do
+describe AxiomusApi::Base do
 
   it 'should raise on wrong xml options' do
     expect do
-      class C < AxiomusApi::Base
+      class C < described_class
         xml_field :some_field, unknown_option: 21
       end
     end.to raise_error
   end
 
   it 'should raise if no tag name' do
-
-    class C < AxiomusApi::Base
+    class C < described_class
       xml_field :value
     end
 
     c = C.new
     c.value = '32'
-
     expect{c.tag_name}.to raise_error
-
   end
 
 end

data/spec/lib/axiomus_api/{delivest_spec.rb → delivset_spec.rb}

@@ -1,6 +1,6 @@
 require_relative '../../spec_helper'
 
-describe 'AxiomusApi::Delivset' do
+describe AxiomusApi::Delivset do
 
   it 'should create below element' do
     delivset = build(:delivset)

data/spec/lib/axiomus_api/label_spec.rb

@@ -1,6 +1,6 @@
 require_relative '../../spec_helper'
 
-describe 'AxiomusApi::Label' do
+describe AxiomusApi::Label do
   it 'should generate barcode' do
     @label = build(:label)
     expect{barcode = @label_barcode64}.not_to raise_error
@@ -8,11 +8,17 @@ describe 'AxiomusApi::Label' do
 
   it 'should render single label' do
     @label = build(:label)
-    expect{html = AxiomusApi::Label.render(@label)}.not_to raise_error
+    expect{html = described_class.render(@label)}.not_to raise_error
   end
 
   it 'should render multiple labels' do
     @labels = (1..10).map{build(:label)}
-    expect{html = AxiomusApi::Label.render(@labels)}.not_to raise_error
+    expect{html = described_class.render(@labels)}.not_to raise_error
   end
+
+  it 'renders label without places' do
+    @label = build(:label_without_places)
+    expect{html = described_class.render(@label)}.not_to raise_error
+  end
+
 end

data/spec/lib/axiomus_api/order/base_order_spec.rb

@@ -1,24 +1,24 @@
 require_relative '../../../spec_helper'
 
-describe 'AxiomusApi::BaseOrder' do
+describe AxiomusApi::BaseOrder do
 
   it 'should build order by mode' do
     ORDER_MODES.each do |mode|
-      order = AxiomusApi::BaseOrder.create_by_mode(mode)
+      order = described_class.create_by_mode(mode)
     end
   end
 
   it 'should create item' do
     ORDER_MODES.each do |mode|
-      order = AxiomusApi::BaseOrder.create_by_mode(mode)
+      order = described_class.create_by_mode(mode)
       item = order.items.add_item
       item.quantity = 21
       expect(order.items.item.first.quantity).to eq(21)
 
       if [:new_export, :update_export, :new_self_export, :update_self_export].include?(mode)
-        expect(item.is_a?(AxiomusApi::ExportItem)).to be_true
+        expect(item.is_a?(AxiomusApi::ExportItem)).to be_truthy
       else
-        expect(item.is_a?(AxiomusApi::Item)).to be_true
+        expect(item.is_a?(AxiomusApi::Item)).to be_truthy
       end
     end
   end

data/spec/lib/axiomus_api/serializable_spec.rb

@@ -1,6 +1,6 @@
 require_relative '../../spec_helper'
 
-describe 'AxiomusApi::Serializable' do
+describe AxiomusApi::Serializable do
 
   it 'should serialize value as text node' do
 

data/spec/lib/axiomus_api/session_spec.rb

@@ -1,24 +1,36 @@
 require_relative '../../spec_helper'
 
-describe 'AxiomusApi::Session' do
+describe AxiomusApi::Session do
   before(:all) do
     AxiomusApi.logger.level = Logger::UNKNOWN
 
     @session = AxiomusApi.test_session
   end
 
+  def enqueue_response(response_body, code = '200', msg='OK')
+    @responses ||= []
+    @responses.push([response_body, code, msg])
+
+    allow_any_instance_of(Net::HTTP).to receive(:request) do |req|
+      next_response = @responses.shift
+      response = Net::HTTPResponse.new(1.0, next_response[1], next_response[2])
+      allow(response).to receive(:body) {next_response[0]}
+      response
+    end
+  end
+
   ORDER_MODES.each do |method|
     order_class = order_factory_name(method)
 
     describe "##{method}" do
       it 'should handle successful request' do
-        HttpMocking.enqueue_response(DummyData.order_success_response(method))
+        enqueue_response(DummyData.order_success_response(method))
         response = @session.send(method, build(order_class))
         expect(response.code).to eq 0
       end
 
       it 'should raise on error' do
-        HttpMocking.enqueue_response(DummyData.order_error_response(method))
+        enqueue_response(DummyData.order_error_response(method))
         expect{@session.send(method, build(order_class))}.to raise_error(AxiomusApi::Errors::RequestError)
       end
     end
@@ -26,7 +38,7 @@ describe 'AxiomusApi::Session' do
 
   describe '#get_regions' do
     it 'should handle successfull request' do
-      HttpMocking.enqueue_response(DummyData::REGIONS_SUCCESS_RESPONSE)
+      enqueue_response(DummyData::REGIONS_SUCCESS_RESPONSE)
       z = @session.get_regions()
       expect(z.regions.count).to eq 1
       expect(z.regions.first.code).to eq '21'
@@ -35,7 +47,7 @@ describe 'AxiomusApi::Session' do
 
   describe '#status' do
     it 'should handle successfull request' do
-      HttpMocking.enqueue_response(DummyData::STATUS_SUCCESS_RESPONSE)
+      enqueue_response(DummyData::STATUS_SUCCESS_RESPONSE)
       z = @session.status('2e3023c3e78f4f0c8cbb81257743c2d7')
       expect(z.order.id).to eq('1013')
       expect(z.order.inner_id).to eq('16777')
@@ -48,21 +60,21 @@ describe 'AxiomusApi::Session' do
 
   describe '#status_list' do
     it 'should handle successfull request' do
-      HttpMocking.enqueue_response(DummyData::STATUS_LIST_SUCCESS_RESPONSE)
+      enqueue_response(DummyData::STATUS_LIST_SUCCESS_RESPONSE)
       z = @session.status_list(['7bbf66349060b723bba20ef687ee4ebf', 'f2c2635a00310d39cf26b7cc1db6fab2'])
     end
   end
 
   describe '#get_version' do
     it 'should handle successfull request' do
-      HttpMocking.enqueue_response(DummyData::GET_VERSION_SUCCESS_RESPONSE)
+      enqueue_response(DummyData::GET_VERSION_SUCCESS_RESPONSE)
       z = @session.get_version
       expect(z).to eq('2.12')
     end
   end
 
   it 'should accept a block' do
-    HttpMocking.enqueue_response(DummyData::REGIONS_SUCCESS_RESPONSE)
+    enqueue_response(DummyData::REGIONS_SUCCESS_RESPONSE)
     res = nil
 
     AxiomusApi.test_session do |s|
@@ -76,7 +88,7 @@ describe 'AxiomusApi::Session' do
   describe '#send_order_request' do
     it 'should raise on invalid order' do
       order = build(:dpd_order, :without_address)
-      HttpMocking.enqueue_response(DummyData.order_success_response(:new_dpd))
+      enqueue_response(DummyData.order_success_response(:new_dpd))
       expect{@session.send_order_request(:new_dpd, order)}.to raise_error(AxiomusApi::Errors::ValidationError)
     end
   end

data/spec/lib/axiomus_api/validated_spec.rb

@@ -1,36 +1,36 @@
 require_relative '../../spec_helper'
 
-describe 'AxiomusApi::Validated' do
+describe AxiomusApi::Validated do
 
   it 'should validate required fields' do
     address = build(:dpd_address, :without_region)
     expect(address).not_to be_valid
-    expect(address.validation_errors).to have(1).items
+    expect(address.validation_errors).to have_exactly(1).items
   end
 
   it 'should validate empty fields' do
     order = build(:order, :with_empty_address)
     expect(order).not_to be_valid
-    expect(order.validation_errors).to have(1).items
+    expect(order.validation_errors).to have_exactly(1).items
   end
 
   it 'should validate wrong type fields' do
     order = build(:post_order, :with_region_services)
     expect(order).not_to be_valid
-    expect(order.validation_errors).to have(1).items
+    expect(order.validation_errors).to have_exactly(1).items
   end
 
   it 'should validate nested fields' do
     order = build(:dpd_order)
     order.address.region = nil
     expect(order).not_to be_valid
-    expect(order.validation_errors).to have(1).items
+    expect(order.validation_errors).to have_exactly(1).items
   end
 
   it 'should validate correct items' do
     order = build(:post_order)
     expect(order).to be_valid
-    expect(order.validation_errors).to have(0).items
+    expect(order.validation_errors).to have_exactly(0).items
   end
 
   it 'should validate array items' do
@@ -41,7 +41,7 @@ describe 'AxiomusApi::Validated' do
     order.delivset.above_sum = 12
     order.delivset.above_price = 12
     expect(order).not_to be_valid
-    expect(order.validation_errors).to have(1).items
+    expect(order.validation_errors).to have_exactly(1).items
   end
 
   it 'should validate max occurs' do
@@ -56,7 +56,7 @@ describe 'AxiomusApi::Validated' do
     end
 
     expect(order).not_to be_valid
-    expect(order.validation_errors).to have(1).items
+    expect(order.validation_errors).to have_exactly(1).items
   end
 
   it 'should validate optional arrays' do

data/spec/lib/axiomus_api_spec.rb

@@ -1,7 +1,7 @@
 require_relative '../spec_helper'
 
-describe 'AxiomusApi' do
+describe AxiomusApi do
   it 'should assign logger' do
-    AxiomusApi.logger = Logger.new($stdout)
+    described_class.logger = Logger.new($stdout)
   end
 end

data/spec/spec_helper.rb

@@ -1,10 +1,11 @@
 require 'coveralls'
 Coveralls.wear!
-
+require 'rspec/collection_matchers'
 require 'factory_girl'
 
 RSpec.configure do |config|
   config.include FactoryGirl::Syntax::Methods
+  config.mock_with :rspec
 end
 
 ORDER_MODES = [:new, :update, :new_carry, :update_carry, :new_export, :update_export,
@@ -24,5 +25,4 @@ end
 
 require_relative '../lib/axiomus_api.rb'
 require_relative 'support/dummy_data.rb'
-require_relative 'support/http_mocking.rb'
 require_relative 'factories.rb'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: axiomus_api
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: 0.5.1
 platform: ruby
 authors:
 - Kinderly LTD
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-19 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -120,7 +120,7 @@ files:
 - spec/factories.rb
 - spec/integration/lib/axiomus_api/session_spec.rb
 - spec/lib/axiomus_api/base_spec.rb
-- spec/lib/axiomus_api/delivest_spec.rb
+- spec/lib/axiomus_api/delivset_spec.rb
 - spec/lib/axiomus_api/label_spec.rb
 - spec/lib/axiomus_api/order/base_order_spec.rb
 - spec/lib/axiomus_api/serializable_spec.rb
@@ -129,7 +129,6 @@ files:
 - spec/lib/axiomus_api_spec.rb
 - spec/spec_helper.rb
 - spec/support/dummy_data.rb
-- spec/support/http_mocking.rb
 homepage: https://github.com/kinderly/axiomus_api
 licenses:
 - MIT

data/spec/support/http_mocking.rb

@@ -1,17 +0,0 @@
-require 'net/http'
-
-module HttpMocking
-
-  def self.enqueue_response(response_body, code = '200', msg='OK')
-    @responses ||= []
-    @responses.push([response_body, code, msg])
-
-    Net::HTTP.any_instance.stub(:request) do |req|
-      next_response = @responses.shift
-      response = Net::HTTPResponse.new(1.0, next_response[1], next_response[2])
-      response.stub(:body => next_response[0])
-      response
-    end
-  end
-
-end