mws-orders 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b05f9a8f9c6d1b3eda7df105bd088572fbe93324682f9902f81a16aa7060b55f
-  data.tar.gz: 812d86fb8d5e6e4bdf8f5ad1b928394290f26a282b5f2eed67c8054da1d1cef7
+  metadata.gz: ade6a5c1c3498da87514f76fb4e6304e1914c0f4a520641e0df1cee2533e97b5
+  data.tar.gz: ce196f172eb0cbaf1f0e994151bff632550cabbe5949d1d72abff1dad3d0ad26
 SHA512:
-  metadata.gz: 0bcd1463e7bcdf91b937926079202a9ebc93ec783da4a459fcef869c65381b8ad935d654462a3397c7ed5145f55c306f6dff4cc7345096e77f96b6c438bc19d5
-  data.tar.gz: a8df5632bc2d3132680cdc9e9c45cb91d355400fae60a6479f8b248332ce9afc80623eb51f0262fec54075ffcc77694e43415770fc58b568654beeaa6607e2ea
+  metadata.gz: 19cba4b4ceff9c1889611f27272fcb090e818c1f7bf888108ccf5c5e82a488541c1a3b0d8a6fafd1a96af313fa10d795fcacb6d86d24869cd20ac7705f63296b
+  data.tar.gz: 493cf6bade595b54da1cee5234e40c79a2de8f01b6281c4843ceb0582ef58327ec0bb4de711dfc229312153b16a530b8df0b0ec38e4ae1687e58fcc9a5928e5e

data/README.md

@@ -39,7 +39,7 @@ client.list_orders_by_next_token(orders.next_token).parse
 Get one or more orders based on their order numbers:
 
 ```ruby
-response = client.get_order('123-1234567-1234567')
+response = client.get_order('902-3159896-1390916')
 order = response.parse
 order.inspect # => #<MWS::Orders::Order 902-3159896-1390916>
 ```
@@ -49,7 +49,7 @@ order.inspect # => #<MWS::Orders::Order 902-3159896-1390916>
 List order items:
 
 ```ruby
-response = client.list_order_items('123-1234567-1234567')
+response = client.list_order_items('902-3159896-1390916')
 order_items = response.parse
 ```
 

data/lib/mws/orders/document.rb

@@ -11,17 +11,31 @@ module MWS
       end
 
       def xpath(path)
-        node.xpath(add_namespace(path))
+        node.xpath(add_namespace(path), namespaces)
       end
 
       def at_xpath(path)
-        node.at_xpath(add_namespace(path))
+        node.at_xpath(add_namespace(path), namespaces)
       end
 
       private
 
       def add_namespace(path)
-        path.split('/').map { |attr| "xmlns:#{attr}" }.join('/')
+        path.split('/')
+            .map { |attr| attr.include?(':') ? attr : "xmlns:#{attr}" }
+            .join('/')
+      end
+
+      def namespaces
+        @namespaces ||= collect_namespaces
+      end
+
+      def collect_namespaces
+        document = node&.document || node
+        document.collect_namespaces.each_with_object({}) do |namespace, hsh|
+          key, val = namespace
+          hsh[key.sub(/^xmlns:/, '')] = val
+        end
       end
     end
   end

data/lib/mws/orders/order.rb

@@ -62,8 +62,8 @@ module MWS
       end
 
       attribute(:payment_execution_detail) do
-        xpath('PaymentExecutionDetail/PaymentExecutionDetailItem')
-          .map { |node| PaymentExecutionDetailItem.new(node) }
+        entities('PaymentExecutionDetail/PaymentExecutionDetailItem',
+                 PaymentExecutionDetailItem)
       end
 
       attribute(:payment_method) do

data/lib/mws/orders/orders.rb

@@ -11,7 +11,7 @@ module MWS
       include Tokenable
 
       def each
-        xpath('Orders/Order').map { |node| yield Order.new(node) }
+        xpath('Orders/Order').each { |node| yield Order.new(node) }
       end
     end
   end

data/lib/mws/orders/service_status.rb

@@ -20,7 +20,7 @@ module MWS
       end
 
       attribute(:messages) do
-        xpath('Messages/Message').map { |node| Message.new(node) }
+        entities('Messages/Message', Message)
       end
     end
   end

data/lib/mws/orders/version.rb

@@ -2,6 +2,6 @@
 
 module MWS
   module Orders
-    VERSION = '0.5.0'
+    VERSION = '0.5.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mws-orders
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Hakan Ensari