resque-reports 0.5.0 → 0.5.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODMyYmYxYjk1NDJmZjkxOGMzZTI1Y2YwMGZkM2M3MWM0YjRkNDRiMw==
-  data.tar.gz: !binary |-
-    NDI0MTk3YjVmYjkwNGE2NzFjOWVlNTAxNTA2NmFlYTJjNjEwMDdmNw==
+SHA1:
+  metadata.gz: 1dec46db12351c776c4e10f0dfd988626d6aabb1
+  data.tar.gz: 5ae5d1b91f141671ee10b729acc06d4c4c3e0af4
 SHA512:
-  metadata.gz: !binary |-
-    MDA5YjYxNTI3ODgwZmVkNDM5NjY1YmM3ZWJjYmFhMjAzYTg3OGRjZjZhNDMx
-    Y2M1ZWUyOTViZTQyYWVkMThiODJiOWRlZDYxMzE0NDBmYWI1NGI4MTBiZGE1
-    MTU2MzcwM2E4Y2ViNDZjMjliMmI1ZjgxZmY3OGNhZjJiY2UxNjI=
-  data.tar.gz: !binary |-
-    NDhiZGUxNDFjOTg2NzZlNGJlODI2MDA5OTI3ODBiMTQ5YjlkNGQwNzgwZjM0
-    OTZmY2MyMGU2ZjY4Mjk4MDg4Nzk3YTcyMzcxNzBkYzRmYzZhMDFhZjNkNjYz
-    ZDc1YTdmYjAzN2M3MTYwOTMxNGE5YWQyMjIxYmIxYmRjMjE3NjM=
+  metadata.gz: dae4527c7b7651753cf0316d26b6e7e899038b4064f6c1d2943e209b855163c5133792867a887ccbb9bfea7a127ba9e5c36775c01785d0550ceb5d649edf5fac
+  data.tar.gz: cfdae4e1cb552a4de90de92f87bc8e185110cb7b91e6e3867479c328b2a19315cc21eddc8ce9fd2ee51a34124d73da60fb4601c35e311d028f939d1539c87900

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

@@ -94,10 +94,9 @@ module Resque
         # Internal: Порядок строк отчета
         #
         # Returns String (SQL)
-        def order
+        def order_by
           nil
         end
-        alias_method :order_by, :order
 
         # Internal: Фильтры отчета
         #
@@ -122,7 +121,7 @@ module Resque
           query.project(Arel.sql(select))
                .take(batch_size)
                .skip(offset)
-               .order(order)
+               .order(order_by)
                .to_sql
         end
       end

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

@@ -23,7 +23,25 @@ module Resque
         end
 
         def hash(*args)
-          Digest::SHA1.hexdigest(args.to_json)
+          Digest::SHA1.hexdigest(obj_to_string(args))
+        end
+
+        def obj_to_string(obj)
+          case obj
+          when Hash
+            s = []
+            obj.keys.sort.each do |k|
+              s << obj_to_string(k)
+              s << obj_to_string(obj[k])
+            end
+            s.to_s
+          when Array
+            s = []
+            obj.each { |a| s << obj_to_string(a) }
+            s.to_s
+          else
+            obj.to_s
+          end
         end
       end
     end

data/lib/resque/reports/version.rb

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

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: resque-reports
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Sergey D.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-21 00:00:00.000000000 Z
+date: 2015-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque-integration
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !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: 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'
 - !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
@@ -116,9 +116,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .rubocop.yml
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
 - Gemfile
 - MIT-LICENSE
 - README
@@ -155,17 +155,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.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: resque-reports