libgss 0.4.1 → 0.5.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWI5MTBmYjkxNGM3OTRjYWZlMzQ5NDYwY2NiZDA5M2ViYmM5Mjc1OQ==
+    MzMyYThjOGEyMWZhYmQ5OGQwOTQwY2Y3NTc3N2I4Mjg5N2M0YWY0Mw==
   data.tar.gz: !binary |-
-    ZjNiYTE4YWI0NTljNmJjNzcyZDBmOTY1MmU5ZDU2M2FlMTk2NmVhYw==
+    ZDM2YTIzZjcxZDU5YTg4ZjZhY2JhNTgwMjBhOWIwYWIzZTU1NmU5NQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YzNkMDkxNzIzYzZhNmJkNmQ2MTk2NzYxNWExYzUwYmYxOTBiOWVmNmRkMjkw
-    NDg5OWJiZGU4YjJkODc2ZjBkOWU1NWFmYjZiZDQ4ZDgyMTE1NWVjYjRhYjY0
-    YmFlNDM0MDBmMWFiYmI1Mjg0NmFiMDZhNGM4YzFkMGM2ZjE2YTA=
+    NTA0ODk5MGY5Y2FjNzc0M2VhNzE2YzUxZDFjMmUyYmIzZjM1NGRiNTM5MGJj
+    MzhhOWQzNzkxY2FlNTQ3MDcyZmFiN2NmMTA1NmQ5N2EwMGIyZDU4ZDRlZjQ5
+    YzNlMzA1OWQyYTdhNTJkZTJhODE5MjRmYjM4M2FmZDg0MWFjNjk=
   data.tar.gz: !binary |-
-    ZDE4MDBmNGI1MzFjNzdjZTI5OTc1MDA0NGQ4ZDkzODA4OTBhOTllNDhmOGNm
-    MTVlYWNlN2RmNzYwMjBlMDk5OTIzNWYxY2FiZmRiZTNiZjBiMTdkNDgxOTNl
-    ODU2MWFjNDVjOTRmMzZhNGE3ZDA4MjQ4MThmZDRiYzAyY2FiMTQ=
+    YTM2YzhhMzY1YTIyMTFmZjM4MzY5OTRiZTAwMjNiNWZmYzRlZWZjOGI0N2Nm
+    YmU4NjUyZjMzMjIxNjNiYzY1NWFjYTdmNmUxM2QyMzEyMGJiNDFiMGJiODk1
+    NTdhN2JkYjg5NjBhYzIwOGJiNWY4YjlkYTViMjkxN2Q2MTM0Zjc=

data/Gemfile.lock

@@ -1,16 +1,18 @@
 PATH
   remote: .
   specs:
-    libgss (0.2.0)
+    libgss (0.5.0)
       httpclient
       json
+      oauth
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.2.3)
-    httpclient (2.3.3)
+    httpclient (2.3.4.1)
     json (1.8.0)
+    oauth (0.4.7)
     rake (10.0.4)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)

data/lib/libgss/action_request.rb

@@ -21,13 +21,14 @@ module Libgss
 
 
     # 読み込みのみ、書き込み不可
-    attr_reader :action_url
+    attr_reader :action_url, :req_headers
     attr_reader :status, :outputs
 
     # コンストラクタ
-    def initialize(httpclient, action_url)
+    def initialize(httpclient, action_url, req_headers)
       @httpclient = httpclient
       @action_url = action_url
+      @req_headers = req_headers
       @status = STATUS_PREPARING
       @actions = []
       @action_id = 0;
@@ -51,7 +52,7 @@ module Libgss
 
     # アクション群を実行するために実際にHTTPリクエストを送信します。
     def send_request(&callback)
-      res = @httpclient.post(action_url, {"inputs" => @actions.map(&:to_hash)}.to_json)
+      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
@@ -312,6 +313,15 @@ module Libgss
       add_action(args)
     end
 
+
+    # マスタの差分を取得します
+    # @param [Hash] downloaded_versions キーが対象となるコレクション名、値がそのバージョンを示すHash
+    # @return 差分コレクション毎の差分を示すHashの配列
+    def master_diffs(downloaded_versions)
+      args = {action: "master_diffs", downloaded_versions: downloaded_versions}
+      add_action(args)
+    end
+
   end
 
 end

data/lib/libgss/asset_request.rb

@@ -10,18 +10,19 @@ module Libgss
     STATUS_ERROR     = 5
     STATUS_TIMEOUT   = 6
 
-    attr_reader :url, :status, :response_data
+    attr_reader :url, :req_headers, :status, :response_data
 
     # コンストラクタ
-    def initialize(httpclient, url)
+    def initialize(httpclient, url, req_headers)
       @httpclient = httpclient
       @url = url
+      @req_headers = req_headers
       @response_data = nil
       @status = STATUS_PREPARING
     end
 
     def send_request(&callback)
-      res = @httpclient.get(url)
+      res = @httpclient.get(url, nil, req_headers)
       @response_data = res.body
       callback.call(@response_data) if callback
     end

data/lib/libgss/network.rb

@@ -26,6 +26,8 @@ module Libgss
     attr_accessor :public_asset_url_prefix
     attr_accessor :public_asset_url_suffix
 
+    attr_accessor :client_version
+    attr_accessor :device_type_cd
 
     DEFAULT_HTTP_PORT  = (ENV['DEFAULT_HTTP_PORT' ] ||  80).to_i
     DEFAULT_HTTPS_PORT = (ENV['DEFAULT_HTTPS_PORT'] || 443).to_i
@@ -60,6 +62,9 @@ module Libgss
       @consumer_secret = options[:consumer_secret] || ENV["CONSUMER_SECRET"]
       @ignore_signature_key = !!options[:ignore_signature_key]
 
+      @device_type_cd = options[:device_type_cd]
+      @client_version = options[:client_version]
+
       @httpclient = HTTPClient.new
       @httpclient.ssl_config.verify_mode = nil # 自己署名の証明書をOKにする
     end
@@ -70,6 +75,12 @@ module Libgss
       r << fields.join(", ") << ">"
     end
 
+    def req_headers
+      {
+        "X-Device-Type" => device_type_cd,
+        "X-Client-Version" => client_version,
+      }
+    end
 
     # GSSサーバに接続してログインの検証と処理を行います。
     #
@@ -80,7 +91,7 @@ module Libgss
     def login(extra = {})
       attrs = { "player[id]" => player_id }
       extra.each{|k, v| attrs[ "player[#{k}]" ] = v }
-      res = @httpclient.post(login_url, attrs)
+      res = @httpclient.post(login_url, attrs, req_headers)
       process_json_response(res) do |obj|
         @player_id ||= obj["player_id"]
         @auth_token = obj["auth_token"]
@@ -99,15 +110,15 @@ module Libgss
     end
 
     def new_action_request
-      ActionRequest.new(httpclient_for_action, action_url)
+      ActionRequest.new(httpclient_for_action, action_url, req_headers)
     end
 
     def new_public_asset_request(asset_path)
-      AssetRequest.new(@httpclient, public_asset_url(asset_path))
+      AssetRequest.new(@httpclient, public_asset_url(asset_path), req_headers)
     end
 
     def new_protected_asset_request(asset_path)
-      AssetRequest.new(@httpclient, protected_asset_url(asset_path))
+      AssetRequest.new(@httpclient, protected_asset_url(asset_path), req_headers)
     end
 
     def httpclient_for_action

data/lib/libgss/version.rb

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

data/spec/libgss/action_request_spec.rb

@@ -53,7 +53,7 @@ describe Libgss::ActionRequest do
 
 
   expected_player_1000001 = {
-    "player_id"=>"fontana:1000001",
+    "player_id"=>"1000001",
     "nickname"=>nil,
     "level"=>1,
     "first_login_at"=> Time.parse("2012/7/15 21:50+09:00").to_i, # 1342356600,

data/spec/libgss/actions/friendship_spec.rb

@@ -24,8 +24,8 @@ describe "Libgss::ActionRequest friendship" do
       request.outputs.length.should == 1
       result = request.outputs.first["result"]
       result.length.should == 8
-      result[0..6].each{|friendship| friendship["requester_id"].should == "fontana:1000001"}
-      result[7..7].each{|friendship| friendship["accepter_id" ].should == "fontana:1000001"}
+      result[0..6].each{|friendship| friendship["requester_id"].should == "1000001"}
+      result[7..7].each{|friendship| friendship["accepter_id" ].should == "1000001"}
     end
   end
 
@@ -49,7 +49,7 @@ describe "Libgss::ActionRequest friendship" do
           friendships = request.outputs.last["result"]
           friendships.length.should == 8 + (new_data ? 1 : 0)
           friendships.detect{|f|
-            f["requester_id"] == "fontana:1000001" &&
+            f["requester_id"] == "1000001" &&
               f["accepter_id"] == target &&
               f["status_cd"] == status_cd
           }.should_not be_nil
@@ -61,7 +61,7 @@ describe "Libgss::ActionRequest friendship" do
           friendships = request.outputs.last["result"]
           friendships.length.should == 8
           friendships.detect{|f|
-            f["requester_id"] == "fontana:1000001" &&
+            f["requester_id"] == "1000001" &&
             f["accepter_id"] == target
           }.should be_nil
 
@@ -73,12 +73,12 @@ describe "Libgss::ActionRequest friendship" do
           friendships.length.should == 8
           if new_data
             friendships.detect{|f|
-              f["requester_id"] == "fontana:1000001" &&
+              f["requester_id"] == "1000001" &&
               f["accepter_id"] == target
             }.should be_nil
           else
             friendships.detect{|f|
-              f["requester_id"] == "fontana:1000001" &&
+              f["requester_id"] == "1000001" &&
               f["accepter_id"] == target &&
               f["status_cd"] == status_cd
             }.should_not be_nil
@@ -100,38 +100,38 @@ describe "Libgss::ActionRequest friendship" do
 
     # フレンドシップがない初期状態
     context "without friendship" do
-      it_should_behave_like "friendship state transition", "fontana:1000009", :apply   , "OK", FriendshipApplied_r, :new
-      it_should_behave_like "friendship state transition", "fontana:1000009", :approve , "NG", 1003
-      it_should_behave_like "friendship state transition", "fontana:1000009", :breakoff, "IG", nil, :new
-      it_should_behave_like "friendship state transition", "fontana:1000009", :block   , "OK", FriendshipBlocked_r, :new
-      it_should_behave_like "friendship state transition", "fontana:1000009", :unblock , "IG", nil, :new
+      it_should_behave_like "friendship state transition", "1000009", :apply   , "OK", FriendshipApplied_r, :new
+      it_should_behave_like "friendship state transition", "1000009", :approve , "NG", 1003
+      it_should_behave_like "friendship state transition", "1000009", :breakoff, "IG", nil, :new
+      it_should_behave_like "friendship state transition", "1000009", :block   , "OK", FriendshipBlocked_r, :new
+      it_should_behave_like "friendship state transition", "1000009", :unblock , "IG", nil, :new
     end
 
     context "approve" do
-      it_should_behave_like "friendship state transition", "fontana:1000005", :approve , "OK", FriendshipApproved
+      it_should_behave_like "friendship state transition", "1000005", :approve , "OK", FriendshipApproved
     end
 
     context "breakoff" do
-      it_should_behave_like "friendship state transition", "fontana:1000002", :breakoff , "OK", FriendshipDeleted
-      it_should_behave_like "friendship state transition", "fontana:1000003", :breakoff , "OK", FriendshipDeleted
-      it_should_behave_like "friendship state transition", "fontana:1000004", :breakoff , "IG", FriendshipDeleted
-      it_should_behave_like "friendship state transition", "fontana:1000005", :breakoff , "OK", FriendshipDeleted
+      it_should_behave_like "friendship state transition", "1000002", :breakoff , "OK", FriendshipDeleted
+      it_should_behave_like "friendship state transition", "1000003", :breakoff , "OK", FriendshipDeleted
+      it_should_behave_like "friendship state transition", "1000004", :breakoff , "IG", FriendshipDeleted
+      it_should_behave_like "friendship state transition", "1000005", :breakoff , "OK", FriendshipDeleted
     end
 
     context "block" do
-      it_should_behave_like "friendship state transition", "fontana:1000002", :block , "OK", FriendshipBlocked_r
-      it_should_behave_like "friendship state transition", "fontana:1000003", :block , "OK", FriendshipBlocked_r
-      it_should_behave_like "friendship state transition", "fontana:1000004", :block , "OK", FriendshipBlocked_r
-      it_should_behave_like "friendship state transition", "fontana:1000005", :block , "OK", FriendshipBlocked_r
-      it_should_behave_like "friendship state transition", "fontana:1000006", :block , "OK", FriendshipBlocked_r
-      it_should_behave_like "friendship state transition", "fontana:1000007", :block , "OK", FriendshipBlocked_lr
-      it_should_behave_like "friendship state transition", "fontana:1000008", :block , "OK", FriendshipBlocked_lr
+      it_should_behave_like "friendship state transition", "1000002", :block , "OK", FriendshipBlocked_r
+      it_should_behave_like "friendship state transition", "1000003", :block , "OK", FriendshipBlocked_r
+      it_should_behave_like "friendship state transition", "1000004", :block , "OK", FriendshipBlocked_r
+      it_should_behave_like "friendship state transition", "1000005", :block , "OK", FriendshipBlocked_r
+      it_should_behave_like "friendship state transition", "1000006", :block , "OK", FriendshipBlocked_r
+      it_should_behave_like "friendship state transition", "1000007", :block , "OK", FriendshipBlocked_lr
+      it_should_behave_like "friendship state transition", "1000008", :block , "OK", FriendshipBlocked_lr
     end
 
     context "unblock" do
-      it_should_behave_like "friendship state transition", "fontana:1000006", :unblock , "OK", FriendshipDeleted
-      it_should_behave_like "friendship state transition", "fontana:1000007", :unblock , "OK", FriendshipBlocked_l
-      it_should_behave_like "friendship state transition", "fontana:1000008", :unblock , "OK", FriendshipBlocked_l
+      it_should_behave_like "friendship state transition", "1000006", :unblock , "OK", FriendshipDeleted
+      it_should_behave_like "friendship state transition", "1000007", :unblock , "OK", FriendshipBlocked_l
+      it_should_behave_like "friendship state transition", "1000008", :unblock , "OK", FriendshipBlocked_l
     end
   end
 

data/spec/libgss/network_spec.rb

@@ -3,7 +3,8 @@ require 'spec_helper'
 describe Libgss::Network do
 
   let(:network) do
-    Libgss::Network.new("http://localhost:3000")
+    # Libgss::Network.new("http://localhost:3000")
+    new_network
   end
 
   describe "#setup" do

data/spec/spec_helper.rb

@@ -13,6 +13,8 @@ end
 def new_network(url = "http://localhost:3000", player_id = "1000001")
   config = YAML.load_file(File.expand_path("../../fontana_sample/config/app_garden.yml", __FILE__))
   opts = {
+    device_type_cd: 1,
+    client_version: "2013073101",
     consumer_secret: config["consumer_secret"],
     player_id: player_id
   }

metadata

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