drudgery 0.1.0 → 0.2.0

data/spec/drudgery_spec.rb

@@ -1,74 +1,103 @@
 require 'spec_helper'
 
-describe Drudgery do
-  describe '.log' do
-    after(:each) do
-      Drudgery.logger = nil
+module Drudgery
+  describe Drudgery do
+    before do
+      Drudgery.listeners.clear
     end
 
-    describe 'if logger defined' do
-      it 'sends mode and message to logger' do
-        logger = mock('logger')
-        logger.expects(:send).with(:debug, "Some message")
-        Drudgery.logger = logger
+    after do
+      Drudgery.listeners.clear
+    end
+
+    describe '.subscribe' do
+      it 'subscribes listener for event' do
+        block = proc { |job| 1 + 1 }
+        Drudgery.subscribe(:before_job, &block)
 
-        Drudgery.log :debug, "Some message"
+        Drudgery.listeners[:before_job].must_equal [block]
       end
-    end
 
-    describe 'if no logger defined' do
-      it 'ignores mode and message' do
-        logger = mock('logger')
-        logger.expects(:send).never
-        Drudgery.logger = nil
+      it 'supports subscription of multiple listeners for a single event' do
+        block1 = proc { |job| 1 + 1 }
+        block2 = proc { |job| 2 + 2 }
+        Drudgery.subscribe(:before_job, &block1)
+        Drudgery.subscribe(:before_job, &block2)
 
-        Drudgery.log :debug, "Some message"
+        Drudgery.listeners[:before_job].must_equal [block1, block2]
       end
     end
-  end
-end
 
-describe Drudgery::Extractors do
-  describe '.instantiate' do
-    it 'initializes extractor of type with args' do
-      Drudgery::Extractors::CSVExtractor.expects(:new).with('file.csv', :col_sep => '|')
-      Drudgery::Extractors.instantiate(:csv, 'file.csv', :col_sep => '|')
+    describe '.unsubscribe' do
+      before do
+        block1 = proc { |job| 1 + 1 }
+        block2 = proc { |job| 2 + 2 }
+        Drudgery.subscribe(:before_job, &block1)
+        Drudgery.subscribe(:before_job, &block2)
+      end
 
-      Drudgery::Extractors::SQLite3Extractor.expects(:new).with('db.sqlite3', 'tablename')
-      Drudgery::Extractors.instantiate(:sqlite3, 'db.sqlite3', 'tablename')
+      it 'unsubscribes all listeners for event' do
+        Drudgery.unsubscribe(:before_job)
 
-      model = stub('model')
-      Drudgery::Extractors::ActiveRecordExtractor.expects(:new).with(model)
-      Drudgery::Extractors.instantiate(:active_record, model)
+        Drudgery.listeners[:before_job].must_be_empty
+      end
     end
 
-    it 'returns an extractor' do
-      extractor = Drudgery::Extractors.instantiate(:csv, 'file.csv')
-      extractor.must_be_kind_of Drudgery::Extractors::CSVExtractor
+    describe '.notify' do
+      it 'notifies all listeners with given arguments for event' do
+        Drudgery.subscribe(:before_job) { |r| r[:x] = 1 + 1 }
+
+        result = {}
+
+        Drudgery.notify(:before_job, result)
+
+        result[:x].must_equal 2
+      end
     end
   end
-end
 
-describe Drudgery::Loaders do
-  describe '.instantiate' do
-    it 'initializes loader of type with args' do
-      Drudgery::Loaders::CSVLoader.expects(:new).with('file.csv', :col_sep => '|')
-      Drudgery::Loaders.instantiate(:csv, 'file.csv', :col_sep => '|')
+  describe Extractors do
+    describe '.instantiate' do
+      it 'initializes extractor of type with args' do
+        Extractors::CSVExtractor.expects(:new).with('file.csv', :col_sep => '|')
+        Extractors.instantiate(:csv, 'file.csv', :col_sep => '|')
 
-      Drudgery::Loaders::SQLite3Loader.expects(:new).with('db.sqlite3', 'tablename')
-      Drudgery::Loaders.instantiate(:sqlite3, 'db.sqlite3', 'tablename')
+        Extractors::SQLite3Extractor.expects(:new).with('db.sqlite3', 'tablename')
+        Extractors.instantiate(:sqlite3, 'db.sqlite3', 'tablename')
 
