axiomus_api 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e7e56548cb4b9fcbf06900faaa40e7203fea890
-  data.tar.gz: 3edb5f8eafc6c2fa1d8b5e87c374a337d27cac69
+  metadata.gz: ad4f4f35b4f4b4e19262b1f7d25d6fee2c26de68
+  data.tar.gz: 87bfb90d97f8c2f159476b8db61c5aae963400b1
 SHA512:
-  metadata.gz: 0ff4fa6ae07e2371c0cbb4de8a79324b6a673297d83966e7c34e1544624de3cc52049372d01ade14a1f767c0e1edbbeea5aa5f40fc23abd9f414e18079987940
-  data.tar.gz: a1a9f6f7590ce9e78de3fab95eedc8566b2097f2846f145fb5f1aec27b59df8fc14488ab980756384d5599375e830b4286771d14d6abc2270c5a48eab2eeaeb4
+  metadata.gz: 25f1d85d1a30a776041719c2f632695555bef952638174dc0a3907c9c35e871362a8373545db74569ab7f974ba89edd53cd232a8d5846bb54cde7e738785f717
+  data.tar.gz: 0cecac24317941a7014780a2a0d60e7ea50f62085a6beb1a14089bbac628baec19397be80cd4e0fc9987530a4bda4ed8aa48374f79fadb55cad2f3bb3189837f

data/.gitignore

@@ -2,3 +2,4 @@
 *.sublime*
 /vendor/bundle
 /coverage
+.coveralls.yml

data/.travis.yml

@@ -5,6 +5,6 @@ rvm:
 install: "bundle install --path vendor/bundle"
 cache:
   directories:
-  - vendor/bundle
-script: "CODECLIMATE_REPO_TOKEN=93631233647d94015cf8e05386117a48a1a23106c2b990e19c96f0f462992e14 bundle exec rspec"
+    - vendor/bundle
+script: "bundle exec rspec"
 

data/Gemfile

@@ -4,7 +4,6 @@ gemspec
 
 group :test do
   gem 'rspec'
-  gem 'coveralls'
-  gem 'codeclimate-test-reporter', require: nil
+  gem 'coveralls', require: false
   gem 'factory_girl', '~> 4.0'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    axiomus_api (0.1)
+    axiomus_api (0.1.1)
       nokogiri (~> 1.6)
 
 GEM
@@ -14,8 +14,6 @@ GEM
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
     atomic (1.1.16)
-    codeclimate-test-reporter (0.3.0)
-      simplecov (>= 0.7.1, < 1.0.0)
     coveralls (0.7.0)
       multi_json (~> 1.3)
       rest-client
@@ -61,7 +59,6 @@ PLATFORMS
 
 DEPENDENCIES
   axiomus_api!
-  codeclimate-test-reporter
   coveralls
   factory_girl (~> 4.0)
   rspec

data/lib/axiomus_api/order/base_order.rb

@@ -5,7 +5,7 @@ class AxiomusApi::BaseOrder < AxiomusApi::Base
   xml_element :order
 
   xml_field :contacts, :items
-  xml_field :description
+  xml_field :description, optional: true
   xml_attribute :inner_id, :okey, optional: true
   xml_attribute :name, :places
   xml_field :services, type: AxiomusApi::Services

data/lib/axiomus_api/order/carry_order.rb

@@ -2,6 +2,6 @@ require_relative 'base_order'
 
 class AxiomusApi::CarryOrder < AxiomusApi::BaseOrder
 
-  xml_attribute :office, :incl_delivery_sum, :sms_sender, :sms, optional: true
+  xml_attribute :office, :incl_deliv_sum, :sms_sender, :sms, optional: true
   xml_attribute :b_date, :e_date
 end

data/lib/axiomus_api/order/dpd_order.rb

@@ -6,6 +6,6 @@ class AxiomusApi::DpdOrder < AxiomusApi::BaseOrder
 
   xml_attribute :d_date, :b_time, :e_time, :post_type
   xml_field :services, type: AxiomusApi::PostServices
-  xml_attribute :address, type: AxiomusApi::DpdAddress
+  xml_field :address, type: AxiomusApi::DpdAddress
 
 end

data/lib/axiomus_api/order/ems_order.rb

@@ -5,7 +5,7 @@ require_relative '../services/post_services'
 class AxiomusApi::EmsOrder < AxiomusApi::BaseOrder
 
   xml_attribute :b_date
-  xml_attribute :incl_delivery_sum, optional: true
+  xml_attribute :incl_deliv_sum, optional: true
   xml_field :address, type: AxiomusApi::EmsAddress
   xml_field :services, type: AxiomusApi::PostServices
 

data/lib/axiomus_api/order/order.rb

@@ -3,6 +3,6 @@ require_relative 'base_order'
 class AxiomusApi::Order < AxiomusApi::BaseOrder
 
   xml_attribute :address, :d_date, :b_time, :e_time, :city
