bridge_cache 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcbcf635958dffd3ce2bf3434966ac404855cefd
-  data.tar.gz: d939dd4a949d0c9b48da19d5485337e8389d026a
+  metadata.gz: fb980e159b42a27d015675b0283220804ae28b49
+  data.tar.gz: cfd141b554926cd16897136c99eb548f2b256bb5
 SHA512:
-  metadata.gz: 5955932e3fdc3eb63da5001c8b137d8bb3d6f1ec53a75994bc6f3d3946db4e6bfeca44ccb73d261df7f15ad94130c36f0c1b0579745808650fd1766e8ce08ff3
-  data.tar.gz: d094e6bac904d755590c98df015fd2ae4a16e9bb24f5a03fb0b4dde598183bbd069d729bd3162a2365abca17381a390dc16e268b210d0a7a53e107fd5714e002
+  metadata.gz: 42ff929b01e2d7baa5876285ed0ed79cb4963e2b213241673a34c325ee34b5c5f7af2b5ef4ad70938748aaddf4f967b4745035791c91f37923df3823544b2684
+  data.tar.gz: fc44ffbe1445c928a48abf491439ede2f889fe999d95ba0c597e6b46c8fe0e2009638b49812a83ab5b1a832825be51e8e3ed9d8f40399dd420270ab6481d1f1e

data/app/lib/bridge_cache/jobs/import_check.rb

@@ -5,14 +5,14 @@ module BridgeCache::Jobs
 
     ATTEMPTS_THRESHOLD = 30
 
-    def perform(bridge_base_url, bridge_api_key, bridge_api_secret, models, attempts, chain = [])
+    def perform(bridge_base_url, bridge_api_key, bridge_api_secret, models, attempts, chain = [], global_options = {})
       remote_data = BridgeBlueprint::RemoteData.new(bridge_base_url, bridge_api_key, bridge_api_secret)
       if attempts > ATTEMPTS_THRESHOLD
         Rails.logger.fatal("Bridge data dump failed to download after #{(ATTEMPTS_THRESHOLD * 30) / 60} minutes")
       elsif remote_data.status == BridgeBlueprint::Constants::STATUS_COMPLETE
-        BridgeCache::Jobs::ImportData.set(queue: self.queue_name).perform_later(bridge_base_url, bridge_api_key, bridge_api_secret, models, chain)
+        BridgeCache::Jobs::ImportData.set(queue: self.queue_name).perform_later(bridge_base_url, bridge_api_key, bridge_api_secret, models, chain, global_options)
       elsif remote_data.status == BridgeBlueprint::Constants::STATUS_PENDING
-        BridgeCache::Jobs::ImportCheck.set(queue: self.queue_name, wait: 30.seconds).perform_later(bridge_base_url, bridge_api_key, bridge_api_secret, models, attempts + 1, chain)
+        BridgeCache::Jobs::ImportCheck.set(queue: self.queue_name, wait: 30.seconds).perform_later(bridge_base_url, bridge_api_key, bridge_api_secret, models, attempts + 1, chain, global_options)
       elsif remote_data.status == BridgeBlueprint::Constants::STATUS_FAILED || remote_data.status == BridgeBlueprint::Constants::STATUS_NOT_FOUND
         raise 'Bridge data dump download failed'
       end

data/app/lib/bridge_cache/jobs/import_data.rb

@@ -3,7 +3,7 @@ module BridgeCache::Jobs
     include BridgeCache::Utils::WorkerHelper
     queue_as :default
 
-    def perform(bridge_base_url, bridge_api_key, bridge_api_secret, models, chain = [])
+    def perform(bridge_base_url, bridge_api_key, bridge_api_secret, models, chain = [], global_options = {})
       begin
         remote_data = BridgeBlueprint::RemoteData.new(bridge_base_url, bridge_api_key, bridge_api_secret)
         Dir.mktmpdir do |dir|

data/app/lib/bridge_cache/jobs/import_start.rb

@@ -2,10 +2,10 @@ module BridgeCache::Jobs
   class ImportStart < ActiveJob::Base
     queue_as :default
 
-    def perform(bridge_base_url, bridge_api_key, bridge_api_secret, models, chain = [])
+    def perform(bridge_base_url, bridge_api_key, bridge_api_secret, models, chain = [], global_options = {})
       begin
         data = BridgeBlueprint::RemoteData.new(bridge_base_url, bridge_api_key, bridge_api_secret)
-        models = (['domain', 'affiliated_sub_account'] + models).uniq
+        models = (['domain', 'affiliated_sub_account'] + models).uniq unless global_options[:subaccount]
         data.start_data_report
         BridgeCache::Jobs::ImportCheck
           .set(queue: self.queue_name, wait: 30.seconds)
@@ -15,7 +15,8 @@ module BridgeCache::Jobs
             bridge_api_secret,
             models,
             0,
-            chain
+            chain,
+            global_options
           )
       rescue => e
         Rails.logger.debug(e)

data/lib/bridge_cache/version.rb

@@ -1,3 +1,3 @@
 module BridgeCache
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridge_cache
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - jshaffer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-15 00:00:00.000000000 Z
+date: 2018-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -274,7 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A mountable engine for bridge data storage