widget_list 1.3.4 → 1.3.5

data/lib/widget_list/engine.rb

@@ -1,8 +1,8 @@
-module WidgetList
-  class Engine < Rails::Engine
-    # auto wire
-    initializer 'widget_list.load_static_assets' do |app|
-      app.middleware.use ::ActionDispatch::Static, "#{root}/vendor"
-    end
-  end
-end
+module WidgetList
+  class Engine < Rails::Engine
+    # auto wire
+    initializer 'widget_list.load_static_assets' do |app|
+      app.middleware.use ::ActionDispatch::Static, "#{root}/vendor"
+    end
+  end
+end

data/lib/widget_list/hash.rb

@@ -1,114 +1,114 @@
-class Hash
-
-  def to_params
-    params = ''
-    stack = []
-
-    each do |k, v|
-      if v.is_a?(Hash)
-        stack << [k,v]
-      elsif v.is_a?(Array)
-        stack << [k,Hash.from_array(v)]
-      else
-        params << "#{k}=#{v}&"
-      end
-    end
-
-    stack.each do |parent, hash|
-      hash.each do |k, v|
-        if v.is_a?(Hash)
-          stack << ["#{parent}[#{k}]", v]
-        else
-          params << "#{parent}[#{k}]=#{v}&"
-        end
-      end
-    end
-
-    params.chop!
-    params
-  end
-
-  def self.from_array(array = [])
-    h = Hash.new
-    array.size.times do |t|
-      h[t] = array[t]
-    end
-    h
-  end
-
-  # Merges self with another hash, recursively.
-  #
-  # This code was lovingly stolen from some random gem:
-  # http://gemjack.com/gems/tartan-0.1.1/classes/Hash.html
-  #
-  # Thanks to whoever made it.
-
-  def deep_merge(hash)
-    target = dup
-
-    hash.keys.each do |key|
-      if hash[key].is_a? Hash and self[key].is_a? Hash
-        target[key] = target[key].deep_merge(hash[key])
-        next
-      end
-
-      target[key] = hash[key]
-    end
-
-    target
-  end
-
-
-  # From: http://www.gemtacular.com/gemdocs/cerberus-0.2.2/doc/classes/Hash.html
-  # File lib/cerberus/utils.rb, line 42
-
-  def deep_merge!(second)
-    second.each_pair do |k,v|
-      if self[k].is_a?(Hash) and second[k].is_a?(Hash)
-        self[k].deep_merge!(second[k])
-      else
-        self[k] = second[k]
-      end
-    end
-  end
-
-
-#-----------------
-
-# cf. http://subtech.g.hatena.ne.jp/cho45/20061122
-  def deep_merge2(other)
-    deep_proc = Proc.new { |k, s, o|
-      if s.kind_of?(Hash) && o.kind_of?(Hash)
-        next s.merge(o, &deep_proc)
-      end
-      next o
-    }
-    merge(other, &deep_proc)
-  end
-
-
-  def deep_merge3(second)
-
-    # From: http://www.ruby-forum.com/topic/142809
-    # Author: Stefan Rusterholz
-
-    merger = proc { |key,v1,v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
-    self.merge(second, &merger)
-
-  end
-
-
-  def keep_merge(hash)
-    target = dup
-    hash.keys.each do |key|
-      if hash[key].is_a? Hash and self[key].is_a? Hash
-        target[key] = target[key].keep_merge(hash[key])
-        next
-      end
-      #target[key] = hash[key]
-      target.update(hash) { |key, *values| values.flatten.uniq }
-    end
-    target
-  end
-
+class Hash
+
+  def to_params
+    params = ''
+    stack = []
+
+    each do |k, v|
+      if v.is_a?(Hash)
+        stack << [k,v]
+      elsif v.is_a?(Array)
+        stack << [k,Hash.from_array(v)]
+      else
+        params << "#{k}=#{v}&"
+      end
+    end
+
+    stack.each do |parent, hash|
+      hash.each do |k, v|
+        if v.is_a?(Hash)
+          stack << ["#{parent}[#{k}]", v]
+        else
+          params << "#{parent}[#{k}]=#{v}&"
+        end
+      end
+    end
+
+    params.chop!
+    params
+  end
+
+  def self.from_array(array = [])
+    h = Hash.new
+    array.size.times do |t|
+      h[t] = array[t]
+    end
+    h
+  end
+
+  # Merges self with another hash, recursively.
+  #
+  # This code was lovingly stolen from some random gem:
+  # http://gemjack.com/gems/tartan-0.1.1/classes/Hash.html
+  #
+  # Thanks to whoever made it.
+
+  def deep_merge(hash)
+    target = dup
+
+    hash.keys.each do |key|
+      if hash[key].is_a? Hash and self[key].is_a? Hash
+        target[key] = target[key].deep_merge(hash[key])
+        next
+      end
+
+      target[key] = hash[key]
+    end
+
+    target
+  end
+
+
+  # From: http://www.gemtacular.com/gemdocs/cerberus-0.2.2/doc/classes/Hash.html
+  # File lib/cerberus/utils.rb, line 42
+
+  def deep_merge!(second)
+    second.each_pair do |k,v|
+      if self[k].is_a?(Hash) and second[k].is_a?(Hash)
+        self[k].deep_merge!(second[k])
+      else
+        self[k] = second[k]
+      end
+    end
+  end
+
+
+#-----------------
+
+# cf. http://subtech.g.hatena.ne.jp/cho45/20061122
+  def deep_merge2(other)
+    deep_proc = Proc.new { |k, s, o|
+      if s.kind_of?(Hash) && o.kind_of?(Hash)
+        next s.merge(o, &deep_proc)
+      end
+      next o
+    }
+    merge(other, &deep_proc)
+  end
+
+
+  def deep_merge3(second)
+
+    # From: http://www.ruby-forum.com/topic/142809
+    # Author: Stefan Rusterholz
+
+    merger = proc { |key,v1,v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
+    self.merge(second, &merger)
+
+  end
+
+
+  def keep_merge(hash)
+    target = dup
+    hash.keys.each do |key|
+      if hash[key].is_a? Hash and self[key].is_a? Hash
+        target[key] = target[key].keep_merge(hash[key])
+        next
+      end
+      #target[key] = hash[key]
+      target.update(hash) { |key, *values| values.flatten.uniq }
+    end
+    target
+  end
+
 end

data/lib/widget_list/md5.rb

@@ -1,19 +1,19 @@
-require 'digest/md5'
-
-class Object
-  def md5key
-    to_s
-  end
-end
-
-class Array
-  def md5key
-    map(&:md5key).join
-  end
-end
-
-class Hash
-  def md5key
-    sort.map(&:md5key).join
-  end
+require 'digest/md5'
+
+class Object
+  def md5key
+    to_s
+  end
+end
+
+class Array
+  def md5key
+    map(&:md5key).join
+  end
+end
+
+class Hash
+  def md5key
+    sort.map(&:md5key).join
+  end
 end

data/lib/widget_list/railtie.rb

@@ -1,42 +1,42 @@
-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
-      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
+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
+      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

@@ -1,219 +1,288 @@
-module Sequel
-  class 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
-
-    def _convert_bind(bind=[])
-      parameters = ''
-      unless bind.empty?
-        all = []
-        (bind||{}).each { |v|
-          if v.class.name.downcase == 'string'
-            all << "'" + v.gsub(/'/,"\\\\'") + "'"
-          else
-            all << v
-          end
-        }
-        parameters = "," + all.join(' ,')
-      end
-      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  = "#{@final_results['NAME'][i]}"
-     }
-=end
-    #
-    # Alternatively you could
-=begin
-        @final_results['ID'].each_with_index { |id,k|
-          name = @final_results['NAME'][k]
-          price = @final_results['PRICE'][k]
-        }
-=end
-
-    def _exec
-      if block_given?
-        @final_count.times {|i|
-          yield i
-        }
-      end
-    end
-
-    def _determine_type(sql_or_obj)
-      if sql_or_obj.class.name.downcase != 'string' && sql_or_obj.class.name.to_s.split('::').last.downcase  == 'dataset'
-        sql = sql_or_obj.get_sql()
-      elsif sql_or_obj.class.name.downcase == 'string'
-        sql = sql_or_obj
-      end
-    end
-
-    # probably not needed really
-    def _update(sql_or_obj,bind={})
-
-    end
-
-    # @param [Object] replace_in_query
-    def _bind(sql='',replace_in_query={})
-      if !replace_in_query.empty? && replace_in_query.class.name == 'Hash'
-        tmp = {}
-        replace_in_query.each { |k, v|
-          new_key = ':' + k.to_s
-          tmp[ new_key ] = v
-        }
-        sql = WidgetList::Utils::fill(tmp, sql)
-      end
-      sql
-    end
-
-    def _get_row_value(row,fieldName)
-      row.send(fieldName).to_s
-    end
-
-    # @param [Object or String] sql_or_obj
-    #                           will either take raw SQL or a Sequel object
-    # @param [Array]            bind
-    #                           will be replacements for ? ? in your query.  Must be in sequence
-    # @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={}, active_record_model=false)
-      # supporting either
-      # if get_database._select('select * from items where name = ? AND price > ?', ['abc', 37]) > 0
-      # 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
-      @final_results = {}
-      if Rails.env == 'development'
-        Rails.logger.info(sql)
-      end
-
-      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.attributes[fieldName].nil?) ? '' : _get_row_value(row,fieldName))
-            }
-            first = 0
-          }
-          @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
-      @final_count = cnt
-      return cnt
-    end
-  end
-
-  class Dataset
-    def get_sql
-      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
+module Sequel
+  class 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
+
+    def _convert_bind(bind=[])
+      parameters = ''
+      unless bind.empty?
+        all = []
+        (bind||{}).each { |v|
+          if v.class.name.downcase == 'string'
+            all << "'" + v.gsub(/'/,"\\\\'") + "'"
+          else
+            all << v
+          end
+        }
+        parameters = "," + all.join(' ,')
+      end
+      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  = "#{@final_results['NAME'][i]}"
+     }
+=end
+    #
+    # Alternatively you could
+=begin
+        @final_results['ID'].each_with_index { |id,k|
+          name = @final_results['NAME'][k]
+          price = @final_results['PRICE'][k]
+        }
+=end
+
+    def _exec
+      if block_given?
+        @final_count.times {|i|
+          yield i
+        }
+      end
+    end
+
+    def _determine_type(sql_or_obj)
+      if sql_or_obj.class.name.downcase != 'string' && sql_or_obj.class.name.to_s.split('::').last.downcase  == 'dataset'
+        sql = sql_or_obj.get_sql()
+      elsif sql_or_obj.class.name.downcase == 'string'
+        sql = sql_or_obj
+      end
+    end
+
+    # probably not needed really
+    def _update(sql_or_obj,bind={})
+
+    end
+
+    # @param [Object] replace_in_query
+    def _bind(sql='',replace_in_query={})
+      if !replace_in_query.empty? && replace_in_query.class.name == 'Hash'
+        tmp = {}
+        replace_in_query.each { |k, v|
+          new_key = ':' + k.to_s
+          tmp[ new_key ] = v
+        }
+        sql = WidgetList::Utils::fill(tmp, sql)
+      end
+      sql
+    end
+
+    def _get_row_value(row,fieldName)
+      row.send(fieldName).to_s
+    end
+
+    # @param [Object or String] sql_or_obj
+    #                           will either take raw SQL or a Sequel object
+    # @param [Array]            bind
+    #                           will be replacements for ? ? in your query.  Must be in sequence
+    # @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={}, active_record_model=false, group_match=false)
+      # supporting either
+      # if get_database._select('select * from items where name = ? AND price > ?', ['abc', 37]) > 0
+      # 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 = {}
+      if Rails.env == 'development'
+        Rails.logger.info(sql)
+      end
+
+      if self.class.name == 'WidgetListActiveRecord'
+        begin
+
+          if $is_mongo
+            if !group_match.nil?
+              params = []
+
+              if group_match.key?('match') && !group_match['match'].empty?
+                group_match['match'].each { |match|
+                  field = match.keys.first
+                  if active_record_model.respond_to?(:serializers) &&  active_record_model.serializers[field].type.to_s == 'Integer'
+                    if match[match.keys.first].class.name == 'Hash'
+                      predicate      = match[field].keys.first
+                      value_original = match[field][predicate]
+                      match_final = {
+                          field => { predicate =>
+                                         WidgetList::List.parse_inputs_for_mongo_predicates(active_record_model, field, predicate, value_original)
+                          }
+                      }
+                    else
+                      match_final = { field => WidgetList::List.parse_inputs_for_mongo_predicates(active_record_model, field, predicate, value_original) }
+                    end
+
+                  else
+                    match_final = { field => WidgetList::List.parse_inputs_for_mongo_predicates(active_record_model, field, predicate, match[field]) }
+                  end
+                  params << {
+                      '$match' =>  match_final
+                  }
+                }
+              end
+
+              params << group_match['group'] if group_match.key?('group')
+              params << group_match['sort']  if group_match.key?('sort')
+              params << group_match['skip']  if group_match.key?('skip')
+              params << group_match['limit'] if group_match.key?('limit')
+
+              active_record_model = active_record_model.collection.aggregate(params)
+            end
+          end
+
+          if $is_mongo && sql == 'count'
+
+            cnt = active_record_model.count
+            @final_results['TOTAL'] = []
+            @final_results['TOTAL'][0] = cnt
+
+          else
+
+            if $is_mongo
+              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)
+            end
+
+            (results||[]).each { |row|
+              cnt += 1
+              row.attributes.keys.each { |fieldName|
+                @final_results[fieldName.to_s.upcase] = [] unless @final_results.key?(fieldName.to_s.upcase)
+                @final_results[fieldName.to_s.upcase] << ((row.send(fieldName).nil? && row.attributes[fieldName].nil?) ? '' : _get_row_value(row,fieldName))
+              } if group_match.nil?
+
+              row.each { |key,value|
+                @final_results['CNT'] = [] unless @final_results.key?('CNT')
+                if key == '_id' && !value.empty?
+                  value.each { |k,v|
+                    @final_results[k.to_s.upcase] = [] unless @final_results.key?(k.to_s.upcase)
+                  }
+                end
+                if key == 'cnt'
+                  @final_results['CNT'] << value
+                elsif key == '_id'
+                  value.each { |k,v|
+                    @final_results[k.to_s.upcase] << v
+                  }
+                end
+
+              } if !group_match.nil?
+            }
+            @last_sql = sql_or_obj
+          end
+
+        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
+      @final_count = cnt
+      return cnt
+    end
+  end
+
+  class Dataset
+    def get_sql
+      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