libgss 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8797c13b87ab107f028edd43426b237b403d54a7
-  data.tar.gz: 2218823fcf1255e345c0d4cc580c277156dd0e52
+  metadata.gz: 0f34218d9370b8d31892b2dc9bc43883c18d3c0b
+  data.tar.gz: d77691024b3ea4a7bb346f6aac4503896383e1c6
 SHA512:
-  metadata.gz: a58f6d8956dc0b13dd01bc606961a2edfc82f8d8e5ed416911f014e2fa2101e453f5b43c54fd46abaaf8b3290ec1ed1ffca46ee7e22422cd1dff7a7cb247cf1b
-  data.tar.gz: 7dea0c14e99e1a11785969675ec43ac3d2c411188ac7b82e01215032ab5e99cd2cd81507005a509b5cdac9192f33730270de5dde3a1297b08a1eb7632adf6c74
+  metadata.gz: ea8da56f9d588bfd1b9d1970749ea87b7ed09a565caf8675ebf4c7ad7770223079f0331489a2daa97d20a7c82e425ea666df9ce1b4a00623b11e36249a18b255
+  data.tar.gz: 96bc30423526821e4074b20d1cfcc26d7a5f4f850955cfb77f902e43a1e7f2420b1a1e7d7c1227abf42a1f8da79154eb5deb2f6f253f38c5a0a7b8edf1758b13

data/Gemfile.lock

@@ -1,11 +1,10 @@
 PATH
   remote: .
   specs:
-    libgss (0.6.1)
+    libgss (0.7.0)
       httpclient
       json
       oauth
-      tengine_support
 
 GEM
   remote: https://rubygems.org/
@@ -39,3 +38,4 @@ DEPENDENCIES
   libgss!
   rake
   rspec
+  tengine_support

data/lib/libgss/async_action_request.rb

@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+require 'libgss'
+
+require 'net/http'
+require 'uri'
+
+module Libgss
+
+  class AsyncActionRequest < ActionRequest
+
+    attr_reader :ids
+    attr_accessor :action_id
+
+    # アクション群を実行するために実際にHTTPリクエストを送信します。
+    def send_request(&callback)
+      res = @httpclient.post(action_url, {"inputs" => @actions.map(&:to_hash)}.to_json, req_headers)
+      case res.code.to_i
+      when 200..299 then # OK
+      else
+        raise Error, "failed to send action request: [#{res.code}] #{res.body}"
+      end
+      r = JSON.parse(res.body)
+      # puts res.body
+      @outputs = Outputs.new(r["outputs"])
+      callback.call(@outputs) if callback
+
+      @ids = @outputs.map do |output|
+        output['id']
+      end
+
+      @outputs
+    end
+
+    def async_status()
+      raise Error, "failed to get response. please exec send_request before call." unless @ids
+
+      res = @httpclient.get(action_url, {input_ids: @ids.join(',')}, req_headers)
+      case res.code.to_i
+      when 200..299 then # OK
+      else
+        raise Error, "failed to send action request: [#{res.code}] #{res.body}"
+      end
+      r = JSON.parse(res.body)
+    end
+  end
+end

data/lib/libgss/http_client_with_signature_key.rb

@@ -5,6 +5,11 @@ require 'oauth'
 
 require 'digest/hmac'
 
+require 'uri'
+
+require 'securerandom'
+
+
 module Libgss
   class HttpClientWithSignatureKey
 
