glass-rails 0.1.2 → 0.1.3

data/lib/generators/glass/model/templates/model.rb

@@ -14,9 +14,11 @@ class Glass::<%= model_name.camelize %> < Glass::TimelineItem
   #### for the timeline object.
   #### 
 
+
   has_menu_item :custom_action_name, display_name: "this is displayed", 
                                      icon_url: "http://icons.iconarchive.com/icons/enhancedlabs/lha-objects/128/Filetype-URL-icon.png", 
-                                     handles_with: :custom_action_handler
+                                     handles_with: :custom_action_handler,
+                                     remove_when_selected: false
 
 
 

data/lib/glass/client.rb

@@ -55,32 +55,62 @@ module Glass
     end
 
 
-    def json_content(options)
+    def json_content(options, api_method="insert")
       if c = options[:content]
         data = c.is_a?(String) ? {text: c} : c
       else
         data = self.timeline_item.to_json.merge(options)
       end
       data = format_hash_properly(data)
-      mirror_api.timeline.insert.request_schema.new(data)
+      mirror_api.timeline.send(api_method).request_schema.new(data)
     end
-    def text_content(text)
-      mirror_api.timeline.insert.request_schema.new({text: text})
+
+    def text_content(text, api_method="insert")
+      mirror_api.timeline.send(api_method).request_schema.new({text: text})
     end
 
     ## optional parameter is merged into the content hash 
     ## before sending. good for specifying more application
     ## specific stuff like speakableText parameters. 
+    def rest_action(options, action="insert")
+      body_object = json_content(options, action)
+      inserting_content = { api_method: mirror_api.timeline.send(action), 
+                            body_object: body_object}
+    end
+    def get(id)
+      self.google_client.execute(get_timeline_item_parameters(id))
+    end
 
     def insert(options={})
-      body_object = json_content(options)
-      inserting_content = { api_method: mirror_api.timeline.insert, 
-                            body_object: body_object }
-      google_client.execute(inserting_content)
+      google_client.execute(rest_action(options, "insert"))
+    end
+
+
+    def patch(options={})
+      glass_item_id = options.delete(:glass_item_id)
+      patch_action = rest_action(options, "patch").merge(parameters: {id: glass_item_id})
+      puts patch_action
+      google_client.execute(patch_action)
+    end
+
+    def update(timeline_item, options={})
+      glass_item_id = options.delete(:glass_item_id)
+      update_content = { api_method: mirror_api.timeline.update, 
+                            body_object: timeline_item,
+                            parameters: {id: glass_item_id}}
+      google_client.execute update_content
     end
 
-    
-    def timeline_list(opts={as_hash: true})
+
+
+    ## deprecated: please use cached_list instead
+    def timeline_list
+      puts "DEPRECATION WARNING: timeline_list is now deprecated, please use cached_list instead"
+      cached_list
+    end
+
+
+    def cached_list(opts={as_hash: true})
       retval = @timeline_list.nil? ? self.list(opts) : @timeline_list
       opts[:as_hash] ? retval.map(&:to_hash).map(&:with_indifferent_access) : retval
     end
@@ -115,6 +145,10 @@ module Glass
       end while page_token.to_s != ''
       timeline_list(opts)
     end
+
+
+
+
     def delete(options={})
       deleting_content = { api_method: mirror_api.timeline.delete,
                            parameters: options }
@@ -125,6 +159,8 @@ module Glass
     def response_hash(google_response)
       JSON.parse(google_response.body).with_indifferent_access
     end
+
+
     private
 
     def setup_with_our_access_tokens
@@ -145,10 +181,6 @@ module Glass
       end
     end
 
-    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"]
@@ -156,12 +188,18 @@ module Glass
       ea_data_hash["id_token"] = google_data_hash["id_token"]
       ea_data_hash
     end
+
+
+    private
     def format_hash_properly(data_hash)
       data_hash.inject({}) do |acc, (key, value)|
         new_key = key.to_s.camelize(:lower)
         acc[new_key]= (new_key == "displayTime") ? format_date(value) : value
         acc
       end.with_indifferent_access
+    end    
+    def to_google_time(time)
+      Time.now.to_i + time
     end
     def format_date(time)
       time.to_time.utc.iso8601.gsub("Z", ".000Z") # fucking google has a weird format

data/lib/glass/menu_item.rb

@@ -1,6 +1,9 @@
 module Glass
   class MenuItem
