libgss 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7dd3ebf42ffbb2444212e81cedbe2612ce5c441d
-  data.tar.gz: 2044b93d9d1f33020093e5e6275687fc97724855
+  metadata.gz: ac0dc188f313e4a363e43888f2d009610e52c49c
+  data.tar.gz: 1fb0499645fbe896d93e46bba73a433b8170a92a
 SHA512:
-  metadata.gz: d10d914ee9d3658a984be8519b4c5f1cfad52392560a356ffbdf03195380858d7e001284866aa6c285445bc2533b21381e7ed84864135be82f9927e69ccae2be
-  data.tar.gz: 0a5f7be36db3014e69908f70628134afb054c56acab954d69c3310c1bb8d72fa785c926d2b4056715ca65a33c312a1cb8c2e02810fccb970ea32739ff6d63f0a
+  metadata.gz: 5bfa50dc8dffb1e771b4d3adbed0953bbd5af0089a4fa17b982906983180279f93464a09720b31483e3ceb01b63fa54bad06bfbd544a427fde6ed560b14551fe
+  data.tar.gz: a73e6a043c3535df90f30d1d126e6ff525b8c4824edfec24dcc28ac6e05c11360d3da0c05ae3088ad231d03c86aa2ddf18d2d7eef3128576f8c17f8527d16718

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    libgss (0.7.4)
+    libgss (0.7.5)
       httpclient
       json
       oauth

data/lib/libgss/network.rb

@@ -101,8 +101,9 @@ module Libgss
     # @option extra [Integer] :device_id デバイス識別子
     # @return [Boolean] ログインに成功した場合はtrue、失敗した場合はfalse
     def login(extra = {})
-      attrs = @player_info.merge({ "player[id]" => player_id })
-      extra.each{|k, v| attrs[ "player[#{k}]" ] = v }
+      @player_info[:id] = player_id
+      @player_info.update(extra)
+      attrs = @player_info.each_with_object({}){|(k,v), d| d[ "player[#{k}]" ] = v }
       res = Libgss.with_retry("login") do
         @httpclient.post(login_url, attrs, req_headers)
       end

data/lib/libgss/version.rb

@@ -1,3 +1,3 @@
 module Libgss
-  VERSION = "0.7.4"
+  VERSION = "0.7.5"
 end

data/spec/libgss/network_spec.rb

@@ -67,6 +67,28 @@ describe Libgss::Network do
       it_should_behave_like "Libgss::Network#login success",
         Proc.new{ network.player_id = nil },
         Proc.new{ network.player_id.should_not == nil }
+
+      it "update player_info with generate_device_id" do
+        network.player_info.should == {}
+        network.generate_device_id
+        network.login!
+        keys = [:id, :device_id, :device_type]
+        network.player_info.keys =~ keys
+        keys.each do |k|
+          network.player_info[k].should_not be_nil
+        end
+      end
+
+      it "update player_info with generate_device_id and extra data" do
+        network.player_info.should == {}
+        network.generate_device_id
+        network.login!(foo: "bar")
+        keys = [:id, :device_id, :device_type, :foo]
+        network.player_info.keys =~ keys
+        keys.each do |k|
+          network.player_info[k].should_not be_nil
+        end
+      end
     end
 
     context "failure with unregistered (maybe invalid) player_id" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libgss
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - akima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-17 00:00:00.000000000 Z
+date: 2013-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler