mws-orders 0.2.0 → 0.4.0

data/lib/mws/orders/order_items.rb

@@ -1,14 +1,16 @@
-require "mws/orders/collection"
-require "mws/orders/order_item"
-require "mws/orders/tokenable"
+# frozen_string_literal: true
+
+require 'mws/orders/collection'
+require 'mws/orders/order_item'
+require 'mws/orders/tokenable'
 
 module MWS
   module Orders
     class OrderItems < Collection
       include Tokenable
 
-      def each(&blk)
-        xpath("OrderItems/OrderItem").each { |node| yield OrderItem.new(node) }
+      def each
+        xpath('OrderItems/OrderItem').each { |node| yield OrderItem.new(node) }
       end
     end
   end

data/lib/mws/orders/orders.rb

@@ -1,14 +1,16 @@
-require "mws/orders/collection"
-require "mws/orders/order"
-require "mws/orders/tokenable"
+# frozen_string_literal: true
+
+require 'mws/orders/collection'
+require 'mws/orders/order'
+require 'mws/orders/tokenable'
 
 module MWS
   module Orders
     class Orders < Collection
       include Tokenable
 
-      def each(&blk)
-        xpath("Orders/Order").map { |node| yield Order.new(node) }
+      def each
+        xpath('Orders/Order').map { |node| yield Order.new(node) }
       end
     end
   end

data/lib/mws/orders/parser.rb

@@ -1,44 +1,69 @@
-require "nokogiri"
-require "mws/orders/orders"
-require "mws/orders/order_items"
-require "mws/orders/service_status"
+# frozen_string_literal: true
+
+require 'nokogiri'
+require 'mws/orders/orders'
+require 'mws/orders/order_items'
+require 'mws/orders/service_status'
+require 'peddler'
 
 module MWS
   module Orders
     class Parser
-      SERVICE_STATUS = /GetServiceStatus/
-      ORDER          = /GetOrder/
-      ORDERS         = /ListOrders/
-      ORDER_ITEMS    = /ListOrderItems/
+      include ::Peddler::Headers
 
-      def initialize(response, _)
+      def initialize(response, _encoding)
         @response = response
       end
 
       def parse
-        node = find_result_node
-
-        case node.name
-        when SERVICE_STATUS
-          ServiceStatus.new(node)
-        when ORDER
-          Orders.new(node).first
-        when ORDERS
-          Orders.new(node)
-        when ORDER_ITEMS
-          OrderItems.new(node)
-        else
-          raise NotImplementedError
+        case result_node.name
+        when /GetOrder/         then order
+        when /GetServiceStatus/ then service_status
+        when /ListOrders/       then orders
+        when /ListOrderItems/   then order_items
+        else raise NotImplementedError
         end
       end
 
+      def headers
+        @response.headers
+      end
+
+      def status_code
+        @response.status
+      end
+
+      def body
+        @response.body
+      end
+
       private
 
+      def order
+        orders.first
+      end
+
+      def orders
+        Orders.new(result_node)
+      end
+
+      def order_items
+        OrderItems.new(result_node)
+      end
+
+      def service_status
+        ServiceStatus.new(result_node)
+      end
+
+      def result_node
+        @result_node ||= find_result_node
+      end
+
       def find_result_node
-        xml = Nokogiri(@response.body)
+        xml = Nokogiri(body)
         root = xml.children.first
 
-        root.children.find { |node| node.name.include?("Result") }
+        root.children.find { |node| node.name.include?('Result') }
       end
     end
 

data/lib/mws/orders/payment_execution_detail.rb

@@ -1,11 +1,15 @@
-require "mws/orders/collection"
-require "mws/orders/payment_execution_detail_item"
+# frozen_string_literal: true
+
+require 'mws/orders/collection'
+require 'mws/orders/payment_execution_detail_item'
 
 module MWS
   module Orders
     class PaymentExecutionDetail < Collection
-      def each(&blk)
-        xpath("PaymentExecutionDetailItem").each { |node| yield PaymentExecutionDetailItem.new(node) }
+      def each
+        xpath('PaymentExecutionDetailItem').each do |node|
+          yield PaymentExecutionDetailItem.new(node)
+        end
       end
     end
   end

data/lib/mws/orders/payment_execution_detail_item.rb

@@ -1,14 +1,16 @@
-require "mws/orders/entity"
+# frozen_string_literal: true
+
+require 'mws/orders/entity'
 
 module MWS
   module Orders
     class PaymentExecutionDetailItem < Entity
       attribute(:payment) do
-        money_at_xpath("Payment")
+        money_at_xpath('Payment')
       end
 
       attribute(:payment_method) do
-        text_at_xpath("PaymentMethod")
+        text_at_xpath('PaymentMethod')
       end
     end
   end

data/lib/mws/orders/service_status.rb

@@ -1,23 +1,25 @@
-require "mws/orders/entity"
-require "mws/orders/service_status_message"
+# frozen_string_literal: true
+
+require 'mws/orders/entity'
+require 'mws/orders/message'
 
 module MWS
   module Orders
     class ServiceStatus < Entity
       attribute(:status) do
-        text_at_xpath("Status")
+        text_at_xpath('Status')
       end
 
       attribute(:timestamp) do
-        time_at_xpath("Timestamp")
+        time_at_xpath('Timestamp')
       end
 
       attribute(:message_id) do
-        text_at_xpath("MessageId")
+        text_at_xpath('MessageId')
       end
 
       attribute(:messages) do
-        xpath("Messages/Message").map { |node| ServiceStatusMessage.new(node) }
+        xpath('Messages/Message').map { |node| Message.new(node) }
       end
     end
   end

data/lib/mws/orders/shipping_address.rb

@@ -1,10 +1,12 @@
-require "mws/orders/entity"
+# frozen_string_literal: true
+
+require 'mws/orders/entity'
 
 module MWS
   module Orders
     class ShippingAddress < Entity
       attribute(:name) do
-        text_at_xpath("Name")
+        text_at_xpath('Name')
       end
 
       attribute(:address_lines) do
@@ -12,23 +14,23 @@ module MWS
       end
 
       attribute(:city) do
-        text_at_xpath("City")
+        text_at_xpath('City')
       end
 
       attribute(:state_or_region) do
-        text_at_xpath("StateOrRegion")
+        text_at_xpath('StateOrRegion')
       end
 
       attribute(:postal_code) do
-        text_at_xpath("PostalCode")
+        text_at_xpath('PostalCode')
       end
 
       attribute(:country_code) do
-        text_at_xpath("CountryCode")
+        text_at_xpath('CountryCode')
       end
 
       attribute(:phone) do
-        text_at_xpath("Phone")
+        text_at_xpath('Phone')
       end
     end
   end

data/lib/mws/orders/tokenable.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module MWS
   module Orders
     module Tokenable
       def next_token
         node = xpath('NextToken').first
-        node.text if node
+        node&.text
       end
     end
   end

data/lib/mws/orders/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module MWS
   module Orders
-    VERSION = "0.2.0"
+    VERSION = '0.4.0'
   end
 end

data/test/fixtures/orders.xml

@@ -41,7 +41,7 @@
               <Amount>10.00</Amount>
             </Payment>
             <PaymentMethod>GC</PaymentMethod>
-          </PaymentExecutionDetailItem>  
+          </PaymentExecutionDetailItem>
         </PaymentExecutionDetail>
         <PaymentMethod>COD</PaymentMethod>
         <MarketplaceId>ATVPDKIKX0DER</MarketplaceId>
@@ -49,6 +49,8 @@
         <BuyerEmail>5vlh04mgfmjh9h5@marketplace.amazon.com</BuyerEmail>
         <ShipmentServiceLevelCategory>Standard
         </ShipmentServiceLevelCategory>
+        <LatestShipDate>2012-10-15T07:59:59Z</LatestShipDate>
+        <LatestDeliveryDate>2012-10-15T07:59:59Z</LatestDeliveryDate>
       </Order>
       <Order>
         <ShipmentServiceLevelCategory>Standard
@@ -68,6 +70,7 @@
         <PurchaseDate>2012-10-11T14:15:55Z</PurchaseDate>
         <EarliestShipDate>2012-10-13T05:00:00Z</EarliestShipDate>
         <LatestShipDate>2012-10-15T07:59:59Z</LatestShipDate>
+        <LatestDeliveryDate>2012-10-15T07:59:59Z</LatestDeliveryDate>
         <OrderType>Preorder</OrderType>
         <NumberOfItemsUnshipped>0</NumberOfItemsUnshipped>
         <MarketplaceId>ATVPDKIKX0DER</MarketplaceId>

data/test/mws/orders/test_entity.rb

@@ -1,89 +1,91 @@
-require "test_helper"
+# frozen_string_literal: true
+
+require 'test_helper'
 
 class TestEntity < MiniTest::Test
   def test_parses_floats
-    xml = <<-EOF
+    xml = <<-XML
     <Float xmlns="example">10.0</Float>
-    EOF
-    entity= build_entity(xml)
-    float = entity.float_at_xpath("Float")
+    XML
+    entity = build_entity(xml)
+    float = entity.float_at_xpath('Float')
     assert_equal 10.0, float
   end
 
   def test_parses_integers
-    xml = <<-EOF
+    xml = <<-XML
     <Integer xmlns="example">10</Integer>
-    EOF
-    entity= build_entity(xml)
-    integer = entity.integer_at_xpath("Integer")
+    XML
+    entity = build_entity(xml)
+    integer = entity.integer_at_xpath('Integer')
     assert_equal 10, integer
   end
 
   def test_parses_money
-    xml = <<-EOF
+    xml = <<-XML
     <Price xmlns="example">
       <CurrencyCode>USD</CurrencyCode>
       <Amount>10.00</Amount>
     </Price>
-    EOF
-    entity= build_entity(xml)
-    money = entity.money_at_xpath("Price")
-    assert_equal "$10.00", money.format
+    XML
+    entity = build_entity(xml)
+    money = entity.money_at_xpath('Price')
+    assert_equal 1000, money.fractional
   end
 
-  def test_parses_japanese_yen
-    xml = <<-EOF
+  def test_parses_yen
+    xml = <<-XML
     <Price xmlns="example">
       <CurrencyCode>JPY</CurrencyCode>
       <Amount>1000.00</Amount>
     </Price>
-    EOF
-    entity= build_entity(xml)
-    money = entity.money_at_xpath("Price")
-    assert_equal "¥1,000", money.format
+    XML
+    entity = build_entity(xml)
+    money = entity.money_at_xpath('Price')
+    assert_equal 1000, money.fractional
   end
 
   def test_parses_text
-    xml = <<-EOF
+    xml = <<-XML
     <Text xmlns="example">Foo</Text>
-    EOF
-    entity= build_entity(xml)
-    text = entity.text_at_xpath("Text")
-    assert_equal "Foo", text
+    XML
+    entity = build_entity(xml)
+    text = entity.text_at_xpath('Text')
+    assert_equal 'Foo', text
   end
 
   def test_strips_text
-    xml = <<-EOF
+    xml = <<-XML
     <Text xmlns="example">Foo
 
     </Text>
-    EOF
-    entity= build_entity(xml)
-    text = entity.text_at_xpath("Text")
-    assert_equal "Foo", text
+    XML
+    entity = build_entity(xml)
+    text = entity.text_at_xpath('Text')
+    assert_equal 'Foo', text
   end
 
   def test_parses_time
-    xml = <<-EOF
+    xml = <<-XML
     <Time xmlns="example">2013-01-01T01:30:00.000-06:00</Time>
-    EOF
-    entity= build_entity(xml)
-    time = entity.time_at_xpath("Time")
+    XML
+    entity = build_entity(xml)
+    time = entity.time_at_xpath('Time')
     assert_kind_of Time, time
   end
 
   def test_handles_nil_values
-    xml = <<-EOF
+    xml = <<-XML
     <Foo xmlns="example">
     </Foo>
-    EOF
-    entity= build_entity(xml)
+    XML
+    entity = build_entity(xml)
 
-    assert_nil entity.float_at_xpath("Bar")
-    assert_nil entity.integer_at_xpath("Bar")
-    assert_nil entity.money_at_xpath("Bar")
-    assert_nil entity.time_at_xpath("Bar")
-    assert_nil entity.text_at_xpath("Bar")
+    assert_nil entity.float_at_xpath('Bar')
+    assert_nil entity.integer_at_xpath('Bar')
+    assert_nil entity.money_at_xpath('Bar')
+    assert_nil entity.time_at_xpath('Bar')
+    assert_nil entity.text_at_xpath('Bar')
   end
 
   private

data/test/mws/orders/test_message.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+class TestMessage < MiniTest::Test
+  def setup
+    node = load_fixture('service_status').xpath('//xmlns:Message').first
+    @message = Message.new(node)
+  end
+
+  def test_locale
+    assert_kind_of String, @message.locale
+  end
+
+  def test_text
+    assert_kind_of String, @message.text
+  end
+end