zuora_connect 1.4.59 → 1.4.60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: addbe2f7558e50958f199c78556110f6e12a6b9a
-  data.tar.gz: 98ba68a2846ead5318e0e1dbb1b032801992cc29
+  metadata.gz: d2b7673aeef42a11c627db572865c7c0eb5001c6
+  data.tar.gz: 83a08a7e946ba4aebf6a7a0e734bdf3a5032b81c
 SHA512:
-  metadata.gz: 7ffae8162e12a45795acc9c365be82c2c77c153312c5ae041d56c7de4e6e9d713d9ea3fd645ec025a2e4a2336d0dbcf35127ceded808304d7de046289cd5c478
-  data.tar.gz: b4549c63ba726c901647ff099bbd0d7c9263d99161cbefd5de2e42570418f9509b02c8db7e881ea87ae3ccd6257acc714269daa4d66bc7aed24fcf55784f30c7
+  metadata.gz: fefb2bb88a4acb786ab92393f96886411aaa8e377f44eeff7e6c45f0da7699f714c1cbdbb7057120098497f73be9c2bf2725000289b601a46fc9c6e3d4562a19
+  data.tar.gz: 88fa4fa9f39d6ee3f380ee293018c5d8c8ce7cf0eb0195f7fa8ed11ff5ec8ac383aed10a752d8f1fe5612a817538d610b863ddd4c8bf830d1e684fb44e249df0

data/app/models/zuora_connect/app_instance_base.rb

@@ -82,6 +82,23 @@ module ZuoraConnect
       return ActiveSupport::MessageEncryptor.new(secret, sign_secret)
     end
 
+    def api_limit(start: true, time: 2.minutes.to_i)
+      if start
+        Redis.current.set("APILimits:#{self.id}", true)
+        Redis.current.expire("APILimits:#{self.id}", time)
+      else
+        Redis.current.del("APILimits:#{self.id}")
+      end
+    end
+
+    def queue_pause
+      Redis.current.set("resque:PauseQueue:#{self.id}", true)
+    end
+
+    def queue_start
+      Redis.current.del("resque:PauseQueue:#{self.id}")
+    end
+
     def catalog_outdated?(time: Time.now - 12.hours)
       return self.catalog_updated_at.blank? || (self.catalog_updated_at < time)
     end

data/config/initializers/resque.rb

@@ -0,0 +1,5 @@
+if defined?(Resque::Worker)
+  Resque.send(:extend, Resque::Additions)
+  Resque::Worker.send(:include, Resque::DynamicQueues)
+  Resque::Job.send(:include, Resque::SelfLookup)
+end

data/lib/resque/additions.rb

@@ -0,0 +1,53 @@
+module Resque
+  module Additions
+    def dequeue_from(queue, klass, *args)
+      ####### ------ Resque Job --------
+      # Perform before_dequeue hooks. Don't perform dequeue if any hook returns false
+      before_hooks = Plugin.before_dequeue_hooks(klass).collect do |hook|
+        klass.send(hook, *args)
+      end
+      return if before_hooks.any? { |result| result == false }
+
+      destroyed = Job.destroy(queue, klass, *args)
+
+      Plugin.after_dequeue_hooks(klass).each do |hook|
+        klass.send(hook, *args)
+      end
+
+      destroyed
+    end
+    
+    ####### ------ Resque Delayed Job --------
+    # Returns delayed jobs schedule timestamp for +klass+, +args+.
+    def scheduled_at_with_queue(queue, klass, *args)
+      search = encode(job_to_hash_with_queue(queue,klass, args))
+      redis.smembers("timestamps:#{search}").map do |key|
+        key.tr('delayed:', '').to_i
+      end
+    end
+
+    # Given an encoded item, remove it from the delayed_queue
+    def remove_delayed_with_queue(queue, klass, *args)
+      search = encode(job_to_hash_with_queue(queue,klass, args))
+      remove_delayed_job(search)
+    end
+
+    #Given a timestamp and job (klass + args) it removes all instances and
+    # returns the count of jobs removed.
+    #
+    # O(N) where N is the number of jobs scheduled to fire at the given
+    # timestamp
+    def remove_delayed_job_with_queue_from_timestamp(timestamp, queue, klass, *args)
+      return 0 if Resque.inline?
+
+      key = "delayed:#{timestamp.to_i}"
+      encoded_job = encode(job_to_hash_with_queue(queue, klass, args))
+
+      redis.srem("timestamps:#{encoded_job}", key)
+      count = redis.lrem(key, 0, encoded_job)
+      clean_up_timestamp(key, timestamp)
+
+      count
+    end
+  end
+end

data/lib/resque/dynamic_queues.rb

