glass-rails 0.0.5 → 0.0.6

data/lib/glass/client.rb

@@ -1,9 +1,10 @@
 require "glass/api_keys"
+require 'active_support/core_ext/hash/indifferent_access'
 require "google/api_client"
 module Glass
   class Client
     attr_accessor :access_token,          :google_client,           :mirror_api, 
-                  :google_account,        :refresh_token,          :content,
+                  :google_account,        :refresh_token,           :content,
                   :mirror_content_type,   :timeline_item,           :has_expired_token
 
 
@@ -25,6 +26,7 @@ module Glass
       ### an api for those who wish to opt out of passing in a
       ### google account, by passing in a hash of options
       ###
+      ###
       ### the tricky aspect of this is how to handle the update
       ### of the token information if the token is expired.
 
@@ -32,15 +34,27 @@ module Glass
       self.refresh_token = opts[:refresh_token] || google_account.try(:refresh_token)
       self.has_expired_token = opts[:has_expired_token] || google_account.has_expired_token?
 
-      
       setup_with_our_access_tokens
       setup_with_user_access_token
       self
     end
+
+    def get_timeline_item(id)
+      response_hash(self.google_client.execute(get_timeline_item_parameters(id)).response)
+    end
+    def get_timeline_item_parameters(id)
+      { api_method: self.mirror_api.timeline.get,
+        parameters: {
+          "id" => id
+        }
+      }
+    end
+
     def set_timeline_item(timeline_object)
       self.timeline_item = timeline_object
       self
     end
+
     def json_content(options)
       mirror_api.timeline.insert.request_schema.new(self.timeline_item.to_json.merge(options))
     end
@@ -62,13 +76,19 @@ module Glass
       google_client.execute(deleting_content)
     end
 
+
+    def response_hash(google_response)
+      JSON.parse(google_response.body).with_indifferent_access
+    end
     private
+
     def setup_with_our_access_tokens
       api_keys = Glass::ApiKeys.new
       ["client_id", "client_secret"].each do |meth| 
         google_client.authorization.send("#{meth}=", api_keys.send(meth)) 
       end
     end
+
     def setup_with_user_access_token
       google_client.authorization.update_token!(access_token: access_token, 
                                                 refresh_token: refresh_token)
@@ -84,6 +104,7 @@ module Glass
     def to_google_time(time)
       Time.now.to_i + time
     end
+
     def convert_user_data(google_data_hash)
       ea_data_hash = {}
       ea_data_hash["token"] = google_data_hash["access_token"]
@@ -91,5 +112,6 @@ module Glass
       ea_data_hash["id_token"] = google_data_hash["id_token"]
       ea_data_hash
     end
+
   end
 end

data/lib/glass/rails/version.rb

@@ -1,5 +1,5 @@
 module Glass
   module Rails
-    VERSION="0.0.5"
+    VERSION="0.0.6"
   end
 end

data/lib/glass/subscription_notification.rb

@@ -1,7 +1,7 @@
 module Glass
   class SubscriptionNotification
-    attr_accessor :google_account,    :params,    :collection,
-                  :user_actions
+    attr_accessor :google_account,    :params,                  :collection,
+                  :user_actions,      :reply_request_hash,      :glass_item_id
 
     class VerificationError < StandardError; end
 
@@ -17,6 +17,13 @@ module Glass
       verify_authenticity!
     end
 
+
+    ## things required to handle the notification properly
+    ##
+    ## 1. depending on the type of notification, we're going
+    ##    to need to get access to a timeline item
+
+
     ## Perform the corresponding notification actions
     def handle!
       if collection == "locations"
@@ -24,34 +31,35 @@ module Glass
         # When your Glassware receives a location update, send a request to the glass.locations.get endpoint to retrieve the latest known location.
         # Something like: google_account.handle_location_update
       else
-        if has_user_action? :share
-          # TODO: Someone shared a card with this user's glassware. Who should handle this?
-          # The actual reply with attachments with itemId, so we need to fetch that
-          # Something like google_account.handle_shared_item(params)
-        elsif has_user_action? :reply
-          # TODO: Someone replied to a card.
-          # itemId => TimelineItem which contains at least: inReplyTo (original item),
-          # text (text transcription of reply), and attachments
-        else # Custom Action or DELETE
-          handle_action(params[:itemId])
-        end
+        self.glass_item_id = params[:itemId]
+        handle_reply(params)
+        handle_action
       end
     end
 
     private
+    def handle_reply(params)
+      return unless has_user_action? :reply
+      google_client = ::Glass::Client.new(google_account: self.google_account)
+      self.reply_request_hash = google_client.get_timeline_item(params[:itemId])
+      self.glass_item_id = reply_request_hash[:inReplyTo]
+    end
+
+
     def has_user_action?(action)
       user_actions.select{|user_action| user_action["type"].downcase == action.to_s}.first
     end
 
     ## Handle actions on a timeline_item with a given id (custom actions, delete, etc.)
-    def handle_action(item_id)
-      timeline_item = find_timeline_item(item_id)
+    def handle_action
+      timeline_item = find_timeline_item(self.glass_item_id)
 
       # TODO: Should we uniq these? When glass doesn't have connection, it will queue up
       # actions, so users might press the same one multiple times.
       user_actions.uniq.each do |user_action|
         type = user_action[:type] == "CUSTOM" ? user_action[:payload] : user_action[:type]
-        timeline_item.send("handles_#{type.downcase}")
+        json_to_return = self.reply_request_hash ? self.reply_request_hash : self.params
+        timeline_item.send("handles_#{type.downcase}", json_to_return)
       end if user_actions
     end
 

data/lib/glass/timeline_item.rb

@@ -100,7 +100,6 @@ module Glass
                 ## for this class. this will override
                 ## defaults_template path if it is 
                 ## defined.
-
     ##   end
     def self.manages_templates(opts={})
       self.template_manager = opts[:with] if opts[:with]
@@ -147,9 +146,9 @@ module Glass
     ## there in the model. 
 
     def self.defines_callback_methods(action, opts)
-      self.send(:define_method, "handles_#{action.to_s.underscore}") do
-        if self.respond_to?(opts[:handled_by])
-          self.send(opts[:handled_by])
+      self.send(:define_method, "handles_#{action.to_s.underscore}") do |json|
+        if self.respond_to?(opts[:handles_with])
+          self.method(opts[:handles_with]).arity > 0 ? self.send(opts[:handles_with], json) : self.send(opts[:handles_with])
         else 
           raise MenuItemHandlerIsNotDefinedError
         end
@@ -158,11 +157,13 @@ module Glass
 
 
 
-    ## not meant to be a part of the public api.
+    ## convert the menu items into hash form
+    ## not a part of the public api.
     def self.menu_items_hash
       {menuItems: self.menu_items.map(&:serialize) }
     end
 
+    ## convert class to instance method.
     ## not meant to be a part of the public api.
     def menu_items_hash
       self.class.menu_items_hash

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: glass-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
+  prerelease: 
 platform: ruby
 authors:
 - Kunal Modi
@@ -9,39 +10,44 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-22 00:00:00.000000000 Z
+date: 2013-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: google-api-client
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -49,6 +55,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -56,62 +63,71 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -119,12 +135,12 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.11.0
-description: ! ' A framework for creating google glass applications using ruby on
-  rails. '
+description: ' A framework for creating google glass applications using ruby on rails. '
 email:
 - kunal@thirstlabs.com
 - han@therubyists.org
@@ -180,26 +196,27 @@ files:
 homepage: http://thirst.github.io/glass-rails/
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A framework for creating google glass applications using ruby on rails.  This
   probably isn't for everyone, but we did our best to make it suitable for as many
   cases as possible.

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NzkzNjIyMWI2MTc4ZGM0M2I3NDc1NzZmNDIyNTQ4ZmMxYTc3NWVjZQ==
-  data.tar.gz: !binary |-
-    MTJkMmM4MzhhMTc3YmE3ZTU1YTY1NDE4YzgxZjQyN2QzMzU2NGFhZQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NGM1MmYyOGMzNTMwZjIxNjExODQzMjhlNDdiYmI0NjQxMGYyNTA4YTAwN2Nh
-    NTI2YWJjZWQ1MjY2ZjlmYjYwNTY0Zjc3NDIyNGY1MjMxYTY0MTU3ZDliZWU3
-    NzViNDFmOTQyMWVmMTM5MDEyNDU2ZjMyZDNhMmU5YTQzZDU1ODQ=
-  data.tar.gz: !binary |-
-    NzM1YWUzOTRhMjA3N2M1MGJlYzU0ZWVhNzc0MjZiNzAyYmJlZDliZDNiNzE1
-    ZjJmNmIyMjMzNWM0YzY3MDMzMmY4OTg0MDljZmFlYWZkMDhiYjNiODYwZDlm
-    YzAwNDU1N2M2ZmUxYjFlMDMyYjE1MDg2ZTJhMGJlYzdkOWE5M2U=