gcm_for_chrome 0.1.0 → 0.2.0

data/README.md

@@ -1,5 +1,5 @@
 # Google Cloud Messaging for Chrome (GCM for Chrome)
-[![Build Status](https://travis-ci.org/henteko/gcm_for_chrome.png?branch=master)](https://travis-ci.org/henteko/gcm_for_chrome)  
+[![Build Status](https://travis-ci.org/henteko/gcm_for_chrome.png?branch=master)](https://travis-ci.org/henteko/gcm_for_chrome)
 
 GCM for Chrome sends notifications to Chrome extensions via [GCM for Chrome](http://developer.chrome.com/apps/cloudMessaging.html)
 
@@ -21,9 +21,7 @@ Or install it yourself as:
 ## Usage
 
 ```ruby
-gcmc = GcmForChrome.new
-# Set up access_token
-gcmc.set_access_token('your_client_id', 'your_client_secret', 'your_refresh_token')
+gcmc = GcmForChrome.new('your_client_id', 'your_client_secret', 'your_refresh_token')
 
 share_data = {
   :title => 'test',

data/lib/gcm_for_chrome.rb

@@ -8,32 +8,42 @@ class GcmForChrome
   NOTIFICATION_URL  = 'https://www.googleapis.com/gcm_for_chrome/v1/messages'
   REFRESH_TOKEN_URL = 'https://accounts.google.com/o/oauth2/token'
 
-  def initialize()
-    @access_token = '' 
+  def initialize(client_id = nil, client_secret = nil, refresh_token = nil)
+    @access_token = nil
+    @access_token_expires_at = nil
+    @client_id = client_id
+    @client_secret = client_secret
+    @refresh_token = refresh_token
   end
 
   def send_notification(channel_ids, subchannel_id, payload)
+    if @access_token_expires_at.nil? or (@access_token_expires_at and @access_token_expires_at < (Time.new + 10))
+      set_access_token(@client_id, @client_secret, @refresh_token)
+    end
     check_notification_value(channel_ids, subchannel_id, payload)
-    initheader = init_header()
+    initheader = init_header
 
     responses = []
     channel_ids.each do |channel_id|
       _payload = create_notification_payload(
         channel_id, subchannel_id, payload
-      ).to_json 
+      ).to_json
       responses.push(restclient_post(NOTIFICATION_URL, _payload, initheader))
     end
-    
+
     return responses
   end
 
   def set_access_token(client_id, client_secret, refresh_token)
-    @access_token = get_access_token(client_id, client_secret, refresh_token)
+    @client_id ||= client_id
+    @client_secret ||= client_secret
+    @refresh_token ||= refresh_token
+    @access_token, @access_token_expires_at = get_access_token(@client_id, @client_secret, @refresh_token)
   end
 
   def get_access_token(client_id, client_secret, refresh_token)
     response = refresh_access_token(client_id, client_secret, refresh_token)
-    return response['access_token']
+    return response['access_token'], Time.at(Time.now + response['expires_in'].to_i)
   end
 
   def refresh_access_token(client_id, client_secret, refresh_token)
@@ -54,7 +64,7 @@ class GcmForChrome
       "subchannelId" => subchannel_id,
       "payload" => payload
     }
-  end 
+  end
 
   def create_refresh_access_token_payload(client_id, client_secret, refresh_token)
     return {
@@ -69,7 +79,7 @@ class GcmForChrome
 
   def check_notification_value(channel_ids, subchannel_id, payload)
     raise 'Not access_token. Please set_access_token.' if @access_token == '' || @access_token == nil
-    raise 'channel_ids blank.' if channel_ids == [] || channel_ids == nil ||channel_ids == '' 
+    raise 'channel_ids blank.' if channel_ids == [] || channel_ids == nil ||channel_ids == ''
     raise 'subchannel_id blank.' if subchannel_id == '' || subchannel_id == nil
     raise 'payload blank.' if payload == '' || payload == nil
   end

data/lib/gcm_for_chrome/version.rb

@@ -1,3 +1,3 @@
 class GcmForChrome
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/gcm_for_chrome_spec.rb

@@ -3,21 +3,21 @@ require 'json'
 
 describe GcmForChrome do
   ACCESS_TOKEN  = 'TESTACCESS_TOKEN'
-  CLIENT_ID     = 'TESTCLIENT_ID' 
+  CLIENT_ID     = 'TESTCLIENT_ID'
   CLIENT_SECRET = 'TESTCLIENT_SECRET'
   REFRESH_TOKEN = 'TESTREFRESH_TOKEN'
 
   before do
     RestClient.stub(:post) do |url, payload, header|
       {
-        access_token: ACCESS_TOKEN 
+        access_token: ACCESS_TOKEN
       }.to_json
     end
     @gcmc = GcmForChrome.new
   end
 
   it "get_access_token" do
-    access_token = @gcmc.get_access_token(CLIENT_ID, CLIENT_SECRET, REFRESH_TOKEN)
+    access_token, access_token_expires_at = @gcmc.get_access_token(CLIENT_ID, CLIENT_SECRET, REFRESH_TOKEN)
     access_token.should == ACCESS_TOKEN
   end
 
@@ -68,11 +68,6 @@ describe GcmForChrome do
     subchannel_id = '0'
     payload = {title: 'test'}.to_json
 
-    it "access_token blank" do
-      proc {
-        @gcmc.send_notification(channel_ids, subchannel_id, payload)
-      }.should raise_error
-    end
     it "channel_ids blank" do
       proc {
         @gcmc.send_notification([], subchannel_id, payload)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gcm_for_chrome
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-04 00:00:00.000000000Z
+date: 2013-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70301666421900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70301666421900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70301666421480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70301666421480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70301666415080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70301666415080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70301666414540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *70301666414540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70301666414160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +85,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70301666414160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Google Cloud Message for Chrome gem
 email:
 - henteko07@gmail.com
@@ -105,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Google Cloud Message for Chrome gem