rabbit_jobs 0.10.3 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c6b09c156ec4c0164346ee69859607ab805b85b
-  data.tar.gz: ef40a547ba61943a21d522cd1061ddbd943ce522
+  metadata.gz: 4e103e5d76bc1c6aa3b69edade6717f009ba607e
+  data.tar.gz: dfc322f356dbc23681affc070d0d1784c8901478
 SHA512:
-  metadata.gz: 9cc091e03732e6ee86b891813dfbce6ce91a1443f2db0a49dc6540cb86819a18032db9d46289fe3d3f0189959111c66a03a862f523d4dc097d22d283cb283e29
-  data.tar.gz: ab6ea59c26df3c2ad64a74b69e3ac10e76067de31a54628d019d2f60cf54ddaa238cc2d9e194f72fb5c644946982b248b35a6a1de95fe54d11c61e1e13c79942
+  metadata.gz: f7c82cd1e03bad53b57eb07b56d3a21e1eae2ac937aa4ae907ffadded8fa4ad6e430a377cae9831daccd138f5626de4e5e1833393fb041a41803b6a70101f3f7
+  data.tar.gz: cfe726f5df67c78192b6b4fb4e04a9fdbc235a80b89fe4bc7c3a585e982ba5df0893748475ca2dc15f14bf4ccbf45028a73b24a268e121a81ba646aaa3886ab4

data/build

@@ -2,6 +2,7 @@
 # -*- coding: utf-8 -*-
 require 'fileutils'
 
+abort("rspec tests failed.") unless system("bundle install")
 abort("rspec tests failed.") unless system("COVERAGE=true && bundle exec rspec")
 
 coverage_dir = File.expand_path('../coverage', __FILE__)

data/lib/rabbit_jobs.rb

@@ -1,21 +1,15 @@
 # -*- encoding : utf-8 -*-
 require 'logger'
-require 'rake'
 require 'json'
-require 'digest/md5'
 require 'bunny'
-require 'uri'
-require 'rufus/scheduler'
-require 'thwait'
+require 'rufus-scheduler'
 require 'yaml'
-require 'active_support'
-require 'active_support/core_ext'
+require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/hash'
+require 'active_support/core_ext/string/inflections'
 
 require 'rabbit_jobs/version'
-
-require 'rabbit_jobs/helpers'
 require 'rabbit_jobs/configuration'
-
 require 'rabbit_jobs/consumer/job_consumer'
 require 'rabbit_jobs/job'
 require 'rabbit_jobs/publisher'

data/lib/rabbit_jobs/configuration.rb

@@ -33,8 +33,6 @@ module RabbitJobs
   end
 
   class Configuration
-    include Helpers
-
     DEFAULT_EXCHANGE_PARAMS = {
       auto_delete: false,
       durable: true
@@ -123,7 +121,7 @@ module RabbitJobs
         self.send(m, yaml[m])
       end
       yaml['queues'].each do |name, params|
-        queue name, symbolize_keys!(params) || {}
+        queue name, params.symbolize_keys || {}
       end
     end
 

data/lib/rabbit_jobs/consumer/job_consumer.rb

@@ -2,8 +2,6 @@
 module RabbitJobs
   module Consumer
     class JobConsumer
-      include RabbitJobs::Helpers
-
       def process_message(delivery_info, properties, payload)
         job, *error_args = RJ::Job.parse(payload)
 

data/lib/rabbit_jobs/job.rb

@@ -3,7 +3,6 @@ require 'benchmark'
 
 module RabbitJobs
   module Job
-    include RabbitJobs::Helpers
     extend self
 
     def self.included(base)
@@ -139,7 +138,7 @@ module RabbitJobs
     def self.parse(payload)
       begin
         encoded = JSON.parse(payload)
-        job_klass = constantize(encoded['class'])
+        job_klass = encoded['class'].to_s.constantize
         job = job_klass.new(*encoded['params'])
         job.opts = encoded['opts']
         job

data/lib/rabbit_jobs/tasks.rb

@@ -1,4 +1,5 @@
 require 'rabbit_jobs'
+require 'rake'
 
 def rails_env
   $my_rails_env ||= defined?(Rails) ? Rails.env : (ENV['RAILS_ENV'] || 'development')
@@ -17,7 +18,7 @@ end
 
 namespace :rj do
   task :environment do
-    Rails.application.require_environment!
+    Rails.application.require_environment! if defined?(Rails)
   end
 
   desc "Start a Rabbit Jobs worker"

data/lib/rabbit_jobs/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
 
 module RabbitJobs
-  VERSION = "0.10.3"
+  VERSION = "0.11.0"
 end

data/lib/tasks/rabbit_jobs.rake

@@ -1,3 +1,2 @@
 $LOAD_PATH.unshift File.dirname(__FILE__) + '/../../lib'
-
 require 'rabbit_jobs/tasks'

data/rabbit_jobs.gemspec

@@ -22,9 +22,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "bunny", "~> 1.0"
   spec.add_dependency "rake"
   spec.add_dependency "rufus-scheduler", "~> 3.0"
-  spec.add_dependency "rails", ">= 3.2", "< 5.0"
+  spec.add_dependency "activesupport", "~> 4.0"
 
-  spec.add_development_dependency "bundler", "~> 1.5"
+  spec.add_development_dependency "bundler"
   # spec.add_development_dependency "rake"
   spec.add_development_dependency "timecop"
   spec.add_development_dependency "rspec"

data/spec/integration/publisher_spec.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'spec_helper'
 require 'json'
 require 'benchmark'
@@ -18,13 +17,11 @@ describe RabbitJobs::Publisher do
 
   it 'should publish message to queue' do
     RJ.publish_to(:rspec_queue, TestJob, 'some', 'other', 'params')
-    # sleep 0.1
     RJ.purge_queue('rspec_queue').should == 1
   end
 
   it 'should accept symbol as queue name' do
     RJ.publish_to(:rspec_queue, TestJob)
-    # sleep 0.1
     RJ.purge_queue('rspec_queue').should == 1
   end
 
@@ -32,26 +29,20 @@ describe RabbitJobs::Publisher do
     RJ.publish_to(:rspec_queue, TestJob)
     RJ.publish_to(:rspec_queue2, TestJob)
     RJ.publish_to(:rspec_queue3, TestJob)
-    # sleep 0.1
     RJ.purge_queue(:rspec_queue, :rspec_queue2, :rspec_queue3).should == 3
   end
 
   it 'should publish job with *params' do
     RJ.publish_to(:rspec_queue, JobWithArgsArray, 'first value', :some_symbol, 123, 'and string')
-    # sleep 0.1
     RJ.purge_queue(:rspec_queue).should == 1
   end
 
   it 'should publish 1000 messages in one second' do
     count = 1000
-    published = 0
     time = Benchmark.measure {
-      count.times {
-        RJ.publish_to(:rspec_queue, TestJob)
-      }
-      # sleep 0.1
+      count.times { RJ.publish_to(:rspec_queue, TestJob) }
       removed = RJ.purge_queue(:rspec_queue, :rspec_queue2, :rspec_queue3)
-      removed.should == 1000
+      removed.should == count
     }
     puts time
   end

metadata

@@ -1,145 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_jobs
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.11.0
 platform: ruby
 authors:
 - Pavel Lazureykis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2014-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - <
-      - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '3.2'
-    - - <
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Background jobs on RabbitMQ
@@ -149,8 +143,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE
 - LICENSE.txt
@@ -165,7 +159,6 @@ files:
 - lib/rabbit_jobs.rb
 - lib/rabbit_jobs/configuration.rb
 - lib/rabbit_jobs/consumer/job_consumer.rb
-- lib/rabbit_jobs/helpers.rb
 - lib/rabbit_jobs/job.rb
 - lib/rabbit_jobs/main_loop.rb
 - lib/rabbit_jobs/publisher.rb
@@ -197,17 +190,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Background jobs on RabbitMQ

data/lib/rabbit_jobs/helpers.rb

@@ -1,53 +0,0 @@
-# -*- encoding : utf-8 -*-
-
-module RabbitJobs
-  module Helpers
-    def symbolize_keys!(hash)
-      hash.inject({}) do |options, (key, value)|
-        options[(key.to_sym rescue key) || key] = value
-        options
-      end
-    end
-
-
-    # Tries to find a constant with the name specified in the argument string:
-    #
-    # constantize("Module") # => Module
-    # constantize("Test::Unit") # => Test::Unit
-    #
-    # The name is assumed to be the one of a top-level constant, no matter
-    # whether it starts with "::" or not. No lexical context is taken into
-    # account:
-    #
-    # C = 'outside'
-    # module M
-    #   C = 'inside'
-    #   C # => 'inside'
-    #   constantize("C") # => 'outside', same as ::C
-    # end
-    #
-    # NameError is raised when the constant is unknown.
-    def constantize(camel_cased_word)
-      camel_cased_word = camel_cased_word.to_s
-
-      if camel_cased_word.include?('-')
-        camel_cased_word = classify(camel_cased_word)
-      end
-
-      names = camel_cased_word.split('::')
-      names.shift if names.empty? || names.first.empty?
-
-      constant = Object
-      names.each do |name|
-        args = Module.method(:const_get).arity != 1 ? [false] : []
-
-        if constant.const_defined?(name, *args)
-          constant = constant.const_get(name)
-        else
-          constant = constant.const_missing(name)
-        end
-      end
-      constant
-    end
-  end
-end