Folder structure and more tests.

lib/axiomus_api.rb

@@ -28,7 +28,7 @@ def self.test_session(&block)
 require_relative('axiomus_api/errors')
 require_relative('axiomus_api/response_codes')
 
-Dir.glob(File.join(File.dirname(__FILE__),'axiomus_api/*.rb')).each do |file|
+Dir.glob(File.join(File.dirname(__FILE__),'axiomus_api/**/*.rb')).each do |file|
   require_relative(file)
 end
 

lib/axiomus_api/actions.rb

@@ -1,6 +1,6 @@
-require_relative('request')
-require_relative('order_request')
-require_relative('status_request')
+require_relative('request/request')
+require_relative('request/order_request')
+require_relative('request/status_request')
 
 module AxiomusApi::Actions
   ACTIONS = {

lib/axiomus_api/ems_address.rb → lib/axiomus_api/address/ems_address.rb

@@ -1,4 +1,4 @@
-require_relative 'base'
+require_relative '../base'
 
 class AxiomusApi::EmsAddress < AxiomusApi::Base
 

lib/axiomus_api/post_address.rb → lib/axiomus_api/address/post_address.rb

@@ -1,4 +1,4 @@
-require_relative 'base'
+require_relative '../base'
 
 class AxiomusApi::PostAddress < AxiomusApi::Base
 

lib/axiomus_api/regions_courier_address.rb → lib/axiomus_api/address/regions_courier_address.rb

@@ -1,4 +1,4 @@
-require_relative 'base'
+require_relative '../base'
 
 class AxiomusApi::RegionsCourierAddress < AxiomusApi::Base
 

lib/axiomus_api/regions_pickup_address.rb → lib/axiomus_api/address/regions_pickup_address.rb

@@ -1,4 +1,4 @@
-require_relative 'base'
+require_relative '../base'
 
 class AxiomusApi::RegionsPickupAddress < AxiomusApi::Base
 

lib/axiomus_api/item.rb → lib/axiomus_api/item/item.rb

@@ -1,4 +1,4 @@
-require_relative 'base'
+require_relative '../base'
 
 class AxiomusApi::Item < AxiomusApi::Base
   xml_element :item

lib/axiomus_api/base_order.rb → lib/axiomus_api/order/base_order.rb

@@ -1,5 +1,5 @@
-require_relative 'base'
-require_relative 'services'
+require_relative '../base'
+require_relative '../services/services'
 
 class AxiomusApi::BaseOrder < AxiomusApi::Base
   xml_element :order

lib/axiomus_api/ems_order.rb → lib/axiomus_api/order/ems_order.rb

@@ -1,6 +1,6 @@
 require_relative 'base_order'
-require_relative 'ems_address'
-require_relative 'post_services'
+require_relative '../address/ems_address'
+require_relative '../services/post_services'
 
 class AxiomusApi::EmsOrder < AxiomusApi::BaseOrder
   #уточнить

lib/axiomus_api/export_order.rb → lib/axiomus_api/order/export_order.rb

@@ -1,6 +1,6 @@
 require_relative 'base_order'
-require_relative 'export_item'
-require_relative 'export_services'
+require_relative '../item/export_item'
+require_relative '../services/export_services'
 
 class AxiomusApi::ExportOrder < AxiomusApi::BaseOrder
 

lib/axiomus_api/post_order.rb → lib/axiomus_api/order/post_order.rb

@@ -1,6 +1,6 @@
 require_relative 'base_order'
-require_relative 'post_address'
-require_relative 'post_services'
+require_relative '../address/post_address'
+require_relative '../services/post_services'
 
 class AxiomusApi::PostOrder < AxiomusApi::BaseOrder
   #уточнить

lib/axiomus_api/regions_courier_order.rb → lib/axiomus_api/order/regions_courier_order.rb

@@ -1,5 +1,5 @@
 require_relative 'regions_order'
-require_relative 'regions_courier_address'
+require_relative '../address/regions_courier_address'
 
 class AxiomusApi::RegionsCourierOrder < AxiomusApi::RegionsOrder
 

lib/axiomus_api/regions_order.rb → lib/axiomus_api/order/regions_order.rb

@@ -1,7 +1,8 @@
 require_relative 'base_order'
+require_relative '../services/regions_services'
 
 class AxiomusApi::RegionsOrder < AxiomusApi::BaseOrder
   xml_attribute :d_date, :b_time, :e_time
   xml_attribute :incl_deliv_sum, optional: true
-
+  xml_field :services, type: AxiomusApi::RegionsServices
 end

lib/axiomus_api/regions_pickup_order.rb → lib/axiomus_api/order/regions_pickup_order.rb

@@ -1,5 +1,5 @@
 require_relative 'regions_order'
-require_relative 'regions_pickup_address'
+require_relative '../address/regions_pickup_address'
 
 class AxiomusApi::RegionsPickupOrder < AxiomusApi::RegionsOrder
 

lib/axiomus_api/order_request.rb → lib/axiomus_api/request/order_request.rb

@@ -1,5 +1,5 @@
 require_relative 'request'
-require_relative 'base_auth'
+require_relative '../base_auth'
 
 class AxiomusApi::OrderRequest < AxiomusApi::Request
   xml_field :order

lib/axiomus_api/request.rb → lib/axiomus_api/request/request.rb

@@ -1,5 +1,5 @@
-require_relative 'base'
-require_relative 'base_auth'
+require_relative '../base'
+require_relative '../base_auth'
 
 class AxiomusApi::Request < AxiomusApi::Base
 

lib/axiomus_api/export_services.rb → lib/axiomus_api/services/export_services.rb

@@ -1,4 +1,4 @@
-require_relative 'base'
+require_relative '../base'
 
 class AxiomusApi::ExportServices < AxiomusApi::Base
 

lib/axiomus_api/post_services.rb → lib/axiomus_api/services/post_services.rb

@@ -1,4 +1,4 @@
-require_relative 'base'
+require_relative '../base'
 
 class AxiomusApi::PostServices < AxiomusApi::Base
 

lib/axiomus_api/services/regions_services.rb

@@ -0,0 +1,7 @@
+require_relative '../base'
+
+class AxiomusApi::RegionsServices < AxiomusApi::Base
+
+  xml_attribute :cheque, :not_open, :extrapack, :big, optional: true
+
+end

lib/axiomus_api/services.rb → lib/axiomus_api/services/services.rb

@@ -1,4 +1,4 @@
-require_relative 'base'
+require_relative '../base'
 
 class AxiomusApi::Services < AxiomusApi::Base
 

lib/axiomus_api/session.rb

@@ -1,8 +1,8 @@
 require 'net/http'
 require_relative 'actions'
-require_relative 'regions_response'
-require_relative 'status_response'
-require_relative 'order_response'
+require_relative 'response/regions_response'
+require_relative 'response/status_response'
+require_relative 'response/order_response'
 
 class AxiomusApi::Session
   include AxiomusApi::Actions

spec/lib/axiomus_api/base_order_spec.rb

@@ -19,4 +19,34 @@
       end
     end
   end
+
+end
+
+{
+  AxiomusApi::EmsOrder => AxiomusApi::EmsAddress,
+  AxiomusApi::PostOrder => AxiomusApi::PostAddress,
+  AxiomusApi::RegionsCourierOrder => AxiomusApi::RegionsCourierAddress,
+  AxiomusApi::RegionsPickupOrder => AxiomusApi::RegionsPickupAddress
+}.each do |c, a|
+  describe c.name do
+    it 'should have correct address type' do
+      expect(c.new.address).to be_an a
+    end
+  end
+end
+
+{
+  AxiomusApi::DeliveryOrder => AxiomusApi::Services,
+  AxiomusApi::EmsOrder => AxiomusApi::PostServices,
+  AxiomusApi::ExportOrder => AxiomusApi::ExportServices,
+  AxiomusApi::PickupOrder => AxiomusApi::Services,
+  AxiomusApi::PostOrder => AxiomusApi::PostServices,
+  AxiomusApi::RegionsCourierOrder => AxiomusApi::RegionsServices,
+  AxiomusApi::RegionsPickupOrder => AxiomusApi::RegionsServices
+}.each do |c, a|
+  describe c.name do
+    it 'should have correct services type' do
+      expect(c.new.services).to be_an a
+    end
+  end
 end