axiomus_api 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01b9bba2a5f6c2a80077adee2f7618cdb3012285
-  data.tar.gz: f0168adfc8ec11167ecf7b9762d493884774f479
+  metadata.gz: a842cb4e7a1790dad6bed6ea6a48f59758f28a1e
+  data.tar.gz: 7ed4a445f550a6832a95c893aadcf06e5a664849
 SHA512:
-  metadata.gz: 1f2d713c2bbaf5c984198dcd53686ce7694842176c78e7308a7278833c1d3ea6d38b4d155abe2a68d44577840bf4c60470c4fa6bdf51d0f44c8c980fa66597f7
-  data.tar.gz: 76a55fe55d9b7dad0a4a9cb81c5e8036127d36523324e8694ed5a35a78079563fbadb26e985f85ea5a24ba781d4664c6ec51e7df22f274748b23642931cd9f9d
+  metadata.gz: 0d370daaf919fc5144e01d4951ec32b39c2768758292a94672388793936a9602bfc59b7226c95f7daa6e9107df9ba196871926c861a368cba38b012c5f43f4c9
+  data.tar.gz: a82560e1fa501abe855e505119ee5770230cd258c718decb68fb519ce9b2acccd05e8bf3191849c6cb26eeab4d9fabdceb31333b6fc960cdacc528505de8f17b

data/.gitignore

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

data/Gemfile

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

data/Gemfile.lock

@@ -1,7 +1,9 @@
 PATH
   remote: .
   specs:
-    axiomus_api (0.2)
+    axiomus_api (0.3)
+      barby (~> 0.5.0)
+      chunky_png (~> 1.3.0)
       nokogiri (~> 1.6)
 
 GEM
@@ -14,6 +16,8 @@ GEM
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
     atomic (1.1.16)
+    barby (0.5.1)
+    chunky_png (1.3.0)
     coveralls (0.7.0)
       multi_json (~> 1.3)
       rest-client
@@ -24,6 +28,8 @@ GEM
     docile (1.1.3)
     factory_girl (4.4.0)
       activesupport (>= 3.0.0)
+    faker (1.3.0)
+      i18n (~> 0.5)
     i18n (0.6.9)
     mime-types (2.2)
     mini_portile (0.5.3)
@@ -61,4 +67,5 @@ DEPENDENCIES
   axiomus_api!
   coveralls
   factory_girl (~> 4.0)
+  faker
   rspec

data/README.md