-      model = stub('model')
-      Drudgery::Loaders::ActiveRecordLoader.expects(:new).with(model)
-      Drudgery::Loaders.instantiate(:active_record, model)
+        model = stub('model')
+        Extractors::ActiveRecordExtractor.expects(:new).with(model)
+        Extractors.instantiate(:active_record, model)
+      end
 
-      Drudgery::Loaders::ActiveRecordImportLoader.expects(:new).with(model)
-      Drudgery::Loaders.instantiate(:active_record_import, model)
+      it 'returns an extractor' do
+        extractor = Extractors.instantiate(:csv, 'file.csv')
+        extractor.must_be_kind_of Extractors::CSVExtractor
+      end
     end
+  end
+
+  describe Loaders do
+    describe '.instantiate' do
+      it 'initializes loader of type with args' do
+        Loaders::CSVLoader.expects(:new).with('file.csv', :col_sep => '|')
+        Loaders.instantiate(:csv, 'file.csv', :col_sep => '|')
 
-    it 'returns an loader' do
-      loader = Drudgery::Loaders.instantiate(:csv, 'file.csv')
-      loader.must_be_kind_of Drudgery::Loaders::CSVLoader
+        Loaders::SQLite3Loader.expects(:new).with('db.sqlite3', 'tablename')
+        Loaders.instantiate(:sqlite3, 'db.sqlite3', 'tablename')
+
+        model = stub('model')
+        Loaders::ActiveRecordLoader.expects(:new).with(model)
+        Loaders.instantiate(:active_record, model)
+
+        Loaders::ActiveRecordImportLoader.expects(:new).with(model)
+        Loaders.instantiate(:active_record_import, model)
+      end
+
+      it 'returns an loader' do
+        loader = Loaders.instantiate(:csv, 'file.csv')
+        loader.must_be_kind_of Loaders::CSVLoader
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -8,8 +8,9 @@ end
 require 'minitest/spec'
 require 'minitest/autorun'
 require 'mocha'
-#require 'turn/autorun'
-
-#Turn.config.format = :dot
 
 require 'drudgery'
+
+require 'sqlite3'
+require 'active_record'
+require 'activerecord-import'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drudgery
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-07 00:00:00.000000000 Z
+date: 2012-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: progressbar
-  requirement: &70214544961640 !ruby/object:Gem::Requirement
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.10'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
-  version_requirements: *70214544961640
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70214544960940 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70214544960940
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70214544960060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,21 +37,31 @@ dependencies:
         version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *70214544960060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70214544959420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.12'
   type: :development
   prerelease: false
-  version_requirements: *70214544959420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70214544958800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,21 +69,15 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70214544958800
-- !ruby/object:Gem::Dependency
-  name: turn
-  requirement: &70214544958120 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: *70214544958120
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: guard-minitest
-  requirement: &70214544957620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +85,15 @@ dependencies:
         version: '0.5'
   type: :development
   prerelease: false
-  version_requirements: *70214544957620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70214544957120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +101,15 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70214544957120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: activerecord-import
-  requirement: &70214544956600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +117,15 @@ dependencies:
         version: 0.2.9
   type: :development
   prerelease: false
-  version_requirements: *70214544956600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.9
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70214544956040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,7 +133,12 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70214544956040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 description: A simple ETL library that supports CSV, SQLite3, and ActiveRecord sources
   and destinations.
 email:
@@ -134,8 +152,6 @@ files:
 - lib/drudgery/extractors/csv_extractor.rb
 - lib/drudgery/extractors/sqlite3_extractor.rb
 - lib/drudgery/job.rb
-- lib/drudgery/job_logger.rb
-- lib/drudgery/job_progress.rb
 - lib/drudgery/loaders/active_record_import_loader.rb
 - lib/drudgery/loaders/active_record_loader.rb
 - lib/drudgery/loaders/csv_loader.rb
@@ -148,8 +164,6 @@ files:
 - spec/drudgery/extractors/active_record_extractor_spec.rb
 - spec/drudgery/extractors/csv_extractor_spec.rb
 - spec/drudgery/extractors/sqlite3_extractor_spec.rb
-- spec/drudgery/job_logger_spec.rb
-- spec/drudgery/job_progress_spec.rb
 - spec/drudgery/job_spec.rb
 - spec/drudgery/loaders/active_record_import_loader_spec.rb
 - spec/drudgery/loaders/active_record_loader_spec.rb
@@ -177,9 +191,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2447573395712005243
 requirements: []
 rubyforge_project: drudgery
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Simple ETL Library
@@ -187,8 +204,6 @@ test_files:
 - spec/drudgery/extractors/active_record_extractor_spec.rb
 - spec/drudgery/extractors/csv_extractor_spec.rb
 - spec/drudgery/extractors/sqlite3_extractor_spec.rb
-- spec/drudgery/job_logger_spec.rb
-- spec/drudgery/job_progress_spec.rb
 - spec/drudgery/job_spec.rb
 - spec/drudgery/loaders/active_record_import_loader_spec.rb
 - spec/drudgery/loaders/active_record_loader_spec.rb

data/lib/drudgery/job_logger.rb

@@ -1,21 +0,0 @@
-module Drudgery
-  class JobLogger
-    def initialize(job_id)
-      @prefix = "## JOB #{job_id}"
-    end
-
-    def log_with_progress(mode, message)
-      STDERR.puts format_message(message) if Drudgery.show_progress
-      log(mode, message)
-    end
-
-    def log(mode, message)
-      Drudgery.log mode, format_message(message)
-    end
-
-    private
-    def format_message(message)
-      "#{@prefix}: #{message}"
-    end
-  end
-end

data/lib/drudgery/job_progress.rb

@@ -1,11 +0,0 @@
-module Drudgery
-  class JobProgress < ProgressBar
-    def initialize(job_id, total)
-      title = "## JOB #{job_id}"
-
-      super(title, total)
-
-      @title_width = title.length + 1
-    end
-  end
-end

data/spec/drudgery/job_logger_spec.rb

@@ -1,59 +0,0 @@
-require 'spec_helper'
-
-describe Drudgery::JobLogger do
-  describe '#initialize' do
-    it 'sets prefix to ## JOB <id>' do
-      logger = Drudgery::JobLogger.new(345)
-      logger.instance_variable_get('@prefix').must_equal '## JOB 345'
-    end
-  end
-
-  describe '#log_with_progress' do
-    before(:each) do
-      @logger = Drudgery::JobLogger.new(123)
-      STDERR.stubs(:puts)
-      Drudgery.stubs(:log)
-    end
-
-    describe 'when progress on' do
-      before(:each) do
-        Drudgery.show_progress = true
-      end
-
-      it 'puts formatted message to STDERR' do
-        STDERR.expects(:puts).with('## JOB 123: Some message')
-        @logger.log_with_progress :info, 'Some message'
-      end
-
-      it 'passes mode and formatted message to Drudgery logger' do
-        Drudgery.expects(:log).with(:info, '## JOB 123: Some message')
-        @logger.log_with_progress :info, 'Some message'
-      end
-    end
-
-    describe 'when progress off' do
-      before(:each) do
-        Drudgery.show_progress = false
-      end
-
-      it 'does not put formatted message to STDERR' do
-        STDERR.expects(:puts).never
-        @logger.log_with_progress :info, 'Some message'
-      end
-
-      it 'passes mode and formatted message to Drudgery logger' do
-        Drudgery.expects(:log).with(:info, '## JOB 123: Some message')
-        @logger.log_with_progress :info, 'Some message'
-      end
-    end
-  end
-
-  describe '#log' do
-    it 'passes mode and formatted message to Drudgery logger' do
-      Drudgery.expects(:log).with(:debug, '## JOB 234: Another message')
-
-      logger = Drudgery::JobLogger.new(234)
-      logger.log :debug, 'Another message'
-    end
-  end
-end

data/spec/drudgery/job_progress_spec.rb

@@ -1,19 +0,0 @@
-require 'spec_helper'
-
-describe Drudgery::JobProgress do
-  describe '#initialize' do
-    before(:each) do
-      STDERR.stubs(:print)
-    end
-
-    it 'sets title to ## JOB <id>' do
-      progress = Drudgery::JobProgress.new(123, 1)
-      progress.instance_variable_get('@title').must_equal '## JOB 123'
-    end
-
-    it 'sets title_with to title.length + 1' do
-      progress = Drudgery::JobProgress.new(123, 1)
-      progress.instance_variable_get('@title_width').must_equal '## JOB 123'.length + 1
-    end
-  end
-end