widget_list 1.0.7 → 1.0.8

data/README.md

@@ -245,11 +245,13 @@ Style a row based on the value of the column.
 ### Example Calling Page That Sets up Config and calls WidgetList.render
 
    
+
     #
     # Load Sample "items" Data. Comment out in your first time executing a widgetlist to create the items table
     #
+=begin
     begin
-      WidgetList::List.get_database.create_table :items do
+      WidgetList::List.get_sequel.create_table :items do
         primary_key :id
         String :name
         Float :price
@@ -257,7 +259,7 @@ Style a row based on the value of the column.
         String :active
         Date :date_added
       end
-      items = WidgetList::List.get_database[:items]
+      items = WidgetList::List.get_sequel[:items]
       100.times {
         items.insert(:name => 'ab\'c_quoted_'    + rand(35).to_s,   :price => rand * 100, :date_added => '2008-02-01', :sku => rand(9999), :active => 'Yes')
         items.insert(:name => '12"3_'            + rand(35).to_s,   :price => rand * 100, :date_added => '2008-02-02', :sku => rand(9999), :active => 'Yes')
@@ -271,6 +273,7 @@ Style a row based on the value of the column.
       #
       logger.info "Test table in items already exists? " + e.to_s
     end
+=end
 
     begin
 
@@ -344,8 +347,21 @@ Style a row based on the value of the column.
       list_parms['fieldsHidden'] = ['sku']
 
       drill_downs = []
-      drill_downs << WidgetList::List::build_drill_down_link(list_parms['name'],'filter_by_name','a.name','a.name','name_linked')
-      drill_downs << WidgetList::List::build_drill_down_link(list_parms['name'],'filter_by_sku','a.sku','a.sku','sku_linked')
+
+      drill_downs << WidgetList::List::build_drill_down( :list_id                => list_parms['name'],
+                                                         :drill_down_name        => 'filter_by_name',
+                                                         :data_to_pass_from_view => 'a.name',
+                                                         :column_to_show         => 'a.name',
+                                                         :column_alias           => 'name_linked'
+                                                       )
+
+      drill_downs << WidgetList::List::build_drill_down(
+                                                         :list_id                => list_parms['name'],
+                                                         :drill_down_name        => 'filter_by_sku',
+                                                         :data_to_pass_from_view => 'a.sku',
+                                                         :column_to_show         => 'a.sku',
+                                                         :column_alias           => 'sku_linked'
+                                                       )
 
       list_parms['view']          = '(
                                        SELECT
@@ -379,7 +395,7 @@ Style a row based on the value of the column.
 
 
       list_parms['noDataMessage'] = 'No Ruby Items Found'
-      list_parms['title']         = 'Ruby Items!!!'
+      list_parms['title']         = 'Ruby Items Using Sequel!!!'
 
       #
       # Create small button array and pass to the buttons key
@@ -399,7 +415,7 @@ Style a row based on the value of the column.
       list_parms['buttons']                                            = {button_column_name => mini_buttons}
       list_parms['fieldFunction']                                      = {
         button_column_name => "''",
-        'date_added'  => ['postgres','oracle'].include?(WidgetList::List.get_database.db_type) ? "TO_CHAR(date_added, 'MM/DD/YYYY')" : "date_added"
+        'date_added'  => ['postgres','oracle'].include?(WidgetList::List::get_db_type) ? "TO_CHAR(date_added, 'MM/DD/YYYY')" : "date_added"
       }
 
       list_parms['groupByItems']    = ['All Records', 'Item Name', 'Sku Number']

data/lib/widget_list/sequel.rb

@@ -132,8 +132,9 @@ module Sequel
       first   = 1
       cnt     = 0
       @final_results = {}
-
-      Rails.logger.info(sql)
+      if Rails.env == 'development'
+        Rails.logger.info(sql)
+      end
 
       if self.class.name == 'WidgetListActiveRecord'
         begin

data/lib/widget_list/version.rb

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

data/lib/widget_list/widgets.rb

@@ -588,6 +588,24 @@ module WidgetList
       items
     end
 
+    def self.validate_items(list,items)
+      valid = true
+      unless items.empty?
+        items.each { |k,v|
+          if !list.to_s.empty? && !list.key?(k)
+            valid = false
+            throw "Required item '#{k.to_s}' only passed in #{items.inspect}"
+          end
+        }
+      end
+
+      if list.to_s.empty? && !items.empty?
+        valid = false
+        throw "Required items are needing to be passed #{items.inspect} are all required for this function"
+      end
+      return valid
+    end
+
     # WidgetButton
     def self.widget_button(text='', list={}, small=false)
       items = {

data/lib/widget_list.rb

@@ -387,7 +387,7 @@ module WidgetList
         end
 
         matchesCurrentList   = $_REQUEST.key?('BUTTON_VALUE') && $_REQUEST['BUTTON_VALUE'] == @items['buttonVal']
-        isSearchRequest      = $_REQUEST.key?('search_filter')
+        isSearchRequest      = $_REQUEST.key?('search_filter') && $_REQUEST['search_filter'] != 'undefined'
         templateCustomSearch = !@items['templateFilter'].empty? # if you define templateFilter WidgetList will not attempt to build a where clause with search
 
         #
@@ -1648,7 +1648,54 @@ module WidgetList
       '<div class="goback" onclick="ListHome(\'' + list_name + '\');" title="Go Back"></div>'
     end
 
+    def self.build_drill_down(*params)
+      required_params = {
+        :list_id                  => true,              # -- your widget_list name (used for JS)
+        :drill_down_name          => true,              # -- an identifier that is pass for the "column" or "type of drill down" which is passed as $_REQUEST['drill_down'] when the user clicks and returned from get_filter_and_drilldown based on session or request
+        :data_to_pass_from_view   => true,              # -- Any SQL function or column name/value in the resultset in which would be the value passed when the user clicks the drill down
+        :column_to_show           => true,              # -- The visible column or SQL functions to display to user for the link
+      }
+
+      optional_params = {
+        :column_alias             => '',                # -- AS XXXX
+        :extra_function           => '',                # -- Onclick of link, call another JS function after the drill down function is called
+        :js_function_name         => 'ListDrillDown',   # -- name of JS Function
+        :column_class             => '',                # -- custom class on the <a> tag
+        :link_color               => 'blue',            # -- whatever color you want the link to be
+        :extra_js_func_params     => '',                # -- Add extra params to ListDrillDown outside of the default
+        :primary_database         => true,              # -- Since this function builds a column before widget_list is instantiated, tell which connection you are using
+      }
+
+      valid = WidgetList::Widgets::validate_items(params[0],required_params)
+      items = WidgetList::Widgets::populate_items(params[0],optional_params)
+
+      if items[:column_alias].empty?
+        items[:column_alias] = items[:column_to_show]
+      end
+
+      if !items[:column_class].empty?
+        items[:column_class] = ' "' + WidgetList::List::concat_string(items[:primary_database]) + items[:column_class] + WidgetList::List::concat_string(items[:primary_database]) + '"'
+      end
+
+      if WidgetList::List.get_db_type(items[:primary_database]) == 'oracle'
+        if $_REQUEST.key?('export_widget_list')
+          link = "#{items[:column_to_show]} #{WidgetList::List::is_sequel(items[:primary_database]) ? " as #{items[:column_alias]} " : ""}"
+        else
+          link = %[q'[<a style='cursor:pointer;color:#{items[:link_color]};' class='#{items[:column_alias]}_drill#{items[:column_class]}' onclick='#{items[:js_function_name]}("#{items[:drill_down_name]}", ListDrillDownGetRowValue(this) ,"#{items[:list_id]}"#{items[:extra_js_func_params]});#{items[:extra_function]}'>]' #{WidgetList::List::concat_string(items[:primary_database])}#{items[:column_to_show]}#{WidgetList::List::concat_string(items[:primary_database])}q'[</a><script class='val-db' type='text'>]' #{WidgetList::List::concat_string(items[:primary_database])} #{items[:data_to_pass_from_view]} #{WidgetList::List::concat_string(items[:primary_database])} q'[</script>]' #{WidgetList::List::concat_outer(items[:primary_database])} #{WidgetList::List::is_sequel(items[:primary_database]) ? " as #{items[:column_alias]} " : ""}]
+        end
+      else
+        if $_REQUEST.key?('export_widget_list')
+          link = "#{items[:column_to_show]} #{WidgetList::List::is_sequel(items[:primary_database]) ? " as #{items[:column_alias]} " : ""}"
+        else
+          link = %[#{WidgetList::List::concat_inner(items[:primary_database])}"<a style='cursor:pointer;color:#{items[:link_color]};' class='#{items[:column_alias]}_drill#{items[:column_class]}' onclick='#{items[:js_function_name]}(#{WidgetList::List::double_quote(items[:primary_database])}#{items[:drill_down_name]}#{WidgetList::List::double_quote(items[:primary_database])}, ListDrillDownGetRowValue(this) ,#{WidgetList::List::double_quote(items[:primary_database])}#{items[:list_id]}#{WidgetList::List::double_quote(items[:primary_database])}#{items[:extra_js_func_params]});#{items[:extra_function]}'>"#{WidgetList::List::concat_string(items[:primary_database])}#{items[:column_to_show]}#{WidgetList::List::concat_string(items[:primary_database])}"</a><script class='val-db' type='text'>"#{WidgetList::List::concat_string(items[:primary_database])} #{items[:data_to_pass_from_view]} #{WidgetList::List::concat_string(items[:primary_database])}"</script>"#{WidgetList::List::concat_outer(items[:primary_database])} #{WidgetList::List::is_sequel(items[:primary_database]) ? " as #{items[:column_alias]} " : ""}]
+        end
+      end
+      return link
+
+    end
+
     def self.build_drill_down_link(listId,drillDownName,dataToPassFromView,columnToShow,columnAlias='',extraFunction='',functionName='ListDrillDown',columnClass='',color='blue',extraJSFunctionParams='',primary=true)
+      warn "`build_drill_down_link` is deprecated. Use `build_drill_down` instead."
       if columnAlias.empty?
         columnAlias = columnToShow
       end
@@ -1670,8 +1717,7 @@ module WidgetList
           link = %[#{WidgetList::List::concat_inner(primary)}"<a style='cursor:pointer;color:#{color};' class='#{columnAlias}_drill#{columnClass}' onclick='#{functionName}(#{WidgetList::List::double_quote(primary)}#{drillDownName}#{WidgetList::List::double_quote(primary)}, ListDrillDownGetRowValue(this) ,#{WidgetList::List::double_quote(primary)}#{listId}#{WidgetList::List::double_quote(primary)}#{extraJSFunctionParams});#{extraFunction}'>"#{WidgetList::List::concat_string(primary)}#{columnToShow}#{WidgetList::List::concat_string(primary)}"</a><script class='val-db' type='text'>"#{WidgetList::List::concat_string(primary)} #{dataToPassFromView} #{WidgetList::List::concat_string(primary)}"</script>"#{WidgetList::List::concat_outer(primary)} #{WidgetList::List::is_sequel(primary) ? " as #{columnAlias} " : ""}]
         end
       end
-
-
+      return link
     end
 
     def self.concat_string(primary)
@@ -2319,7 +2365,7 @@ module WidgetList
       end
     end
 
-    def self.get_db_type(primary)
+    def self.get_db_type(primary=true)
       WidgetList::List::load_widget_list_yml()
       if primary
         database_conn = $widget_list_conf[:primary]
@@ -2329,13 +2375,13 @@ module WidgetList
       WidgetList::List::determine_db_type(database_conn)
     end
 
-    def get_db_type(primary)
+    def get_db_type(primary=true)
       WidgetList::List::get_db_type(primary)
     end
 
     def get_view
       @active_record_model = false
-      if @is_sequel
+      if (@is_primary_sequel && @items['database'] == 'primary') ||  (@is_secondary_sequel && @items['database'] == 'secondary')
         return @items['view']
       elsif @items['view'].respond_to?('scoped') && @items['view'].scoped.respond_to?('to_sql')
         @active_record_model = @items['view'].name.constantize
@@ -2383,6 +2429,7 @@ module WidgetList
     end
 
     def connect
+
       @has_connected = true
       begin
         if Rails.root.join("config", "widget-list.yml").file?
@@ -2396,17 +2443,18 @@ module WidgetList
           throw 'widget-list.yml not found'
         end
 
-        @is_sequel                         = true
-        if @primary_conn != false && ! @primary_conn.include?('://')
-          @is_sequel                       = false
+        @is_primary_sequel                 = true
+        @is_secondary_sequel               = true
+        if @primary_conn != false && ! @primary_conn.include?(':/')
+          @is_primary_sequel               = false
         end
 
-        if @secondary_conn != false && !@secondary_conn.include?('://')
-          @is_sequel                       = false
+        if @secondary_conn != false && !@secondary_conn.include?(':/')
+          @is_secondary_sequel             = false
         end
 
         if @primary_conn != false
-          if @primary_conn.include?('://')
+          if @primary_conn.include?(':/')
             @widget_list_sequel_conn         = Sequel.connect(@primary_conn)
             @widget_list_sequel_conn.db_type = WidgetList::List::determine_db_type(@primary_conn)
           else
@@ -2416,7 +2464,7 @@ module WidgetList
         end
 
         if @secondary_conn != false
-          if @secondary_conn.include?('://')
+          if @secondary_conn.include?(':/')
             @widget_list_sequel_conn2         = Sequel.connect(@secondary_conn)
             @widget_list_sequel_conn2.db_type = WidgetList::List::determine_db_type(@secondary_conn)
           else
@@ -2426,7 +2474,7 @@ module WidgetList
         end
 
       rescue Exception => e
-        p "widget-list.yml and connection to @widget_list_sequel_conn or @widget_list_sequel_conn2 failed.  Please fix and try again (" + e.to_s + ")"
+        Rails.logger.info "widget-list.yml and connection to @widget_list_sequel_conn or @widget_list_sequel_conn2 failed.  Please fix and try again (" + e.to_s + ")"
       end
 
     end
@@ -2446,36 +2494,36 @@ module WidgetList
       return is_sequel
     end
 
+    def self.get_sequel(primary=true)
+      WidgetList::List::load_widget_list_yml()
+      if primary
+        Sequel.connect($widget_list_conf[:primary])
+      else
+        Sequel.connect($widget_list_conf[:secondary])
+      end
+    end
+
     def get_database
 
       if @has_connected.nil?
         connect
       end
 
-      if @is_sequel
-        begin
-          if @widget_list_sequel_conn.class.name.to_s.split('::').first == 'Sequel'
-            if @current_db_selection == 'primary' || @current_db_selection.nil?
-              @widget_list_sequel_conn.test_connection
-            end
-            if @current_db_selection == 'secondary'
-              @widget_list_sequel_conn2.test_connection
-            end
-          else
-            connect
-          end
-        rescue
-          connect
-        end
+      if @is_primary_sequel && @widget_list_sequel_conn.class.name.to_s.split('::').first == 'Sequel' && @current_db_selection == 'primary' || @current_db_selection.nil?
+        @widget_list_sequel_conn.test_connection
+      end
+
+      if @is_secondary_sequel && @widget_list_sequel_conn2.class.name.to_s.split('::').first == 'Sequel' && @current_db_selection == 'secondary'
+        @widget_list_sequel_conn2.test_connection
       end
 
       case @current_db_selection
         when 'primary'
-          return (@is_sequel) ? @widget_list_sequel_conn : @widget_list_ar_conn
+          return (@is_primary_sequel) ? @widget_list_sequel_conn : @widget_list_ar_conn
         when 'secondary'
-          return (@is_sequel) ? @widget_list_sequel_conn2 : @widget_list_ar_conn2
+          return (@is_secondary_sequel) ? @widget_list_sequel_conn2 : @widget_list_ar_conn2
         else
-          return (@is_sequel) ? @widget_list_sequel_conn : @widget_list_ar_conn
+          return (@is_primary_sequel) ? @widget_list_sequel_conn : @widget_list_ar_conn
       end
 
     end

data/vendor/assets/stylesheets/widget_list.css

@@ -633,7 +633,7 @@ div.inputOuter .inputInner input.search-ahead {width:97%}
 * Search Ahead Magifier Glass
 */
 .widget-search-magnifier {background: url('../assets/images/gobblecons/mid-gray/search-16.png') no-repeat scroll 0px 0px transparent;float:right;margin:7px;position: relative;right:-13px;top:-30px;cursor:pointer;border:0px solid red;height:20px;width:20px}
-.widget-search-magnifier:hover {background: url('../assets/images/gobblecons/teal/search-16.png') no-repeat scroll 0px 0px transparent}
+.widget-search-magnifier:hover {background: url('../assets/images/gobblecons/mid-gray/search-16.png') no-repeat scroll 0px 0px transparent}
 
 /**
 * Advanced Search Close Button

metadata

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