axiomus_api 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a842cb4e7a1790dad6bed6ea6a48f59758f28a1e
-  data.tar.gz: 7ed4a445f550a6832a95c893aadcf06e5a664849
+  metadata.gz: 3e07c90ada20d4d8317aca5cba92d3d3d79781f5
+  data.tar.gz: 1e830f91d74db9fff95e2747e7e5eb04c502aa93
 SHA512:
-  metadata.gz: 0d370daaf919fc5144e01d4951ec32b39c2768758292a94672388793936a9602bfc59b7226c95f7daa6e9107df9ba196871926c861a368cba38b012c5f43f4c9
-  data.tar.gz: a82560e1fa501abe855e505119ee5770230cd258c718decb68fb519ce9b2acccd05e8bf3191849c6cb26eeab4d9fabdceb31333b6fc960cdacc528505de8f17b
+  metadata.gz: 0b22f978c6fe2551224c279ea07b6e36682d94656dee9744e92ff5194d5d918178956fdb58b3a2f1f02ea860a20c7e3d25acc42d51e3e59a7a53d626aecfaa62
+  data.tar.gz: 6ff41ce49692794bbc51078b2b6552172f36628b5316b1791819fae953cbb63109c76d861155127796133e45815110ca1656cfed2f0e835e805e4f4f55ee0378

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    axiomus_api (0.3)
-      barby (~> 0.5.0)
-      chunky_png (~> 1.3.0)
+    axiomus_api (0.4)
+      barby (~> 0.5)
+      chunky_png (~> 1.3)
       nokogiri (~> 1.6)
 
 GEM

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-04-04 are implemented.
+All methods exposed by the API v. 2.13 are implemented.
 
 ## Installation
 
@@ -112,6 +112,35 @@ Most orders use `AxiomusApi::Item` as their item type, but some don't. To safely
   @status = @session.status(@okey)
 ```
 
+### Rendering labels locally
+You can render Axiomus labels in your own layout. The labels are rendered in HTML format.
+```ruby
+label = AxiomusApi::Label.new
+label.dispatch_number = '213123123123'
+label.order_id = '12345'
+label.client_name = 'John Doe'
+label.weight = 0.3
+label.date =
+label.b_time = 10
+label.e_time = 14
+label.place = 1
+label.places = 3
+label.address = '344000 Ростов-на-Дону, ул. Б. Садовая 23'
+label.type = 'P'
+label.city = 'ПР'
+html = AxiomusApi::Label.render(label)
+```
+
+You can also render several labels on one page:
+```ruby
+html = AxiomusApi::Label.render([label1, label2, label3])
+```
+
+There's a built-in ERB template for rendering labels, but you can also provide your own:
+```ruby
+html = AxiomusApi::Label.render(label, my_erb_string)
+```
+
 ### Error handling
 
 Before sending a request, the library will validate your order object to check for missing fields or wrong type of parameters. If there are errors, it will raise an `AxiomusApi::Errors::ValidationError` exception. List of errors can be accessed via the order's `#validation_errors` method. Please note that passing validation doesn't necessarily mean the order will be accepted by Axiomus.

data/lib/axiomus_api/label.rb

@@ -22,6 +22,14 @@ class AxiomusApi::Label
     dispatch_number.to_s.gsub(/(....)$/, '`\1')
   end
 
+  def delivery_time
+    if b_time.nil? || e_time.nil?
+      nil
+    else
+      "#{b_time}-#{e_time}"
+    end
+  end
+
   def barcode_raw(height = 70)
     barcode = Barby::Code39.new("#{dispatch_number}+#{place}")
     barcode.wide_width = 3

data/lib/axiomus_api/services/region_services.rb

@@ -2,6 +2,6 @@ require_relative '../base'
 
 class AxiomusApi::RegionServices < AxiomusApi::Base
 
-  xml_attribute :cheque, :not_open, :extrapack, :big, optional: true
+  xml_attribute :cheque, :not_open, :extrapack, :big, :part_return, optional: true
 
 end

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

@@ -67,7 +67,7 @@
           <div class="d2">
             <b><%= label.date.strftime('%d.%m.%y') %></b>
             <br/>
-            <span class="time"><%= label.b_time %>-<%= label.e_time %></span>
+            <span class="time"><%= label.delivery_time %></span>
           </div>
           <div class="d10">
             <img src='<%= label.barcode_base64 %>'/>

data/lib/axiomus_api/version.rb

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

data/spec/factories.rb

@@ -78,6 +78,7 @@ FactoryGirl.define do
     not_open {generate :boolean}
     extrapack {generate :boolean}
     big {generate :boolean}
+    part_return {generate :boolean}
   end
 
   factory :base_order, class: AxiomusApi::BaseOrder do
@@ -244,13 +245,13 @@ FactoryGirl.define do
     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}
+    b_time {rand(0..1) == 0 ? rand(10..17) : nil}
+    e_time {b_time.nil? ? nil : 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)]}
+    city {['Мск', 'СПб'][rand(0..1)]}
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: axiomus_api
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - Kinderly LTD
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-18 00:00:00.000000000 Z
+date: 2014-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri