marketplace_web_service 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f28041e47bf57d747d23b02e2896c255f1c32a90
-  data.tar.gz: a61d946c4743938358d764bc7bcd81cfcf4d62bb
+  metadata.gz: 2f4ff93dac20f15865f105e22202cd5b246ae0d1
+  data.tar.gz: af2075a5e950eed79f9c9c4ffe3d99c018e02bcb
 SHA512:
-  metadata.gz: 946259c65ec86b8c93731b07dc261f2e3e2db8d2dd406245d096b29fa4dbd5deac1b3b3778d763b67b6cd40ad1b880375a8e4f25f4850946d02c3eb101c203bb
-  data.tar.gz: d3012bd41edb161417b6184deef31274becab95ba577abb4c70f630559168e4eec4c606ff5e7eba9ba990b8baba9723eca0e6db0cdb1b9414dc8a3403058ff2e
+  metadata.gz: f80a5ae26a99bdf8edc0c852dac8628c927ada747d401f33445e86088f50e320f354e1ffb8b059306c93e3187ebf798c07447ae69a92b8d7d032a0575ab7f3d9
+  data.tar.gz: e4652031bf15c83e5aee67ffe3687c991dff8bc6c94d5038822cea72e9c704a21386e0c28864f32df2c6dce86e17292a057d9b2b2540bd165941c013f7e8332c

data/README.md

@@ -1,5 +1,6 @@
 # MarketplaceWebService
 
