libgss 0.5.0 → 0.6.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzMyYThjOGEyMWZhYmQ5OGQwOTQwY2Y3NTc3N2I4Mjg5N2M0YWY0Mw==
+    YzVkZDBjNDQzMDg1OWY2NGQ4ODBlYmJjYzI4Yzg0MTNmNWMwYzMxYQ==
   data.tar.gz: !binary |-
-    ZDM2YTIzZjcxZDU5YTg4ZjZhY2JhNTgwMjBhOWIwYWIzZTU1NmU5NQ==
+    YWY3YzczZmM1M2ZiNGE5NjY3ODJiZjYwYzUzZWQxYTZlMWM2MGMzZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NTA0ODk5MGY5Y2FjNzc0M2VhNzE2YzUxZDFjMmUyYmIzZjM1NGRiNTM5MGJj
-    MzhhOWQzNzkxY2FlNTQ3MDcyZmFiN2NmMTA1NmQ5N2EwMGIyZDU4ZDRlZjQ5
-    YzNlMzA1OWQyYTdhNTJkZTJhODE5MjRmYjM4M2FmZDg0MWFjNjk=
+    MGQzOWUzMjA4Y2ZlMjIyZGM0ZWI0Yjg0NzFiNDMyODg0YTlkNzExYzhiZGYz
+    MWU4M2QxNjE4YzVkODY2MzYwNDg1ZDk5NGRkNWE4MzNjZTc5MmRlYjBlNTYx
+    Mjc4YWI2ZTlhNzJlYTA5ZmQ1NTk2ZGVjMTlhMDgzYWYyZGYxMTA=
   data.tar.gz: !binary |-
-    YTM2YzhhMzY1YTIyMTFmZjM4MzY5OTRiZTAwMjNiNWZmYzRlZWZjOGI0N2Nm
-    YmU4NjUyZjMzMjIxNjNiYzY1NWFjYTdmNmUxM2QyMzEyMGJiNDFiMGJiODk1
-    NTdhN2JkYjg5NjBhYzIwOGJiNWY4YjlkYTViMjkxN2Q2MTM0Zjc=
+    MDkxOWQ2NjBjODNkODNhYjM0YTg1ODQzYmY2OWM0MWMzZTBhODdmY2U5YWZi
+    YTNkNzMwZDhjNjg4YjgxNzA2MWJhMGQ4NWI2OGY4MTEyMzQ2ODM0NjY4OGZj
+    M2EyMmMzNjY0ZjQxZWM5ZWY1ZjEyMzc4NThhOWViY2QzYmFiM2M=

data/Rakefile

@@ -32,13 +32,13 @@ task :test do
     raise "#{sample_dir} is empty. You have to do `git submodule update --init` before `rake test`"
   end
 
-  fileutils.chdir(sample_dir){ system!("rake vendor:fontana:reset servers:start") }
+  fileutils.chdir(sample_dir){ system!("rake test:servers:start") }
   begin
     fileutils.chdir(__dir__) do
       Rake::Task["spec"].execute
     end
   ensure
-    fileutils.chdir(sample_dir){ system!("rake servers:stop") }
+    fileutils.chdir(sample_dir){ system!("rake test:servers:stop") }
   end
 
   # 最後の子プロセスの終了ステータスで終了します

data/lib/libgss/network.rb

@@ -29,12 +29,12 @@ module Libgss
     attr_accessor :client_version
     attr_accessor :device_type_cd
 
+    PRODUCTION_HTTP_PORT  =  80
+    PRODUCTION_HTTPS_PORT = 443
+
     DEFAULT_HTTP_PORT  = (ENV['DEFAULT_HTTP_PORT' ] ||  80).to_i
     DEFAULT_HTTPS_PORT = (ENV['DEFAULT_HTTPS_PORT'] || 443).to_i
 
-    TEST_HTTP_PORT  = 3000
-    TEST_HTTPS_PORT = 3001
-
     # Libgss::Networkのコンストラクタです。
     #
     # @param [String] base_url_or_host 接続先の基準となるURLあるいはホスト名
@@ -43,7 +43,9 @@ module Libgss
     # @option options [String]  :player_id 接続に使用するプレイヤのID
     # @option options [String]  :consumer_secret GSSサーバとクライアントの間で行う署名の検証に使用される文字列。
     # @option options [Boolean] :ssl_disabled SSLを無効にするかどうか。
-    # @option options [Boolean]  :ignore_signature_key シグネチャキーによる署名を行うかどうか
+    # @option options [Boolean] :ignore_signature_key シグネチャキーによる署名を行うかどうか
+    # @option options [Integer] :device_type_cd GSS/fontanaに登録されたデバイス種別
+    # @option options [String]  :client_version GSS/fontanaに登録されたクライアントリリースのバージョン
     def initialize(base_url_or_host, options = {})
       @ssl_disabled = options.delete(:ssl_disabled)
       if base_url_or_host =~ URI.regexp
@@ -89,6 +91,8 @@ module Libgss
     # @option options [String]  :platform 接続先のGSSサーバの認証のプラットフォーム。デフォルトは"fontana"。
     # @return [Boolean] ログインに成功した場合はtrue、失敗した場合はfalse
     def login(extra = {})
+      retry_count = 0
+      begin
       attrs = { "player[id]" => player_id }
       extra.each{|k, v| attrs[ "player[#{k}]" ] = v }
       res = @httpclient.post(login_url, attrs, req_headers)
@@ -98,6 +102,13 @@ module Libgss
         @signature_key = obj["signature_key"]
         !!@auth_token && !!@signature_key
       end
+      rescue OpenSSL::SSL::SSLError => e
+        $stderr.puts("retrying login [#{e.class.name}] #{e.message}")
+        sleep(0.2)
+        retry_count += 1
+        retry if retry_count > 3
+        raise e
+      end
     end
 
     def ignore_signature_key?
@@ -159,7 +170,7 @@ module Libgss
 
     def build_https_url(uri)
       uri.scheme = "https"
-      uri.port = (uri.port == TEST_HTTP_PORT) ? TEST_HTTPS_PORT : DEFAULT_HTTPS_PORT
+      uri.port = (uri.port == PRODUCTION_HTTP_PORT) ? PRODUCTION_HTTPS_PORT : uri.port + 1
       uri.to_s
     end
 

data/lib/libgss/version.rb

@@ -1,3 +1,3 @@
 module Libgss
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/spec/libgss/asset_request_spec.rb

@@ -8,7 +8,7 @@ describe "Libgss::AssetRequest" do
 
   let(:network) do
     network = new_network
-    network.public_asset_url_prefix = "http://localhost:3000/a/"
+    network.public_asset_url_prefix = "http://localhost:4000/a/"
     network.login
     network
   end

data/spec/libgss/network_spec.rb

@@ -10,12 +10,11 @@ describe Libgss::Network do
   describe "#setup" do
     context "valid" do
       it do
-        network.player_id.should == nil
+        # network.player_id.should == nil
         network.auth_token.should == nil
         network.signature_key.should == nil
         res = network.setup
         network.player_id.should_not == nil
-        network.player_id.should =~ /^fontana:/
         network.auth_token.should_not == nil
         network.signature_key.should_not == nil
         res.should == true
@@ -114,9 +113,9 @@ describe Libgss::Network do
       network.inspect.should_not =~ /@httpclient/
     end
 
-    it "isn't too long" do
-      network.inspect.length.should < 300
-    end
+    # it "isn't too long" do
+    #   network.inspect.length.should < 300
+    # end
   end
 
 end

data/spec/spec_helper.rb

@@ -6,11 +6,11 @@ require 'tengine/support/yaml_with_erb'
 require 'httpclient'
 def request_fixture_load(fixture_name)
   c = HTTPClient.new
-  c.post("http://localhost:3000/libgss_test/fixture_loadings/#{fixture_name}.json", "_method" => "put")
+  c.post("http://localhost:4000/libgss_test/fixture_loadings/#{fixture_name}.json", "_method" => "put")
 end
 
 
-def new_network(url = "http://localhost:3000", player_id = "1000001")
+def new_network(url = "http://localhost:4000", player_id = "1000001")
   config = YAML.load_file(File.expand_path("../../fontana_sample/config/app_garden.yml", __FILE__))
   opts = {
     device_type_cd: 1,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libgss
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - akima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-12 00:00:00.000000000 Z
+date: 2013-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler