libgss 0.0.2 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2Y0OGU1MjZkZDE4ZDA2YmYzM2Q5YzNhNjMzYjczZTQwOThmODFiMg==
+    NDEzZGE2OTI5OGE3MDMzNTgxZjU2Zjg0ZmY4YzVlMDAzYzMwOGQzOA==
   data.tar.gz: !binary |-
-    NDMwZmZiNTY5OGE3MTk2ZWMzZDRmN2IzNjgzMjkyYjdhNDY2YjBkNw==
+    YjExOGRiOGM5NzlhNDNjNTNkMmRiODM4NDc5MTVhM2ExZjBkNzVhZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZDQ0NWUxMTNmZTVjZjg2MTJiNGMwZGUyYmI2NDM3NjI1YzJhODRlMjZlNTc4
-    MDE3ODg4MTA0MjZhMGQwZTY4ZmI3NTdlNDYzY2MxZjI1Y2NjN2FkMzU5MDFj
-    N2FiOWEwNGIxYjY5OTViYWQ4NGRlZDg4OTdkNWIzY2ZiMDExZjA=
+    ZmU2NzFiYThmNDIzMTA0MDk4ODg1NDQzYmIzODYyN2I0MDI1ZmZhY2QzOGJi
+    YzkwMjY1NDkzNTI1NWIxNDAzYjg5Njc4NDYzOWY2OTdmMWJjYWQ2MWFlOWNk
+    M2Y1ODdkMjE3MzVhMjllNmViYzI0YTFhYWZkNmI1MjA3Zjc5MjQ=
   data.tar.gz: !binary |-
-    Y2JkMDE0NTljMmNlOGY5M2UwMTFlODY0NTkwNjUxZTVkMGNjNDQxZjkzNGNl
-    ZGM0Mzc3ZDNiNzgyM2ZjMGU5MGNiZGVjYjUwZTljMzU0YzIyMjcwNTZkNzMw
-    MDAwZDdjMmQyMTUxZjUzMzFlNTRhZTVjNDQ2MGI0ODA0OTZkZjk=
+    Y2Y2NzE0MjEzMGU4MjcwMDc1Mzc4NTBkNTFlMTU5ZmNjOGMyOGRmMDU0Mzc1
+    ZDY3NTdmYjYyOGJhMmYzZjQ2OTNjMWM2NzM0ZjY3NWM3NDkwNjdmZjA1NTQ3
+    MjlhOTQ1MjBmODMxYjJhOGFiZjZlMWExMjNjZTM0MWY4NTM5NjE=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    libgss (0.0.2)
+    libgss (0.2.0)
       httpclient
       json
 

data/README_ja.md

@@ -11,7 +11,11 @@ libgss-rubyはGroovenautsのGSS用通信ライブラリです。
 
 ## インストール方法
 
-### bundlerを使う方法
+以下の２つの方法があります。プロジェクトを作成してGemfileが定義されている場合は、bundlerを使う方法をおすすめします。
+それ以外の場合は、手動でインストールする方法でインストールしてください。
+
+
+### プロジェクトを作ってbundlerを使う方法
 
 アプリケーションのGemfileに以下の行を追加します:
 

data/lib/libgss/network.rb

@@ -24,9 +24,12 @@ module Libgss
     attr_accessor :public_asset_url_suffix
 
 
-    DEFAULT_HTTP_PORT = (ENV['DEFAULT_HTTP_PORT'] || 80).to_i
+    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
+
     def initialize(base_url_or_host, options = {})
       @ssl_disabled = options.delete(:ssl_disabled)
       if base_url_or_host =~ URI.regexp
@@ -50,24 +53,26 @@ module Libgss
       r << fields.join(", ") << ">"
     end
 
+    def register
+      res = @httpclient.post(registration_url)
+      process_json_response(res) do |obj|
+        self.player_id = obj["player_id"].sub(/\Afontana:/, '')
+        !!self.player_id
+      end
+    end
+
     def login
-      raise "player_id is not set." if player_id.nil? || player_id.empty?
       res = @httpclient.post(login_url, "player[id]" => player_id)
-      case res.status
-      when 200...300 then # OK
-      when 300...400 then return false # リダイレクト対応はしません
-      when 400...500 then return false
-      when 500...600 then return false
-      else raise "invalid http status: #{res.status}"
+      process_json_response(res) do |obj|
+        @player_id ||= obj["player_id"]
+        @auth_token = obj["auth_token"]
+        @signature_key = obj["signature_key"]
+        !!@auth_token && !!@signature_key
       end
-      begin
-        obj = JSON.parse(res.content)
-      rescue JSON::ParserError => e
-        return false
-      end
-      @auth_token = obj["auth_token"]
-      @signature_key = obj["signature_key"]
-      true
+    end
+
+    def setup
+      (load_player_id || register) && login
     end
 
     def new_action_request
@@ -84,12 +89,44 @@ module Libgss
 
     private
 
+    # ストレージからplayer_idをロードします
+    # 保存されていたらtrueを、保存されていなかったらfalseを返します。
+    #
+    # ストレージは、cocos2d-x ならば CCUserDefault のようにデータを永続化するものを指します。
+    #     http://www.cocos2d-x.org/reference/native-cpp/d0/d79/classcocos2d_1_1_c_c_user_default.html
+    #
+    # ただし、libgss-rubyはテスト用なので毎回違うplayer_idを使います。
+    # もし保存したい場合は、別途ファイルなどに記録してください。
+    def load_player_id
+      return false
+    end
+
+    def process_json_response(res)
+      case res.status
+      when 200...300 then # OK
+      when 300...400 then return false # リダイレクト対応はしません
+      when 400...500 then return false
+      when 500...600 then return false
+      else raise "invalid http status: #{res.status}"
+      end
+      begin
+        obj = JSON.parse(res.content)
+        return yield(obj)
+      rescue JSON::ParserError => e
+        return false
+      end
+    end
+
     def build_https_url(uri)
       uri.scheme = "https"
-      uri.port = DEFAULT_HTTPS_PORT
+      uri.port = (uri.port == TEST_HTTP_PORT) ? TEST_HTTPS_PORT : DEFAULT_HTTPS_PORT
       uri.to_s
     end
 
+    def registration_url
+      @registration_url ||= ssl_base_url + "/platforms/#{platform}/registration.json"
+    end
+
     def login_url
       @login_url ||= ssl_base_url + "/platforms/#{platform}/sign_in.json"
     end

data/lib/libgss/version.rb

@@ -1,3 +1,3 @@
 module Libgss
-  VERSION = "0.0.2"
+  VERSION = "0.2.0"
 end

data/spec/libgss/action_request_spec.rb

@@ -9,7 +9,7 @@ describe Libgss::ActionRequest do
   let(:network) do
     network = Libgss::Network.new("http://localhost:3000")
     network.player_id = "1000001"
-    network.login
+    network.login.should == true
     network
   end
 

data/spec/libgss/network_spec.rb

@@ -3,15 +3,45 @@ require 'spec_helper'
 describe Libgss::Network do
 
   let(:network) do
-    network = Libgss::Network.new("http://localhost:3000")
-    network.player_id = "1000001"
-    network
+    Libgss::Network.new("http://localhost:3000")
+  end
+
+  describe "#registration" do
+    context "valid" do
+      it do
+        network.player_id.should == nil
+        network.register
+        network.player_id.should_not == nil
+        network.player_id.should_not =~ /^fontana:/
+      end
+    end
+  end
+
+  describe "#setup" do
+    context "valid" do
+      it do
+        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_not =~ /^fontana:/
+        network.auth_token.should_not == nil
+        network.signature_key.should_not == nil
+        res.should == true
+      end
+    end
   end
 
   describe "#login" do
+    before do
+      network.player_id = "1000001"
+    end
+
     context "success" do
-      shared_examples_for "Libgss::Network#login success" do |block|
+      shared_examples_for "Libgss::Network#login success" do |block, after_block = nil|
         before(&block)
+        after(&after_block) if after_block
 
         it do
           network.auth_token.should == nil
@@ -24,10 +54,27 @@ describe Libgss::Network do
       end
 
       it_should_behave_like "Libgss::Network#login success", Proc.new{ network.player_id = "1000001" }
-      it_should_behave_like "Libgss::Network#login success", Proc.new{ network.player_id = "unregistered" }
+      # it_should_behave_like "Libgss::Network#login success", Proc.new{ network.player_id = "unregistered" }
+
+      it_should_behave_like "Libgss::Network#login success",
+        Proc.new{ network.player_id = nil },
+        Proc.new{ network.player_id.should_not == nil }
+
     end
 
     context "failure" do
+      it "unregistered (maybe invalid) player_id" do
+        network.player_id = "unregistered"
+        network.auth_token.should == nil
+        network.signature_key.should == nil
+        res = network.login
+        network.auth_token.should == nil
+        network.signature_key.should == nil
+        res.should == false
+      end
+    end
+
+    context "error" do
       shared_examples_for "Libgss::Network#login failure" do
         it do
           network.auth_token.should == nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libgss
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.2.0
 platform: ruby
 authors:
 - akima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-21 00:00:00.000000000 Z
+date: 2013-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler