resque-reports 0.3.5 → 0.3.6

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NzYyMTMxNzc4Y2RkZjQ1OWEwNzg0MTkxMTc2YmQ0MTA3NTBkZTQzNQ==
-  data.tar.gz: !binary |-
-    ZWIzNzQwOTcxY2RjOTYxZTk5ZjBlMTY4NjkwNmJjZTU0NjBlZmZlNg==
+SHA1:
+  metadata.gz: 8dbaf30352c2e435726ec9cc9fe1d6364a850efd
+  data.tar.gz: 6d96fded79937853de430a3c332a56901c0e2ea0
 SHA512:
-  metadata.gz: !binary |-
-    M2Q3ZGQ3YzY5OWU1MjczMDVkNzY0YmM0OTcwMTBiZDAzYWQwZDc0OWJkZjVm
-    NDg4NTgyMDgwMDczNTI4ZDkxNjJlY2JjZmMzMjQ3NTg2YWY2ODZiMzgyMmJh
-    ZDc0ZmNmNGZkYzIyOGFhNWU1NDU3ZmVlNzAwMDAwMzE4ODliOGU=
-  data.tar.gz: !binary |-
-    Mzg2MmYyNDdkYjc5NDg1ZGJkZTVlNzlmYWFkZDQwOWIzYTgwYWMwNTFjZjhh
-    YjBlNDJhOGYyODAyYjVkOTIzZGQ2MWUyMWU1NWVhMzM4MmYyMmQxMjFmZWVj
-    YTg0MTQ4ZjUwMzBjYzA3OWE5N2IyZWU4NjVkM2NlN2JkYTE5Yzc=
+  metadata.gz: 50e199c9d2788226da04fc4e9ef9c6cad4e0c7313a4e7c40654afe18b7ffae7475aa4759e2b6ae7896fb190f48f438cc2104295d282ec5a778666777b8e8dd06
+  data.tar.gz: 1d1233ca179cc4686ce046a08aeefadadb0d49efd86f086b753f195eaf98b05332aa9c687b6b38cd8cfbb81b1ba607e1eba92c43f363aa132153ad54a269a591

data/lib/resque/reports/base_report.rb

@@ -76,17 +76,18 @@ module Resque
         protected
 
         attr_reader :create_block
-        attr_accessor :file_extension,
-                      :file_encoding,
-                      :file_directory,
-                      :job_queue
-
-        alias_method :super_extension, :file_extension
-        alias_method :extension, :file_extension=
-        alias_method :set_extension, :file_extension=
-        alias_method :encoding, :file_encoding=
-        alias_method :directory, :file_directory=
-        alias_method :queue, :job_queue=
+        attr_accessor :_extension,
+                      :_encoding,
+                      :_directory,
+                      :_queue,
+                      :_output_filename
+
+        alias_method :super_extension, :_extension
+        alias_method :extension, :_extension=
+        alias_method :encoding, :_encoding=
+        alias_method :directory, :_directory=
+        alias_method :queue, :_queue=
+        alias_method :output_filename, :_output_filename=
 
         def set_instance(obj)
           @instance = obj
@@ -98,7 +99,7 @@ module Resque
 
         # override for Extenstions::TableBuilding, to use custom encoding
         def encoded_string(obj)
