dynamic_query 0.2.0 → 0.3.0

data/README.md

@@ -12,6 +12,7 @@ gem 'dynamic_query'
 rails g dynamic_query
 
 ## you may skip this step unless you want to customize your own helper
+## Regenerate the helper after upgrade dynamic_query
 rails g dynamic_query:helper
 ```
 

data/app/helpers/dynamic_query.erb

@@ -5,8 +5,8 @@
       <% or_val.each_with_index do |(and_key, and_val), idx2| %>
       <tr>
         <td>
-          <%= submit_tag 'ǁ', :name => "query[add_or]", :style => 'color: purple;', :title => 'OR' if idx1 == 0 && idx2 == 0 %>
-          <%= submit_tag '-', :name => "query[remove_#{or_key}]", :style => 'color: red;' if idx1 != 0 && idx2 == 0 %>
+          <%= 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(DynamicQuery::OPERATOR, and_val[:operator]), :class => 'query_op' %></td>
@@ -25,8 +25,8 @@
           <% end %>
         </td>
         <td>
-          <%= submit_tag '+', :name => "query[#{or_key}-and]", :style => 'color: blue;', :title => 'AND' if idx2 == 0 %>
-          <%= submit_tag 'x', :name => "query[#{or_key}-#{and_key}]", :style => 'color: green;' if idx2 != 0 %>
+          <%= 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 %>

data/lib/dynamic_query/dynamic_query.erb

@@ -5,8 +5,8 @@
       <% or_val.each_with_index do |(and_key, and_val), idx2| %>
       <tr>
         <td>
-          <%= submit_tag 'ǁ', :name => "query[add_or]", :style => 'color: purple;', :title => 'OR' if idx1 == 0 && idx2 == 0 %>
-          <%= submit_tag '-', :name => "query[remove_#{or_key}]", :style => 'color: red;' if idx1 != 0 && idx2 == 0 %>
+          <%= 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>
@@ -25,8 +25,8 @@
           <% end %>
         </td>
         <td>
-          <%= submit_tag '+', :name => "query[#{or_key}-and]", :style => 'color: blue;', :title => 'AND' if idx2 == 0 %>
-          <%= submit_tag 'x', :name => "query[#{or_key}-#{and_key}]", :style => 'color: green;' if idx2 != 0 %>
+          <%= 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 %>

data/lib/dynamic_query/version.rb

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

data/lib/dynamic_query.rb

@@ -75,21 +75,26 @@ module DynamicQuery
     
     def panel(query)
       query ||= { 'or_1' => { 'and_1' => { :column => '', :operator => '', :value1 => '', :value2 => '' } } }
-      add_and_condition(query)
-      add_or_condition(query)
-      remove_and_condition(query)
-      remove_or_condition(query)
-      query[:columns] = @columns
-      query
+      query = query.clone
+      action = query[:action]
+      
+      panel = filter_valid_info(query)
+      panel_action(panel, action)
+      panel[:columns] = @columns
+      
+      panel
     end
     
     def statement(query)
       query ||= { 'or_1' => { 'and_1' => { :column => '', :operator => '', :value1 => '', :value2 => '' } } }
+      query = query.clone
+      query = filter_valid_info(query)
+      
       or_stat = []
-      query.select { |k, v| k =~ /^or_\d+$/ && v.kind_of?(Hash) }.each do |or_key, or_val|
+      query.each do |or_key, or_val|
         and_stat = [[]]
         or_val.each do |and_key, and_val|
-          if and_val.kind_of?(Hash) && @columns.include?(and_val[:column])
+          if @columns.include?(and_val[:column])
             case and_val[:operator]
             when '=', '>', '>=', '<', '<=', '!=', 'LIKE', 'NOT LIKE'
               unless and_val[:value1].blank?
@@ -129,59 +134,49 @@ module DynamicQuery
     private
     
     
-    def remove_or_condition(query)
-      query.each do |key, val|
-        if key =~ /^remove_or_\d+$/
-          query.delete("or_#{key.match(/\d+/)[0]}")
-          break
-        end
-      end
-    end
-    
-    def remove_and_condition(query)
-      query.each do |key, val|
-        if key =~ /^or_\d+-and_\d+$/
-          query["or_#{key.scan(/\d+/)[0]}"].delete("and_#{key.scan(/\d+/)[1]}")
-          break
-        end
-      end
-    end
-    
-    def add_or_condition(query)
-      or_key = nil
+    def filter_valid_info(query)
+      output = {}
       
-      query.each do |key, val|
-        if key =~ /^add_or$/
-          or_key = get_new_or_condition_key(query)
-          break
+      query.each do |or_key, or_val|
+        if or_key =~ /^or_\d+$/ && or_val.kind_of?(Hash)
+          or_val.each do |and_key, and_val|
+            if and_key =~ /^and_\d+$/ && and_val.kind_of?(Hash) &&
+              (['column', 'operator', 'value1', 'value2'] - and_val.keys.map { |k| k.to_s }).empty?
+               output[or_key] ||= {}; output[or_key][and_key] ||= {}
+               output[or_key][and_key] = and_val
+            end
+          end
         end
       end
       
-      if or_key
-        query[or_key] = {}
-        query[or_key]['and_1'] = { :column => '', :operator => '', :value1 => '', :value2 => '' }
-      end
+      output
     end
     
-    
-    def add_and_condition(query)
-      query.each do |key, val|
-        if key =~ /^or_\d+-and$/
-          and_key = get_new_and_condition_key(query["or_#{key.match(/\d+/)[0]}"])
-          query["or_#{key.match(/\d+/)[0]}"][and_key] = { :column => '', :operator => '', :value1 => '', :value2 => '' }
-          break
-        end
-      end
+    def panel_action(panel, action)
+      case action.keys.first
+      when /^add_or$/
+        or_key = get_new_or_condition_key(panel)
+        panel[or_key] = { 'and_1' => { :column => '', :operator => '', :value1 => '', :value2 => '' } }
+      when /^remove_or_\d+/
+        panel.delete("or_#{action.keys.first.match(/\d+/)[0]}")
+      when /add_and_to_or_\d+/
+        or_key = "or_#{action.keys.first.match(/\d+/)[0]}"
+        and_key = get_new_and_condition_key(panel[or_key])
+        panel[or_key][and_key] = { :column => '', :operator => '', :value1 => '', :value2 => '' }  
+      when /remove_and_\d+_from_or_\d+/
+        or_key = "or_#{action.keys.first.scan(/\d+/)[1]}"
+        and_key = "and_#{action.keys.first.scan(/\d+/)[0]}"
+        panel[or_key].delete(and_key) if panel[or_key]
+      end if action.kind_of?(Hash)
     end
     
-    def get_new_or_condition_key(query)
-      count = query.keys.select { |i| i =~ /\d+$/ }.map { |key| key.match(/\d+/)[0].to_i }.max.to_i + 1
-      p count
+    def get_new_or_condition_key(or_conditions)
+      count = or_conditions.keys.map { |key| key.match(/\d+/)[0].to_i }.max.to_i + 1
       "or_#{count}"
     end
     
-    def get_new_and_condition_key(or_condition)
-      count = or_condition.keys.map { |key| key.match(/\d+/)[0].to_i }.max.to_i + 1
+    def get_new_and_condition_key(and_conditions)
+      count = and_conditions.keys.map { |key| key.match(/\d+/)[0].to_i }.max.to_i + 1
       "and_#{count}"
     end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_query
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-22 00:00:00.000000000 Z
+date: 2012-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -143,7 +143,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2346444755047590570
+      hash: -1018923921235041626
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -155,5 +155,5 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: dynamic_query-0.2.0
+summary: dynamic_query-0.3.0
 test_files: []