widget_list 1.0.6 → 1.0.7

data/lib/widget_list/railtie.rb

@@ -4,7 +4,7 @@ module WidgetList
     config.before_configuration do
       config_file = Rails.root.join("config", "widget-list.yml")
       if config_file.file?
-        WidgetList::List::connect
+        # 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|
@@ -28,5 +28,15 @@ module WidgetList
       end
     end
 
+    initializer "Include widget_list" do
+      ActiveSupport.on_load(:action_controller) do
+        if WidgetList::List::is_sequel(true) || WidgetList::List::is_sequel(false)
+          require 'sequel'
+        end
+        require 'widget_list/sequel'
+      end
+    end
+
+
   end
 end

data/lib/widget_list/sequel.rb

@@ -34,27 +34,35 @@ module Sequel
       parameters
     end
 
+    def _convert_active_record_bind(sql='',bind=[])
+      unless bind.empty?
+        (bind||{}).each { |v|
+          sql.sub!(/\?/,v.to_s)
+        }
+      end
+    end
+
     # _exec, pass a block and iterate the total rows
     #
     # example
     #
 =begin
      $DATABASE._exec {|i|
-       asdf  = "#{WidgetList::List.get_database.final_results['NAME'][i]}"
+       asdf  = "#{@final_results['NAME'][i]}"
      }
 =end
     #
     # Alternatively you could
 =begin
-        WidgetList::List.get_database.final_results['ID'].each_with_index { |id,k|
-          name = WidgetList::List.get_database.final_results['NAME'][k]
-          price = WidgetList::List.get_database.final_results['PRICE'][k]
+        @final_results['ID'].each_with_index { |id,k|
+          name = @final_results['NAME'][k]
+          price = @final_results['PRICE'][k]
         }
 =end
 
     def _exec
       if block_given?
-        WidgetList::List.get_database.final_count.times {|i|
+        @final_count.times {|i|
           yield i
         }
       end
@@ -93,22 +101,29 @@ module Sequel
     # @param [Hash]             replace_in_query
     #                           will be a traditional php bind hash {'BIND'=>'value'}.  which will replace :BIND in the query.  thanks mwild
 
-    def _select(sql_or_obj, bind=[], replace_in_query={})
+    def _select(sql_or_obj, bind=[], replace_in_query={}, active_record_model=false)
       # supporting either
-      # if WidgetList::List.get_database._select('select * from items where name = ? AND price > ?', ['abc', 37]) > 0
+      # if get_database._select('select * from items where name = ? AND price > ?', ['abc', 37]) > 0
       # or
-      # if WidgetList::List.get_database._select(WidgetList::List.get_database[:items].filter(:name => 'abc')) > 0
+      # if get_database._select(get_database[:items].filter(:name => 'abc')) > 0
       #
       sql = ''
       sql = _determine_type(sql_or_obj)
 
-      # 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)
+      if self.class.name != 'WidgetListActiveRecord'
 
-      # escape anything incoming in raw SQL such as bound items to create the ruby string to pass
-      #
-      sql.gsub!(/'/,"\\\\'")
+        # 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)
 
@@ -116,32 +131,56 @@ module Sequel
       #
       first   = 1
       cnt     = 0
-      WidgetList::List.get_database.final_results = {}
+      @final_results = {}
 
       Rails.logger.info(sql)
 
-      eval("
-      begin
-        WidgetList::List.get_database.errors = false
-        WidgetList::List.get_database['" + sql + "' " +  parameters + "].each { |row|
-          cnt += 1
-          row.each { |k,v|
-            if first == 1
-              WidgetList::List.get_database.final_results[k.to_s.upcase] = []
-            end
-            WidgetList::List.get_database.final_results[k.to_s.upcase] << v
+      if self.class.name == 'WidgetListActiveRecord'
+        begin
+          results = active_record_model.find_by_sql(sql)
+          (results||[]).each { |row|
+            cnt += 1
+            row.attributes.keys.each { |fieldName|
+              if first == 1
+                @final_results[fieldName.to_s.upcase] = []
+              end
+              @final_results[fieldName.to_s.upcase] << ((row.send(fieldName).nil?) ? '' : row.send(fieldName))
+            }
+            first = 0
           }
-          first = 0
-        }
-        WidgetList::List.get_database.last_sql = WidgetList::List.get_database['" + sql + "' " +  parameters + "].get_sql
-      rescue Exception => e
-        Rails.logger.info(e)
-        WidgetList::List.get_database.errors = true
-        WidgetList::List.get_database.last_error = e.to_s
-        WidgetList::List.get_database.last_sql = '" + sql + "' + \"\n\n\n\" + ' With Bind => ' + bind.inspect + ' And  BindLegacy => ' + replace_in_query.inspect
+          @last_sql = sql_or_obj
+
+        rescue Exception => e
+          cnt         = 0
+          Rails.logger.info(e)
+          @errors     = true
+          @last_error = e.to_s
+          @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
+          end
+        ")
       end
-      ")
-      WidgetList::List.get_database.final_count = cnt
+      @final_count = cnt
       return cnt
     end
   end
@@ -151,4 +190,25 @@ module Sequel
       select_sql()
     end
   end
+end
+
+
+class WidgetListActiveRecord < Sequel::Database
+  @final_results = {}
+  attr_accessor :final_results
+
+  @errors = false
+  attr_accessor :errors
+
+  @last_error = ''
+  attr_accessor :last_error
+
+  @db_type = ''
+  attr_accessor :db_type
+
+  @final_count = 0
+  attr_accessor :final_count
+
+  @last_sql = ''
+  attr_accessor :last_sql
 end

data/lib/widget_list/version.rb

@@ -1,3 +1,3 @@
 module WidgetList
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
 end

data/publish_gem.sh

@@ -19,7 +19,7 @@ echo 'Next Add *= require '$GEMNAME' to application.css in your rails applicatio
 echo 'module '$CAMELCASE > lib/$GEMNAME/engine.rb
 echo '  class Engine < Rails::Engine' >> lib/$GEMNAME/engine.rb
 echo '    # auto wire' >> lib/$GEMNAME/engine.rb
-echo "    initializer 'static_assets.load_static_assets' do |app|" >> lib/$GEMNAME/engine.rb
+echo "    initializer '""$GEMNAME"".load_static_assets' do |app|" >> lib/$GEMNAME/engine.rb
 echo '      app.middleware.use ::ActionDispatch::Static, "#{root}/vendor"' >> lib/$GEMNAME/engine.rb
 echo '    end' >> lib/$GEMNAME/engine.rb
 echo '  end' >> lib/$GEMNAME/engine.rb

data/vendor/assets/javascripts/widget_list.js

@@ -174,13 +174,17 @@ function ajaxStatus(eToHide, fadeInOut)
 }
 
 
-function ListChangeGrouping(listId)
+function ListChangeGrouping(listId, obj, extra)
 {
+   if (typeof(extra) == 'undefined')
+   {
+      var extra = '';
+   }
    ajaxStatus(listId, 1);
    HideAdvancedSearch(jQuery('#' + listId + '-group'));
    jQuery('#list_search_id_' + listId ).val('');
    InitInfoFields(jQuery('#list_search_id_' + listId));
-   ListJumpMin(jQuery('#' + listId + '_jump_url').val() + '&searchClear=1&switch_grouping=' + jQuery('#list_group_id_' + listId ).val(), listId);
+   ListJumpMin(jQuery('#' + listId + '_jump_url').val() + '&searchClear=1&switch_grouping=' + jQuery('#list_group_id_' + listId ).val() + '&group_row_id=' + jQuery(obj).attr('id') + extra , listId);
 }
 
 function ListHome(listId)
@@ -190,7 +194,7 @@ function ListHome(listId)
    });
 }
 
-function ListDrillDown(mode,data,listId)
+function ListDrillDown(mode, data, listId, extra)
 {
    jQuery('#list_search_id_' + listId).val('');
    var grouping = '';
@@ -198,7 +202,7 @@ function ListDrillDown(mode,data,listId)
    {
       grouping = '&switch_grouping=' + jQuery('#list_group_id_' + listId).val();
    }
-   ListJumpMin(jQuery('#' + listId + '_jump_url').val() + '&drill_down=' + mode + '&filter=' + data + grouping + '&search_filter=', listId, function(){
+   ListJumpMin(jQuery('#' + listId + '_jump_url').val() + '&drill_down=' + mode + '&filter=' + data + grouping + '&search_filter=' + extra, listId, function(){
       InitInfoFields(jQuery('#list_search_id_' + listId));
    });
 }
@@ -228,6 +232,67 @@ function ListJumpResponse(response)
    }
 }
 
+/**
+ * ListMessagePopup()
+ */
+function ListMessagePopup(id, html, hieght, width)
+{
+    jQuery('.ajaxLoad,.ajaxLoad2').remove();
+    if (typeof(hieght) =="undefined")
+    {
+        var hieght = '200'
+    }
+    if (typeof(width) =="undefined")
+    {
+        var width = '400'
+    }
+
+    if(document.getElementById(id))
+    {
+        elmToHide  = document.getElementById(id);
+        var overLay = '<div style="position:relative;top:0px;"><div id="loading' + id + '" class="ajaxLoad" style="height:' + jQuery(elmToHide).height() + 'px;width:' + jQuery(elmToHide).width() + 'px;top:-' + jQuery(elmToHide).height() + 'px;"></div></div><div class="ajaxLoad2" id="message' + id + '" style="height:' + hieght + 'px;width:' + width + 'px;left:100px;top:200px;left:250px;z-index: 1000;background-position: 50% 50%;position: absolute;display: block;border:2px solid #dadada;box-shadow:0 2px 4px #c0c0c0;text-align:center;background-color:#FFFFFF;padding:15px;">' + html + '</div>';
+
+        jQuery(elmToHide).append(overLay);
+
+        jQuery('#message' + id).children( ).each( function( index )
+        {
+            jQuery( this ).addClass( 'tmp-popup-class' );
+        });
+
+        jQuery('#loading' + id).fadeTo("fast", .20);
+
+        jQuery('html,body').animate({scrollTop: jQuery('#message' + id).offset().top - 100 }, 400);
+    }
+
+    jQuery("body").unbind('click');
+
+    setTimeout(function() {
+        jQuery("body").click
+            (
+                function(e)
+                {
+                    if(e.target.id == 'message' + id || e.target.className == 'tmp-popup-class')
+                    {
+                        return false;
+                    }
+                    if (jQuery('#' + e.target.id).parents('#message' + id).length == 0 || (e.target.id != 'message' + id && jQuery('#' + e.target.id).parents('#message' + id).length != 1))
+                    {
+                        jQuery('#message' + id + ', #loading'+ id).remove();
+                    }
+                }
+            );
+    }, 1000);
+}
+
+/**
+ * ListMessageClose()
+ */
+function ListMessageClose()
+{
+    jQuery('.ajaxLoad,.ajaxLoad2').remove();
+}
+
+
 /**
 * ListJumpMin()
 */

data/vendor/assets/stylesheets/widget_list.css

@@ -1,7 +1,7 @@
 .widget_list_outer
 {
-   padding-left: 15px;
-   padding-right: 15px;
+   padding-left:  6px;
+   padding-right: 13px;
 }
 
 .horizontal_rule
@@ -768,10 +768,10 @@ ul#pagination li div.active
 */
 div#advanced-search-container ul.advanced-search-container-inline, div#advanced-search-container ul {list-style:none; margin:0px; padding:3px; height:51px; width:450px}
 div#advanced-search-container ul.advanced-search-container-inline input.info-input, div#advanced-search-container ul input.info-input {font-size:11px}
-   div#advanced-search-container ul.advanced-search-container-inline li {display:inline-block;width:150px; margin-top:4px;}
+   div#advanced-search-container ul.advanced-search-container-inline li {display:inline-block;width:428px; margin-top:4px;}
    div#advanced-search-container ul.advanced-search-container-inline li#required_message_inline {font-size:10px}
    div#advanced-search-container ul.advanced-search-container-inline li#required_message_inline div.required {top:4px}
-   div#advanced-search-container ul#search_columns li {width:190px}
+   div#advanced-search-container ul#search_columns li {width:428px}
 
    
 /**

data/widget_list.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |gem|
   gem.description   = %q{An Advanced and flexible ajax data grid.  Outside of all of the RAILS Active record CRAP!}
   gem.summary       = %q{In rails you have will_paginate and other gems like it using the ActiveRecord approach, but widget_list adds some awesome treats to standard boring pagers}
   gem.homepage      = "https://github.com/davidrenne/widget_list"
-  gem.add_dependency('sequel', '3.42.0')
+  gem.add_dependency('sequel', '3.42.0')  # SEQUEL IS NOW OPTIONAL!! I am sure most people will be using ActiveRecord ORM
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: widget_list
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-21 00:00:00.000000000 Z
+date: 2013-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel