widget_list 1.3.7 → 2.0.1

data/lib/extensions/action_controller_base.rb

@@ -1,33 +1,26 @@
 require 'action_controller'
 
-ActionController::Base.class_eval {
-  private
-    def globalize_request
-      # Create super global PHP variables
-      $_SESSION = self.session
-      $_SERVER  = self.env
-      $_REQUEST = self.request.filtered_parameters
+module WidgetList
+  module ControllerContext
+    private
+
+    def with_widget_list_request_context
+      RequestContext.session = session.to_h.deep_dup
+      RequestContext.server = request.env
+      RequestContext.request = request.filtered_parameters
+      RequestContext.csrf_token = form_authenticity_token
+
+      yield
+    ensure
+      if RequestContext.used && RequestContext.session
+        %w[pageDisplayLimit DRILL_DOWNS CURRENT_GROUPING ROW_LIMIT list_checks SEARCH_FILTER LIST_SEQUENCE LIST_COL_SORT list_count DRILL_DOWN_FILTERS].each do |key|
+          session[key] = RequestContext.session[key] if RequestContext.session.key?(key)
+        end
+      end
+      RequestContext.reset
     end
+  end
+end
 
-  private
-    def store_session
-      # Store pre-defined widget_list session items to the actual session
-
-      %w(pageDisplayLimit DRILL_DOWNS CURRENT_GROUPING ROW_LIMIT list_checks SEARCH_FILTER LIST_SEQUENCE LIST_COL_SORT list_count DRILL_DOWN_FILTERS).each { |key|
-        self.session[key] = $_SESSION[key]
-      }
-
-      test= 1
-    end
-}
-
-ActionController::Base.instance_eval {
-  helper_method :globalize_request
-
-  helper_method :store_session
-
-  before_filter :globalize_request
-
-  after_filter :store_session
-}
-
+ActionController::Base.include(WidgetList::ControllerContext)
+ActionController::Base.around_action :with_widget_list_request_context

data/lib/widget_list/engine.rb

@@ -1,8 +1,5 @@
 module WidgetList
   class Engine < Rails::Engine
-    # auto wire
-    initializer 'widget_list.load_static_assets' do |app|
-      app.middleware.use ::ActionDispatch::Static, "#{root}/vendor"
-    end
+    # Rails discovers gem assets in vendor/assets through its asset pipeline.
   end
 end

data/lib/widget_list/railtie.rb

@@ -1,42 +1,19 @@
 module WidgetList
   class Railtie < Rails::Railtie
-
-    config.before_configuration do
-      config_file = Rails.root.join("config", "widget-list.yml")
-      if config_file.file?
-        # WidgetList::List::connect
-      else
-        puts "\nWidget List config not found.  Creating config/widget-list.yml.  \n\nPlease configure it with the appropriate connections"
-        File.open(Rails.root.join("config", "widget-list.yml"), 'w') { |file|
-          file.write("#For connection examples see: http://sequel.rubyforge.org/rdoc/files/doc/opening_databases_rdoc.html\n\n")
-          file.write("development:\n")
-          file.write("  :primary:     sqlite:/\n")
-          file.write("  :secondary:   sqlite:/\n")
-          file.write("\n")
-          file.write("test:\n")
-          file.write("  :primary:     sqlite:/\n")
-          file.write("  :secondary:   sqlite:/\n")
-          file.write("\n")
-          file.write("release:\n")
-          file.write("  :primary:     sqlite:/\n")
-          file.write("  :secondary:   sqlite:/\n")
-          file.write("\n")
-          file.write("production:\n")
-          file.write("  :primary:     sqlite:/\n")
-          file.write("  :secondary:   sqlite:/\n")
-        }
-      end
-    end
-
-    initializer "Include widget_list" do
+    initializer 'widget_list.database_adapters' do
       ActiveSupport.on_load(:action_controller) do
-        if WidgetList::List::is_sequel(true) || WidgetList::List::is_sequel(false)
-          require 'sequel'
-        end
+        require 'sequel'
         require 'widget_list/sequel'
       end
     end
 
-
+    initializer 'widget_list.assets' do |app|
+      if defined?(Sprockets::Railtie) && app.config.respond_to?(:assets)
+        image_root = Pathname.new(__dir__).join('../..', 'vendor/assets/images').expand_path
+        images = Dir[image_root.join('**/*')].select { |path| File.file?(path) && %w[.gif .jpg .jpeg .png].include?(File.extname(path).downcase) }
+        app.config.assets.precompile += images.map { |path| Pathname.new(path).relative_path_from(image_root).to_s }
+        app.config.assets.precompile += %w[widget_list.css widgets.css widget_list.js]
+      end
+    end
   end
 end

data/lib/widget_list/request_context.rb

@@ -0,0 +1,5 @@
+module WidgetList
+  class RequestContext < ActiveSupport::CurrentAttributes
+    attribute :request, :server, :session, :used, :csrf_token
+  end
+end

data/lib/widget_list/sequel.rb

@@ -111,32 +111,14 @@ module Sequel
       # or
       # if get_database._select(get_database[:items].filter(:name => 'abc')) > 0
       #
-      sql = ''
       sql = _determine_type(sql_or_obj)
-
-      if self.class.name != 'WidgetListActiveRecord'
-
-        # build csv of bind to eval below (arguments need to be like this for raw SQL passed with bind in Sequel)
-        #
-        parameters = _convert_bind(bind)
-
-        # escape anything incoming in raw SQL such as bound items to create the ruby string to pass
-        #
-        sql.gsub!(/'/,"\\\\'")
-      else
-
-        _convert_active_record_bind(sql, bind)
-
-      end
-
       sql = _bind(sql,replace_in_query)
 
       # build rows array['COLUMN'][0] = 1234;
       #
-      first   = 1
       cnt     = 0
-      tmp     = nil
       @final_results = {}
+      @errors = false
       if Rails.env == 'development'
         Rails.logger.info(sql)
       end
@@ -194,7 +176,7 @@ module Sequel
               results = active_record_model.all.to_a if active_record_model.respond_to?('all')
               results = active_record_model.to_a if active_record_model.respond_to?('to_a') && !group_match.nil?
             else
-              results = active_record_model.find_by_sql(sql)
+              results = active_record_model.find_by_sql(bind.empty? ? sql : [sql, *bind])
             end
 
             (results||[]).each { |row|
@@ -232,27 +214,21 @@ module Sequel
           @last_sql   = sql_or_obj
         end
       else
-        eval("
-          begin
-            @errors = false
-            self['" + sql + "' " +  parameters + "].each { |row|
-              cnt += 1
-              row.each { |k,v|
-                if first == 1
-                  @final_results[k.to_s.upcase] = []
-                end
-                @final_results[k.to_s.upcase] << v
-              }
-              first = 0
-            }
-            @last_sql = self['" + sql + "' " +  parameters + "].get_sql
-          rescue Exception => e
-            Rails.logger.info(e)
-            @errors = true
-            @last_error = e.to_s
-            @last_sql = '" + sql + "' + \"\n\n\n\" + ' With Bind => ' + bind.inspect + ' And  BindLegacy => ' + replace_in_query.inspect
+        begin
+          dataset = sql_or_obj.is_a?(Sequel::Dataset) ? sql_or_obj : fetch(sql, *bind)
+          dataset.each do |row|
+            cnt += 1
+            row.each do |key, value|
+              (@final_results[key.to_s.upcase] ||= []) << value
+            end
           end
-        ")
+          @last_sql = dataset.sql
+        rescue StandardError => e
+          Rails.logger.info(e)
+          @errors = true
+          @last_error = e.to_s
+          @last_sql = "#{sql}\nWith Bind => #{bind.inspect} And BindLegacy => #{replace_in_query.inspect}"
+        end
       end
       @final_count = cnt
       return cnt
@@ -285,4 +261,4 @@ class WidgetListActiveRecord < Sequel::Database
 
   @last_sql = ''
   attr_accessor :last_sql
-end
+end

data/lib/widget_list/utils.rb

@@ -25,10 +25,10 @@ module WidgetList
     def self.build_query_string(args)
       q = []
       args.each { |k,v|
-        if v.class.name == 'Hash'
-          q << {k => v}.to_params
+        if v.is_a?(Hash) || v.respond_to?(:to_unsafe_h)
+          q << {k => (v.respond_to?(:to_unsafe_h) ? v.to_unsafe_h : v)}.to_query
         else
-          q << k.to_s + '=' + CGI.escape(URI.decode(v.to_s))
+          q << k.to_s + '=' + CGI.escape(v.to_s)
         end
       }
       q.join('&')
@@ -39,8 +39,8 @@ module WidgetList
     def self.build_url(page='',args = {}, append_get=false)
       qs = build_query_string(args)
       getvars = ''
-      if append_get && $_REQUEST
-        getvars = build_query_string($_REQUEST)
+      if append_get && WidgetList::RequestContext.request
+        getvars = build_query_string(WidgetList::RequestContext.request)
       end
 
       unless page =~ /\?/
@@ -54,7 +54,7 @@ module WidgetList
     def self.fill(tags = {}, template = '')
       tpl = template.dup
       tags.each { |k,v|
-        tpl = tpl.gsub(k.to_s,v.to_s)
+        tpl = tpl.gsub(k.to_s) { v.to_s }
       }
       tpl
     end
@@ -92,4 +92,4 @@ module WidgetList
 
   end
 
-end
+end

data/lib/widget_list/version.rb

@@ -1,3 +1,3 @@
 module WidgetList
-  VERSION = "1.3.7"
+  VERSION = "2.0.1"
 end

data/lib/widget_list/widgets.rb

@@ -62,7 +62,6 @@ module WidgetList
         '<!--VALUE-->'       => items['value'],
         '<!--REQUIRED-->'    => items['template_required'],
         '<!--CHECKED-->'     => items['checked'],
-        '<!--VALUE-->'       => items['value'],
         '<!--DISABLED-->'    => items['disabled']
       }
 
@@ -761,4 +760,4 @@ end
 # require 'widget_list/utils'
 # require 'widget_list/hash'
 # require 'widget_list/tpl'
-# puts WidgetList::Widgets.test_all
+# puts WidgetList::Widgets.test_all