simple_drilldown 0.10.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f10c93cd2049eaa829e29002181350220b204776e6144abdf9ccb4a099f0410
-  data.tar.gz: 78f94e8d4d20eec48892fbd917fbc7b72d563d4707aac2c85b94c491f66e884c
+  metadata.gz: 0ee5038998f08867aae8f882ebec8163339cd1e96dcc0348988a9043c01c4abe
+  data.tar.gz: fe9d7bed224bac9ad31ef1243f75193cfaba1c7fc6205af264f0fa3fd53892ca
 SHA512:
-  metadata.gz: c95c74daefab61fe569b0aa45717d11a47d47a5ffd77e885cfbcc3b3b22063a50e9ba8609b7d128445984417eda7eafe85f21344f9b4831059fe368662e4fac7
-  data.tar.gz: 3432bc0565e8fef78ff48a9dffb0f73dfd95872ba233fb91987942667878e55c1b326367998e7f8cc9f3d6a05d655c663b731167bdc4d2a55df426aa5b142bd8
+  metadata.gz: a0f67e84ac3294cc28b4441871b129a221395599c55b59a3aa20a3e1b8a9baa2724f33fb6c3569781d6aa661a4a577643e1c5dfc6cc5754fcaf1a50d4f91879d
+  data.tar.gz: b506d8a98433aec2cb3e5b58002a280c41d385c30c49caf0d0ab56d41eb163214614b4b6b2a7edb2bd06070dcd7305d844bdd03963e3ec45d8b734859cb5c39b

data/README.md

@@ -66,7 +66,7 @@ end
 Create a new controller to focus on posts.  Each drilldown controller focuses on
 one main entity.
 
-    bin/rails g drilldown_controller User
+    bin/rails g simple_drilldown:controller User
 
 ```ruby
 class PostsDrilldownController < DrilldownController
@@ -115,8 +115,12 @@ results.
 
 ### Views
 
-You need the following views:
+This gem includes views for the drilldown visualization using Bootstrap.
 
+You can override any views by creating them in your `app/views/drilldown` directory.
+If you would like a local copy of the views for overriding you can use the generator.
+
+    bin/rails g simple_drilldown:views
 
 
 ## Excel export

data/app/views/drilldown/_chart.html.erb

@@ -41,12 +41,12 @@
     options << [@dimensions[i][:pretty_name], @dimensions[i][:url_param_name]] if @dimensions[i]
     options += @remaining_dimensions.keys.map { |name| [controller.c_dimension_defs[name][:pretty_name], name] } %>
     <%= t(i == 0 ? :group_by : :then_by) %>:
-    <%= form.select 'dimensions', options, { :selected => @search.dimensions && @search.dimensions[i] },
+    <%= form.select 'dimensions', options.sort, { :selected => @search.dimensions && @search.dimensions[i] },
       { onChange: 'form.submit()', name: 'search[dimensions][]', id: "search_dimensions_#{i}" } %>
   <% end %>
 
   <br/>
-  <%= t :chart_type %>
+  <%= t :chart_type %>:
   <%= form.radio_button 'display_type', SimpleDrilldown::Search::DisplayType::BAR, { :onChange => 'form.submit()' } %>
   <%= form.label :display_type_bar, t(:bar) %>
   <%= form.radio_button 'display_type', SimpleDrilldown::Search::DisplayType::PIE, { :disabled => @search.dimensions.size >= 2, :onChange => 'form.submit()' } %>

data/app/views/drilldown/index.html.erb

@@ -17,8 +17,9 @@
       <div class="col-md-3" valign="top">
         <ul class="nav nav-tabs">
           <li class="nav-item">
-            <a id="filter-tab" class="nav-link active" data-target="#filter" data-toggle="tab"><%= t :filter %></a></li>
-          <li><a id="fields-tab" class="nav-link" data-target="#fields" data-toggle="tab"><%= t :fields %></a>
+            <a id="filter-tab" class="nav-link active" data-target="#filter" data-toggle="tab" data-bs-toggle="tab" data-bs-target="#filter"><%= t :filter %></a></li>
+          <li class="nav-item">
+            <a id="fields-tab" class="nav-link" data-target="#fields" data-toggle="tab" data-bs-toggle="tab" data-bs-target="#fields"><%= t :fields %></a>
           </li>
         </ul>
 

data/lib/generators/{drilldown_controller → simple_drilldown/controller}/USAGE

@@ -2,7 +2,7 @@ Description:
     Create a DrilldownController.
 
 Example:
-    rails generate drilldown_controller Thing
+    rails generate simple_drilldown:controller Thing
 
     This will create:
         app/controllers/thing_drilldown_controller.rb

data/lib/generators/simple_drilldown/controller/controller_generator.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module SimpleDrilldown
+  class ControllerGenerator < Rails::Generators::NamedBase
+    source_root File.expand_path('templates', __dir__)
+
+    def copy_drilldown_controller_file
+      template 'drilldown_controller.rb.erb', "app/controllers/#{file_name}_drilldown_controller.rb"
+      template 'drilldown_controller_test.rb.erb', "test/controllers/#{file_name}_drilldown_controller_test.rb"
+      route "draw_drilldown :#{singular_name}"
+    end
+  end
+end

data/lib/generators/simple_drilldown/views/USAGE

@@ -0,0 +1,9 @@
+Description:
+    Generate drilldown views.
+
+Example:
+    bin/rails generate simple_drilldown:views
+
+    This will create:
+        app/views/drilldown
+        app/views/layouts/drilldown

data/lib/generators/simple_drilldown/views/views_generator.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module SimpleDrilldown
+  class ViewsGenerator < Rails::Generators::Base
+    source_root File.expand_path('../../../../', __dir__)
+
+    def copy_drilldown_views_file
+      directory 'app/views'
+    end
+  end
+end

data/lib/simple_drilldown/controller.rb

@@ -135,7 +135,9 @@ module SimpleDrilldown
           interval: interval,
           label_method: label_method,
           legal_values: legal_values,
-          pretty_name: I18n.t(name, default: [:"activerecord.models.#{name}", name.to_s.titleize]),
+          pretty_name: I18n.t(:"drilldown.dimension.#{name}",
+                              default: [:"drilldown.#{name}", :"activerecord.models.#{name}", name.to_sym,
+                                        name.to_s.titleize]),
           queries: queries,
           reverse: reverse,
           select_expression:
@@ -267,8 +269,8 @@ module SimpleDrilldown
             fk_col = ass.options[:foreign_key] || "#{model}_id"
             sql = +"LEFT JOIN #{include_table} #{include_alias} ON #{include_alias}.#{fk_col} = #{model_table}.id"
             sql << " AND #{include_alias}.deleted_at IS NULL" if ass.klass.paranoid?
-            if ass.scope && (ass_order = ScopeHolder.new(ass.scope).to_s)
-              ass_order = ass_order.sub(/ DESC\s*$/i, '')
+            if ass.scope && (base_ass_order = ScopeHolder.new(ass.scope).to_s)
+              /^(?<ass_order>\S*)(?<ass_order_desc>\s+DESC)?/i =~ base_ass_order
               ass_order_prefixed = ass_order.dup
               ActiveRecord::Base.connection.columns(include_table).map(&:name).each do |cname|
                 ass_order_prefixed.gsub!(/\b#{cname}\b/, "#{include_alias}.#{cname}")
@@ -276,10 +278,10 @@ module SimpleDrilldown
               paranoid_clause = 'AND t2.deleted_at IS NULL' if ass.klass.paranoid?
               # FIXME(uwe):  Should we add "where" from the ScopeHolder here as well?
               #              Ref: SimpleDrilldown::Changes#changes_for
-              min_query = <<~SQL
-                SELECT MIN(#{ass_order}) FROM #{include_table} t2 WHERE t2.#{fk_col} = #{model_table}.id #{paranoid_clause}
+              aggregate_query = <<~SQL
+                SELECT #{ass_order_desc ? :MAX : :MIN}(#{ass_order}) FROM #{include_table} t2 WHERE t2.#{fk_col} = #{model_table}.id #{paranoid_clause}
               SQL
-              sql << " AND  #{ass_order_prefixed} = (#{min_query})"
+              sql << " AND  #{ass_order_prefixed} = (#{aggregate_query})"
             end
             sql
           else
@@ -578,12 +580,12 @@ module SimpleDrilldown
         raise "Field definition missing for: #{field.inspect}" unless field_def
 
         field_includes = field_def[:include]
-        list_includes = merge_includes(list_includes, field_includes) if field_includes
+        list_includes = self.class.merge_includes(list_includes, field_includes) if field_includes
       end
       if @search.list_change_times
         @history_fields.each do |f|
           if @search.fields.include? f
-            list_includes = merge_includes(list_includes, assignment: { order: :"#{f}_changes" })
+            list_includes = self.class.merge_includes(list_includes, assignment: { order: :"#{f}_changes" })
           end
         end
       end

data/lib/simple_drilldown/helper.rb

@@ -89,9 +89,13 @@ module SimpleDrilldown
     private
 
     def caption_txt
-      "#{controller.c_target_class} #{I18n.t(@search.select_value.downcase,
-                                             default: @search.select_value.to_s.titleize)}" +
-        (@dimensions && @dimensions.any? ? " by #{@dimensions.map { |d| d[:pretty_name] }.join(' and ')}" : '')
+      class_txt = controller.c_target_class &&
+                  I18n.t(controller.c_target_class.name.pluralize.to_sym,
+                         default: [controller.c_target_class.name.downcase.pluralize.to_sym,
+                                   controller.c_target_class.name.pluralize])
+      value_txt = I18n.t(@search.select_value.downcase, default: @search.select_value.to_s.titleize)
+      dimensions_txt = " by #{@dimensions.map { |d| d[:pretty_name] }.join(' and ')}" if @dimensions&.any?
+      "#{class_txt} #{value_txt}#{dimensions_txt}"
     end
   end
 end

data/lib/simple_drilldown/version.rb

@@ -1,3 +1,3 @@
 module SimpleDrilldown
-  VERSION = '0.10.0'
+  VERSION = '0.12.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_drilldown
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-07 00:00:00.000000000 Z
+date: 2022-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx_rails
@@ -44,20 +44,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -137,10 +137,12 @@ files:
 - config/locales/en.yml
 - config/locales/nb.yml
 - config/routes.rb
-- lib/generators/drilldown_controller/USAGE
-- lib/generators/drilldown_controller/drilldown_controller_generator.rb
-- lib/generators/drilldown_controller/templates/drilldown_controller.rb.erb
-- lib/generators/drilldown_controller/templates/drilldown_controller_test.rb.erb
+- lib/generators/simple_drilldown/controller/USAGE
+- lib/generators/simple_drilldown/controller/controller_generator.rb
+- lib/generators/simple_drilldown/controller/templates/drilldown_controller.rb.erb
+- lib/generators/simple_drilldown/controller/templates/drilldown_controller_test.rb.erb
+- lib/generators/simple_drilldown/views/USAGE
+- lib/generators/simple_drilldown/views/views_generator.rb
 - lib/simple_drilldown.rb
 - lib/simple_drilldown/changes.rb
 - lib/simple_drilldown/controller.rb
@@ -170,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Simple data warehouse and drilldown.

data/lib/generators/drilldown_controller/drilldown_controller_generator.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-class DrilldownControllerGenerator < Rails::Generators::NamedBase
-  source_root File.expand_path('templates', __dir__)
-
-  def copy_drilldown_controller_file
-    template 'drilldown_controller.rb.erb', "app/controllers/#{file_name}_drilldown_controller.rb"
-    template 'drilldown_controller_test.rb.erb', "test/controllers/#{file_name}_drilldown_controller_test.rb"
-    route "draw_drilldown :#{singular_name}"
-  end
-end