-    attr_accessor :action, :id, :display_name, :icon_url
+    attr_accessor :action,        :id,                    :display_name, 
+                  :icon_url,      :remove_when_selected
+
+                  
     BUILT_IN_ACTIONS = [:reply,         :reply_all,       :delete, 
                         :share,         :read_aloud,      :voice_call, 
                         :navigate,      :toggle_pinned]
@@ -12,10 +15,11 @@ module Glass
     end
 
     def initialize(opts={})
-      self.action           = opts[:action] || "CUSTOM"
-      self.id               = opts[:id]
-      self.display_name     = opts[:display_name]
-      self.icon_url         = opts[:icon_url]
+      self.action                 = opts[:action] || "CUSTOM"
+      self.id                     = opts[:id]
+      self.display_name           = opts[:display_name]
+      self.icon_url               = opts[:icon_url]
+      self.remove_when_selected   = opts[:remove_when_selected] || false
     end
 
     def action
@@ -24,7 +28,8 @@ module Glass
 
     def serialize
       hash = {action: action}
-      hash.merge!({id: id, 
+      hash.merge!({id: id,
+                   removeWhenSelected: remove_when_selected,
                    values: [{ displayName: display_name, 
                               iconUrl: icon_url}]}) if action == "CUSTOM"
       hash

data/lib/glass/rails/version.rb

@@ -1,5 +1,5 @@
 module Glass
   module Rails
-    VERSION="0.1.2"
+    VERSION="0.1.3"
   end
 end

data/lib/glass/timeline_item.rb

@@ -212,33 +212,60 @@ module Glass
       return self
     end
 
+
+
+
+
     def insert(opts={})
+      puts "DEPRECATION WARNING: insert is now deprecated, please use mirror_insert instead"
+      mirror_insert(opts)
+    end
+
+
+    def mirror_insert(opts={})
       result = client.insert(opts)
-      if result.error? 
-        raise TimelineInsertionError
-      else
-        data = result.data
-        result_data_type = :html #default
-        [:html, :text].each do |result_type|
-          result_data_type = result_type if data.send(result_type).present?
-        end
-        self.update_attributes(glass_item_id: data.id, 
-                                glass_etag: data.etag,
-                                glass_self_link: data.self_link,
-                                glass_kind: data.kind,
-                                glass_created_at: data.created,
-                                glass_updated_at: data.updated,
-                                glass_content_type: result_data_type,
-                                glass_content: data.send(result_data_type))
-      end
+      raise TimelineInsertionError if result.error? 
+      save_data(result)
     end
-    def patch(opts={})
-      
+    def mirror_get(opts={})
+      self.client = Glass::Client.create(self)
+      result = client.get(self.glass_item_id)
+      save_data(result)
+    end
+    def mirror_patch(opts={})
+      opts.merge!(glass_item_id: self.glass_item_id)
+      self.client = Glass::Client.create(self)
+      result = client.patch(opts)
+      save_data(result)
+    end
+    def mirror_update(timeline_item, opts={})
+      opts.merge!(glass_item_id: self.glass_item_id)
+      self.client = Glass::Client.create(self)
+      result = client.update(timeline_item, opts) 
+      save_data(result)   
+    end
+    def mirror_delete
+      self.client = Glass::Client.create(self)
+      client.delete(id: self.glass_item_id)
+      self.update_attributes(is_deleted: true)
     end
-    # def update(opts={})
-
-    # end
 
+    def save_data(result)
+      data = result.data
+      result_data_type = :html #default
+      [:html, :text].each do |result_type|
+        result_data_type = result_type if data.send(result_type).present?
+      end
+      self.update_attributes(glass_item_id: data.id, 
+                              glass_etag: data.etag,
+                              glass_self_link: data.self_link,
+                              glass_kind: data.kind,
+                              glass_created_at: data.created,
+                              glass_updated_at: data.updated,
+                              glass_content_type: result_data_type,
+                              glass_content: data.send(result_data_type))
+      to_indifferent_json_hash(result)
+    end
 
 
     ## this is not intended to be a part of the public api
@@ -256,5 +283,10 @@ module Glass
     def has_default_template?
       self.class.default_template
     end
+    private
+    def to_indifferent_json_hash(obj)
+      JSON.parse(obj.body).with_indifferent_access
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glass-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-14 00:00:00.000000000 Z
+date: 2013-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties