raport 0.1.13.pre → 0.1.14.pre

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NzAwZjEzZGFmNjE4NDdhMjkxNjY4YzFkNTk1NzFkOTUwMjAyNDY5Yg==
-  data.tar.gz: !binary |-
-    N2YyNmI2ZjYzNWY3OGZkOTkxMTMyOWMyNWFiZjdiMDdmODI0YzI0MA==
+SHA1:
+  metadata.gz: 19ba82bbddb2cec85ec6f0a7b0298609cf2cf762
+  data.tar.gz: c2d61ba05ec72b947c801957830d52c9e55617c6
 SHA512:
-  metadata.gz: !binary |-
-    YzdjMGZlOTRmZmEwZmNiODc1NjE0MDM3MmJiN2ZlNDBjZDA0OThlZDIzNTdj
-    ZDA5MjgxMTQwYTI3MWViNjU1ZWQ1Y2M5MjZiYTJkNDA2NTVmMzc4MjI3YmYx
-    NGMxYmE4Njk3NzcxOTc2M2I3NGJjZmMxNjFjNjZmYjU0MDZhNjU=
-  data.tar.gz: !binary |-
-    MTJjYzRkZGNlY2U1YmVhZTBiM2RkNGE5YmE5MDcxOGIxOTE3YTRkMTE5MGZk
-    OTBmOTg3OGZjN2ZiMGY1MDc5ZDBmYjYwZTRkMDg3Njk3NjY4M2ViNTYwZWNk
-    MDZhNmJlMTVlYWM3MDNlMzlhZjNjYWNjNjc2ZDRjNWRkZDBkMDA=
+  metadata.gz: 72d50f0171de1a8a7ec0a7c681fa33442d9dd4343fe0f6ae0dd47b7afc8a7d85af2fdcdc801b4b72ed68b42eb50f9e1b67ec9f5c4e9119c34935b8d1d6d7d7da
+  data.tar.gz: 132bf6f24d1a0b9c78c7549efb0055caf898bdf273fdd149f48c0cb5ae7616306ec01688eee3dda801f804fa26df7e59caac4a0a3df7ac4c19c0c0e7ba24295d

data/app/models/raport/report.rb

@@ -18,6 +18,8 @@ module Raport
     #
 
     store :query, accessors: [:joins, :where, :select]
+    
+    serialize :where, Hash
 
     #
     # Plugins
@@ -189,8 +191,6 @@ module Raport
       end
     end
 
-    "DISTINCT ON (profiles.id) profiles.*"
-
     def resource_class
       @resource_class ||= resource_class_name.constantize
     end

data/lib/raport/concerns/controllers/reportify.rb

@@ -36,7 +36,7 @@ module Raport
         action_name: action_name,
         select: collection.select_values,
         joins: collection.joins_values,
-        where: formatted_sql_values(collection.where_values),
+        where: collection.where_values_hash,
         resource_class_name: resource_class.name, 
         template: current_template, 
         locale: I18n.locale
@@ -44,10 +44,6 @@ module Raport
     end
   
     private
-
-    def formatted_sql_values(values)
-      values.kind_of?(Array) ? values.map { |value| value.respond_to?(:to_sql) ? value.to_sql : value }.join(' AND ') : nil
-    end
   
     def current_template
       lookup_context.find(action_name, lookup_context.prefixes, false, [], formats: [request.format.to_sym]).inspect

data/lib/raport/gem_version.rb

@@ -6,7 +6,7 @@ module Raport
   module VERSION
     MAJOR = 0
     MINOR = 1
-    TINY  = 13
+    TINY  = 14
     PRE   = 'pre'
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raport
 version: !ruby/object:Gem::Version
-  version: 0.1.13.pre
+  version: 0.1.14.pre
 platform: ruby
 authors:
 - Michael Rüffer
@@ -9,62 +9,62 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
   name: state_machines-activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
 - !ruby/object:Gem::Dependency
@@ -85,98 +85,98 @@ dependencies:
   name: inherited_resources
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: delayed_job_active_record
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: pg
   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: '0'
   type: :development
   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
     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-activejob
   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: factory_girl_rails
   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: This gem gives your rails app the ability to create large data reports,
@@ -225,17 +225,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: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Report engine