marketplace_web_service 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f4ff93dac20f15865f105e22202cd5b246ae0d1
-  data.tar.gz: af2075a5e950eed79f9c9c4ffe3d99c018e02bcb
+  metadata.gz: b050d9e13f090866dccb8998f44218a5a8b26b6a
+  data.tar.gz: ffba83a4ef0b45e4b2cd6d3d2bb1f89df27fd545
 SHA512:
-  metadata.gz: f80a5ae26a99bdf8edc0c852dac8628c927ada747d401f33445e86088f50e320f354e1ffb8b059306c93e3187ebf798c07447ae69a92b8d7d032a0575ab7f3d9
-  data.tar.gz: e4652031bf15c83e5aee67ffe3687c991dff8bc6c94d5038822cea72e9c704a21386e0c28864f32df2c6dce86e17292a057d9b2b2540bd165941c013f7e8332c
+  metadata.gz: b9b7861be76f73e0ba9e7da7b58033671387676492fbf422fa545ec452a37807ec0d1c4ee4b04a60c58f4f04e49ce08925ca4f1734f83108bc6bfe97289f78b3
+  data.tar.gz: 73963d4de204c40b57e1a3362a74efacfba120d448014e3e36c237b861d4204fc6dbd8a1526a1356a4ebebc1caba804c1c2c23e9a2d218a5197688027c5e34d4

data/lib/mws.rb

@@ -1,7 +1,9 @@
 require "mws/query_string"
-require "mws/report"
 require "mws/request"
 require "mws/version"
 
+require "mws/feed"
+require "mws/report"
+
 module MWS
 end

data/lib/mws/api.rb

@@ -0,0 +1,18 @@
+require "mws/query_string"
+require "mws/request"
+
+module MWS
+  module API
+    module_function
+
+    def request(method, args, default_version)
+      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
+  end
+end

data/lib/mws/feed.rb

@@ -0,0 +1,13 @@
+require "mws/api"
+
+module MWS
+  module Feed
+    DEFAULT_VERSION = "2009-01-01"
+
+    module_function
+
+    def method_missing(method, args={})
+      MWS::API.request(method, args, DEFAULT_VERSION)
+    end
+  end
+end

data/lib/mws/query_string.rb

@@ -1,7 +1,7 @@
 require "time"
+require "mws/query_string/percent_encoded_string"
 require "mws/query_string/request_string"
 require "mws/query_string/signature"
-require "mws/query_string/uri_encoder"
 
 module MWS
   class QueryString < ::String
@@ -28,8 +28,7 @@ module MWS
     private
 
     def query_string
-      encoder = MWS::QueryString::UriEncoder.new
-      sorted_params.each.map{|k, v| [k, encoder.encode(v)].join("=") }.join("&")
+      sorted_params.each.map{|k, v| [k, PercentEncodedString.new(v)].join("=") }.join("&")
     end
 
     def sorted_params

data/lib/mws/query_string/percent_encoded_string.rb

@@ -0,0 +1,12 @@
+require "uri_encoding"
+
+module MWS
+  class QueryString < ::String
+    class PercentEncodedString < ::String
+      def initialize(string)
+        encoded_string = UriEncoding.encode(string, UriEncoding::UnreservedCharacters)
+        super(encoded_string)
+      end
+    end
+  end
+end

data/lib/mws/query_string/request_string.rb

@@ -1,4 +1,4 @@
-require "mws/query_string/uri_encoder"
+require "mws/query_string/percent_encoded_string"
 
 module MWS
   class QueryString < ::String
@@ -19,8 +19,7 @@ module MWS
       end
 
       def encoded_params
-        encoder = MWS::QueryString::UriEncoder.new
-        Hash[sorted_params.map{|pair| pair.map{|elm| encoder.encode(elm.to_s) } } ]
+        Hash[sorted_params.map{|pair| pair.map{|elm| PercentEncodedString.new(elm.to_s) } } ]
       end
 
       def request_string