+[![Gem Version](https://badge.fury.io/rb/marketplace_web_service.svg)](http://badge.fury.io/rb/marketplace_web_service)
 [![Build Status](https://travis-ci.org/e-maido/marketplace_web_service.svg?branch=master)](https://travis-ci.org/e-maido/marketplace_web_service)
 [![Coverage Status](https://img.shields.io/coveralls/e-maido/marketplace_web_service.svg)](https://coveralls.io/r/e-maido/marketplace_web_service)
 

data/lib/mws/query_string/request_string.rb

@@ -3,11 +3,11 @@ require "mws/query_string/uri_encoder"
 module MWS
   class QueryString < ::String
     class RequestString < ::String
-      def initialize(method, host, path, params)
-        @method = method
-        @host   = host
-        @path   = path
-        @params = params
+      def initialize(args)
+        @method   = args[:method]
+        @endpoint = args[:endpoint]
+        @path     = args[:path]
+        @params   = args[:params]
 
         super(request_string)
       end
@@ -26,7 +26,7 @@ module MWS
       def request_string
         [
           @method.to_s.upcase,
-          @host,
+          @endpoint,
           @path,
           encoded_params.map{|pair| pair.join("=") }.join("&")
         ].join("\n")

data/lib/mws/query_string.rb

@@ -1,3 +1,4 @@
+require "time"
 require "mws/query_string/request_string"
 require "mws/query_string/signature"
 require "mws/query_string/uri_encoder"
@@ -12,11 +13,11 @@ module MWS
     }
 
     def initialize(args)
-      @key    = args[:key]
-      @method = args[:method] || DEFAULT_METHOD
-      @host   = args[:host]
-      @path   = args[:path] || DEFAULT_PATH
-      @params = DEFAULT_PARAMS.merge(args[:params])
+      @key      = args[:key]
+      @method   = args[:method] || DEFAULT_METHOD
+      @endpoint = args[:endpoint]
+      @path     = args[:path] || DEFAULT_PATH
+      @params   = DEFAULT_PARAMS.merge(args[:params])
 
       @params["Timestamp"] = timestamp_string
       @params["Signature"] = signature_string # This substitution must be final substitution
@@ -31,8 +32,28 @@ module MWS
       sorted_params.each.map{|k, v| [k, encoder.encode(v)].join("=") }.join("&")
     end
 
+    def sorted_params
+      expanded_params.sort_by{|k, _v| k }
+    end
+
+    def expanded_params
+      params = {}
+      @params.each do |key, value|
+        if Array === value
+          value.each.with_index(1) do |v, idx|
+            element_name = key.match(/([A-Z][a-z]+)List/)[1]
+            new_key = [key, element_name, idx.to_s].join(".")
+            params[new_key] = v
+          end
+        else
+          params[key] = value
+        end
+      end
+      params
+    end
+
     def timestamp_string
-      (@params["Timestamp"].is_a?(Time) ? @params["Timestamp"] : Time.now).iso8601
+      (@params["Timestamp"].is_a?(Time) ? @params["Timestamp"] : Time.now).getutc.iso8601
     end
 
     def signature_string
@@ -40,11 +61,7 @@ module MWS
     end
 
     def request_string
-      MWS::QueryString::RequestString.new(@method, @host, @path, @params)
-    end
-
-    def sorted_params
-      @params.sort_by{|k, _v| k }
+      MWS::QueryString::RequestString.new(method: @method, endpoint: @endpoint, path: @path, params: expanded_params)
     end
   end
 end

data/lib/mws/report.rb

@@ -0,0 +1,17 @@
+module MWS
+  module Report
+    DEFAULT_VERSION = "2009-01-01"
+
+    def method_missing(method, args={})
+      action = method.to_s.split("_").map(&:capitalize).join
+      args[:params] = {"Action" => action, "Version" => DEFAULT_VERSION}.merge(args[:params])
+      args = args.merge({path: "/?#{MWS::QueryString.new(args)}"})
+
+      req = MWS::Request.new(args)
+      res = req.execute
+      res.body
+    end
+
+    module_function :method_missing
+  end
+end

data/lib/mws/request.rb

@@ -0,0 +1,41 @@
+require "base64"
+require "digest/md5"
+require "net/http"
+require "net/https"
+
+module MWS
+  class Request
+    DEFAULT_METHOD = :post
+
+    def initialize(args)
+      @method   = args[:method] || DEFAULT_METHOD
+      @path     = args[:path]
+      @endpoint = args[:endpoint]
+      @headers  = args[:headers] || {}
+      @body     = args[:body] || ""
+    end
+
+    def execute
+      client = Net::HTTP.new(@endpoint, 443)
+      client.use_ssl = true
+
+      client.start do |https|
+        case @method
+        when :post then return https.post(@path, @body, headers)
+        else raise ArgumentError, "#{@method} is unknown HTTP method"
+        end
+      end
+    end
+
+    private
+
+    def headers
+      {
+        "Content-Type" => "text/xml",
+        "Content-MD5" => Base64.encode64(Digest::MD5.digest(@body)),
+        "User-Agent"  => "MarketplaceWebService/#{MWS::VERSION} (Language=Ruby)",
+        "Host"        => @endpoint
+      }.merge(@headers)
+    end
+  end
+end

data/lib/mws/version.rb

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

data/lib/mws.rb

@@ -1,4 +1,6 @@
 require "mws/query_string"
+require "mws/report"
+require "mws/request"
 require "mws/version"
 
 module MWS

data/spec/mws/query_string/request_string_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
 describe MWS::QueryString::RequestString do
-  let(:request_string){ MWS::QueryString::RequestString.new(method, host, path, params) }
+  let(:request_string){ MWS::QueryString::RequestString.new(method: method, endpoint: endpoint, path: path, params: params) }
   let(:method){ "POST" }
-  let(:host){ "mws.amazonservice.com" }
+  let(:endpoint){ "mws.amazonservices.com" }
   let(:path){ "/" }
   let(:params) {
     {
@@ -17,7 +17,7 @@ describe MWS::QueryString::RequestString do
   let(:valid_request_string){
     request_string = <<-REQUEST_STRING
 POST
-mws.amazonservice.com
+mws.amazonservices.com
 /
 Attr1=Value1&Attr2=Value2&Attr3=Value3&Timestamp=12%3A34%3A56
     REQUEST_STRING

data/spec/mws/query_string_spec.rb

@@ -5,10 +5,12 @@ describe MWS::QueryString do
   let(:valid_args){
     {
       key: "ThisIsSigningKey",
-      host: "mws.amazonservice.com",
+      endpoint: "mws.amazonservices.com",
       params: {
         "Action" => "SubmitFeed",
-        "Timestamp" => Time.new(2009, 8, 20, 1, 10, 27, 607)
+        "Timestamp" => Time.new(2009, 8, 20, 1, 10, 27, 607),
+        "SomethingIdList" => [123, 456],
+        "SomethingTypeList" => ["ABC", "DEF"]
       }
     }
   }
@@ -19,5 +21,7 @@ describe MWS::QueryString do
     it("should be formated with query style"){ is_expected.to match /\A([^=&]+=[^=&]+)(&[^=&]+=[^=&]+)*\Z/ }
     it("should be URI encoded"){ is_expected.not_to match /\A[A-Za-z0-9\-\_\.\~]*\Z/ }
     it("should have timestamp in ISO8601 format"){ is_expected.to match /\d{4}-\d{2}-\d{2}T\d{2}%3A\d{2}%3A\d{2}/ }
+    it("should have expanded ids"){ is_expected.to match "SomethingIdList.Id.1=123" }
+    it("should have expanded types"){ is_expected.to match "SomethingTypeList.Type.2=DEF" }
   end
 end

data/spec/mws/report_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe MWS::Report do
+  describe ".method_missing" do
+    describe ".get_report_list" do
+      let(:valid_args){
+        {
+          key: "ThisIsSigningKey",
+          endpoint: "mws.amazonservices.com",
+          params: {
+            "AWSAccessKeyId" => "AccessKeyIdString",
+            "SellerId" => "SellerIdString",
+            "ReportTypeList" => ["_GET_FLAT_FILE_ORDERS_DATA_"],
+            "Acknowledged" => false,
+            "MaxCount" => 100
+          }
+        }
+      }
+
+      before do
+        response = double("request")
+        expect(response).to receive(:body).and_return("BodyString")
+        request = double("request")
+        expect(request).to receive(:execute).and_return(response)
+        expect(MWS::Request).to receive(:new).and_return(request)
+      end
+
+      subject { described_class.get_report_list(valid_args) }
+      it { is_expected.to be_a String }
+    end
+  end
+end

data/spec/mws/request_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe MWS::Request do
+  let(:request){ MWS::Request.new(valid_args) }
+  let(:valid_args){
+    {
+      path: "/?Attr=Value",
+      endpoint: "mws.amazonservices.com",
+      headers: {},
+      body: ""
+    }
+  }
+
+  describe "initialize" do
+    subject{ request }
+    it{ is_expected.to be_a MWS::Request }
+  end
+
+  describe "#execute" do
+    context "POST" do
+      before do
+        http = Net::HTTP.new("")
+        expect(http).to receive(:use_ssl=).with(true)
+        expect(http).to receive(:start).and_yield(http)
+        expect(http).to receive(:post)
+        expect(Net::HTTP).to receive(:new).and_return(http)
+      end
+
+      it "should POST request" do
+        expect{ request.execute }.not_to raise_error
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marketplace_web_service
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - OSA Shunsuke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-29 00:00:00.000000000 Z
+date: 2014-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,12 +86,16 @@ files:
 - lib/mws/query_string/request_string.rb
 - lib/mws/query_string/signature.rb
 - lib/mws/query_string/uri_encoder.rb
+- lib/mws/report.rb
+- lib/mws/request.rb
 - lib/mws/version.rb
 - marketplace_web_service.gemspec
 - spec/mws/query_string/request_string_spec.rb
 - spec/mws/query_string/signature_spec.rb
 - spec/mws/query_string/uri_encoder_spec.rb
 - spec/mws/query_string_spec.rb
+- spec/mws/report_spec.rb
+- spec/mws/request_spec.rb
 - spec/mws_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/e-maido/marketplace_web_service
@@ -123,5 +127,7 @@ test_files:
 - spec/mws/query_string/signature_spec.rb
 - spec/mws/query_string/uri_encoder_spec.rb
 - spec/mws/query_string_spec.rb
+- spec/mws/report_spec.rb
+- spec/mws/request_spec.rb
 - spec/mws_spec.rb
 - spec/spec_helper.rb