@@ -0,0 +1,73 @@
+module Resque
+  module DynamicQueues
+    # Returns a list of queues to use when searching for a job.
+    #
+    # A splat ("*") means you want every queue (in alpha order) - this
+    # can be useful for dynamically adding new queues.
+    #
+    # The splat can also be used as a wildcard within a queue name,
+    # e.g. "*high*", and negation can be indicated with a prefix of "!"
+    #
+    # An @key can be used to dynamically look up the queue list for key from redis.
+    # If no key is supplied, it defaults to the worker's hostname, and wildcards
+    # and negations can be used inside this dynamic queue list.   Set the queue
+    # list for a key with Resque.set_dynamic_queue(key, ["q1", "q2"]
+    #
+    def queues_with_dynamic
+      queue_names = @queues.dup
+      
+      return queues_without_dynamic if queue_names.grep(/(^!)|(^@)|(\*)/).size == 0
+
+      real_queues = Resque.queues
+      matched_queues = []
+
+      #Remove Queues under Api Limits
+      api_limit_instances = Redis.current.keys("APILimits:*").map {|key| key.split('APILimits:').last.to_i}
+      real_queues = real_queues.select {|key| key if !api_limit_instances.include?((key.match(/^(\d*)_.*/) || [])[1].to_i)}
+      
+      #Queue Pausing 
+      paused_instances = Redis.current.keys("resque:PauseQueue:*").map {|key| key.split('resque:PauseQueue:').last.to_i}
+      real_queues = real_queues.select {|key| key if !paused_instances.include?((key.match(/^(\d*)_.*/) || [])[1].to_i)}
+
+      while q = queue_names.shift
+        q = q.to_s
+
+        if q =~ /^(!)?@(.*)/
+          key = $2.strip
+          key = hostname if key.size == 0
+
+          add_queues = Resque.get_dynamic_queue(key)
+          add_queues.map! { |q| q.gsub!(/^!/, '') || q.gsub!(/^/, '!') } if $1
+
+          queue_names.concat(add_queues)
+          next
+        end
+
+        if q =~ /^!/
+          negated = true
+          q = q[1..-1]
+        end
+
+        patstr = q.gsub(/\*/, ".*")
+        pattern = /^#{patstr}$/
+        if negated
+          matched_queues -= matched_queues.grep(pattern)
+        else
+          matches = real_queues.grep(/^#{pattern}$/)
+          matches = [q] if matches.size == 0 && q == patstr
+          matched_queues.concat(matches.sort)
+        end
+      end
+     
+      return matched_queues.uniq
+    end
+
+
+    def self.included(receiver)
+      receiver.class_eval do
+        alias queues_without_dynamic queues
+        alias queues queues_with_dynamic
+      end
+    end
+  end
+end

data/lib/resque/self_lookup.rb

@@ -0,0 +1,12 @@
+module Resque
+  module SelfLookup
+    def payload_class
+      @payload_class ||= constantize(@payload['class'])
+      @payload_class.instance_eval { class << self; self end }.send(:attr_accessor, :worker)
+      @payload_class.instance_eval { class << self; self end }.send(:attr_accessor, :job)
+      @payload_class.worker =  self.worker
+      @payload_class.job =  self
+      return @payload_class
+    end
+  end
+end

data/lib/zuora_connect.rb

@@ -4,6 +4,9 @@ require 'zuora_connect/exceptions'
 require 'zuora_connect/controllers/helpers'
 require 'zuora_connect/views/helpers'
 require 'zuora_connect/railtie'
+require 'resque/additions' 
+require 'resque/dynamic_queues'
+require 'resque/self_lookup'
 
 module ZuoraConnect
   class << self

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.4.59"
+  VERSION = "1.4.60"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.4.59
+  version: 1.4.60
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-25 00:00:00.000000000 Z
+date: 2017-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-session_store
@@ -225,6 +225,7 @@ files:
 - app/views/zuora_connect/static/session_error.html.erb
 - config/initializers/apartment.rb
 - config/initializers/redis.rb
+- config/initializers/resque.rb
 - config/routes.rb
 - db/migrate/20100718151733_create_connect_app_instances.rb
 - db/migrate/20101024162319_add_tokens_to_app_instance.rb
@@ -235,6 +236,9 @@ files:
 - db/migrate/20110503003602_add_catalog_data_to_app_instance.rb
 - db/migrate/20110503003603_add_catalog_mappings_to_app_instance.rb
 - db/migrate/20110503003604_catalog_default.rb
+- lib/resque/additions.rb
+- lib/resque/dynamic_queues.rb
+- lib/resque/self_lookup.rb
 - lib/tasks/zuora_connect_tasks.rake
 - lib/zuora_connect.rb
 - lib/zuora_connect/configuration.rb