dynamic_query 0.3.1 → 0.3.2

data/README.md

@@ -22,7 +22,7 @@ rails g dynamic_query:helper
 ## controller of Rails 3
 dq = dynamic_query(:list, :entry) # list models you wish to be queried. e.g. List => :list, AbcDef => :abc_def
 @panel = dq.panel(params[:query])
-@lists = List.includes(:entries).where(dq.statement(params[:query]))
+@lists = List.includes(:entries).where(dq.statement(params[:query])).all
 
 ## render query panel in the view:
 <%= dynamic_query @panel %>
@@ -39,6 +39,10 @@ dq = dynamic_query(:list, :entry, :reveal_keys => true)
 dq = dynamic_query(:list, :entry, :accept => { :list => [:name], :entry => [:title, :priority] }, :reject => { :entry => [:title] })
 # only lists.name and entries.priority can be seen on the query panel because the white list gets higher precedence than the black list
 
+# column display names can be defined by following options
+dq = dynamic_query(:list, :entry, :alias => { 'lists.name' =>  'Full Name' })
+# those names are used in the html select tag
+
 ## query panel is simply a rails form_tag which means it can accept the same hash options
 <%= dynamic_query @panel, :remote => true %>
 ```

data/app/helpers/dynamic_query.erb

@@ -8,7 +8,7 @@
           <%= submit_tag 'ǁ', :name => "query[action][add_or]", :style => 'color: purple;', :title => 'OR' if idx1 == 0 && idx2 == 0 %>
           <%= submit_tag '-', :name => "query[action][remove_#{or_key}]", :style => 'color: red;' if idx1 != 0 && idx2 == 0 %>
         </td>
-        <td><%= select_tag "query[#{or_key}][#{and_key}][column]", options_for_select(panel[:columns].keys, and_val[:column]) %></td>
+        <td><%= select_tag "query[#{or_key}][#{and_key}][column]", options_for_select(panel[:columns], and_val[:column]) %></td>
         <td><%= select_tag "query[#{or_key}][#{and_key}][operator]", options_for_select(DynamicQuery::OPERATOR, and_val[:operator]), :class => 'query_op' %></td>
         <td>
           <% if ['IS NULL', 'IS NOT NULL'].include? and_val[:operator] %>

data/app/helpers/dynamic_query_helper.rb

@@ -1,9 +1,7 @@
 module DynamicQueryHelper
-  
   def dynamic_query(panel, opt = {})
     template = ERB.new(File.read(File.dirname(__FILE__) + '/dynamic_query.erb'))
     content = template.result(binding)
     content.html_safe
   end
-  
 end

data/lib/dynamic_query.rb

@@ -11,18 +11,18 @@ module DynamicQuery
   end
               
   class DynamicQueryInstance
-    
     def initialize(*models, opt)
       @reveal_keys = false
       @white_list = []
       @black_list = []
+      @aliases = {}
       
-      if opt.kind_of?(Array)
+      if opt.kind_of? Array
         models = models + opt
         opt = {}
       end
       
-      unless opt.kind_of?(Hash)
+      unless opt.kind_of? Hash
         models << opt
         opt = {}
       end
@@ -32,7 +32,7 @@ module DynamicQuery
         
         if key == :accept
           val.each do |model, columns|
-            if models.include?(model)
+            if models.include? model
               model = model.to_s.split(/_/).map { |word| word.capitalize }.join.constantize
               columns.each { |col|  @white_list << "#{model.table_name}.#{col}" }
             end
@@ -41,36 +41,60 @@ module DynamicQuery
         
         if key == :reject
           val.each do |model, columns|
-            if models.include?(model)
+            if models.include? model
               model = model.to_s.split(/_/).map { |word| word.capitalize }.join.constantize
               columns.each { |col|  @black_list << "#{model.table_name}.#{col}" }
             end
           end
         end
-      end if opt.kind_of?(Hash)
+        
+        if key == :alias
+          @aliases = val.kind_of?(Hash) ? val.clone : {}
+        end
+      end if opt.kind_of? Hash
       
       @columns = {}
       models.each do |model|
         model = model.to_s.split(/_/).map { |word| word.capitalize }.join.constantize
-        model = model.columns.map { |col| { "#{model.table_name}.#{col.name}" => col.type } }.reduce(:merge)
-        @columns.merge!(model)
+        model = Hash[model.columns.map { |col| ["#{model.table_name}.#{col.name}"] * 2 }]
+        @columns.merge! model
+      end
+      
+      @column_types = {}
+      models.each do |model|
+        model = model.to_s.split(/_/).map { |word| word.capitalize }.join.constantize
+        model = Hash[model.columns.map { |col| ["#{model.table_name}.#{col.name}", col.type] }]
+        @column_types.merge! model
       end
       
       unless @reveal_keys
         @columns.keys.each do |key|
-          @columns.delete(key) if key =~ /\.id$/ || key =~ /_id$/
+          @columns.delete key if key =~ /\.id$/ || key =~ /_id$/
         end
       end
       
       unless @white_list.empty?
         selected_columns = {}
         @white_list.each do |white|
-          selected_columns[white] = @columns[white] if @columns.keys.include?(white)
+          selected_columns[white] = @columns[white] if @columns.keys.include? white
         end
         @columns = selected_columns
       end
       
-      @black_list.each { |black| @columns.delete(black) }
+      @black_list.each { |black| @columns.delete black }
+      
+      translate_columns = {}
+      used_aliases = {}
+      @columns.each do |option, value|
+        if @aliases[option]
+          used_aliases[option] = @aliases[option]
+          translate_columns[@aliases[option]] = value
+        else
+          translate_columns[option] = value
+        end
+      end
+      @columns = translate_columns
+      @aliases = used_aliases
     end
     
     def panel(query)
@@ -94,7 +118,7 @@ module DynamicQuery
       query.each do |or_key, or_val|
         and_stat = [[]]
         or_val.each do |and_key, and_val|
-          if @columns.include?(and_val[:column])
+          if @columns.include?(and_val[:column]) || @aliases.include?(and_val[:column])
             case and_val[:operator]
             when '=', '>', '>=', '<', '<=', '!=', 'LIKE', 'NOT LIKE'
               unless and_val[:value1].blank?
@@ -130,10 +154,7 @@ module DynamicQuery
       params.unshift(stat.join(' OR '))
     end
     
-    
     private
-    
-    
     def filter_valid_info(query)
       output = {}
       
@@ -179,7 +200,5 @@ module DynamicQuery
       count = and_conditions.keys.map { |key| key.match(/\d+/)[0].to_i }.max.to_i + 1
       "and_#{count}"
     end
-  
   end
-  
 end

data/lib/dynamic_query/helper.rb

@@ -1,13 +1,9 @@
 module DynamicQuery
-  
   module Helper
-    
     def dynamic_query(panel, opt = {})
-      template = ERB.new(File.read(File.dirname(__FILE__) + '/dynamic_query.erb'))
+      template = ERB.new(File.read(File.dirname(__FILE__) + '/../../app/helpers/dynamic_query.erb'))
       content = template.result(binding)
       content.html_safe
     end
-    
   end
-  
 end

data/lib/dynamic_query/railtie.rb

@@ -1,17 +1,13 @@
 require 'dynamic_query/helper'
 
 module DynamicQuery
-  
   class Railtie < Rails::Railtie
-    
-    initializer "dynamic_query" do
+    initializer 'dynamic_query' do
       ActionController::Base.send :include, DynamicQuery
     end
     
-    initializer "dynamic_query.helper" do
+    initializer 'dynamic_query.helper' do
       ActionView::Base.send :include, Helper
     end
-    
   end
-  
 end

data/lib/dynamic_query/version.rb

@@ -1,11 +1,9 @@
 class DynamicQuery
-  
   module Version
     MAJOR = 0
     MINOR = 3
-    PATCH = 1
+    PATCH = 2
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end
-  
 end

data/lib/generators/dynamic_query_generator.rb

@@ -4,7 +4,6 @@ class DynamicQueryGenerator < Rails::Generators::Base
   source_root File.expand_path("../../../", __FILE__)
   
   def manifest
-    copy_file "app/assets/javascripts/dynamic_query.js", "app/assets/javascripts/dynamic_query.js"
+    copy_file 'app/assets/javascripts/dynamic_query.js', 'app/assets/javascripts/dynamic_query.js'
   end
-  
 end

data/lib/generators/helper_generator.rb

@@ -1,15 +1,12 @@
 require 'rails/generators'
 
 module DynamicQuery
-  
   class HelperGenerator < Rails::Generators::Base
-    source_root File.expand_path("../../../", __FILE__)
+    source_root File.expand_path('../../../', __FILE__)
   
     def manifest
-      copy_file "app/helpers/dynamic_query_helper.rb", "app/helpers/dynamic_query_helper.rb"
-      copy_file "app/helpers/dynamic_query.erb", "app/helpers/dynamic_query.erb"
+      copy_file 'app/helpers/dynamic_query_helper.rb', 'app/helpers/dynamic_query_helper.rb'
+      copy_file 'app/helpers/dynamic_query.erb', 'app/helpers/dynamic_query.erb'
     end
-    
   end
-  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_query
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-25 00:00:00.000000000 Z
+date: 2013-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -122,7 +122,6 @@ files:
 - app/helpers/dynamic_query.erb
 - app/helpers/dynamic_query_helper.rb
 - lib/dynamic_query.rb
-- lib/dynamic_query/dynamic_query.erb
 - lib/dynamic_query/helper.rb
 - lib/dynamic_query/railtie.rb
 - lib/dynamic_query/version.rb
@@ -143,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1729559994982098119
+      hash: 608810096619642963
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -155,5 +154,5 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: dynamic_query-0.3.1
+summary: dynamic_query-0.3.2
 test_files: []

data/lib/dynamic_query/dynamic_query.erb

@@ -1,39 +0,0 @@
-<%= form_tag(request.path, { :method => :get, :style => 'text-align: center;' }.merge(opt)) %>
-  <% if panel %>
-  <table style="margin-left: auto; margin-right: auto;">
-    <% panel.select { |k, _| k =~ /^or_\d+$/ }.each_with_index do |(or_key, or_val), idx1| %>
-      <% or_val.each_with_index do |(and_key, and_val), idx2| %>
-      <tr>
-        <td>
-          <%= submit_tag 'ǁ', :name => "query[action][add_or]", :style => 'color: purple;', :title => 'OR' if idx1 == 0 && idx2 == 0 %>
-          <%= submit_tag '-', :name => "query[action][remove_#{or_key}]", :style => 'color: red;' if idx1 != 0 && idx2 == 0 %>
-        </td>
-        <td><%= select_tag "query[#{or_key}][#{and_key}][column]", options_for_select(panel[:columns].keys, and_val[:column]) %></td>
-        <td><%= select_tag "query[#{or_key}][#{and_key}][operator]", options_for_select(OPERATOR, and_val[:operator]), :class => 'query_op' %></td>
-        <td>
-          <% if ['IS NULL', 'IS NOT NULL'].include? and_val[:operator] %>
-            <%= text_field_tag "query[#{or_key}][#{and_key}][value1]", '', :style => 'display: none;' %>
-          <% else %>
-            <%= text_field_tag "query[#{or_key}][#{and_key}][value1]", and_val[:value1] %>
-          <% end %>
-        </td>
-        <td>
-          <% if ['BETWEEN', 'NOT BETWEEN'].include? and_val[:operator] %>
-            <%= text_field_tag "query[#{or_key}][#{and_key}][value2]", and_val[:value2] %>
-          <% else %>
-            <%= text_field_tag "query[#{or_key}][#{and_key}][value2]", '', :style => 'display: none;' %>
-          <% end %>
-        </td>
-        <td>
-          <%= submit_tag '+', :name => "query[action][add_and_to_#{or_key}]", :style => 'color: blue;', :title => 'AND' if idx2 == 0 %>
-          <%= submit_tag 'x', :name => "query[action][remove_#{and_key}_from_#{or_key}]", :style => 'color: green;' if idx2 != 0 %>
-        </td>
-      </tr>
-      <% end %>
-      <tr style="height: 10px;"></tr>
-    <% end %>
-  <% end %>
-  </table>
-  <br />
-  <%= submit_tag 'Query', :style => 'width: 150px;'%>
-</form>