-          obj.to_s.encode(file_encoding,
+          obj.to_s.encode(_encoding,
                           invalid: :replace,
                           undef: :replace)
         end
@@ -124,7 +125,6 @@ module Resque
       # Constants #
       #++
 
-      DEFAULT_EXTENSION = 'txt'
       DEFAULT_QUEUE = :base
 
       #--
@@ -132,17 +132,29 @@ module Resque
       #++
 
       def_delegators Const::TO_EIGENCLASS,
-                     :file_directory,
-                     :file_extension,
-                     :file_encoding,
+                     :_directory,
+                     :_extension,
+                     :_encoding,
+                     :_queue,
                      :create_block,
                      :set_instance,
-                     :set_extension,
-                     :job_queue
+                     :_extension=
 
       def_delegators :@cache_file, :filename, :exists?, :ready?
       def_delegator Const::TO_SUPER, :super_extension
 
+      attr_reader :job_id
+
+      def self.build(options = {})
+        in_background = options.delete(:background)
+        force = options.delete(:force)
+        report = new(options)
+
+        in_background ? report.bg_build(force) : report.build(force)
+
+        report
+      end
+
       #--
       # Public instance methods
       #++
@@ -156,9 +168,7 @@ module Resque
           create_dispatch(*args)
         else
           if args && (attrs_hash = args.first) && attrs_hash.is_a?(Hash)
-            attrs_hash.each do |name, value|
-              send("#{name}=", value)
-            end
+            attrs_hash.each { |name, value| send("#{name}=", value) }
           end
         end
 
@@ -182,20 +192,20 @@ module Resque
         args_json = [*@args, force].to_json
 
         # Check report if it already in progress and tring return its job_id...
-        job_id = ReportJob.enqueued?(report_class, args_json).try(:meta_id)
+        @job_id = ReportJob.enqueued?(report_class, args_json).try(:meta_id)
 
         # ...and start new job otherwise
-        job_id || ReportJob.enqueue_to(job_queue || DEFAULT_QUEUE, report_class, args_json).try(:meta_id)
+        @job_id ||= ReportJob.enqueue_to(_queue || DEFAULT_QUEUE, report_class, args_json).try(:meta_id)
       end
 
       protected
 
       def init_cache_file
-        set_extension super_extension || DEFAULT_EXTENSION
+        self._extension = super_extension || DEFAULT_EXTENSION
 
-        @cache_file = CacheFile.new(file_directory,
-                                    generate_filename(@args, file_extension),
-                                    coding: file_encoding)
+        @cache_file = CacheFile.new(_directory,
+                                    generate_filename(@args, _extension),
+                                    coding: _encoding)
       end
 
       # Method specifies how to output report data

data/lib/resque/reports/cache_file.rb

@@ -1,3 +1,4 @@
+require 'tempfile'
 # coding: utf-8
 module Resque
   module Reports
@@ -33,17 +34,29 @@ module Resque
       def open(force = false)
         prepare_cache_dir
 
-        force ? FileUtils.rm_f(@filename) : return if File.exists?(@filename)
+        (force ? clear : return) if File.exists?(@filename)
 
-        remove_unfinished_on_error do
-          File.open(@filename, "w:#{@coding}") do |file|
-            yield file
-          end
+        with_tempfile do |tempfile|
+          yield tempfile
+
+          tempfile.close
+          FileUtils.cp(tempfile.path, @filename)
         end
       end
 
+      def clear
+        FileUtils.rm_f(@filename)
+      end
+
       protected
 
+      def with_tempfile
+        yield(tempfile = Tempfile.new(Digest::MD5.hexdigest(@filename), :encoding => @coding))
+      ensure
+        tempfile.close unless tempfile.closed?
+        tempfile.try(:unlink)
+      end
+
       def prepare_cache_dir
         FileUtils.mkdir_p @dir # create folder if not exists
 
@@ -67,16 +80,6 @@ module Resque
            .map { |fname| File.join(@dir, fname) if File.extname(fname) == @ext }
            .compact
       end
-
-      def remove_unfinished_on_error
-        yield
-      rescue => error
-        # remove everything that was written due to it inconsistance
-        FileUtils.rm_f @filename
-
-        # don't suppress any errors here
-        raise error
-      end
     end
   end
 end

data/lib/resque/reports/common/batched_report.rb

@@ -5,119 +5,125 @@ module Resque
       module BatchedReport
         extend ActiveSupport::Concern
 
-        BATCH_SIZE = 10_000
-
-        module InstanceMethods
-          # Internal: Выполняет запрос отчета пачками и выполняет block для каждой пачки
-          #   Переопредленный метод из Resque::Reports
-          #
-          # Returns Nothing
-          def data_each(force = false)
-            0.step(data_size, batch_size) do |batch_offset|
-              ActiveRecord::Base.connection.execute(batched_query(batch_offset)).each do |element|
-                yield element
-              end
+        included do
+          BATCH_SIZE = 10_000
+        end
+
+        # Internal: Подключение используемое для выполнения запросов
+        #
+        # Returns connection adapter
+        def connection
+          ActiveRecord::Base.connection
+        end
+
+        # Internal: Выполняет запрос отчета пачками и выполняет block для каждой пачки
+        #   Переопредленный метод из Resque::Reports
+        #
+        # Returns Nothing
+        def data_each(force = false)
+          0.step(data_size, batch_size) do |batch_offset|
+            connection.execute(batched_query(batch_offset)).each do |element|
+              yield element
             end
           end
+        end
 
-          # Internal: Возвращает общее кол-во строк в отчете
-          #   Переопредленный метод из Resque::Reports
-          #
-          # Returns Fixnum
-          def data_size
-            @data_size ||= ActiveRecord::Base.connection.execute(count_query)[0]['count'].to_i
-          end
+        # Internal: Возвращает общее кол-во строк в отчете
+        #   Переопредленный метод из Resque::Reports
+        #
+        # Returns Fixnum
+        def data_size
+          @data_size ||= connection.execute(count_query)[0]['count'].to_i
+        end
 
-          protected
+        protected
 
-          # Internal: Возвращает отфильтрованный запрос отчета
-          #
-          # Returns Arel::SelectManager
-          def query
-            filter base_query
-          end
+        # Internal: Возвращает отфильтрованный запрос отчета
+        #
+        # Returns Arel::SelectManager
+        def query
+          filter base_query
+        end
 
-          # Internal: Полезный метод для хранения Arel::Table объектов для запроса отчета
-          #
-          # Returns Hash, {:table_name => #<Arel::Table @name="table_name">, ...}
-          def tables
-            return @tables if defined? @tables
+        # Internal: Полезный метод для хранения Arel::Table объектов для запроса отчета
+        #
+        # Returns Hash, {:table_name => #<Arel::Table @name="table_name">, ...}
+        def tables
+          return @tables if defined? @tables
 
-            tables = models.map(&:arel_table)
+          tables = models.map(&:arel_table)
 
-            @tables = tables.inject({}) { |a, e| a.store(e.name, e) && a }.with_indifferent_access
-          end
+          @tables = tables.reduce({}) { |a, e| a.store(e.name, e) && a }.with_indifferent_access
+        end
 
-          # Internal: Полезный метод для join'а необходимых таблиц через Arel
-          #
-          # Returns Arel
-          def join_tables(source_table, joins)
-            joins.inject(source_table) do |query, joined|
-              query.join(joined[:table]).on(joined[:on])
-            end
-          end
+        # Internal: Полезный метод для join'а необходимых таблиц через Arel
+        #
+        # Returns Arel
+        def join_tables(source_table, *joins)
+          joins.inject(source_table) { |query, joined| query.join(joined[:table]).on(joined[:on]) }
+        end
 
-          # Internal: Размер пачки отчета
-          #
-          # Returns Fixnum
-          def batch_size
-            BATCH_SIZE
-          end
+        # Internal: Размер пачки отчета
+        #
+        # Returns Fixnum
+        def batch_size
+          BATCH_SIZE
+        end
 
-          # Internal: Модели используемые в отчете
-          #
-          # Returns Array of Arel::Table
-          def models
-            fail NotImplementedError
-          end
+        # Internal: Модели используемые в отчете
+        #
+        # Returns Array of Arel::Table
+        def models
+          fail NotImplementedError
+        end
 
-          # Internal: Основной запрос отчета (Arel)
-          #
-          # Returns Arel::SelectManager
-          def base_query
-            fail NotImplementedError
-          end
+        # Internal: Основной запрос отчета (Arel)
+        #
+        # Returns Arel::SelectManager
+        def base_query
+          fail NotImplementedError
+        end
 
-          # Internal: Поля запрашиваемые отчетом
-          #
-          # Returns String (SQL)
-          def select
-            fail NotImplementedError
-          end
+        # Internal: Поля запрашиваемые отчетом
+        #
+        # Returns String (SQL)
+        def select
+          fail NotImplementedError
+        end
 
-          # Internal: Порядок строк отчета
-          #
-          # Returns String (SQL)
-          def order
-            nil
-          end
+        # Internal: Порядок строк отчета
+        #
+        # Returns String (SQL)
+        def order
+          nil
+        end
+        alias_method :order_by, :order
 
-          # Internal: Фильтры отчета
-          #
-          # Returns Arel::SelectManager
-          def filter(query)
-            query
-          end
+        # Internal: Фильтры отчета
+        #
+        # Returns Arel::SelectManager
+        def filter(query)
+          query
+        end
 
-          # Internal: Запрос количества строк в отчете
-          #
-          # Returns String (SQL)
-          def count_query
-            query.project(Arel.sql('COUNT(*) as count')).to_sql
-          end
+        # Internal: Запрос количества строк в отчете
+        #
+        # Returns String (SQL)
+        def count_query
+          query.project(Arel.sql('COUNT(*) as count')).to_sql
+        end
 
-          # Internal: Запрос пачки строк отчета
-          #
-          #   offset - Numeric, число строк на которое сдвигается запрос
-          #
-          # Returns String (SQL)
-          def batched_query(offset)
-            query.project(Arel.sql(select))
-                 .take(batch_size)
-                 .skip(offset)
-                 .order(order)
-                 .to_sql
-          end
+        # Internal: Запрос пачки строк отчета
+        #
+        #   offset - Numeric, число строк на которое сдвигается запрос
+        #
+        # Returns String (SQL)
+        def batched_query(offset)
+          query.project(Arel.sql(select))
+               .take(batch_size)
+               .skip(offset)
+               .order(order_by)
+               .to_sql
         end
       end
     end

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

@@ -14,10 +14,12 @@ module Resque
       #   end
       module FilenameGen
 
+        DEFAULT_EXTENSION = 'txt'
+
         private
 
         def generate_filename(args, fextension)
-          "#{ hash(self.class.to_s, *args) }.#{ fextension }"
+          "#{ hash(self.class.to_s, *args) }.#{ fextension || DEFAULT_EXTENSION }"
         end
 
         def hash(*args)

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

@@ -28,6 +28,13 @@ module Resque
           end
 
           def column(name, value, options = {})
+            if options[:skip_if].present?
+              if options[:skip_if].is_a?(Symbol)
+                return if @instance.send(options.delete(:skip_if))
+              elsif options[:skip_if].respond_to?(:call)
+                return if options.delete(:skip_if).call
+              end
+            end
             add_column_header(name) || add_column_cell(value, options)
           end
 

data/lib/resque/reports/extensions.rb

@@ -32,7 +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
+        base.send :include, EnqueueToFix # enqueue task to exact queue
       end
     end
   end

data/lib/resque/reports/version.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 module Resque
   module Reports
-    VERSION = '0.3.5'
+    VERSION = '0.3.6'
   end
 end
 

data/resque-reports.gemspec

@@ -18,12 +18,11 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'resque-integration', '>= 0.2.9'
+  gem.add_dependency 'resque-integration', '>= 0.4.4'
   gem.add_dependency 'activesupport' # избавиться от зависимости
 
-  gem.add_development_dependency "bundler", "~> 1.3"
-  gem.add_development_dependency "rake"
+  gem.add_development_dependency 'bundler', '~> 1.3'
+  gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec', '>= 2.14.0'
-  gem.add_development_dependency 'rspec-given', '~> 3.0'
   gem.add_development_dependency 'simplecov'
 end

data/spec/resque/reports/base_report_spec.rb

@@ -2,8 +2,6 @@
 require 'spec_helper'
 require 'stringio'
 
-require 'resque-reports'
-
 class MyTypeReport < Resque::Reports::BaseReport
   extension :type
 
@@ -51,15 +49,15 @@ describe 'Resque::Reports::BaseReport successor' do
   let(:dummy) { Resque::Reports::Extensions::Dummy.new }
 
   describe '#extension' do
-    before { File.stub(:exists? => true) }
+    before { allow(File).to receive(:exists?).and_return(true) }
 
-    it { File.extname(my_report.filename).should eq '.type' }
+    it { expect(File.extname(my_report.filename)).to eq '.type' }
   end
 
   describe '#source' do
-    before { my_report.stub(select_data: [dummy]) }
+    before { allow(my_report).to receive(:select_data).and_return([dummy]) }
 
-    it { my_report.should_receive(:select_data) }
+    it { expect(my_report).to receive(:select_data) }
 
     after { my_report.build true }
   end
@@ -68,32 +66,32 @@ describe 'Resque::Reports::BaseReport successor' do
     subject { my_report.instance_variable_get(:@cache_file) }
     let(:tmpdir) { File.join(Dir.tmpdir, 'resque-reports') }
 
-    it { subject.instance_variable_get(:@dir).should eq tmpdir }
+    it { expect(subject.instance_variable_get(:@dir)).to eq tmpdir }
   end
 
   describe '#create' do
-    it { my_report.instance_variable_get(:@main_param).should eq 'test' }
+    it { expect(my_report.instance_variable_get(:@main_param)).to eq 'test' }
   end
 
   describe '#encoding' do
     subject { my_report.instance_variable_get(:@cache_file) }
     let(:utf_coding) { Resque::Reports::Extensions::Encodings::UTF8 }
 
-    it { subject.instance_variable_get(:@coding).should eq utf_coding }
+    it { expect(subject.instance_variable_get(:@coding)).to eq utf_coding }
   end
 
   describe '#write' do
     subject { MyReport.new('#write test') }
 
     before do
-      subject.stub(:data_each) { |&block| block.call(dummy) }
-      subject.stub(build_table_row: ['row'])
-      subject.stub(build_table_header: ['header'])
+      allow(subject).to receive(:data_each) { |&block| block.call(dummy) }
+      allow(subject).to receive(:build_table_row).and_return(['row'])
+      allow(subject).to receive(:build_table_header).and_return(['header'])
 
       subject.write(io)
     end
 
-    it { io.string.should eq "header\r\nrow\r\n" }
+    it { expect(io.string).to eq "header\r\nrow\r\n" }
   end
 
   describe '#bg_build' do
@@ -102,13 +100,10 @@ describe 'Resque::Reports::BaseReport successor' do
     context 'when report is building twice' do
       subject { MyReport.new('#bg_build test') }
 
-      before { job_class.stub(enqueue_to: 'job_id') }
+      before { allow(job_class).to receive(:enqueue_to).and_return('job_id') }
 
       it do
-        job_class
-          .should_receive(:enqueue_to).twice
-          #.with(:my_type_reports, 'MyReport', '["#bg_build test",true]')
-
+        expect(job_class).to receive(:enqueue_to).twice
       end
 
       after do
@@ -119,44 +114,41 @@ describe 'Resque::Reports::BaseReport successor' do
     context 'when report is building' do
       subject { MyReport.new('#bg_build test') }
 
-      before { job_class.stub(enqueue_to: 'job_id') }
+      before { allow(job_class).to receive(:enqueue_to).and_return('job_id') }
 
-      it do
-        job_class
-          .should_receive(:enqueue_to)
-          #.with(:my_type_reports, 'MyReport', '["#bg_build test",true]')
-      end
+      it { expect(job_class).to receive(:enqueue_to) }
 
-      after  { subject.bg_build true }
+      after { subject.bg_build true }
     end
 
     context 'when report is not build yet' do
       subject { MyReport.new('#bg_build test') }
 
       before do
-        job_class.stub(enqueued?: double('Meta', meta_id: 'enqueued_job_id'))
+        allow(job_class).to receive(:enqueued?).and_return(double('Meta', meta_id: 'enqueued_job_id'))
       end
 
-      it { subject.bg_build(true).should eq 'enqueued_job_id' }
+      it { expect(subject.bg_build(true)).to eq 'enqueued_job_id' }
     end
   end
 
   describe '#build' do
-    subject { MyReport.new('#build test') }
-
-    it { subject.should_receive(:decorate_second).exactly(3).times }
+    context 'when report decorated' do
+      subject { MyReport.new('#build test') }
 
-    after  { subject.build true }
+      it { expect(subject).to receive(:decorate_second).exactly(3).times }
 
+      after  { subject.build true }
+    end
     context 'when report was built' do
       subject { MyReport.new('was built test') }
 
       before { subject.build true }
 
-      its(:exists?) { should be_true }
+      it { expect(subject).to be_exists }
       it do
-        File.read(subject.filename)
-          .should eq <<-REPORT.gsub(/^ {12}/, '')
+        expect(File.read(subject.filename))
+          .to eq <<-REPORT.gsub(/^ {12}/, '')
             First one|Second\r
             one|one - is second\r
             was built test|was built test - is second\r
@@ -168,7 +160,7 @@ describe 'Resque::Reports::BaseReport successor' do
   describe '#data_each' do
     subject { MyReport.new('#data_each test') }
 
-    it { subject.should_receive(:data_each) }
+    it { expect(subject).to receive(:data_each) }
 
     after { subject.write(io) }
   end
@@ -176,7 +168,7 @@ describe 'Resque::Reports::BaseReport successor' do
   describe '#build_table_header' do
     subject { MyReport.new('#build_table_header test') }
 
-    it { subject.should_receive(:build_table_header) }
+    it { expect(subject).to receive(:build_table_header) }
 
     after { subject.write(io) }
   end
@@ -184,7 +176,7 @@ describe 'Resque::Reports::BaseReport successor' do
   describe '#build_table_row' do
     subject { MyReport.new('#build_table_row test') }
 
-    it { subject.should_receive(:build_table_row).twice }
+    it { expect(subject).to receive(:build_table_row).twice }
 
     after { subject.write(io) }
   end

data/spec/resque/reports/csv_report_spec.rb

@@ -57,7 +57,7 @@ describe 'Resque::Reports::CsvReport successor' do
       subject { MyCsvDefaultsReport.new }
 
       it 'sets csv_options defaults' do
-        subject.options.should eq MyCsvReport::DEFAULT_CSV_OPTIONS
+        expect(subject.options).to eq MyCsvReport::DEFAULT_CSV_OPTIONS
       end
     end
 
@@ -69,7 +69,7 @@ describe 'Resque::Reports::CsvReport successor' do
       end
 
       it 'merges csv_options with defaults' do
-        subject.options.should eq my_options
+        expect(subject.options).to eq my_options
       end
     end
   end
@@ -78,12 +78,12 @@ describe 'Resque::Reports::CsvReport successor' do
     context 'when report was built' do
       subject { MyCsvReport.new('was built test') }
 
-      before { subject.build true }
+      after { subject.build true }
 
-      its(:exists?) { should be_true }
+      it { expect(subject).to be_exists }
       it do
-        File.read(subject.filename)
-          .should eq <<-CSV.gsub(/^ {12}/, "")
+        expect(File.read(subject.filename))
+          .to eq <<-CSV.gsub(/^ {12}/, '')
             First one,Second,Third
             decorated: one,was built test - is second,3'rd row element is: 3
           CSV

data/spec/resque/reports/report_job_spec.rb

@@ -32,10 +32,10 @@ describe Resque::Reports::ReportJob do
   end
 
   describe '.execute' do
-    before { Reports::MyCsvReport.stub(new: my_report) }
+    before { allow(Reports::MyCsvReport).to receive(:new).and_return(my_report) }
 
     context 'when building report' do
-      before { my_report.stub(build: nil) }
+      before { allow(my_report).to receive(:build).and_return(nil) }
 
       it do
         expect(Reports::MyCsvReport)
@@ -60,24 +60,24 @@ describe Resque::Reports::ReportJob do
 
     context 'when events are firing' do
       before do
-        described_class.stub(get_meta: {})
-        described_class.get_meta.stub(save: true)
+        allow(described_class).to receive(:get_meta).and_return({})
+        allow(described_class.get_meta).to receive(:save).and_return(true)
       end
 
       context 'when progress total is zero' do
         before do
-          my_report.stub(select_data: [])
-          my_report.stub(data_size: 0)
+          allow(my_report).to receive(:select_data).and_return([])
+          allow(my_report).to receive(:data_size).and_return(0)
         end
 
-        it { described_class.should_not_receive(:at) }
+        it { expect(described_class).to_not receive(:at) }
 
         after { described_class.execute(*exec_params) }
       end
 
       context 'when works default handlers' do
         context 'when error occurs' do
-          before { my_report.stub(:build_table_row) { fail 'Custom error' } }
+          before { allow(my_report).to receive(:build_table_row) { fail 'Custom error' } }
 
           it do
             expect { described_class.execute(*exec_params) }
@@ -86,7 +86,7 @@ describe Resque::Reports::ReportJob do
         end
 
         context 'when progress is changed' do
-          it { described_class.should_receive(:at).with(2, 2, nil) }
+          it { expect(described_class).to receive(:at).with(2, 2, nil) }
 
           after { described_class.execute(*exec_params) }
         end
@@ -95,28 +95,21 @@ describe Resque::Reports::ReportJob do
       context 'when works custom handlers' do
         context 'when error occurs' do
           before do
-            my_report.stub(:error_message) { |e| fail "Boom! #{e.message}" }
-            my_report.stub(:build_table_row) { fail 'Custom error' }
+            allow(my_report).to receive(:error_message) { |e| fail "Boom! #{e.message}" }
+            allow(my_report).to receive(:build_table_row) { fail 'Custom error' }
           end
 
-          it do
-            expect { described_class.execute(*exec_params) }
-              .to raise_error('Boom! Custom error')
-          end
+          it { expect { described_class.execute(*exec_params) }.to raise_error('Boom! Custom error') }
         end
 
         context 'when progress is changed' do
           before do
-            my_report.stub(:progress_message) do |progress, total|
+            allow(my_report).to receive(:progress_message) do |progress, total|
               "my progress: #{progress} / #{total}"
             end
           end
 
-          it do
-            described_class
-              .should_receive(:at)
-              .with(2, 2, 'my progress: 2 / 2')
-          end
+          it { expect(described_class).to receive(:at).with(2, 2, 'my progress: 2 / 2') }
 
           after { described_class.execute(*exec_params) }
         end
@@ -125,14 +118,11 @@ describe Resque::Reports::ReportJob do
       context 'when task is performed by resque' do
         context 'when error occurs' do
           before do
-            my_report.stub(:error_message) { |e| fail "Boom! #{e.message}" }
-            my_report.stub(:build_table_row) { fail 'Custom error' }
+            allow(my_report).to receive(:error_message) { |e| fail "Boom! #{e.message}" }
+            allow(my_report).to receive(:build_table_row) { fail 'Custom error' }
           end
 
-          it do
-            expect { described_class.execute(*exec_params) }
-              .to raise_error('Boom! Custom error')
-          end
+          it { expect { described_class.execute(*exec_params) }.to raise_error('Boom! Custom error') }
         end
       end
     end

data/spec/spec_helper.rb

@@ -5,6 +5,5 @@ SimpleCov.start
 require 'rubygems'
 require 'bundler/setup'
 require 'rspec'
-require 'rspec/given'
 
 require 'resque-reports'

metadata

@@ -1,111 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: resque-reports
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Sergey D.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-30 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque-integration
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.9
+        version: 0.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.9
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: activesupport
   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: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   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: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.0
-- !ruby/object:Gem::Dependency
-  name: rspec-given
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.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: Make your custom reports to CSV in background using Resque with simple
@@ -116,9 +102,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .rubocop.yml
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
 - Gemfile
 - MIT-LICENSE
 - README
@@ -155,12 +141,12 @@ 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: []