Merge pull request #17 from chaunce/v0.7.3

V0.7.3

Author: chaunce

.github/workflows/ruby.yml

@@ -23,7 +23,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6
+        ruby-version: 3.3.5
     - name: Install dependencies
       run: bundle install
     - name: Run specs (sqlite)

.ruby-version

@@ -1 +1 @@
-3.1.3
+3.3.5

.travis.yml

@@ -1,10 +1,12 @@
-script:
-  - cd spec/dummy && RAILS_ENV=test bundle exec rake db:create db:schema:load && cd ../..
-  - bundle exec rspec
 language: ruby
 rvm:
-  - 2.2
+  - 3.3.5
 env:
   - DB=mysql
   - DB=postgres
   - DB=sqlite
+install:
+  - bundle install
+script:
+  - cd spec/dummy && RAILS_ENV=test bundle exec rake db:create db:schema:load && cd ../..
+  - bundle exec rspec

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_reporter (0.7.2)
+    active_reporter (0.7.3)
       deeply_enumerable (>= 0.9.3, < 2.0)
       rails (>= 6.1, < 8)
 
@@ -131,7 +131,7 @@ GEM
     mini_portile2 (2.8.8)
     minitest (5.25.5)
     mysql2 (0.5.6)
-    net-imap (0.5.7)
+    net-imap (0.5.8)
       date
       net-protocol
     net-pop (0.1.2)
@@ -247,7 +247,6 @@ DEPENDENCIES
   mysql2
   pg
   pry
-  rails (>= 6.0, < 8)
   rspec-rails
   simplecov
   sqlite3

active_reporter.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
   s.add_dependency "rails", ">= 6.1", "< 8"
   s.add_dependency "deeply_enumerable", ">= 0.9.3", "< 2.0"
 
-  s.add_development_dependency "rails", ">= 6.0", "< 8"
   s.add_development_dependency "pg"
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "mysql2"

lib/active_reporter/dimension/bin.rb

@@ -116,7 +116,7 @@ def data_contains_nil?
       def autopopulate_bins
         return [] if bin_start.blank? || bin_end.blank?
 
-        bin_count = [((bin_end - bin_start)/(bin_width)).to_i, 1].max
+        bin_count = ((bin_end - bin_start)/(bin_width)).to_i
         invalid_param!(:bin_width, "is too small for the domain; would generate #{bin_count.to_i} bins") if bin_count > max_bins
 
         bins = bin_count.times.map { |i| { min: (bin_start + (bin_width*i)), max: (bin_start + (bin_width*i.next)) } }

lib/active_reporter/dimension/enum.rb

@@ -13,6 +13,22 @@ def all_values
         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 @@ def sanitize_sql_value(value)
       end
 
       def enum?
-        true # Hash(model&.defined_enums).include?(attribute.to_s)
+        Hash(model&.defined_enums).include?(attribute.to_s)
       end
     end
   end

lib/active_reporter/version.rb

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