dynamic_query 0.3.0 → 0.3.1

data/lib/dynamic_query.rb

@@ -58,7 +58,7 @@ module DynamicQuery
       
       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
       
@@ -80,7 +80,7 @@ module DynamicQuery
       
       panel = filter_valid_info(query)
       panel_action(panel, action)
-      panel[:columns] = @columns
+      panel[:columns] = @columns.clone
       
       panel
     end
@@ -157,13 +157,13 @@ module DynamicQuery
       when /^add_or$/
         or_key = get_new_or_condition_key(panel)
         panel[or_key] = { 'and_1' => { :column => '', :operator => '', :value1 => '', :value2 => '' } }
-      when /^remove_or_\d+/
+      when /^remove_or_\d+$/
         panel.delete("or_#{action.keys.first.match(/\d+/)[0]}")
-      when /add_and_to_or_\d+/
+      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+/
+      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]

data/lib/dynamic_query/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_query
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-23 00:00:00.000000000 Z
+date: 2012-10-25 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: -1018923921235041626
+      hash: 1729559994982098119
 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.3.0
+summary: dynamic_query-0.3.1
 test_files: []