iij-sakagura 0.1.0 → 0.1.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2f0e9914792d60a8a94d92e248be4b945f6b1469
+  data.tar.gz: a69aaebf85e23074e4bbea328b85bb82f20eec61
+SHA512:
+  metadata.gz: 1756a605bc87ca0a9af42d7a0ee2387740f31b7a61e493b317ad8cf782899a8d32a010a3070d657a0e930807aeda1875842bb64bcdd59e08c44b2eafb316380f
+  data.tar.gz: d56f3e5808480d3dd5d0f98aa1cbd5db58d9c544bd61860c84bd3d88d0b7fc1d6c5dfe5007c71a633b6e5b6e3088f84bbb540baf0cfbff67ca36d97148a8c5e2

data/Gemfile

@@ -10,7 +10,7 @@ group :test do
   gem 'simplecov', :require => false
   gem 'simplecov-rcov', :require => false
   gem 'webmock'
-  gem 'vcr', '~> 2.8.0'
+  gem 'vcr', '~> 2.9.2'
 end
 
 gemspec

data/iij-sakagura.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "json"
-  spec.add_dependency "faraday"
-  spec.add_dependency "faraday_middleware"
+  spec.add_dependency "faraday", [">= 0.8.0", "< 0.10"]
+  spec.add_dependency "faraday_middleware", [">= 0.9.0", "< 0.10"]
 end

data/lib/iij/sakagura/core/middleware/iij_sakagura_raise_error.rb

@@ -49,7 +49,9 @@ module IIJ
           end
         end
 
-        Faraday.register_middleware :response, :iij_sakagura_raise_error => RaiseError
+        if Faraday::Response.respond_to? :register_middleware
+          Faraday::Response.register_middleware :iij_sakagura_raise_error => RaiseError
+        end
       end
     end
   end

data/lib/iij/sakagura/core/middleware/signature_v2.rb

@@ -23,8 +23,12 @@ module IIJ
             @app.call(env)
           end
 
+          def current_time
+            Time.now
+          end
+
           def required_params