@@ -17,6 +22,8 @@ module Libgss
       headers = {
         "oauth_consumer_key" => network.consumer_key || "",
         "oauth_token"        => network.auth_token,
+        "oauth_nonce"        => oauth_nonce,
+        "oauth_timestamp"    => oauth_timestamp,
       }
       oauth_params = {
         "body" => body,
@@ -42,6 +49,66 @@ module Libgss
       res = @impl.post(uri, body, headers.update(original_headers))
     end
 
+    def get(uri, query={}, original_headers = {}, &block)
+      headers = {
+        "oauth_consumer_key" => network.consumer_key || "",
+        "oauth_token"        => network.auth_token,
+        "oauth_nonce"        => oauth_nonce,
+        "oauth_timestamp"    => oauth_timestamp,
+      }
+      oauth_params = {
+        "oauth_signature_method" => "HMAC-SHA1"
+      }.update(headers)
+
+      encoded_query = ''
+      query.each do |key, val|
+        key = key.to_s
+        if val.is_a?(::Array)
+          k = CGI.escape("#{key}[]")
+          val.each do |v|
+            encoded_query << "&#{k}=#{URI.escape(v.to_s)}"
+          end
+        elsif val.is_a?(::Hash)
+          val.each do |k, v|
+            k = URI.escape("#{key}[#{k}]")
+            encoded_query << "&#{k}=#{URI.escape(v.to_s)}"
+          end
+        else
+          encoded_query << "&#{URI.escape(key)}=#{URI.escape(val.to_s)}"
+        end
+      end
+      if uri =~ /\?/
+        uri += encoded_query
+      else
+        uri += encoded_query.gsub(/^&/, '?')
+      end
+      req_hash = {
+        "method" => "POST",
+        "uri"    => uri,
+        "parameters" => oauth_params
+      }
+
+      options = {
+        :consumer_secret => network.consumer_secret,
+        :token_secret    => network.signature_key
+      }
+
+      signature_class = Libgss.use_oauth_gem ? ::OAuth::Signature : Signature
+      $stdout.puts("signature_class: #{signature_class.name}") if ENV["VERBOSE"]
+
+      headers["oauth_signature"] = signature_class.sign(req_hash, options)
+
+      res = @impl.get(uri, nil, headers.update(original_headers))
+    end
+
+    def oauth_nonce
+      SecureRandom.uuid.to_s
+    end
+
+    def oauth_timestamp
+      Time.now.utc.to_i
+    end
+
     class Signature
       class << self
         def sign(req_hash, options)

data/lib/libgss/network.rb

@@ -117,6 +117,10 @@ module Libgss
       ActionRequest.new(httpclient_for_action, action_url, req_headers)
     end
 
+    def new_async_action_request
+      AsyncActionRequest.new(httpclient_for_action, aync_action_url, req_headers)
+    end
+
     def new_public_asset_request(asset_path)
       AssetRequest.new(@httpclient, public_asset_url(asset_path), req_headers)
     end
@@ -179,6 +183,10 @@ module Libgss
       @action_url ||= base_url + "/api/#{API_VERSION}/actions.json?auth_token=#{auth_token}"
     end
 
+    def aync_action_url
+      @async_action_url ||= base_url + "/api/#{API_VERSION}/async_actions.json?auth_token=#{auth_token}"
+    end
+
     def public_asset_url(asset_path)
       "#{@public_asset_url_prefix}#{asset_path}#{@public_asset_url_suffix}"
     end

data/lib/libgss/version.rb

@@ -1,3 +1,3 @@
 module Libgss
-  VERSION = "0.6.2"
+  VERSION = "0.7.0"
 end

data/lib/libgss.rb

@@ -5,6 +5,7 @@ module Libgss
   autoload :Network      , "libgss/network"
   autoload :Action       , "libgss/action"
   autoload :ActionRequest, "libgss/action_request"
+  autoload :AsyncActionRequest, "libgss/async_action_request"
   autoload :Outputs      , "libgss/outputs"
   autoload :HttpClientWithSignatureKey, "libgss/http_client_with_signature_key"
 

data/spec/libgss/async_action_request_spec.rb

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+require 'spec_helper'
+
+describe Libgss::AsyncActionRequest do
+  before do
+    request_fixture_load("01_basic")
+  end
+
+  let(:network) do
+    network = new_network
+    network.login.should == true
+    network
+  end
+
+  let(:request) do
+    network.new_async_action_request
+  end
+
+  describe "#get" do
+    context "Player" do
+      it do
+        request.get_by_player
+        request.send_request do |outputs|
+          outputs.length.should == 1
+          outputs[0]['status'].should eq('executing')
+        end
+      end
+    end
+
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libgss
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - akima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-12 00:00:00.000000000 Z
+date: 2013-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -131,6 +131,7 @@ files:
 - lib/libgss/action.rb
 - lib/libgss/action_request.rb
 - lib/libgss/asset_request.rb
+- lib/libgss/async_action_request.rb
 - lib/libgss/fontana.rb
 - lib/libgss/http_client_with_signature_key.rb
 - lib/libgss/network.rb
@@ -148,6 +149,7 @@ files:
 - spec/libgss/actions/ruby_stored_script_spec.rb
 - spec/libgss/actions/schedule_spec.rb
 - spec/libgss/asset_request_spec.rb
+- spec/libgss/async_action_request_spec.rb
 - spec/libgss/network_spec.rb
 - spec/protected_assets/Icon.png
 - spec/public_assets/Default.png
@@ -188,6 +190,7 @@ test_files:
 - spec/libgss/actions/ruby_stored_script_spec.rb
 - spec/libgss/actions/schedule_spec.rb
 - spec/libgss/asset_request_spec.rb
+- spec/libgss/async_action_request_spec.rb
 - spec/libgss/network_spec.rb
 - spec/protected_assets/Icon.png
 - spec/public_assets/Default.png