glass-rails 0.1.5 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d4e68dd44d9acc1a4db1e881de0e215f0c6b724
-  data.tar.gz: 64a8e0d00431a9c3c2ae9e379b73082943ff06a1
+  metadata.gz: 3f0c58157a2668abbda0417296fcf8ac4f57a3a4
+  data.tar.gz: b7859dc9b8804a5c7c2f95a0fe27eb8cf236d852
 SHA512:
-  metadata.gz: b779ef5e95f0576baaba0c11c27222d93aad62a76f70722686031fdbcc0407b27ce473ec4c5e645e1db660b4fee0be22628254f5f901adce1b00c7c35ca8a865
-  data.tar.gz: ebb85eb846ac8b6ce922358a7da1593af599184e9ea5920682393e3f277784a6f736f3dc922dad0ee768ee0457b001e4669e5139037773bbfb4c89c8448dce9a
+  metadata.gz: 6c51db88dae76a80f11a2ef3fcce707e8944f27ea615111872d939449ac09aa276175f21fc45514acc8bbc51ba13fc0aad28d42c961a67a74565e8917f7b4825
+  data.tar.gz: 92de4b4ca3572f44bc297ee6cb8a4f6063b2aa530d116b4a6b34af255b0cd490db6381bfeb3e656ec40dba835207f014897b859b02882ab8fe7633fb8c485cc5

data/glass-rails.gemspec

@@ -23,11 +23,11 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "railties", [">= 3.1"]
   spec.add_dependency "google-api-client"
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler", ">= 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "pry-rails"
   spec.add_development_dependency "rspec", ">= 1.5.2"
-  spec.add_development_dependency "rspec-rails", '~> 2.11.0'
+  spec.add_development_dependency "rspec-rails", '>= 2.11.0'
 
 end

data/lib/generators/glass/install/templates/google_account.rb

@@ -1,8 +1,8 @@
 class GoogleAccount < ActiveRecord::Base
   belongs_to :<%= user_model.underscore.singularize %>
-  attr_accessible :email, :expires_at, :name, :refresh_token, :token, :verification_secret
   before_create :generate_verification_secret
   after_create :subscribe_to_google_notifications
+  
   def token_expiry
     Time.at(self.expires_at)
   end

data/lib/generators/glass/install/templates/initializer.rb

@@ -1,24 +1,21 @@
-if Rails.env.development?
-  ##
-  ## if you've set this elsewhere you may want 
-  ## to comment this out. 
-  ##
-  ## Glass requires this to be defined for callback url 
-  ## purposes.
-  ##
-  Rails.application.routes.default_url_options[:host] = 'localhost:3000'
-elsif Rails.env.test?
-  
-  ## setup whatever you want for default url options for your test env.
-end
+## if you've set this elsewhere you may want 
+## to comment this out. 
+##
+## Glass requires this to be defined for callback url 
+## purposes.
+
+Rails.application.routes.default_url_options[:host] = 'localhost:3000' if Rails.env.development?
+
+## Your configuration details here:
 
 Glass.setup do |config|
-  ## you can override the logo here
-  ## config.brandname = "examplename"
+  ## modify this to change the name of your glass app
+  ## config.application_name = "SomeGlassApp"
 
+  ## modify this to change the application version of your glass app
+  ## config.application_version = "0.0.1"
 
 
   ## manually override your glass views path here.
   config.glass_template_path = "app/views/glass"
-
 end

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

@@ -1,7 +1,7 @@
 class Glass::<%= model_name.camelize %> < Glass::TimelineItem
 
 
-  defaults_template with: "table.html.erb"
+  defaults_template_with  :simple
 
 
 
@@ -30,4 +30,4 @@ class Glass::<%= model_name.camelize %> < Glass::TimelineItem
     ## when the action is invoked
   end
 
-end
+end

data/lib/glass.rb

@@ -4,14 +4,14 @@ require 'active_support/dependencies'
 require 'glass/rails/version'
 
 module Glass
+  
+  mattr_accessor :application_name
+  application_name = (defined?(::Rails) && ::Rails.application) ? ::Rails.application.class.name.split('::').first : "SomeGlassApp"
+  @@application_name = application_name
 
-  mattr_accessor :brandname
-  @@brandname = "example"
-
-  mattr_accessor :brandname_styles
-  @@brandname_styles = {color: "#8BCDF8", 
-                        font_size: "30px"}
-
+  mattr_accessor :application_version
+  @@application_version = "0.0.1"
+  
   mattr_accessor :glass_template_path
   @@glass_template_path = "app/views/glass" 
 

data/lib/glass/client.rb

@@ -17,7 +17,7 @@ module Glass
 
     def initialize(opts)
       self.api_keys = opts[:api_keys] || ::Glass::ApiKeys.new
-      self.google_client = ::Google::APIClient.new
+      initialize_google_api_client
       self.mirror_api = google_client.discovered_api("mirror", "v1")
       self.google_account = opts[:google_account]
 
@@ -37,6 +37,11 @@ module Glass
       setup_with_user_access_token
       self
     end
+    def initialize_google_api_client
+      application_name = ::Glass.application_name
+      application_version = ::Glass.application_version
+      self.google_client = ::Google::APIClient.new(application_name: application_name, application_version: application_version)
+    end
 
     def get_timeline_item(id)
       response_hash(self.google_client.execute(get_timeline_item_parameters(id)).response)

data/lib/glass/rails/version.rb

@@ -1,5 +1,5 @@
 module Glass
   module Rails
-    VERSION="0.1.5"
+    VERSION="1.0.0"
   end
 end

data/lib/glass/template.rb

@@ -19,9 +19,9 @@ module Glass
     ## "app/views/glass-templates/tweets/blue.html.erb"
 
     ## then your template name would be:
-    ## "tweets/blue.html.erb"
+    ## "tweets/blue"
     def initialize(opts={})
-      self.template_name = opts.delete(:template_name) || "simple.html.erb"
+      self.template_name = opts.delete(:template_name) || "simple"
       set_template_instance_variables(opts)
       super(glass_template_path)
     end
@@ -42,4 +42,4 @@ module Glass
       ::Glass.glass_template_path
     end
   end  
-end
+end

data/lib/glass/timeline_item.rb

@@ -15,12 +15,6 @@ 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,
-                    :is_deleted,        :google_account_id
-
-
 
     ## i'd use cattr_accessor, but unfortunately
     ## ruby has some very crappy class variables, which
@@ -33,21 +27,12 @@ module Glass
 
     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
     ## had there values set yet.
     attr_writer :client, :mirror_content, :template_name
 
-
-
-
-
-
-
-
     ### a couple custom attr_readers which raise a
     ### helpful error message if the value is nil;
     ### i.e. error flow handling.
@@ -59,15 +44,7 @@ module Glass
       raise UnserializedTemplateError unless @client
       @client
     end
-
-
-
-
-
-
-
-
-
+    
     ## this methods sets the default template for
     ## all instances of the class.
 
@@ -90,24 +67,19 @@ module Glass
     ## Usage:
     ##   class Glass::Tweet < Glass::TimelineItem
 
-    ##     defaults_template_with "table.html.erb"
+    ##     defaults_template_with :table
                 ## 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"
+        self.default_template = name_of_template.to_s
+      else
+        raise InvalidArgumentError, 'Template name is not a symbol'
       end
     end
 
-
-
-
-
-
-
-
     ## this methods sets the default template for
     ## all instances of the class.
 
@@ -290,13 +262,13 @@ module Glass
 
     ## this is not intended to be a part of the public api
     def template_name
-      @template_name = self.class.default_template || "simple.html.erb"
+      @template_name = self.class.default_template
     end
 
     ## this is not intended to be a part of the public api
     def setup_template(variables={})
-      glass_template_path = variables[:template_name] || self.template_name
-      Glass::Template.new({template_name: glass_template_path}.merge(variables)).render_self
+      variables[:template_name] ||= self.template_name
+      Glass::Template.new(variables).render_self
     end
 
     ## this is not intended to be a part of the public api
@@ -309,4 +281,4 @@ module Glass
     end
 
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glass-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 1.0.0
 platform: ruby
 authors:
 - Kunal Modi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-21 00:00:00.000000000 Z
+date: 2013-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -43,14 +43,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
@@ -113,14 +113,14 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.11.0
 description: ' A framework for creating google glass applications using ruby on rails. '
@@ -196,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
 summary: A framework for creating google glass applications using ruby on rails.  This