glass-rails 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a19746d62af42ca28df70f89759112e24dec7880
-  data.tar.gz: f53da33675d86299fe04abc0f2431c8b40a39423
+  metadata.gz: 37b56305c29a9db73a5ada1a75300f60068973ac
+  data.tar.gz: bf7de7f146ee006b4b127b7b6d481c4ed4d3247b
 SHA512:
-  metadata.gz: 42b2711f95ac616c37db2488296ba95ed88c076bfa32f703ee65d0fc34da70142939a5af29d64e330d348ee00bb0449c859dee1190f623199cab48158a677967
-  data.tar.gz: 15f892d876444c765b408a5fc5fa33f68223902f9ecc85b86a2bf300360fdeeacccf0d1e13280b69acad1f376d00619ffc2f1a0e26ee6c2b6b40707e592c71ba
+  metadata.gz: 2e1d1e03191e5d4d4137559d6d33e8aa7f2a1cb9cfbb40aa6a54ecdab737376cf89a2098db99f71e002a47c5a8bc630cacec14a0df339c26c36b58556e73f25d
+  data.tar.gz: 46f57ec672c8d5470e399bacafae9d9273aab99d430808fccd4023ec6f745406e696cb16ebf03898e9d463a737a4f667be923d2381e92429381b53381cbac62f

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

@@ -14,12 +14,10 @@ Glass.setup do |config|
   ## config.application_name = "SomeGlassApp"
 
 
-
   #  modify this to change the application version of your glass app
   ## config.application_version = "0.0.1"
 
 
-
   #  if you don't want to use a yaml file to load your api
   #  keys, then you can use these config vars to force load
   #  your keys from enviroment variables, or whatever method 
@@ -29,7 +27,6 @@ Glass.setup do |config|
   ## config.client_secret = ENV["GOOGLE_CLIENT_SECRET"]
 
 
-
   ## manually override your glass views path here.
   config.glass_template_path = "app/views/glass"
 end

data/lib/glass.rb

@@ -4,7 +4,7 @@ require 'active_support/dependencies'
 require 'glass/rails/version'
 
 module Glass
-  
+  DEVELOPMENT_PROXY_URL = "https://mirrornotifications.appspot.com/forward?url="
   mattr_accessor :application_name
   application_name = (defined?(::Rails) && ::Rails.application) ? ::Rails.application.class.name.split('::').first : "SomeGlassApp"
   @@application_name = application_name

data/lib/glass/client.rb

@@ -7,6 +7,7 @@ module Glass
                   :google_account,        :refresh_token,           :content,
                   :mirror_content_type,   :timeline_item,           :has_expired_token,
                   :api_keys,              :timeline_list
+    attr_writer   :callback_url
 
     def self.create(timeline_item, opts={})
       client = new(opts.merge({google_account: timeline_item.google_account}))
@@ -18,6 +19,11 @@ module Glass
       setup_google_api_keys
       initialize_google_client
       self.google_account = opts[:google_account]
+
+      self.access_token = opts[:access_token] || google_account.try(:token)
+      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
@@ -35,6 +41,18 @@ module Glass
       }
     end
 
+    def callback_url
+      if ::Rails.env.production?
+        ::Rails.application.routes.url_helpers.glass_notifications_callback_url(protocol: 'https')
+      else
+        ::Glass::DEVELOPMENT_PROXY_URL + @callback_url + "/glass/notifications"
+      end
+    end
+
+
+
+
+
     def set_timeline_item(timeline_object)
       self.timeline_item = timeline_object
       self
@@ -185,7 +203,7 @@ module Glass
 
     def initialize_google_client
       application_name = ::Glass.application_name
-      application_version = ::Glass.application_versio
+      application_version = ::Glass.application_version
       self.google_client = ::Google::APIClient.new(application_name: application_name, 
                                                    application_version: application_version)
       self.mirror_api = google_client.discovered_api("mirror", "v1")

data/lib/glass/rails/version.rb

@@ -1,5 +1,5 @@
 module Glass
   module Rails
-    VERSION="1.0.2"
+    VERSION="1.0.3"
   end
 end

data/lib/glass/subscription.rb

@@ -17,21 +17,20 @@ module Glass
     ##  collection can be :timeline or :locations
     ##  operation is an array of operations subscribed to. Valid values are 'UPDATE', 'INSERT', 'DELETE'
     def insert(opts={})
+      mirror_api_method = opts[:mirror_api_method] || :subscriptions 
       subscription = mirror_api.subscriptions.insert.request_schema.new(
         collection:   opts[:collection] || DEFAULT_COLLECTION,
         userToken:    user_token,
         verifyToken:  verification_secret,
-        callbackUrl:  opts[:callback_url] || callback_url,
+        callbackUrl:  opts[:callback_url] || google_client.callback_url,
         operation:    opts[:operations] || DEFAULT_OPERATIONS)
-      result = google_client.execute(api_method: mirror_api.subscriptions.insert,
+      result = google_client.execute(api_method: mirror_api.send(mirror_api_method).insert,
                                      body_object: subscription)
       result
     end
 
     ## Must be HTTPS
-    def callback_url
-      ::Rails.application.routes.url_helpers.glass_notifications_callback_url(protocol: 'https')
-    end
+
 
     ## Token string used to identify user in the callback
     def user_token

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glass-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Kunal Modi