-  xml_attribute :incl_delivery_sum, :from_mkad, :garden_ring, :sms_sender, :sms, optional: true
+  xml_attribute :incl_deliv_sum, :from_mkad, :garden_ring, :sms_sender, :sms, optional: true
 
 end

data/lib/axiomus_api/order/post_order.rb

@@ -5,7 +5,7 @@ require_relative '../services/post_services'
 class AxiomusApi::PostOrder < AxiomusApi::BaseOrder
   #уточнить
   xml_attribute :b_date, :post_type
-  xml_attribute :incl_delivery_sum, optional: true
+  xml_attribute :incl_deliv_sum, optional: true
   xml_field :address, type: AxiomusApi::PostAddress
   xml_field :services, type: AxiomusApi::PostServices
 

data/lib/axiomus_api/serializable.rb

@@ -6,7 +6,7 @@ module AxiomusApi::Serializable
     attribute_fields = serializable_fields.select{|k,v| v[:xml_type] == :attribute}
 
     attributes = Hash[attribute_fields.map do |k,v|
-      [v[:xml_name] || k, self.send(k).to_s]
+      [v[:xml_name] || k, normalize_axiomus_xml(self.send(k).to_s)]
     end].reject{|k,v| v.nil? || v.empty?}
 
     builder = Nokogiri::XML::Builder.new(:encoding => 'UTF-8') do |xml|
@@ -29,11 +29,13 @@ module AxiomusApi::Serializable
       }
     end
 
-    if xml_header
+    xml = if xml_header
       builder.to_xml
     else
       builder.doc.root.to_xml
     end
+
+    normalize_axiomus_xml(xml)
   end
 
   private
@@ -47,9 +49,13 @@ module AxiomusApi::Serializable
       }
     else
       xml.send(xml_name) {
-        xml.text(obj.to_s)
+        xml.text(normalize_axiomus_xml(obj.to_s))
       }
     end
   end
 
+  def normalize_axiomus_xml(str)
+    str.gsub(/&[^;]+;/, '')
+  end
+
 end

data/lib/axiomus_api/session.rb

@@ -84,9 +84,9 @@ class AxiomusApi::Session
     logger.info("Request to #{xml_request.mode}")
     logger.debug("Request body: #{xml_request.to_xml}")
     response = connection.request(http_request)
-    response.body.gsub!(/^.*<?xml/, '<?xml')
     logger.info("Response: #{response.code}")
     logger.debug("Response raw: #{response.body}")
+    response.body.gsub!(/^.*<\?xml/, '<?xml')
     response
   end
 

data/lib/axiomus_api/version.rb

@@ -1,3 +1,3 @@
 module AxiomusApi
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/spec/factories.rb

@@ -14,7 +14,7 @@ FactoryGirl.define do
   end
 
   factory :item, class: AxiomusApi::Item do
-    name {"Product #{rand(1..1000)}"}
+    name {"Product "'\"Awesome\"'" #{rand(1..1000)}"}
     weight {rand(0.1..10.0)}
     quantity {rand(1..10)}
     price {rand(0.5..10000.0)}
@@ -87,6 +87,10 @@ FactoryGirl.define do
 
   factory :dpd_address, class: AxiomusApi::DpdAddress, parent: :ems_address do
     region 'обл Ростовская'
+
+    trait :without_region do
+      region nil
+    end
   end
 
   factory :region_courier_address, class: AxiomusApi::RegionCourierAddress do
@@ -103,10 +107,6 @@ FactoryGirl.define do
   end
 
   factory :order, class: AxiomusApi::Order, parent: :base_order do
-    trait :incl_delivery_sum do
-      incl_delivery_sum rand(100.0..200.00)
-    end
-
     sms {rand(1..2) ? generate(:sms) : nil}
     d_date {Time.now + rand(1..10)*24*60*60}
     b_time {rand(10..19)}
@@ -115,6 +115,14 @@ FactoryGirl.define do
     city 0
     garden_ring {generate :boolean}
     from_mkad {rand(1..2) == 2 && garden_ring !='yes' && city > 0 ? rand(1..40) : nil}
+
+    trait :incl_deliv_sum do
+      incl_deliv_sum rand(100.0..200.00)
+    end
+
+    trait :with_empty_address do
+      address ''
+    end
   end
 
   factory :carry_order, class: AxiomusApi::CarryOrder, parent: :base_order do
@@ -164,6 +172,10 @@ FactoryGirl.define do
     address {build(:post_address)}
     services {build(:post_services)}
     contacts {generate(:sms)}
+
+    trait :with_region_services do
+      services {build(:region_services)}
+    end
   end
 
   factory :ems_order, class: AxiomusApi::EmsOrder, parent: :base_order do
@@ -195,6 +207,10 @@ FactoryGirl.define do
     d_date {(Time.now + rand(5..15)*24*60*60).strftime('%Y-%m-%d')}
     b_time {rand(10..17)}
     e_time {b_time + 1}
+
+    trait :without_address do
+      address nil
+    end
   end
 
 end

data/spec/lib/axiomus_api/base_spec.rb

@@ -0,0 +1,26 @@
+require_relative '../../spec_helper'
+
+describe 'AxiomusApi::Base' do
+
+  it 'should raise on wrong xml options' do
+    expect do
+      class C < AxiomusApi::Base
+        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
+      xml_field :value
+    end
+
+    c = C.new
+    c.value = '32'
+
+    expect{c.tag_name}.to raise_error
+
+  end
+
+end

data/spec/lib/axiomus_api/serializable_spec.rb

@@ -0,0 +1,22 @@
+require_relative '../../spec_helper'
+
+describe 'AxiomusApi::Serializable' do
+
+  it 'should serialize value as text node' do
+
+    class Node < AxiomusApi::Base
+      xml_element :node
+      xml_field :value, xml_type: :text
+      xml_attribute :id
+    end
+
+    n = Node.new
+    n.id = 1
+    n.value = 'Some value'
+
+    expect(n.to_xml()).to eq('<node id="1">Some value</node>')
+
+  end
+
+
+end

data/spec/lib/axiomus_api/session_spec.rb

@@ -8,16 +8,18 @@ describe 'AxiomusApi::Session' do
   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))
-        response = @session.send(method, build(:base_order))
+        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))
-        expect{@session.send(method, build(:base_order))}.to raise_error(AxiomusApi::Errors::RequestError)
+        expect{@session.send(method, build(order_class))}.to raise_error(AxiomusApi::Errors::RequestError)
       end
     end
   end
@@ -44,4 +46,35 @@ describe 'AxiomusApi::Session' do
     end
   end
 
+  it 'should accept a block' do
+    HttpMocking.enqueue_response(DummyData::REGIONS_SUCCESS_RESPONSE)
+    res = nil
+
+    AxiomusApi.test_session do |s|
+      res = s.get_regions
+    end
+
+    expect(res.regions.count).to eq 1
+    expect(res.regions.first.code).to eq '21'
+  end
+
+  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))
+      expect{@session.send_order_request(:new_dpd, order)}.to raise_error(AxiomusApi::Errors::ValidationError)
+    end
+  end
+
+  describe '#labels_link' do
+    it 'should return correct URL' do
+      order_nums = []
+      10.times {order_nums << rand(1..10000)}
+      url = @session.labels_link(order_nums)
+      order_nums.each do |on|
+        expect(url).to include(on.to_s)
+      end
+    end
+  end
+
 end

data/spec/lib/axiomus_api/validated_spec.rb

@@ -0,0 +1,36 @@
+require_relative '../../spec_helper'
+
+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
+  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
+  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
+  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
+  end
+
+  it 'should validate correct items' do
+    order = build(:post_order)
+    expect(order).to be_valid
+    expect(order.validation_errors).to have(0).items
+  end
+
+end

data/spec/lib/axiomus_api_spec.rb

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

data/spec/spec_helper.rb

@@ -1,9 +1,7 @@
 require 'coveralls'
-require 'codeclimate-test-reporter'
-require 'factory_girl'
-
 Coveralls.wear!
-CodeClimate::TestReporter.start
+
+require 'factory_girl'
 
 RSpec.configure do |config|
   config.include FactoryGirl::Syntax::Methods
@@ -13,6 +11,17 @@ ORDER_MODES = [:new, :update, :new_carry, :update_carry, :new_export, :update_ex
     :new_self_export, :update_self_export, :new_post, :update_post, :new_dpd, :update_dpd, :new_ems, :update_ems,
     :new_region_courier, :update_region_courier, :new_region_pickup, :update_region_pickup]
 
+
+def order_factory_name(order_mode)
+  match = /_(.+)$/.match(order_mode)
+
+  if match.nil?
+    :order
+  else
+    "#{match[1]}_order".to_sym
+  end
+end
+
 require_relative '../lib/axiomus_api.rb'
 require_relative 'support/dummy_data.rb'
 require_relative 'support/http_mocking.rb'

data/spec/support/http_mocking.rb

@@ -2,10 +2,6 @@ require 'net/http'
 
 module HttpMocking
 
-  def self.clear_response_queue
-    @responses = []
-  end
-
   def self.enqueue_response(response_body, code = '200', msg='OK')
     @responses ||= []
     @responses.push([response_body, code, msg])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: axiomus_api
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Kinderly LTD
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-31 00:00:00.000000000 Z
+date: 2014-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -81,7 +81,10 @@ files:
 - spec/factories.rb
 - spec/integration/axiomus_api/session_spec.rb
 - spec/lib/axiomus_api/base_order_spec.rb
+- spec/lib/axiomus_api/base_spec.rb
+- spec/lib/axiomus_api/serializable_spec.rb
 - spec/lib/axiomus_api/session_spec.rb
+- spec/lib/axiomus_api/validated_spec.rb
 - spec/lib/axiomus_api_spec.rb
 - spec/spec_helper.rb
 - spec/support/dummy_data.rb