active_reporter 0.7.1 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a17f440927f29a1dac9ad70f949fc92d0f57c72d8ccac27a4b27c0e737f86b43
-  data.tar.gz: 7cede09d4c1e903437b18b945e2ad3ea283ac6cdf886a21cd938124d1c39bcbf
+  metadata.gz: bd621943a7508651f94f389d81cb897e5dc7eae2d10f9dd2f261f29533bdc588
+  data.tar.gz: da5082a988b18ff4f821f4e96c184f0e0bfae72bcc0474de2b6d110481bd428b
 SHA512:
-  metadata.gz: '0851b545beec8ac54b01d5148e8a04b0b39ef94e26f6ce8ca946ab6243bb2bb2f96da10d5d057748142b46d837310397443a27ce1c3b1eaed37faa8a5026be04'
-  data.tar.gz: a511a0301caeff962a234cf472b1557cda47381e04091af704816fcd3951fe4d4bfba4e531f30aeeb6b945ef9b5e038d277ab2ae30a5f915ede53964da09549a
+  metadata.gz: 561cc794d2820d10b6f62abb3a0da32f86a0dad34e007c6e5dede83ef30f5d6433cea1d308e44561a24fa3a30360859ccd7b9efb87a47078d9afc541654f40ef
+  data.tar.gz: d64d12a3fc5df2f0af7505f49f1987b963a2d7ed3909128e5af5cc7b42acf9c8e9c0d084924d9ae7cbe4c6941eafabf79730d054fe3722190d7c190bcc7e309e

data/lib/active_reporter/dimension/enum.rb

@@ -13,6 +13,22 @@ module ActiveReporter
         enum_values.keys.tap { |values| values.unshift(nil) unless values.include?(nil) }.uniq
       end
 
+      def filter(relation)
+        values = if Rails.gem_version >= Gem::Version.new("7")
+          filter_values.map { |value| enum_values[value] }.uniq
+        else
+          filter_values
+        end
+        query = case values
+        when [] then "1=0"
+        when [nil] then "#{expression} IS NULL"
+        else
+          in_values = "#{expression} IN (?)"
+          values.include?(nil) ? "#{expression} IS NULL OR #{in_values}" : in_values
+        end
+        relation.where(query, values.compact)
+      end
+
       private
 
       def enum_values
@@ -31,7 +47,7 @@ module ActiveReporter
       end
 
       def enum?
-        true # Hash(model&.defined_enums).include?(attribute.to_s)
+        Hash(model&.defined_enums).include?(attribute.to_s)
       end
     end
   end

data/lib/active_reporter/version.rb

@@ -1,3 +1,3 @@
 module ActiveReporter
-  VERSION = "0.7.1"
+  VERSION = "0.7.3"
 end

data/spec/dummy/config/environments/development.rb

@@ -25,16 +25,16 @@ Rails.application.configure do
   # Debug mode disables concatenation and preprocessing of assets.
   # This option may cause significant delays in view rendering with a large
   # number of complex assets.
-  config.assets.debug = true
+  # config.assets.debug = true
 
   # Asset digests allow you to set far-future HTTP expiration dates on all assets,
   # yet still be able to expire them through the digest params.
-  config.assets.digest = true
+  # config.assets.digest = true
 
   # Adds additional error checking when serving assets at runtime.
   # Checks for improperly declared sprockets dependencies.
   # Raises helpful error messages.
-  config.assets.raise_runtime_errors = true
+  # config.assets.raise_runtime_errors = true
 
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true

data/spec/dummy/config/environments/production.rb

@@ -25,15 +25,15 @@ Rails.application.configure do
   config.serve_static_files = ENV["RAILS_SERVE_STATIC_FILES"].present?
 
   # Compress JavaScripts and CSS.
-  config.assets.js_compressor = :uglifier
+  # config.assets.js_compressor = :uglifier
   # config.assets.css_compressor = :sass
 
   # Do not fallback to assets pipeline if a precompiled asset is missed.
-  config.assets.compile = false
+  # config.assets.compile = false
 
   # Asset digests allow you to set far-future HTTP expiration dates on all assets,
   # yet still be able to expire them through the digest params.
-  config.assets.digest = true
+  # config.assets.digest = true
 
   # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
 

data/spec/dummy/config/initializers/assets.rb

@@ -1,7 +1,7 @@
 # Be sure to restart your server when you modify this file.
 
 # Version of your assets, change this if you want to expire all your assets.
-Rails.application.config.assets.version = "1.0"
+# Rails.application.config.assets.version = "1.0"
 
 # Add additional assets to the asset load path
 # Rails.application.config.assets.paths << Emoji.images_path