zuora_connect 0.0.9.3.3 → 0.0.9.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4924c0d75878a3b31e5fb95229460435d2b2d37c
-  data.tar.gz: 79b75fd3fc967171522123926a4914eef55f0272
+  metadata.gz: 87b1366862b0a9cdeb1e9ac498bbc7c768799ead
+  data.tar.gz: e60795ed8bad5d7f79355942e36529eee2a5e774
 SHA512:
-  metadata.gz: f62f2dddbad985b3c867edcb7c2e04cac413167f981c3b9009eea3a9d75fa22f8d9ce3e2e1e1613d1c4bb974d19d5d475c6d9022a94bb40a51d704a676e549b1
-  data.tar.gz: c05b2586bca743fddd1d7cee334a5f71fd9b5b6bc16a77994a12477a27fa2b954c25219570ea798529d8be646a6f6080d0807601f4500fdf630a2b0d08041e90
+  metadata.gz: bd17ce708b1796cd36b42a41be760b626128657fb1f904bd2615711554cf85b802ae509f7c4eb439eda61ca5cb0cb6a90f17d9b90a1c662982e06eaf3a466dfb
+  data.tar.gz: 325ec4e2b04c0b654bbcf8ed990bf180815917755cea8a1ed752a6e66189c9c77838f8476c5a20bbb2e7156daf1d841fe86a8f5d14fc11854cdf406ecda09734

data/app/models/zuora_connect/app_instance.rb

@@ -8,8 +8,12 @@ module ZuoraConnect
       @options = Hash.new
       @logins = Hash.new
       @valid = false
-      Apartment::Migrator.migrate(self.id)
+      self.attr_builder("timezone", ZuoraConnect.configuration.default_time_zone)
+      self.attr_builder("locale", ZuoraConnect.configuration.default_locale)
       Apartment::Tenant.switch!(self.id)
+      if( ActiveRecord::Migration.check_pending! != nil)
+        Apartment::Migrator.migrate(self.id)
+      end
       Thread.current[:appinstance] = self
     end
 
@@ -40,6 +44,8 @@ module ZuoraConnect
           build_task(session["#{self.id}::task_data"], session)
         end
       end
+      I18n.locale = self.locale
+      Time.zone = self.timezone
       @valid = true
     end
 
@@ -86,6 +92,9 @@ module ZuoraConnect
           v.each do |opt|
             @options[opt["config_name"]] = opt
           end
+        elsif k == "user_settings"
+          self.timezone =  v["timezone"]
+          self.locale = v["local"]
         end
       end
     end

data/db/migrate/20160718151733_create_connect_app_instances.rb

@@ -3,9 +3,6 @@ class CreateConnectAppInstances < ActiveRecord::Migration
     if !ActiveRecord::Base.connection.table_exists?('zuora_connect_app_instances')
       create_table :zuora_connect_app_instances do |t|
         t.timestamps null: false
-        t.string "access_token"
-        t.string "token"
-        t.string "refresh_token"
       end
     end
   end

data/db/migrate/20161024162319_add_tokens_to_app_instance.rb

@@ -0,0 +1,6 @@
+class AddTokensToAppInstance < ActiveRecord::Migration
+  def change
+    add_column :zuora_connect_app_instances, :access_token, :string unless column_exists? :zuora_connect_app_instances, :access_token
+    add_column :zuora_connect_app_instances, :refresh_token, :string unless column_exists? :zuora_connect_app_instances, :refresh_token
+  end
+end

data/db/migrate/20161024220705_add_token_to_app_instance.rb

@@ -0,0 +1,5 @@
+class AddTokenToAppInstance < ActiveRecord::Migration
+  def change
+    add_column :zuora_connect_app_instances, :token, :string  unless column_exists? :zuora_connect_app_instances, :token
+  end
+end

data/lib/zuora_connect/controllers/helpers.rb

@@ -32,8 +32,8 @@ module ZuoraConnect
           setup_instance_via_dev_mode
         end
         @appinstance.new_session(:session =>instance_data_lookup(@appinstance.id, @appinstance.access_token))
-        I18n.locale = session["#{@appinstance.id}::user::locale"] ?  session["#{@appinstance.id}::user::locale"] : ZuoraConnect.configuration.default_locale
-        Time.zone = session["#{@appinstance.id}::user::timezone"] ? session["#{@appinstance.id}::user::timezone"] : ZuoraConnect.configuration.default_time_zone
+        I18n.locale = session["#{@appinstance.id}::user::locale"] ?  session["#{@appinstance.id}::user::locale"] : @appinstance.locale
+        Time.zone = session["#{@appinstance.id}::user::timezone"] ? session["#{@appinstance.id}::user::timezone"] : @appinstance.timezone
       end
 
       def persist_connect_app_session

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "0.0.9.3.3"
+  VERSION = "0.0.9.3.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 0.0.9.3.3
+  version: 0.0.9.3.4
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-22 00:00:00.000000000 Z
+date: 2016-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -127,6 +127,8 @@ files:
 - config/initializers/apartment.rb
 - config/routes.rb
 - db/migrate/20160718151733_create_connect_app_instances.rb
+- db/migrate/20161024162319_add_tokens_to_app_instance.rb
+- db/migrate/20161024220705_add_token_to_app_instance.rb
 - lib/tasks/zuora_connect_tasks.rake
 - lib/zuora_connect.rb
 - lib/zuora_connect/configuration.rb