sheepla 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba095070e93b0af664dfa673f64520719dab1ed3
-  data.tar.gz: bf86e08c0f16f0149bcfd539eb2e98b7d731fa54
+  metadata.gz: 380c4cc89e9d22be4a5d055503045169a04175f7
+  data.tar.gz: ec1d4790e0657c7160928dd03a260a22377d9b65
 SHA512:
-  metadata.gz: b4ab3f7588bb889ffaa3263f5887bcb69f662ccf26ed35fcb4db3007fa2ccd1be3ab3e03b52eeff0abda6a66dc2e9384822089c63f27588da60c0802214d3521
-  data.tar.gz: a318f5ca6af2b7efba9af43f67c3e63145b91c7016c7fd2ddc0b9ccddfa839dd6d63e27d272dbfc435c11a825aad04e10ee087cf5accfc17aba5c9e4d3157b81
+  metadata.gz: 669000e3b01bd50812e1e95397fe8d2192a71185425607a5e71ed0ca6d88764e66e69f5fcd3bcf1309bf0d894847366fc18c6982d719e56980cf2cc2c0537054
+  data.tar.gz: 8666a7f481ed27e7a2a09f7c03c839e029a556e5fc0f5ed03966dbae10a757018b73c38ead5008a0f93a8338079994e568c5762c7e77cbfb51a6a666428b1805

data/lib/sheepla/version.rb

@@ -1,3 +1,3 @@
 module Sheepla
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/sheepla.rb

@@ -2,7 +2,6 @@ require 'rubygems'
 require 'net/https'
 require 'uri'
 require 'nokogiri'
-require 'ostruct'
 
 module Sheepla
   class ApiError < StandardError; end
@@ -17,7 +16,8 @@ module Sheepla
     end
 
     def create_order(params)
-      order = params.clone.deep_stringify_keys
+      order = params.deep_transform_keys{ |key| key.to_s.camelize(:lower) }
+
       raise ApiError.new("Order parameters don't contain all obligatory keys") unless validate_order(order)
 
       connection('createOrder')
@@ -85,40 +85,40 @@ module Sheepla
         body_wrapper('createOrderRequest') do |xml|
           xml.orders do
             xml.order do
-              xml.orderValue order['order_value']
-              xml.orderValueCurrency order['order_currency']
-              xml.externalDeliveryTypeId order['external_delivery_type_id']
-              xml.externalDeliveryTypeName order['external_delivery_type_name']
-              xml.externalPaymentTypeId order['external_payment_type_id']
-              xml.externalPaymentTypeName order['external_payment_type_name']
-              xml.externalCarrierName order['external_carrier_name']
-              xml.externalCarrierId order['external_carrier_id']
-              xml.externalCountryId order['external_country_id']
-              xml.externalBuyerId order['external_buyer_id']
-              xml.externalOrderId order['external_order_id']
-              xml.shipmentTemplate order['shipment_template']
-              xml.comments order['comments']
-              xml.createdOn order['created_on'].to_s
-              xml.deliveryPrice order['delivery_price']
-              xml.deliveryPriceCurrency order['delivery_price_currency']
-              xml.deliveryAddress do
-                xml.street order['delivery_address']['street']
-                xml.zipCode order['delivery_address']['zip_code']
-                xml.city order['delivery_address']['city']
-                xml.countryAlpha2Code order['delivery_address']['country_alpha2_code']
-                xml.firstName order['delivery_address']['first_name']
-                xml.lastName order['delivery_address']['last_name']
-                xml.companyName order['delivery_address']['company_name']
-                xml.phone order['delivery_address']['phone']
-                xml.email order['delivery_address']['email']
-              end
-              add_order_items(xml, order['order_items'])
-              add_delivery_options(xml, order['delivery_options']) if order['delivery_options']
+              add_delivery_address(xml, order.delete('deliveryAddress'))
+              add_order_items(xml, order.delete('orderItems')) if order['orderItems']
+              add_delivery_options(xml, order.delete('deliveryOptions')) if order['deliveryOptions']
+              add_other_order_data(xml, order)
+              # xml.orderValue order['order_value']
+              # xml.orderValueCurrency order['order_currency']
+              # xml.externalDeliveryTypeId order['external_delivery_type_id']
+              # xml.externalDeliveryTypeName order['external_delivery_type_name']
+              # xml.externalPaymentTypeId order['external_payment_type_id']
+              # xml.externalPaymentTypeName order['external_payment_type_name']
+              # xml.externalCarrierName order['external_carrier_name']
+              # xml.externalCarrierId order['external_carrier_id']
+              # xml.externalCountryId order['external_country_id']
+              # xml.externalBuyerId order['external_buyer_id']
+              # xml.externalOrderId order['external_order_id']
+              # xml.shipmentTemplate order['shipment_template']
+              # xml.comments order['comments']
+              # xml.createdOn order['created_on'].to_s
+              # xml.deliveryPrice order['delivery_price']
+              # xml.deliveryPriceCurrency order['delivery_price_currency']
+
             end
           end
         end
       end
 
+      def add_delivery_address(xml, delivery_address)
+        xml.deliveryAddress do
+          delivery_address.each do |delivery_key, delivery_value|
+            xml.send(delivery_key, delivery_value)
+          end
+        end
+      end
+
       def add_order_items(xml, order_items)
         xml.orderItems do
           order_items.each do |order_item|
@@ -145,6 +145,12 @@ module Sheepla
         end 
       end
 
+      def add_other_order_data(xml, order_data)
+        order_data.each do |k,v|
+          xml.send(k, v)
+        end        
+      end
+
       def validate_order(params)
         params['order_value'] &&
         params['order_currency'] &&

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sheepla
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Marcin Jan Adamczyk