@@ -10,7 +10,7 @@
 
 This is a Ruby wrapper over [Axiomus](http://www.axiomus.ru "axiomus.ru") delivery service public [API](http://www.axiomus.ru/customers/api/ "Axiomus API").
 
-All methods exposed by the API by 2014-03-30 are implemented.
+All methods exposed by the API by 2014-04-04 are implemented.
 
 ## Installation
 

data/axiomus_api.gemspec

@@ -16,4 +16,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency('nokogiri', '~>1.6')
+  s.add_dependency('barby', '~>0.5')
+  s.add_dependency('chunky_png', '~>1.3')
 end

data/lib/axiomus_api/actions.rb

@@ -1,6 +1,7 @@
 require_relative('request/request')
 require_relative('request/order_request')
 require_relative('request/status_request')
+require_relative('request/status_list_request')
 
 module AxiomusApi::Actions
   ACTIONS = {
@@ -23,7 +24,9 @@ module AxiomusApi::Actions
     update_region_courier: AxiomusApi::OrderRequest,
     new_region_pickup: AxiomusApi::OrderRequest,
     update_region_pickup: AxiomusApi::OrderRequest,
-    status: AxiomusApi::StatusRequest
+    status: AxiomusApi::StatusRequest,
+    status_list: AxiomusApi::StatusListRequest,
+    get_version: AxiomusApi::Request
   }
 
   def create_request(mode)

data/lib/axiomus_api/label.rb

@@ -0,0 +1,53 @@
+require 'barby'
+require 'barby/barcode/code_39'
+require 'barby/outputter/png_outputter'
+require 'base64'
+require 'erb'
+
+class AxiomusApi::Label
+  attr_accessor :dispatch_number
+  attr_accessor :order_id
+  attr_accessor :client_name
+  attr_accessor :weight
+  attr_accessor :date
+  attr_accessor :b_time
+  attr_accessor :e_time
+  attr_accessor :place
+  attr_accessor :places
+  attr_accessor :address
+  attr_accessor :type
+  attr_accessor :city
+
+  def dispatch_number_formatted
+    dispatch_number.to_s.gsub(/(....)$/, '`\1')
+  end
+
+  def barcode_raw(height = 70)
+    barcode = Barby::Code39.new("#{dispatch_number}+#{place}")
+    barcode.wide_width = 3
+    Base64.encode64(barcode.to_png(height: height, margin: 0))
+  end
+
+  def barcode_base64(height = 70)
+    s = barcode_raw(height)
+    "data:image/png;base64,#{s}"
+  end
+
+  def self.render(labels, template = nil)
+    renderer = ERB.new(template || default_template)
+    labels = labels.is_a?(Array) ? labels : [labels]
+    @labels = labels.select{|l| l.is_a?(AxiomusApi::Label)}
+    renderer.result(binding)
+  end
+
+  private
+
+  def self.default_template
+    File.read(default_erb)
+  end
+
+  def self.default_erb
+    File.join(File.dirname(File.expand_path(__FILE__)), 'templates/labels.html.erb')
+  end
+
+end

data/lib/axiomus_api/request/status_list_request.rb

@@ -0,0 +1,30 @@
+require_relative 'request'
+
+class AxiomusApi::StatusListRequest < AxiomusApi::Request
+  class Okey < ::AxiomusApi::Base
+    xml_field :value, xml_type: :text
+  end
+
+  class Okeylist < ::AxiomusApi::Base
+    xml_field_array :okey, type: Okey
+
+    def add_okey(okey)
+      n_okey = Okey.new
+      n_okey.value = okey
+      (@okey ||= []) << n_okey
+    end
+  end
+
+  xml_field :okeylist
+
+  def initialize
+    @okeylist = Okeylist.new
+  end
+
+  def okeys=(value)
+    okeys = value.is_a?(Array) ? value : [value]
+    okeys.each do |o|
+      @okeylist.add_okey(o.to_s)
+    end
+  end
+end

data/lib/axiomus_api/response/status_list_response.rb

@@ -0,0 +1,33 @@
+require 'nokogiri'
+
+class AxiomusApi::StatusListResponse
+  class Okey
+    attr_accessor :id
+    attr_accessor :status_code
+    attr_accessor :status_name
+    attr_accessor :inner_id
+    attr_accessor :price
+    attr_accessor :customer_price
+    attr_accessor :value
+
+    def initialize(xml_node)
+      @id = xml_node.xpath('@id').text
+      @status_code = xml_node.xpath('@status_code').text
+      @status_name = xml_node.xpath('@status_name').text
+      @inner_id = xml_node.xpath('@inner_id').text
+      @price = xml_node.xpath('@price').text.to_f
+      @customer_price = xml_node.xpath('@customer_price').text.to_f
+      @value = xml_node.text
+    end
+  end
+
+  attr_accessor :okeys
+
+  def initialize(xml)
+    doc = Nokogiri::XML(xml)
+    @okeys = doc.xpath('/response/okeylist/okey').map do |node|
+      Okey.new(node)
+    end
+  end
+end
+

data/lib/axiomus_api/response/version_response.rb

@@ -0,0 +1,11 @@
+require 'nokogiri'
+
+class AxiomusApi::VersionResponse
+  attr_accessor :version
+
+  def initialize(xml)
+    doc = Nokogiri::XML(xml)
+    @version = doc.xpath('/response/version').text
+  end
+end
+

data/lib/axiomus_api/session.rb

@@ -2,6 +2,8 @@ require 'net/http'
 require_relative 'actions'
 require_relative 'response/regions_response'
 require_relative 'response/status_response'
+require_relative 'response/status_list_response'
+require_relative 'response/version_response'
 require_relative 'response/order_response'
 
 class AxiomusApi::Session
@@ -45,6 +47,23 @@ class AxiomusApi::Session
     status_response
   end
 
+  def status_list(okeys)
+    xml_request = create_request(:status_list)
+    xml_request.auth = nil
+    xml_request.okeys = okeys
+    response = send_request(xml_request)
+    status_response = AxiomusApi::StatusListResponse.new(response.body)
+    status_response
+  end
+
+  def get_version
+    xml_request = create_request(:get_version)
+    xml_request.auth = nil
+    response = send_request(xml_request)
+    version_response = AxiomusApi::VersionResponse.new(response.body)
+    version_response.version
+  end
+
   def send_order_request(mode, order)
     if(!order.valid?)
       error_msg = order.validation_errors.join('\n')
@@ -82,7 +101,7 @@ class AxiomusApi::Session
     connection = Net::HTTP.new(AxiomusApi::AXIOMUS_HOST, AxiomusApi::AXIOMUS_PORT)
     http_request = get_http_request(xml_request)
     logger.info("Request to #{xml_request.mode}")
-    logger.debug("Request body: #{xml_request.to_xml}")
+    logger.debug("Request body: #{xml_request.to_xml(true)}")
     response = connection.request(http_request)
     logger.info("Response: #{response.code}")
     logger.debug("Response raw: #{response.body}")

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

@@ -0,0 +1,84 @@
+<!DOCTYPE html>
+<html>
+  <head>
+  <title>Ярлыки Axiomus</title>
+  <meta charset="utf-8"/>
+  <style type="text/css" media="all">
+  body {padding: 0; margin: 0; width: 200mm; font-family: Arial, Tahoma, Verdana, Helvetica, sans-serif; font-weight: bold;}
+        @page {margin: 0;}
+        div {float: left; overflow: hidden;}
+        .label {height: 55.3mm; width: 98mm;/*этикетка размером 59.4x105mm 10шт*/border: 1px solid #000;}
+        .bb { margin: 4mm 2mm;}
+        .d1 {height: 17mm; width: 57mm; padding-left: 3mm;}
+
+        .d1n {height: 8mm; width: 57mm; font-size: 23pt; }
+        .d2n {height: 4mm; width: 53mm; text-align:right;font: normal 9pt Arial, Times, Georgia, serif !important;}       /*53mm !*/
+        .d1cu {height: 4mm; width: 57mm; }
+
+        .d2 {height: 16mm; width: 30.5mm; font-weight: normal; font-size: 18pt; text-align: right; line-height: 23pt;}
+        .d3 {height: 10mm; width: 88mm; font: normal 12pt Times, Georgia, serif; text-align: right;}
+        .d3-2 {height: 10mm; width: 88mm; font: normal 12pt Times, Georgia, serif;}
+
+        .d2, .d3-2, .d8-2, .d8 {border-bottom: 0.5mm solid #777;}
+        .d3, .d3-2, .d8-1, .d8-2 {color: #555;}
+        .cu {font: normal 10pt Arial, Times, Georgia, serif; line-height: 10pt;}
+        .cnum {text-align:right;font: normal 10pt Arial, Times, Georgia, serif !important;}
+        .con {font: normal 13pt Times, Georgia, serif;}
+        .time {font-weight: normal; font-size: 14pt;}
+
+        .d4 {height: 12mm; width: 32mm;}
+        .d5 {height: 12mm; width: 19mm; font-size: 14pt;}
+        .d6 {height: 12mm; width: 16mm; font-size: 16pt;}
+        .d7 {height: 12mm; width: 28mm; font-size: 25pt;}
+        .d1, .d4, .d5, .d6, .d8 {border-right: 0.5mm solid #777;}
+        .d4, .d5, .d6, .d7 {text-align: center; line-height: 40pt;}
+
+        .d8-1 {height: 10mm; width: 65mm; font: normal 12pt Times, Georgia, serif; text-align: right;}
+        .d8-2 {padding:0 0 0 3;height: 10mm; width: 65mm; font: normal 11pt Times, Georgia, serif;}
+        .d8 {height: 16mm;width: 22.5mm;  line-height: 23pt;font-weight: normal; font-size: 21pt;text-align: center;padding-top: 4mm;}
+        .d9 {height: 9mm; width:24.5mm; font-weight: normal; font-size: 21pt;text-align: center;padding-top: 3mm;border-right: 0.5mm solid #777;}
+        .d10 {height: 20mm;width: 60mm; border-right: 0.5mm solid #777; border-bottom: 0.5mm solid #777; text-align:center;}
+        .d11 {height: 20mm; width: 30mm; font: normal 10pt Arial, Georgia, serif; text-align: right;border-bottom: 0.5mm solid #777;}
+
+        #bundl {font: bold 20pt Arial, Tahoma, Verdana, Helvetica, sans-serif; line-height: 40pt;}
+
+
+        #close { text-align: center; display: block; width: 150px; font: bold 16px Arial, Tahoma, Verdana, Helvetica, sans-serif; color: #036; border: 2px solid #eee; padding: 3px 10px 3px 3px; background: #FFEAEA; text-decoration: none; margin-top: 10px;}
+  #close:hover {color: #777; background: #eee;}
+  #close img {padding: 0; margin: 3px 7px; vertical-align: middle; border: none;}
+
+
+        @media print {
+    #close {display: none;}
+                .page_brake {page-break-before: always; padding: 0px; margin: 0px;}
+  </style>
+  </head>
+  <body>
+    <% @labels.each do |label| %>
+      <div class="label">
+        <div class="bb">
+          <div class="d1">
+            <div class="d1n"><%= label.dispatch_number_formatted %></div>
+            <div class="d2n">(<%= label.order_id %>)</div>
+            <div class="d1cu">
+              <span class="cu"><%= label.client_name %></span>
+            </div>
+          </div>
+          <div class="d2">
+            <b><%= label.date.strftime('%d.%m.%y') %></b>
+            <br/>
+            <span class="time"><%= label.b_time %>-<%= label.e_time %></span>
+          </div>
+          <div class="d10">
+            <img src='<%= label.barcode_base64 %>'/>
+          </div>
+          <div class="d11"><%= label.address %></div>
+          <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>
+      </div>
+    <% end %>
+  </body>
+</html>

data/lib/axiomus_api/version.rb

@@ -1,3 +1,3 @@
 module AxiomusApi
-  VERSION = '0.2'
+  VERSION = '0.3'
 end

data/lib/axiomus_api.rb

@@ -1,6 +1,7 @@
 require 'logger'
 
 module AxiomusApi
+  AXIOMUS_API_VERSION = '2.12'
   AXIOMUS_PROD_PATH = '/hydra/api_xml.php'
   AXIOMUS_TEST_PATH = '/test/api_xml_test.php'
   AXIOMUS_HOST = 'axiomus.ru'

data/spec/factories.rb

@@ -1,4 +1,5 @@
 #coding: utf-8
+require('faker')
 
 FactoryGirl.define do
   sequence :inner_id do |n|
@@ -80,10 +81,11 @@ FactoryGirl.define do
   end
 
   factory :base_order, class: AxiomusApi::BaseOrder do
-    contacts 'John Galt'
+    name {Faker::Name.name}
+    contacts {name}
     description 'Awesome description'
     inner_id {rand(1..2)==2 ? generate(:inner_id) : nil}
-    name 'John Galt'
+
 
     trait :has_okey do
       okey '2e3023c3e78f4f0c8cbb81257743c2d7'
@@ -236,4 +238,19 @@ FactoryGirl.define do
     end
   end
 
+  factory :label, class: AxiomusApi::Label do
+    dispatch_number {rand(2300000..2400000)}
+    order_id {rand(20000..60000)}
+    client_name {Faker::Company.name}
+    weight {rand(0.1..10.0)}
+    date {(Time.now + rand(1..10)*24*60*60)}
+    b_time {rand(10..17)}
+    e_time {b_time + 1}
+    places {rand(1..3)}
+    place {rand(1..places)}
+    address {"#{Faker::Address.postcode} #{Faker::Address.city}, #{Faker::Address.street_address}"}
+    type {['Д', 'C', 'Р'][rand(0..2)]}
+    city {['Мск', 'Спб'][rand(0..1)]}
+  end
+
 end

data/spec/integration/lib/axiomus_api/session_spec.rb

@@ -13,6 +13,24 @@ describe 'AxiomusApi::Sesion' do
     end
   end
 
+  # describe '#status_list' do
+  #   it 'should handle multiple okeys' do
+  #     order = build(:order)
+  #     z1 = @session.new(order)
+  #     order = build(:order)
+  #     z2 = @session.new(order)
+  #     r = @session.status_list([z1.okey, z2.okey])
+  #     puts r
+  #   end
+  # end
+
+  # describe '#get_version' do
+  #   it 'should return version' do
+  #     version = @session.get_version
+  #     puts version
+  #   end
+  # end
+
   describe '#new, #update' do
     it 'should create new order and update it' do
       order = build(:order)

data/spec/lib/axiomus_api/label_spec.rb

@@ -0,0 +1,18 @@
+require_relative '../../spec_helper'
+
+describe 'AxiomusApi::Label' do
+  it 'should generate barcode' do
+    @label = build(:label)
+    expect{barcode = @label_barcode64}.not_to raise_error
+  end
+
+  it 'should render single label' do
+    @label = build(:label)
+    expect{html = AxiomusApi::Label.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
+  end
+end

data/spec/lib/axiomus_api/session_spec.rb

@@ -46,6 +46,21 @@ describe 'AxiomusApi::Session' do
     end
   end
 
+  describe '#status_list' do
+    it 'should handle successfull request' do
+      HttpMocking.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)
+      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)
     res = nil

data/spec/support/dummy_data.rb

@@ -58,4 +58,32 @@ module DummyData
     </response>
   XML
 
+  STATUS_LIST_SUCCESS_RESPONSE = <<-XML
+  <?xml version="1.0" encoding="utf-8" ?>
+  <response>
+  <request>status_list</request>
+  <okeylist>
+    <okey id="1180901"
+          status_code="100"
+          status_name="выполнен"
+          inner_id="Заказ #878"
+          price="406.02"
+          customer_price="430.00">7bbf66349060b723bba20ef687ee4ebf</okey>
+    <okey id="1991064"
+          status_code="100"
+          status_name="выполнен"
+          inner_id="" price="0.00"
+          customer_price="">f2c2635a00310d39cf26b7cc1db6fab2</okey>
+  </okeylist>
+  </response>
+  XML
+
+  GET_VERSION_SUCCESS_RESPONSE = <<-XML
+  <?xml version="1.0" encoding="utf-8" ?>
+  <response>
+    <request>get_version</request>
+    <version>2.12</version>
+  </response>
+  XML
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: axiomus_api
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Kinderly LTD
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -24,6 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: barby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: chunky_png
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 description: This gem provides a Ruby wrapper over Axiomus API.
 email:
 - nuinuhin@gmail.com
@@ -56,6 +84,7 @@ files:
 - lib/axiomus_api/item/item.rb
 - lib/axiomus_api/items/export_items.rb
 - lib/axiomus_api/items/items.rb
+- lib/axiomus_api/label.rb
 - lib/axiomus_api/order/base_order.rb
 - lib/axiomus_api/order/carry_order.rb
 - lib/axiomus_api/order/dpd_order.rb
@@ -69,10 +98,13 @@ files:
 - lib/axiomus_api/order/self_export_order.rb
 - lib/axiomus_api/request/order_request.rb
 - lib/axiomus_api/request/request.rb
+- lib/axiomus_api/request/status_list_request.rb
 - lib/axiomus_api/request/status_request.rb
 - lib/axiomus_api/response/order_response.rb
 - lib/axiomus_api/response/regions_response.rb
+- lib/axiomus_api/response/status_list_response.rb
 - lib/axiomus_api/response/status_response.rb
+- lib/axiomus_api/response/version_response.rb
 - lib/axiomus_api/response_codes.rb
 - lib/axiomus_api/serializable.rb
 - lib/axiomus_api/services/export_services.rb
@@ -80,12 +112,14 @@ files:
 - lib/axiomus_api/services/region_services.rb
 - lib/axiomus_api/services/services.rb
 - lib/axiomus_api/session.rb
+- lib/axiomus_api/templates/labels.html.erb
 - lib/axiomus_api/validated.rb
 - lib/axiomus_api/version.rb
 - 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/label_spec.rb
 - spec/lib/axiomus_api/order/base_order_spec.rb
 - spec/lib/axiomus_api/serializable_spec.rb
 - spec/lib/axiomus_api/session_spec.rb