-            expire = Time.now + @expire_after
+            expire = current_time + @expire_after
 
             {
               "AccessKeyId" => @access_key,
@@ -64,7 +68,10 @@ module IIJ
             params.sort_by{|k,v| k}.map{|k,v| escape(k.to_s) + "=" + escape(v.to_s) }.join('&')
           end
         end
-        Faraday.register_middleware :request, :signature_v2 => SignatureV2
+
+        if Faraday::Request.respond_to? :register_middleware
+          Faraday::Request.register_middleware :signature_v2 => SignatureV2
+        end
       end
     end
   end

data/lib/iij/sakagura/version.rb

@@ -1,5 +1,5 @@
 module IIJ
   module Sakagura
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/spec/helper.rb

@@ -13,8 +13,24 @@ require 'webmock/rspec'
 
 WebMock.disable_net_connect!
 
+module RequestMiddlewareExampleGroup
+  def self.included(base)
+    base.let(:endpoint) { "http://api.example.jp/1/" }
+    base.let(:connection) { Faraday.new :url => endpoint }
+    base.let(:middleware) { described_class.new(lambda{|env| env }, *middleware_options) }
+  end
+
+  def process(method = :get, &block)
+    middleware.call(make_env(method, &block))
+  end
+
+  def make_env(method = :get, &block)
+    connection.build_request(method, &block).to_env(connection)
+  end
+end
+
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.include RequestMiddlewareExampleGroup, :type => :request_middleware
 end
 
 require 'vcr'

data/spec/iij/sakagura/core/middleware/signature_v2_spec.rb

@@ -0,0 +1,81 @@
+require 'helper'
+require 'iij/sakagura/core/middleware/signature_v2'
+
+describe IIJ::Sakagura::Core::Middleware::SignatureV2, type: :request_middleware do
+  def middleware_options
+    [
+     {
+       endpoint: endpoint,
+       access_key: access_key,
+       secret_key: secret_key,
+       expire_after: expire_after
+     }
+    ]
+  end
+
+  let(:endpoint) { "https://api.example.jp/json" }
+  let(:access_key) { "0123456789abcdefghij" }
+  let(:secret_key) { "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMN" }
+  let(:expire_after) { 3600 }
+
+  before do
+    expect_any_instance_of(described_class).to receive(:current_time).and_return( Time.utc(2013, 10, 1) )
+  end
+
+  shared_examples_for "valid signature" do
+    let(:result) do
+      process(:post) do |req|
+        req.body = params
+      end
+    end
+    let(:signature) do
+      digest = OpenSSL::HMAC.digest(OpenSSL::Digest::SHA256.new, secret_key, string_to_sign)
+      Base64.encode64(digest).chomp
+    end
+
+    it { expect(result[:body]['Signature']).to eq(signature) }
+  end
+
+  describe "#call" do
+    context "simple request" do
+      let(:params) do
+        {
+          "Action" => "Test",
+          "APIVersion" => "20130901"
+        }
+      end
+      let(:string_to_sign) do
+        [
+         "POST",
+         "api.example.jp",
+         "/json",
+         "APIVersion=20130901&AccessKeyId=#{access_key}&Action=Test&Expire=2013-10-01T01%3A00%3A00Z&SignatureMethod=HmacSHA256&SignatureVersion=2"
+        ].join("\n")
+      end
+
+      it_should_behave_like "valid signature"
+    end
+
+    context "long list param" do
+      let(:params) do
+        init = {
+          "Action" => "Test",
+          "APIVersion" => "20130901"
+        }
+        (1..10).inject(init) {|h, i| h["Param.#{i}"] = i; h }
+      end
+
+      let(:string_to_sign) do
+        param_str = "Param.1=1&Param.10=10&Param.2=2&Param.3=3&Param.4=4&Param.5=5&Param.6=6&Param.7=7&Param.8=8&Param.9=9"
+
+        [
+         "POST",
+         "api.example.jp",
+         "/json",
+         "APIVersion=20130901&AccessKeyId=#{access_key}&Action=Test&Expire=2013-10-01T01%3A00%3A00Z&#{param_str}&SignatureMethod=HmacSHA256&SignatureVersion=2"
+        ].join("\n")
+      end
+      it_should_behave_like "valid signature"
+    end
+  end
+end

data/spec/iij/sakagura/core/query_client_spec.rb

@@ -31,7 +31,7 @@ describe IIJ::Sakagura::Core::QueryClient do
   let(:signed_at) { Time.gm(2013, 10, 1) }
   let(:expire_after) { 3600 }
   before do
-    Time.stub(:now).and_return(signed_at)
+    expect(Time).to receive(:now).and_return(signed_at)
   end
 
   let(:client) do

metadata

@@ -1,64 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: iij-sakagura
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.1.1
 platform: ruby
 authors:
 - Takahiro HIMURA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-13 00:00:00.000000000 Z
+date: 2014-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.10'
 description: IIJ API platform (Sakagura) SDK
 email:
 - taka@himura.jp
@@ -66,7 +71,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -87,6 +92,7 @@ files:
 - spec/cassettes/IIJ_Sakagura_GP_Client/_gp_service_code_list/returns_service_code_list.yml
 - spec/cassettes/IIJ_Sakagura_GP_GP/_service_code_list/.yml
 - spec/helper.rb
+- spec/iij/sakagura/core/middleware/signature_v2_spec.rb
 - spec/iij/sakagura/core/query_client_spec.rb
 - spec/iij/sakagura/gp/client_spec.rb
 - spec/iij/sakagura/gp/gp_spec.rb
@@ -94,32 +100,32 @@ files:
 homepage: https://github.com/iij/ruby-iij-sakagura
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: IIJ API platform (Sakagura) SDK
 test_files:
 - spec/cassettes/IIJ_Sakagura_GP_Client/_gp_service_code_list/returns_service_code_list.yml
 - spec/cassettes/IIJ_Sakagura_GP_GP/_service_code_list/.yml
 - spec/helper.rb
+- spec/iij/sakagura/core/middleware/signature_v2_spec.rb
 - spec/iij/sakagura/core/query_client_spec.rb
 - spec/iij/sakagura/gp/client_spec.rb
 - spec/iij/sakagura/gp/gp_spec.rb