data/lib/mws/report.rb

@@ -1,17 +1,13 @@
+require "mws/api"
+
 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)}"})
+    module_function
 
-      req = MWS::Request.new(args)
-      res = req.execute
-      res.body
+    def method_missing(method, args={})
+      MWS::API.request(method, args, DEFAULT_VERSION)
     end
-
-    module_function :method_missing
   end
 end

data/lib/mws/version.rb

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

data/marketplace_web_service.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "uri_encoding", ">= 0.0.2"
+
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"

data/spec/mws/feed_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe MWS::Feed do
+  describe ".method_missing" do
+    describe ".submit_feed" do
+      let(:valid_args){
+        {
+          key: "ThisIsSigningKey",
+          endpoint: "mws.amazonservices.com",
+          params: {
+            "AWSAccessKeyId" => "AccessKeyIdString",
+            "SellerId" => "SellerIdString",
+            "FeedType" => "_POST_PRODUCT_PRICING_DATA_"
+          },
+          body: request_body
+        }
+      }
+      let(:request_body){ "" }
+
+      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.submit_feed(valid_args) }
+      it { is_expected.to be_a String }
+    end
+  end
+end

data/spec/mws/query_string/{uri_encoder_spec.rb → percent_encoded_string_spec.rb}

@@ -1,9 +1,7 @@
-require 'spec_helper'
-
-describe MWS::QueryString::UriEncoder do
-  describe "#encode" do
-    let(:encoder){ MWS::QueryString::UriEncoder.new }
+require "spec_helper"
 
+describe MWS::QueryString::PercentEncodedString do
+  describe "initialize" do
     mappings = {
       "abcdefghijklmnopqrstuvwxyz" => "abcdefghijklmnopqrstuvwxyz",
       "ABCDEFGHIJKLMNOPQRSTUVWXYZ" => "ABCDEFGHIJKLMNOPQRSTUVWXYZ",
@@ -18,9 +16,13 @@ describe MWS::QueryString::UriEncoder do
       "2009-08-20T01:10:27.607Z" => "2009-08-20T01%3A10%3A27.607Z"
     }
 
+    subject{ described_class.new("") }
+    it{ is_expected.to be_an_instance_of(described_class) }
+    it{ is_expected.to be_a(String) }
+
     mappings.each do |before, after|
       describe "\"#{before}\"" do
-        subject{ encoder.encode(before) }
+        subject{ described_class.new(before) }
         it{ is_expected.to eq(after) }
       end
     end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: marketplace_web_service
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - OSA Shunsuke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-18 00:00:00.000000000 Z
+date: 2014-09-23 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: uri_encoding
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -82,17 +96,20 @@ files:
 - Rakefile
 - lib/marketplace_web_service.rb
 - lib/mws.rb
+- lib/mws/api.rb
+- lib/mws/feed.rb
 - lib/mws/query_string.rb
+- lib/mws/query_string/percent_encoded_string.rb
 - 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/feed_spec.rb
+- spec/mws/query_string/percent_encoded_string_spec.rb
 - 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
@@ -123,9 +140,10 @@ signing_key:
 specification_version: 4
 summary: Simple wrapper gem for Amazon MWS(Marketplace Web Service) API.
 test_files:
+- spec/mws/feed_spec.rb
+- spec/mws/query_string/percent_encoded_string_spec.rb
 - 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

data/lib/mws/query_string/uri_encoder.rb

@@ -1,17 +0,0 @@
-module MWS
-  class QueryString < ::String
-    class UriEncoder
-      NO_ENCODE_CHARACTERS = /[A-Za-z0-9\-\_\.\~]/
-
-      def encode(string)
-        string.to_s.each_char.map{|char| char.match(NO_ENCODE_CHARACTERS) ? char : escape_char(char) }.join("")
-      end
-
-      private
-
-      def escape_char(char)
-        char.each_byte.map{|byte| "%#{byte.to_s(16).upcase}" }.join("")
-      end
-    end
-  end
-end