workers_loader 0.0.1 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTVlM2IzMzNhYjRjZmFlYzBiYTBhNWY3NDZmMTAyNjg0ZTJmY2Q4YQ==
+    MzM2NTBjNDBlOGZhZTVhMjI5MDUzMDJkYTA5MTNkYmY4ZjcxZjBhMA==
   data.tar.gz: !binary |-
-    MmYzOGJmOGY3MWUxZTEzMDg1OTNiYmE0ODNiODViNWEzOTNhMTQyMQ==
+    NmQ0YzNmMTc5ZWJiZDZmYTYwNTlmMmM1OWQwZGExY2E0NjU0MWQwZA==
 SHA512:
   metadata.gz: !binary |-
-    MzExODcxMWIwYTEyYzI5MWYyZWI1ZDNmOGQ4YmUxNDg5MGEyMmQ3NDQ2MGJj
-    NjM2Y2I4YjkwMDVkMzhjMDc1ODMwMGJkYTFlZDUyYWY1NjU3NTI0ZDkzMmEy
-    YWRmYmJmMmM0NTJkMDRjZTc2MjJiNzhhY2U2ZjY2MTcwZTI4ZTk=
+    N2ViMDA2YjliNzUwMjEzYTViODFjNmMyOWRjODQwNjkyYjg5YjM3NTQwNDg0
+    YjkxZWY1ZjY2NjA0NmU4OWJkOGYxMTRhYzkwNDlkYmNiZWIwZWQ2NGM1ZWNj
+    NmUyNmE4MDU3ZGNkNGFlNWE0ZDk3ZDlkMDkyMjk3NWYwZjk2ZGI=
   data.tar.gz: !binary |-
-    NzAxNzA5ZDE1ZjEyMDcxZTgwZTgyNjJhM2VhMWVjNDlhZjRmODM3NzY3ZTgw
-    YzRkNGEwYzBmZmI1YWVkMzQ2OTY2MTMzNmVhNWJkMzQ1Y2U5NDAyYTM3YTc0
-    OTRlNTJlMjBjYjgyNzgzYTUxMmZmZjI5MjY2NTNjZWJlZGNkY2E=
+    MGMyNzU4N2RjZWY5ZWE2OTczMTMzNDYwOWU5MWU0MjVhNjE1NGQwMjE4MDU5
+    YTI0MTQ2OWEzN2RmYjBlMGZiMGVhZjQ4NjlhNzM3N2M1NDQ5NjYwMDU5Mjc2
+    ZTA4ZGJlYWY5NzM1ZTE3MGFjMTAzZTdmZDEyNmZkYTc3NGU2Nzg=

data/Rakefile

@@ -18,8 +18,6 @@ Dir[File.join(File.dirname(__FILE__), 'tasks/**/*.rake')].each {|f| load f }
 
 require 'rspec/core'
 require 'rspec/core/rake_task'
-
-desc 'Run all specs in spec directory (excluding plugin specs)'
-RSpec::Core::RakeTask.new(spec: 'app:db:test:prepare')
+RSpec::Core::RakeTask.new(:spec)
 
 task default: :spec

data/lib/workers_loader/path.rb

@@ -7,16 +7,15 @@ module WorkersLoader
 
     def initialize(base, parent = true)
       base = match[1] if match = /(.*)\/$/.match(base)
-      @base = base
-
-      @parent = base.split('/').last if parent
+      path = base.split('/')
+      @parent = path.pop if parent
+      @base = path.join('/')
     end
 
     def files
-      path = File.join(base, '{**/*.rb}')
+      path = File.join(base_with_parent, '{**/*.rb}')
       Dir[path]
         .map { |file| /#{base}\/(.*).rb/.match(file)[1] }
-        .map { |relative_path| relative_path_for(relative_path) }
     end
 
     def class_for(relative_path)
@@ -32,9 +31,8 @@ module WorkersLoader
       Resque.queue_from_class(class_for(relative_path))
     end
 
-    def relative_path_for(path)
-      parent.nil? ? path : File.join(parent, path)
+    def base_with_parent
+      parent.nil? ? base : File.join(base, parent)
     end
-    private :relative_path_for
   end
 end

data/lib/workers_loader/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module WorkersLoader
-  VERSION = '0.0.1'
+  VERSION = '0.0.3'
 end

data/lib/workers_loader.rb

@@ -30,7 +30,7 @@ module WorkersLoader
         duplacates = workers_in_path
           .select { |worker| workers.include?(worker) }
         if duplacates.any?
-          fail("Workers already present! #{duplacates.join(', ')}")
+          fail("Workers already present! #{duplacates.sort.join(', ')}")
         end
 
         self.workers += workers_in_path

data/spec/lib/workers_loader/path_spec.rb

@@ -2,23 +2,73 @@
 require 'spec_helper'
 
 describe WorkersLoader::Path do
-  let(:base) do
-    File.join(File.dirname(__FILE__), '..', '..', 'support', 'dummy')
+  let(:support_path) do
+    File.join(File.dirname(__FILE__), '..', '..', 'support')
   end
-  subject { described_class.new(base) }
 
-  describe '#files' do
-    let(:files) { %w(dummy/bar/base dummy/foo dummy/bar/baz).sort }
-    it { expect(subject.files.sort).to eq(files) }
-  end
+  context 'without parent' do
+    let(:base) { File.join(support_path, 'data') }
+    subject { described_class.new(base, false) }
+
+    describe '#base' do
+      it { expect(subject.base).to eq(base) }
+    end
+
+    describe '#base_with_parent' do
+      it { expect(subject.base_with_parent).to eq(base) }
+    end
+
+    describe '#parent' do
+      it { expect(subject.parent).to be_nil }
+    end
 
-  describe '#class_for' do
-    it { expect(subject.class_for('dummy/foo')).to eq(Dummy::Foo) }
-    it { expect(subject.class_for('dummy/bar/baz')).to eq(Dummy::Bar::Baz) }
+    describe '#files' do
+      let(:files) { %w(user reports/usage).sort }
+      it { expect(subject.files.sort).to eq(files) }
+    end
+
+    describe '#class_for' do
+      it { expect(subject.class_for('user')).to eq(User) }
+      it { expect(subject.class_for('reports/usage')).to eq(Reports::Usage) }
+    end
+
+    describe '#queue_for' do
+      it { expect(subject.queue_for('user')).to eq(:user_queue) }
+      it { expect(subject.queue_for('reports/usage')).to eq(:usage_queue) }
+    end
   end
 
-  describe '#queue_for' do
-    it { expect(subject.queue_for('dummy/foo')).to eq(:dummy_foo) }
-    it { expect(subject.queue_for('dummy/bar/baz')).to eq(:baz_queue) }
+  context 'with parent' do
+    let(:base) { File.join(support_path, 'dummy') }
+    let(:base_without_parent) { support_path }
+
+    subject { described_class.new(base) }
+
+    describe '#base' do
+      it { expect(subject.base).to eq(base_without_parent) }
+    end
+
+    describe '#base_with_parent' do
+      it { expect(subject.base_with_parent).to eq(base) }
+    end
+
+    describe '#parent' do
+      it { expect(subject.parent).to eq('dummy') }
+    end
+
+    describe '#files' do
+      let(:files) { %w(dummy/bar/base dummy/foo dummy/bar/baz).sort }
+      it { expect(subject.files.sort).to eq(files) }
+    end
+
+    describe '#class_for' do
+      it { expect(subject.class_for('dummy/foo')).to eq(Dummy::Foo) }
+      it { expect(subject.class_for('dummy/bar/baz')).to eq(Dummy::Bar::Baz) }
+    end
+
+    describe '#queue_for' do
+      it { expect(subject.queue_for('dummy/foo')).to eq(:dummy_foo) }
+      it { expect(subject.queue_for('dummy/bar/baz')).to eq(:baz_queue) }
+    end
   end
 end

data/spec/lib/workers_loader_spec.rb

@@ -35,11 +35,11 @@ describe WorkersLoader do
       described_class.add_path(workers_path)
       described_class.load_workers!
     end
-
-    it { expect(described_class.workers).to eq([:baz_queue, :dummy_foo]) }
+    let(:workers) { [:baz_queue, :dummy_foo].sort }
+    it { expect(described_class.workers.sort).to eq(workers) }
 
     context 'prevent duplicates' do
-      let(:message) { 'Workers already present! baz_queue, dummy_foo' }
+      let(:message) { "Workers already present! #{workers.join(', ')}" }
       it { expect { described_class.load_workers! }.to raise_error(message) }
     end
   end

data/spec/support/data/reports/usage.rb

@@ -0,0 +1,7 @@
+# encoding: utf-8
+
+module Reports
+  class Usage
+    @queue = :usage_queue
+  end
+end

data/spec/support/data/user.rb

@@ -0,0 +1,5 @@
+# encoding: utf-8
+
+class User
+  @queue = :user_queue
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workers_loader
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Ricard Forniol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-30 00:00:00.000000000 Z
+date: 2015-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,6 +24,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.21
+- !ruby/object:Gem::Dependency
+  name: resque
+  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: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fuubar
+  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: Resque workers loading strategy system
 email:
 - ricard.forniol@pushtech.com
@@ -68,6 +96,8 @@ files:
 - spec/lib/workers_loader/path_spec.rb
 - spec/lib/workers_loader_spec.rb
 - spec/spec_helper.rb
+- spec/support/data/reports/usage.rb
+- spec/support/data/user.rb
 - spec/support/dummy/bar/base.rb
 - spec/support/dummy/bar/baz.rb
 - spec/support/dummy/foo.rb
@@ -98,6 +128,8 @@ test_files:
 - spec/lib/workers_loader/path_spec.rb
 - spec/lib/workers_loader_spec.rb
 - spec/spec_helper.rb
+- spec/support/data/reports/usage.rb
+- spec/support/data/user.rb
 - spec/support/dummy/bar/base.rb
 - spec/support/dummy/bar/baz.rb
 - spec/support/dummy/foo.rb