glass-rails 0.0.7 → 0.0.8

data/README.md

@@ -175,7 +175,7 @@ could instantiate a new instance of the class and assign it
 an associated google account like so
 
 ```ruby
-gt = Glass::Tweet.new(google_account_id: GoogleAccount.first)
+gt = Glass::Tweet.new(google_account_id: GoogleAccount.first.id)
 ```
 Then, you can populate an erb template with instance variables by
 using the `serialize` method which is available to all subclasses 
@@ -196,8 +196,8 @@ For example, let's say you have the following erb template:
 You can serialize the template for a glass::tweet instance like so:
 
 ```ruby
-gt = Glass::Tweet.new(google_account_id: GoogleAccount.first)
-gt.serialize({template_variables: {content: "asdfasdfasdf", title: "title"}})
+gt = Glass::Tweet.new(google_account_id: GoogleAccount.first.id)
+gt.serialize({template_variables: {content: "random stuff", title: "title"}})
 ```
 
 which will basically populate the `@content` and `@title` instance variables

data/lib/glass/client.rb

@@ -5,7 +5,8 @@ module Glass
   class Client
     attr_accessor :access_token,          :google_client,           :mirror_api, 
                   :google_account,        :refresh_token,           :content,
-                  :mirror_content_type,   :timeline_item,           :has_expired_token
+                  :mirror_content_type,   :timeline_item,           :has_expired_token,
+                  :api_keys,              :timeline_list
 
 
 
@@ -18,6 +19,7 @@ module Glass
 
 
     def initialize(opts)
+      self.api_keys = opts[:api_keys] || ::Glass::ApiKeys.new
       self.google_client = ::Google::APIClient.new
       self.mirror_api = google_client.discovered_api("mirror", "v1")
       self.google_account = opts[:google_account]
@@ -56,7 +58,15 @@ module Glass
     end
 
     def json_content(options)
-      mirror_api.timeline.insert.request_schema.new(self.timeline_item.to_json.merge(options))
+      if c = options[:content]
+        data = c.is_a?(String) ? {text: c} : c
+      else
+        data = self.timeline_item.to_json.merge(options)
+      end
+      mirror_api.timeline.insert.request_schema.new(data)
+    end
+    def text_content(text)
+      mirror_api.timeline.insert.request_schema.new({text: text})
     end
 
     ## optional parameter is merged into the content hash 
@@ -64,12 +74,48 @@ module Glass
     ## specific stuff like speakableText parameters. 
 
     def insert(options={})
-      body_object = options[:content] || json_content(options)
+      body_object = json_content(options)
       inserting_content = { api_method: mirror_api.timeline.insert, 
                             body_object: body_object }
       google_client.execute(inserting_content)
     end
 
+    
+    def timeline_list(opts={as_hash: true})
+      retval = @timeline_list.nil? ? self.list(opts) : @timeline_list
+      opts[:as_hash] ? retval.map(&:to_hash) : retval
+    end
+
+
+
+    ### this method is pretty much extracted directly from 
+    ### the mirror API code samples in ruby
+    ###
+    ### https://developers.google.com/glass/v1/reference/timeline/list
+
+    def list(opts={as_hash: true})
+      page_token = nil
+      parameters = {}
+      self.timeline_list = []
+      begin
+        parameters = {}
+        parameters['pageToken'] = page_token if page_token.present?
+        api_result = google_client.execute(api_method: mirror_api.timeline.list,
+                                           parameters: parameters)
+        if api_result.success?
+          timeline_items = api_result.data
+          page_token = nil if timeline_items.items.empty?
+          if timeline_items.items.any?
+            @timeline_list.concat(timeline_items.items)
+            page_token = timeline_items.next_page_token
+          end
+        else
+          puts "An error occurred: #{result.data['error']['message']}"
+          page_token = nil
+        end
+      end while page_token.to_s != ''
+      timeline_list(opts)
+    end
     def delete(options={})
       deleting_content = { api_method: mirror_api.timeline.delete,
                            parameters: options }
@@ -83,9 +129,8 @@ module Glass
     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)) 
+        google_client.authorization.send("#{meth}=", self.api_keys.send(meth)) 
       end
     end
 

data/lib/glass/rails/version.rb

@@ -1,5 +1,5 @@
 module Glass
   module Rails
-    VERSION="0.0.7"
+    VERSION="0.0.8"
   end
 end

data/lib/glass/timeline_item.rb

@@ -179,7 +179,7 @@ module Glass
 
     ## For example,
     ## @google_account = GoogleAccount.first
-    ## @timeline_object =  TimelineObject.new(google_account_id: @google_account.id)
+    ## @timeline_object =  Glass::TimelineItem.new(google_account_id: @google_account.id)
     ## @timeline_object.serialize({template_variables: {content: "this is the content
     ##                                                            i've pushed to glass"}})
     ## 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glass-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-29 00:00:00.000000000 Z
+date: 2013-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties