hirefire-resource 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f76249632b57bc4180ff62be419e4d327fac2f9c
-  data.tar.gz: 8994e97e741c960facf72acb6d0185d20a810c02
+  metadata.gz: 0e0b10eb9ebd32206b2a2b8f3fa6c9a8b5dda5f2
+  data.tar.gz: 1c4395b5cdc157db1c229dfcb3d154fd931c7e3f
 SHA512:
-  metadata.gz: 12e1072617b7af769452d73a6db73d55eceab0e27144ca454a982e7758fcceb9e87a414b0a48e3905533e7d4dba329e64d1faed9c06ab6e1d71e8cdabeb89e11
-  data.tar.gz: 95f776786bd20be9ac4959d09cb048ffdcb7be81d19b3a9f0f41d70c195c51724649854e0dfacf24d0d963b0b151dd3e9e8df1ed1d5b5676d3fdc932cadf7302
+  metadata.gz: 633c624c86b25ba906651366a95b1ea202ea1e403f8b26737ee09ccd463a6c02d73127c75fdc3eacf8217c8ab1ed70754d80e66a8cb3656f3fb1eaf33993c0e8
+  data.tar.gz: 507b88dee198030dd3cd5063da0804b56b8f14a9e3384df30af8edefeeb321b7a2fe17e4fa56d5af39996dbd52dc590582bb879e1e0dad9af350ef89d878b0af

data/hirefire-resource.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name        = "hirefire-resource"
-  gem.version     = "0.1.3"
+  gem.version     = "0.2.0"
   gem.platform    = Gem::Platform::RUBY
   gem.authors     = "Michael van Rooijen"
   gem.email       = "michael@hirefire.io"

data/lib/hirefire/macro/delayed_job.rb

@@ -6,35 +6,48 @@ module HireFire
       module Job
         extend self
 
-        # Determines whether `ActiveRecord (3)` or `Mongoid` is being used.
-        # Once determined, it will build the appropriate query criteria in order
-        # to count the amount of jobs in a given queue and return the result.
+        # Returns the job quantity for the provided queue(s).
         #
         # @example Delayed::Job Macro Usage
-        #   HireFire::Macro::Delayed::Job.queue # all queues
-        #   HireFire::Macro::Delayed::Job.queue("email") # only email queue
-        #   HireFire::Macro::Delayed::Job.queue("audio", "video") # audio and video queues
         #
-        # @param [Array] queues provide one or more queue names, or none for "all".
+        #   # all queues using ActiveRecord mapper.
+        #   HireFire::Macro::Delayed::Job.queue(:mapper => :active_record)
+        #
+        #   # only "email" queue with Mongoid mapper.
+        #   HireFire::Macro::Delayed::Job.queue("email", :mapper => :mongoid)
         #
+        #   # "audio" and "video" queues with ActiveRecord mapper.
+        #   HireFire::Macro::Delayed::Job.queue("audio", "video", :mapper => :active_record)
+        #
+        # @param [Array] queues provide one or more queue names, or none for "all".
+        #   Last argument can pass in a Hash containing :mapper => :active_record or :mapper => :mongoid
         # @return [Integer] the number of jobs in the queue(s).
+        #
         def queue(*queues)
           queues.flatten!
 
-          if defined?(Mongoid)
+          if queues.last.is_a?(Hash)
+            options = queues.pop
+          else
+            options = {}
+          end
+
+          case options[:mapper]
+          when :active_record
             c = ::Delayed::Job
             c = c.where(:failed_at => nil)
-            c = c.where(:run_at.lte => Time.now.utc)
-            c = c.where(:queue.in => queues) unless queues.empty?
+            c = c.where("run_at <= ?", Time.now.utc)
+            c = c.where(:queue => queues) unless queues.empty?
             c.count
-          elsif defined?(ActiveRecord)
+          when :mongoid
             c = ::Delayed::Job
             c = c.where(:failed_at => nil)
-            c = c.where("run_at <= ?", Time.now.utc)
-            c = c.where(:queue => queues) unless queues.empty?
+            c = c.where(:run_at.lte => Time.now.utc)
+            c = c.where(:queue.in => queues) unless queues.empty?
             c.count
           else
-            raise "HireFire could not detect ActiveRecord or Mongoid for HireFire::Macro::Delayed::Job."
+            raise %{Must pass in :mapper => :active_record or :mapper => :mongoid\n} +
+              %{For example: HireFire::Macro::Delayed::Job.queue("worker", :mapper => :active_record)}
           end
         end
       end

data/lib/hirefire/macro/qc.rb

@@ -13,10 +13,10 @@ module HireFire
       #   HireFire::Macro::QC.queue("email") # counts the `email` queue.
       #
       # @param [String, Symbol, nil] queue the queue name to count. (default: `default`)
-      #
       # @return [Integer] the number of jobs in the queue(s).
+      #
       def queue(queue = "default")
-        ::QC::Queries.count(queue.to_s)
+        ::QC::Worker.new(:q_name => queue.to_s).queue.count
       end
     end
   end

data/lib/hirefire/macro/qu.rb

@@ -13,8 +13,8 @@ module HireFire
       #   HireFire::Macro::Qu.queue("audio", "video") # audio and video queues
       #
       # @param [Array] queues provide one or more queue names, or none for "all".
-      #
       # @return [Integer] the number of jobs in the queue(s).
+      #
       def queue(*queues)
         queues = ::Qu.backend.queues if queues.empty?
         queues.flatten.inject(0) { |memo, queue| memo += ::Qu.backend.length(queue); memo }

data/lib/hirefire/macro/resque.rb

@@ -13,8 +13,8 @@ module HireFire
       #   HireFire::Macro::Resque.queue("audio", "video") # audio and video queues
       #
       # @param [Array] queues provide one or more queue names, or none for "all".
-      #
       # @return [Integer] the number of jobs in the queue(s).
+      #
       def queue(*queues)
         queues = queues.flatten.map(&:to_s)
         queues = ::Resque.queues if queues.empty?

data/lib/hirefire/macro/sidekiq.rb

@@ -13,8 +13,8 @@ module HireFire
       #   HireFire::Macro::Sidekiq.queue("audio", "video") # audio and video queues
       #
       # @param [Array] queues provide one or more queue names, or none for "all".
-      #
       # @return [Integer] the number of jobs in the queue(s).
+      #
       def queue(*queues)
         queues = queues.flatten.map(&:to_s)
         queues = ::Sidekiq::Stats.new.queues.map { |name, _| name } if queues.empty?

data/lib/hirefire/middleware.rb

@@ -7,6 +7,7 @@ module HireFire
     # and `ENV["HIREFIRE_TOKEN"]` in `@token` for convenience.
     #
     # @param [ActionDispatch::Routing::RouteSet] app.
+    #
     def initialize(app)
       @app   = app
       @token = ENV["HIREFIRE_TOKEN"]
@@ -16,6 +17,7 @@ module HireFire
     # Otherwise, fall through to the rest of the middleware below HireFire::Middleware.
     #
     # @param [Hash] env containing request information.
+    #
     def call(env)
       @env = env
 
@@ -35,6 +37,7 @@ module HireFire
     # This url will be requested every minute by HireFire in order to fetch dyno data.
     #
     # @return [text/html, application/json] based on whether the `test` or `info` url was requested.
+    #
     def each(&block)
       if test?
         block.call "HireFire Middleware Found!"
@@ -48,6 +51,7 @@ module HireFire
     # Generates a JSON string based on the dyno data.
     #
     # @return [String] in JSON format.
+    #
     def dynos
       dyno_data = HireFire::Resource.dynos.inject(String.new) do |json, dyno|
         json << %|,{"name":"#{dyno[:name]}","quantity":#{dyno[:quantity].call || "null"}}|; json
@@ -59,6 +63,7 @@ module HireFire
     # Returns true if the PATH_INFO matches the test url.
     #
     # @return [Boolean] true if the requested url matches the test url.
+    #
     def test?
       @env["PATH_INFO"] == "/hirefire/test"
     end
@@ -66,6 +71,7 @@ module HireFire
     # Returns true if the PATH_INFO matches the info url.
     #
     # @return [Boolean] true if the requested url matches the info url.
+    #
     def info?
       @env["PATH_INFO"] == "/hirefire/#{@token || "development"}/info"
     end

data/lib/hirefire/resource.rb

@@ -5,6 +5,7 @@ module HireFire
     extend self
 
     # @return [Array] The configured dynos.
+    #
     attr_accessor :dynos
 
     # Sets the `@dynos` instance variable to an empty Array to hold all the dyno configuration.
@@ -17,6 +18,7 @@ module HireFire
     #   end
     #
     # @yield [HireFire::Resource] to allow for block-style configuration.
+    #
     def configure
       @dynos ||= []
       yield self
@@ -26,6 +28,7 @@ module HireFire
     #
     # @param [Symbol, String] name the name of the dyno as defined in the Procfile.
     # @param [Proc] block an Integer containing the quantity calculation logic.
+    #
     def dyno(name, &block)
       @dynos << { :name => name, :quantity => block }
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hirefire-resource
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael van Rooijen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-12 00:00:00.000000000 Z
+date: 2013-09-02 00:00:00.000000000 Z
 dependencies: []
 description: HireFire - The Heroku Dyno Manager
 email: michael@hirefire.io