resque-reports 0.3.0 → 0.3.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YTQ0NGJiYjk0OGMyYWVhYmU4OGVmNzhiNWNhZmI0ZWFlYzI4OTMyOQ==
+  data.tar.gz: !binary |-
+    MTJmMDEzZmQ0OGIxZTdkMmE4NjdlYmI0ZDIwNzc1YjNhOWNiYWZmOQ==
+SHA512:
+  metadata.gz: !binary |-
+    ZTk3NWJhMzcyZjBjNTA4MDE3OWQ5NzkzZGVjZTRmYTY2MjdjM2Q1OTE2MTBm
+    NGZiMTRkOGQ2OWE2NTY0YTk0ZDVjY2UwNzMxZDk3ODVjNTQ3NzA1NzgxNTgw
+    ZTBlMjRkYWIwYTQ4ODBmNmQ0OWFiZDI3ZTJmODc0ZTIxODVjNzM=
+  data.tar.gz: !binary |-
+    ZmJkYTIzYjZiYjZiYTgwYThhODMzZTc1NmRkMTYxYWRkMzU1ZWY2NjU5OWUx
+    MTJkYTI3NWQ1NjRjODBiODdiYTVlN2VjZjA5MDU0OGUzODU1YzE5NWZhMWYy
+    YzE2YTNlMTk3MTcwMjNkZDAxMDMxOWZjYzg4ZWJiNzI2MTViM2Y=

data/app/jobs/resque/reports/report_job.rb

@@ -9,9 +9,11 @@ module Resque
     # @example:
     #
     #    ReportJob.enqueue('Resque::Reports::MyReport', [1, 2].to_json)
+    #    ReportJob.enqueue_to(:my_queue, 'Resque::Reports::MyReport', [1, 2].to_json)
     #
     class ReportJob
       include Resque::Integration
+      extend Extensions::EnqueueToFix
 
       unique
 
@@ -26,9 +28,6 @@ module Resque
           fail "Supports only successors of BaseReport, but got #{report_class}"
         end
 
-        fail 'Report queue is not specified' unless report_class.job_queue
-        queue report_class.job_queue
-
         args = JSON.parse(args_json)
         force = args.pop
 

data/lib/resque/reports/base_report.rb

@@ -62,15 +62,13 @@ module Resque
 
       class << self
 
-        attr_reader :job_queue
-
         protected
 
         attr_reader :create_block
-        attr_writer :job_queue
         attr_accessor :file_extension,
                       :file_encoding,
-                      :file_directory
+                      :file_directory,
+                      :job_queue
 
         alias_method :super_extension, :file_extension
         alias_method :extension, :file_extension=
@@ -116,6 +114,7 @@ module Resque
       #++
 
       DEFAULT_EXTENSION = 'txt'
+      DEFAULT_QUEUE = :base
 
       #--
       # Delegators
@@ -127,7 +126,8 @@ module Resque
                      :file_encoding,
                      :create_block,
                      :set_instance,
-                     :set_extension
+                     :set_extension,
+                     :job_queue
 
       def_delegators :@cache_file, :filename, :exists?, :ready?
       def_delegator Const::TO_SUPER, :super_extension
@@ -166,8 +166,9 @@ module Resque
 
         # Check report if it already in progress and tring return its job_id...
         job_id = ReportJob.enqueued?(report_class, args_json).try(:meta_id)
+
         # ...and start new job otherwise
-        job_id || ReportJob.enqueue(report_class, args_json).try(:meta_id)
+        job_id || ReportJob.enqueue_to(job_queue || DEFAULT_QUEUE, report_class, args_json).try(:meta_id)
       end
 
       protected

data/lib/resque/reports/extensions/enqueue_to_fix.rb

@@ -0,0 +1,28 @@
+# coding: utf-8
+require 'resque/plugins/progress'
+
+module Resque
+  module Reports
+    module Extensions
+      module EnqueueToFix
+        def self.extended(base)
+          base.extend(Resque::Plugins::Progress)
+          base.extend(ClassMethods)
+        end
+
+        module ClassMethods
+          def enqueue_to(*args) #:nodoc:
+            queue = args.shift
+            meta = enqueued?(*args) and return meta
+
+            meta = Resque::Plugins::Meta::Metadata.new({'meta_id' => meta_id(args), 'job_class' => self.to_s})
+            meta.save
+
+            Resque.enqueue_to(queue, self, meta.meta_id, *args)
+            meta
+          end
+        end
+      end
+    end
+  end
+end

data/lib/resque/reports/extensions.rb

@@ -1,5 +1,6 @@
 # coding: utf-8
 require 'resque/reports/extensions/const'
+require 'resque/reports/extensions/enqueue_to_fix'
 require 'resque/reports/extensions/event_callbacks'
 require 'resque/reports/extensions/event_templates'
 require 'resque/reports/extensions/filename_gen'
@@ -31,6 +32,7 @@ module Resque
         base.send :include, EventCallbacks # event callbacks and handlers
         base.send :include, EventTemplates # template events handling methods
         base.send :include, Encodings # encoding constants
+        base.send :include, EnqueueToFix # encoding constants
       end
     end
   end

data/lib/resque/reports/version.rb

@@ -1,6 +1,7 @@
 # coding: utf-8
 module Resque
   module Reports
-    VERSION = '0.3.0'
+    VERSION = '0.3.2'
   end
 end
+

data/lib/resque/reports.rb

@@ -10,6 +10,7 @@ require 'resque/reports/csv_report'
 
 require 'resque/reports/version'
 
+
 # Resque namespace
 module Resque
   # Resque::Reports namespace

data/spec/resque/reports/base_report_spec.rb

@@ -106,13 +106,13 @@ describe 'Resque::Reports::BaseReport successor' do
     context 'when report is building twice' do
       subject { MyReport.new('#bg_build test') }
 
-      before { job_class.stub(enqueue: 'job_id') }
+      before { job_class.stub(enqueue_to: 'job_id') }
 
       it do
         job_class
-          .should_receive(:enqueue)
-          .with('MyReport', '["#bg_build test",true]')
-          .twice
+          .should_receive(:enqueue_to).twice
+          #.with(:my_type_reports, 'MyReport', '["#bg_build test",true]')
+
       end
 
       after do
@@ -123,12 +123,12 @@ describe 'Resque::Reports::BaseReport successor' do
     context 'when report is building' do
       subject { MyReport.new('#bg_build test') }
 
-      before { job_class.stub(enqueue: 'job_id') }
+      before { job_class.stub(enqueue_to: 'job_id') }
 
       it do
         job_class
-          .should_receive(:enqueue)
-          .with('MyReport', '["#bg_build test",true]')
+          .should_receive(:enqueue_to)
+          #.with(:my_type_reports, 'MyReport', '["#bg_build test",true]')
       end
 
       after  { subject.bg_build true }

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: resque-reports
 version: !ruby/object:Gem::Version
-  version: 0.3.0
-  prerelease: 
+  version: 0.3.2
 platform: ruby
 authors:
 - Sergey D.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque-integration
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-given
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -147,6 +132,7 @@ files:
 - lib/resque/reports/extensions.rb
 - lib/resque/reports/extensions/const.rb
 - lib/resque/reports/extensions/encodings.rb
+- lib/resque/reports/extensions/enqueue_to_fix.rb
 - lib/resque/reports/extensions/event_callbacks.rb
 - lib/resque/reports/extensions/event_templates.rb
 - lib/resque/reports/extensions/filename_gen.rb
@@ -160,33 +146,26 @@ files:
 homepage: https://github.com/sclinede/resque-reports
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 375761733447731005
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 375761733447731005
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: resque-reports
 test_files:
 - spec/resque/reports/base_report_spec.rb