resque-reports 0.4.4 → 0.4.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGI4MGEyNzY1NmNlOTM5YmY4YzY2MGNhMzQ1NDExZWYwMDE5MTRmYw==
+    YTg1YTcwMDRhNWJhYTViN2I1NjVmYzMxODQwNjBjNmZlZGEyNDg2Nw==
   data.tar.gz: !binary |-
-    ZTQyNzM2NmZiODU0NzkyYzE0MmUxNDkzYWUzYjVlMzQwOGFiYzI2Nw==
+    MWY4NWZhNzZlN2MyNmYzMjVlMWU0ODA0M2Q2M2E4Mjg5ZmJjZjE4Yg==
 SHA512:
   metadata.gz: !binary |-
-    NzNkOTVlZDgzZjE1MTE3NjFkMTU1MjAwMDVmNDQyYTVkZjk5YmVjZjU1MmVm
-    MzBlNWNjZmRmYzBkMTg0MWRjMjk5OTQzNjU4NmVmZjRkZjdhNzY1YTc5YTg2
-    ODI5MDIyNDI2YTI3ZDJkMzE2ZWE1ODdkMDgzMjBmYzQ4ZGVmZTU=
+    OTYyN2UxMzVlMDJlYWYyZjU0Yzc4ODE0NWQ3YzY1ZDQwZDdiZDY0MGMzYWJh
+    YzYyMmRiZjQ3N2U1ZjIzMjAzMDU2ZDQ3ZDFkY2RlNmVhMzAwZmRlZTkxNzEw
+    MDMxYWU1YmJjMmRiYzZkN2VmODVjZmIxMGJiYTg0YmQ0YTAzYjc=
   data.tar.gz: !binary |-
-    NThmYmQzYTM4YWFmYmUzNmIyMDg5MGMwYzcxYmFhYTIzOWY2OGZlZTYxZTEw
-    MmRkMjFhZTExMzIyMzJhMzkwMzMxMWQ2NzMwODk4YTU3YzFjZDFlYTI2YTdi
-    OGM0ZmE0ZjdhNjg5MTFiN2ExZmI0OGE3MTg3NDA3N2M5NWM0YmE=
+    MGYwN2RhZGFiZWMxYzQyMTAyMzY5YWJmNGMwY2NjZjA2NzIyYTA4NGY2YzA3
+    NjliYmU2ZmEzOTU4MzViODNiNjhlMDJiZTNiNWEwNTQxZWNjMDc2MTM3ZjVi
+    Zjk2ZWU2YWI0ZWU2MzAyZGVjNGQ0MGUxNTA0NTYyMjMyYzlhZDQ=

data/Gemfile

@@ -1,5 +1,5 @@
+source 'https://gems.railsc.ru'
 source 'https://rubygems.org'
-source 'http://apress:montalcino@gems.dev.apress.ru'
 
 # Specify your gem's dependencies in resque-reports.gemspec
 gemspec

data/lib/resque/reports/base_report.rb

@@ -28,6 +28,7 @@ module Resque
     #     queue :custom_reports # Resque queue name
     #     source :select_data # method called to retrieve report data
     #     encoding UTF8 # file encoding
+    #     expire_in 86_400 # cache time of the file, default: 86_400
     #
     #     # Specify in which directory to keep this type files
     #     directory File.join(Dir.tmpdir, 'resque-reports')
@@ -80,7 +81,8 @@ module Resque
                       :_encoding,
                       :_directory,
                       :_queue,
-                      :_output_filename
+                      :_output_filename,
+                      :_expire_in
 
         alias_method :super_extension, :_extension
         alias_method :extension, :_extension=
@@ -88,6 +90,7 @@ module Resque
         alias_method :directory, :_directory=
         alias_method :queue, :_queue=
         alias_method :output_filename, :_output_filename=
+        alias_method :expire_in, :_expire_in=
 
         def set_instance(obj)
           @instance = obj
@@ -138,7 +141,8 @@ module Resque
                      :_queue,
                      :create_block,
                      :set_instance,
-                     :_extension=
+                     :_extension=,
+                     :_expire_in
 
       def_delegators :@cache_file, :filename, :exists?, :ready?
       def_delegator Const::TO_SUPER, :super_extension
@@ -202,10 +206,11 @@ module Resque
 
       def init_cache_file
         self._extension = super_extension || DEFAULT_EXTENSION
+        options = {coding: _encoding, expire_in: _expire_in}
 
         @cache_file = CacheFile.new(_directory,
                                     generate_filename(@args, _extension),
-                                    coding: _encoding)
+                                    options)
       end
 
       # Method specifies how to output report data

data/lib/resque/reports/cache_file.rb

@@ -22,7 +22,7 @@ module Resque
       end
 
       def exists?
-        File.exists?(@filename)
+        !expired?(@filename)
       end
       alias_method :ready?, :exists?
 
@@ -75,7 +75,9 @@ module Resque
       end
 
       def expired?(fname)
-        File.file?(fname) && File.mtime(fname) + @expiration_time < Time.now
+        return true unless File.file?(fname)
+
+        File.mtime(fname) + @expiration_time < Time.now
       end
 
       def cache_files_array

data/lib/resque/reports/version.rb

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

data/resque-reports.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec', '>= 2.14.0'
   gem.add_development_dependency 'simplecov'
+  gem.add_development_dependency 'timecop', '~> 0.7.1'
 end

data/spec/resque/reports/csv_report_spec.rb

@@ -51,6 +51,22 @@ class MyCsvDefaultsReport < Resque::Reports::CsvReport
   end
 end
 
+class MyCsvExpiredReport < Resque::Reports::CsvReport
+  expire_in 3600
+  source :select_data
+  encoding UTF8
+
+  directory File.join(Dir.tmpdir, 'resque-reports')
+
+  table do |element|
+    column 'Uno', "#{element} - is value"
+  end
+
+  def select_data
+    []
+  end
+end
+
 describe 'Resque::Reports::CsvReport successor' do
   describe '.csv_options' do
     context 'when custom options not set' do
@@ -90,4 +106,24 @@ describe 'Resque::Reports::CsvReport successor' do
       end
     end
   end
+
+  describe '#exists?' do
+    context 'when report was built' do
+      subject { MyCsvExpiredReport.new }
+
+      before { subject.build }
+
+      it do
+        Timecop.travel(1.hour.since) do
+          expect(subject.exists?).to be_false
+        end
+      end
+
+      it do
+        Timecop.travel(30.minutes.since) do
+          expect(subject.exists?).to be_true
+        end
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resque-reports
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Sergey D.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-12 00:00:00.000000000 Z
+date: 2015-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque-integration
@@ -94,6 +94,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.1
 description: Make your custom reports to CSV in background using Resque with simple
   DSL
 email: