glass-rails 0.1.3 → 0.1.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 19353d5df818760d42848f4b11e72c893b1111e9
+  data.tar.gz: e16f222e3a56f981bd1e2b4d4070bc89a5905303
+SHA512:
+  metadata.gz: 1263100e4cd2cbddd1d795eb7ec11ef3ea5a36bad7120890f70efce8e09f64a35f6725f28806e594f360df7c1f110ba1aa521c01a01b0f039cbe82a4108ef246
+  data.tar.gz: 440c742944f9628d8a7b243a8c52a7b3bb934bb81c4f08f2f6ce516b46ad22a2346addd6570b5e320c97caeac514f97b5412140a4e8ae3a31cc285dfedfa15a8

data/lib/glass/rails/version.rb

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

data/lib/glass/subscription.rb

@@ -30,7 +30,7 @@ module Glass
 
     ## Must be HTTPS
     def callback_url
-      Rails.application.routes.url_helpers.glass_notifications_callback_url(protocol: 'https')
+      ::Rails.application.routes.url_helpers.glass_notifications_callback_url(protocol: 'https')
     end
 
     ## Token string used to identify user in the callback

data/lib/glass/timeline_item.rb

@@ -1,4 +1,5 @@
 require 'active_record'
+require 'active_support/core_ext/hash/indifferent_access'
 require "glass/menu_item"
 ## this is an abstract class, not intended to be
 ## used directly
@@ -14,9 +15,9 @@ module Glass
 
     belongs_to :google_account
 
-    attr_accessible :display_time,      :glass_content,     :glass_content_type, 
-                    :glass_created_at,  :glass_etag,        :glass_item_id, 
-                    :glass_kind,        :glass_self_link,   :glass_updated_at, 
+    attr_accessible :display_time,      :glass_content,     :glass_content_type,
+                    :glass_created_at,  :glass_etag,        :glass_item_id,
+                    :glass_kind,        :glass_self_link,   :glass_updated_at,
                     :is_deleted,        :google_account_id
 
 
@@ -28,15 +29,15 @@ module Glass
 
     class_attribute :actions
     class_attribute :menu_items
-    class_attribute :default_template 
+    class_attribute :default_template
 
     attr_accessor :template_type, :to_json
 
 
 
     ## only a writer for these two
-    ## because I want to hook an error 
-    ## message to each of these if they haven't 
+    ## because I want to hook an error
+    ## message to each of these if they haven't
     ## had there values set yet.
     attr_writer :client, :mirror_content, :template_name
 
@@ -53,7 +54,7 @@ module Glass
     def mirror_content
       raise UnserializedTemplateError unless @mirror_content
       @mirror_content
-    end 
+    end
     def client
       raise UnserializedTemplateError unless @client
       @client
@@ -68,18 +69,36 @@ module Glass
 
 
     ## this methods sets the default template for
-    ## all instances of the class. 
+    ## all instances of the class.
 
-    ## Usage: 
+    ## Usage:
     ##   class Glass::Tweet < Glass::TimelineItem
 
-    ##     defaults_template "table.html.erb" 
+    ##     defaults_template with: "table.html.erb"
                 ## this defaults to the glass_template_path
                 ## which you set in your glass initializer.
 
     ##   end
     def self.defaults_template(opts={})
-      self.default_template = opts[:with] if opts[:with]
+      puts "DEPRECATION WARNING: defaults_template is now deprecated, please use defaults_template_with instead"
+      self.default_template = opts[:with]
+    end
+
+    ## this methods sets the default template for
+    ## all instances of the class.
+
+    ## Usage:
+    ##   class Glass::Tweet < Glass::TimelineItem
+
+    ##     defaults_template_with "table.html.erb"
+                ## this defaults to the glass_template_path
+                ## which you set in your glass initializer.
+
+    ##   end
+    def self.defaults_template_with(name_of_template)
+      if name_of_template.is_a? Symbol
+        self.default_template = name_of_template.to_s + ".html.erb"
+      end
     end
 
 
@@ -90,15 +109,15 @@ module Glass
 
 
     ## this methods sets the default template for
-    ## all instances of the class. 
+    ## all instances of the class.
 
-    ## Usage: 
+    ## Usage:
     ##   class Glass::Tweet < Glass::TimelineItem
 
     ##     manages_templates :template_manager_name
                 ## this will set your template manager
                 ## for this class. this will override
-                ## defaults_template path if it is 
+                ## defaults_template path if it is
                 ## defined.
     ##   end
     def self.manages_templates(opts={})
@@ -110,9 +129,9 @@ module Glass
 
 
     ## this methods sets the default template for
-    ## all instances of the class. 
+    ## all instances of the class.
 
-    ## Usage: 
+    ## Usage:
     ##   class Glass::Tweet < Glass::TimelineItem
 
     ##     has_menu_item :my_custom_action,
@@ -125,11 +144,11 @@ module Glass
     ##         # action occurs.
     ##       end
     ##   end
-    def self.has_menu_item(action_sym, opts={}) 
+    def self.has_menu_item(action_sym, opts={})
       self.actions ||= []
       self.menu_items ||= []
       unless self.actions.include?(action_sym)
-        self.actions += [action_sym] 
+        self.actions += [action_sym]
         defines_callback_methods(action_sym, opts)
         menu_item = ::Glass::MenuItem.create(action_sym, opts)
         self.menu_items += [menu_item]
@@ -139,17 +158,17 @@ module Glass
 
 
     ## this is really just a little meta-programming
-    ## trick which basically forces a call to the method 
+    ## trick which basically forces a call to the method
     ## specified by with parameter in the has_menu_item method.
-    ## 
-    ## it allows you to put the callback logic right 
-    ## there in the model. 
+    ##
+    ## it allows you to put the callback logic right
+    ## there in the model.
 
     def self.defines_callback_methods(action, opts)
       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 
+        else
           raise MenuItemHandlerIsNotDefinedError
         end
       end
@@ -173,7 +192,7 @@ module Glass
 
 
 
-    ## this method will instantiate instance variables 
+    ## this method will instantiate instance variables
     ## in the erb template with the values you specify
     ## in a hash parameter under the key [:template_variables]
 
@@ -182,16 +201,16 @@ module Glass
     ## @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"}})
-    ## 
+    ##
     ## would render this erb template:
 
 
-    ## <article> 
+    ## <article>
     ##   <%= @content %>
     ## </article>
 
     ## into this:
-  
+
     ## '<article> \n    this is the content i've pushed to glass \n  </article>'
     ##
     ##
@@ -199,7 +218,7 @@ module Glass
     ## requests you send with your push.
 
 
-    ## 
+    ##
     def serialize(opts={})
       raise GoogleAccountNotSpecifiedError unless self.google_account.present?
       type = self.template_type || :html
@@ -224,7 +243,7 @@ module Glass
 
     def mirror_insert(opts={})
       result = client.insert(opts)
-      raise TimelineInsertionError if result.error? 
+      raise TimelineInsertionError if result.error?
       save_data(result)
     end
     def mirror_get(opts={})
@@ -233,20 +252,20 @@ module Glass
       save_data(result)
     end
     def mirror_patch(opts={})
-      opts.merge!(glass_item_id: self.glass_item_id)
+      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)
+      opts.merge! glass_item_id: self.glass_item_id
       self.client = Glass::Client.create(self)
-      result = client.update(timeline_item, opts) 
-      save_data(result)   
+      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)
+      client.delete id: self.glass_item_id
       self.update_attributes(is_deleted: true)
     end
 
@@ -256,7 +275,7 @@ module Glass
       [: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, 
+      self.update_attributes(glass_item_id: data.id,
                               glass_etag: data.etag,
                               glass_self_link: data.self_link,
                               glass_kind: data.kind,
@@ -264,6 +283,7 @@ module Glass
                               glass_updated_at: data.updated,
                               glass_content_type: result_data_type,
                               glass_content: data.send(result_data_type))
+
       to_indifferent_json_hash(result)
     end
 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glass-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.3
-  prerelease: 
+  version: 0.1.4
 platform: ruby
 authors:
 - Kunal Modi
@@ -10,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-17 00:00:00.000000000 Z
+date: 2013-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -23,7 +21,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -31,7 +28,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -39,7 +35,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -47,7 +42,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,7 +49,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -63,7 +56,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -71,7 +63,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -79,7 +70,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -87,7 +77,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -95,7 +84,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -103,7 +91,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -111,7 +98,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -119,7 +105,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -127,7 +112,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -135,7 +119,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -150,7 +133,6 @@ extra_rdoc_files: []
 files:
 - .DS_Store
 - .gitignore
-- .rvmrc
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -197,27 +179,26 @@ 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: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 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.