dynamic_query 0.4.0 → 0.5.0

data/README.md

@@ -8,9 +8,6 @@ Installation:
 ## Gemfile for Rails 3
 gem 'dynamic_query'
 
-## rails generator
-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
@@ -29,6 +26,9 @@ dq = dynamic_query(List, Entry)
 
 ## render query panel in the view:
 <%= dynamic_query @panel %>
+
+## render query result in the view:
+<%= dynamic_result @lists %>
 ```
 
 ## Advanced usage of dynamic_query

data/Rakefile

@@ -1,48 +1,39 @@
-# encoding: utf-8
-
-require 'rubygems'
-require 'bundler'
+#!/usr/bin/env rake
 begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
+  require 'bundler/setup'
+  require 'bundler/gem_tasks'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
-require 'rake'
-
-require 'jeweler'
-require './lib/dynamic_query/version.rb'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "dynamic_query"
-  gem.homepage = "http://github.com/wnameless/dynamic_query"
-  gem.license = "Apache License, Version 2.0"
-  gem.version = DynamicQuery::Version::STRING
-  gem.summary = "dynamic_query-#{gem.version}"
-  gem.description = %Q{A dynamic query gui for ActiveRecord}
-  gem.email = "wnameless@gmail.com"
-  gem.authors = ["Wei-Ming Wu"]
-  # dependencies defined in Gemfile
-  gem.files = Dir["{app,lib}/**/*"] + ["LICENSE.txt", "Rakefile", "README.md"]
+begin
+  require 'rdoc/task'
+rescue LoadError
+  require 'rdoc/rdoc'
+  require 'rake/rdoctask'
+  RDoc::Task = Rake::RDocTask
 end
-Jeweler::RubygemsDotOrgTasks.new
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
+RDoc::Task.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'DynamicQuery'
+  rdoc.options << '--line-numbers'
+  rdoc.rdoc_files.include('README.md')
+  rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-task :default => :test
 
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "dynamic_query #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+
+Bundler::GemHelper.install_tasks
+
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
 end
+
+
+task :default => :test

data/app/helpers/_combined_result.html.erb

@@ -0,0 +1,72 @@
+<% completed_row = result.first %>
+
+<center id="combined_result">
+  
+<table id="combined_result_table" style="text-align: center">
+<% if completed_row %>
+  <tr>
+    <%= completed_row.map { |record|
+      "<th colspan='#{record.attributes.size}'>#{record.table_name}</th>" }.join.html_safe %>
+  </tr>
+  <tr>
+    <%= completed_row.map{ |rec|
+      rec.attributes.map { |k, _| k } }.flatten.map { |col| "<th>#{col}</th>" }.join.html_safe %>
+  </tr>
+<% end %>
+  <% result.each do |row| %>
+  <tr>
+    <% row.map { |rec| rec.attributes.map { |k ,v| v } }.flatten.each do |col| %>
+    <td><%= col %></td>
+    <% end %>
+  </tr>
+  <% end %>
+</table>
+
+<button id="table2csv">Download CSV</button>
+
+<script>
+  var regulateCSVCell = function( cell ) {
+    if ( cell.indexOf( ',' ) == -1 ) {
+      return cell;
+    }
+    return '"' + cell + '"';
+  };
+
+  var ary2CSV = function( ary ) {
+    csv = '';
+    for ( var row in ary ) {
+      for ( var col in ary[row] ) {
+        if ( col == 0 ) {
+          csv += regulateCSVCell( ary[row][col] )
+        } else {
+          csv += ',' + regulateCSVCell( ary[row][col] )
+        }
+      }
+      csv += "\n"
+    }
+    return csv;
+  };
+  
+  var saveCSV = function( csv ) {
+    var href = 'data:application/csv;charset=utf-8,'
+    href += encodeURIComponent( csv );
+    window.open( href );
+  };
+
+  $( '#table2csv' ).on( 'click', function() {
+    var table = [];
+    $( '#combined_result_table tr' ).each( function( index ) {
+      if ( index > 0 ) {
+        var row = [];
+        $( this ).children().each( function() {
+          row.push( $( this ).text() );
+        });
+        table.push( row );
+      }
+    });
+    
+    saveCSV( ary2CSV( table ) );
+  });
+</script>
+
+</center>

data/app/helpers/{dynamic_query.erb → _dynamic_query.html.erb}

@@ -1,11 +1,14 @@
+<% or_disable = opt[:or_disable]; opt.delete(:or_disable) %>
+
 <%= form_tag(request.path, { :method => :get, :style => 'text-align: center;' }.merge(opt)) %>
+  <%= html %>
   <% 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][add_or]", :style => 'color: purple;', :title => 'OR' if idx1 == 0 && idx2 == 0 and !or_disable %>
           <%= 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], and_val[:column]) %></td>
@@ -34,6 +37,24 @@
     <% end %>
   <% end %>
   </table>
-  <br />
   <%= submit_tag 'Query', :style => 'width: 150px;'%>
 </form>
+
+<script>
+  $('.query_op').on('change', function() {
+    var _ref, _ref1;
+    if ((_ref = $(this).val()) === 'IS NULL' || _ref === 'IS NOT NULL') {
+      $('#' + $(this).attr('id').split(/_/).slice(0, -1).join('_') + '_value1').val('');
+      $('#' + $(this).attr('id').split(/_/).slice(0, -1).join('_') + '_value2').val('');
+      $('#' + $(this).attr('id').split(/_/).slice(0, -1).join('_') + '_value1').hide();
+      return $('#' + $(this).attr('id').split(/_/).slice(0, -1).join('_') + '_value2').hide();
+    } else if ((_ref1 = $(this).val()) === 'BETWEEN' || _ref1 === 'NOT BETWEEN') {
+      $('#' + $(this).attr('id').split(/_/).slice(0, -1).join('_') + '_value1').show();
+      return $('#' + $(this).attr('id').split(/_/).slice(0, -1).join('_') + '_value2').show();
+    } else {
+      $('#' + $(this).attr('id').split(/_/).slice(0, -1).join('_') + '_value1').show();
+      $('#' + $(this).attr('id').split(/_/).slice(0, -1).join('_') + '_value2').val('');
+      return $('#' + $(this).attr('id').split(/_/).slice(0, -1).join('_') + '_value2').hide();
+    }
+  });
+</script>

data/app/helpers/_dynamic_result.html.erb

@@ -0,0 +1,59 @@
+<center>
+  <table id="dynamic_result_table">
+    <% if result.first %>
+    <tr>
+      <%= result.first.attributes.map { |k, _| "<th>#{k}</th>" }.join.html_safe %>
+    </tr>
+    <% end %>
+    <% result.each do |patient| %>
+    <tr>
+      <%= patient.attributes.map { |_, v| "<td>#{v}</td>" }.join.html_safe %>
+    </tr>
+    <% end if result %>
+  </table>
+  
+  <button id="table2csv">Download CSV</button>
+  
+  <script>
+    var regulateCSVCell = function( cell ) {
+      if ( cell.indexOf( ',' ) == -1 ) {
+        return cell;
+      }
+      return '"' + cell + '"';
+    };
+  
+    var ary2CSV = function( ary ) {
+      csv = '';
+      for( var row in ary ) {
+        for( var col in ary[row] ) {
+          if ( col == 0 ) {
+            csv += regulateCSVCell( ary[row][col] )
+          } else {
+            csv += ',' + regulateCSVCell( ary[row][col] )
+          }
+        }
+        csv += "\n"
+      }
+      return csv;
+    };
+    
+    var saveCSV = function( csv ) {
+      var href = 'data:application/csv;charset=utf-8,'
+      href += encodeURIComponent( csv );
+      window.open( href );
+    };
+  
+    $( '#table2csv' ).on( 'click', function() {
+      var table = [];
+      $( '#dynamic_result_table tr' ).each( function( index ) {
+        var row = [];
+        $( this ).children().each( function() {
+          row.push( $( this ).text() );
+        });
+        table.push( row );
+      });
+      
+      saveCSV( ary2CSV( table ) );
+    });
+  </script>
+</center>

data/app/helpers/dynamic_query_helper.rb

@@ -1,6 +1,20 @@
 module DynamicQueryHelper
   def dynamic_query(panel, opt = {})
-    template = ERB.new(File.read(File.dirname(__FILE__) + '/dynamic_query.erb'))
+    html = ''
+    yield html if block_given?
+    template = ERB.new(File.read(File.dirname(__FILE__) + '/_dynamic_query.html.erb'))
+    content = template.result(binding)
+    content.html_safe
+  end
+  
+  def dynamic_result(result)
+    template = ERB.new(File.read(File.dirname(__FILE__) + '/_dynamic_result.html.erb'))
+    content = template.result(binding)
+    content.html_safe
+  end
+  
+  def combined_result(result)
+    template = ERB.new(File.read(File.dirname(__FILE__) + '/_combined_result.html.erb'))
     content = template.result(binding)
     content.html_safe
   end

data/lib/dynamic_query/combine_query.rb

@@ -0,0 +1,144 @@
+require 'dynamic_query/validator'
+require 'dynamic_query/joiner'
+
+module DynamicQuery
+  module CombineQuery
+    include Validator, Joiner
+    
+    def conditions(query, table = nil)
+      query ||= {}
+      query = query.clone
+      query = filter_valid_info(query)
+      
+      conditions = []
+      query.each do |_, ands|
+        conditions << ands.map { |_, v| condition_to_pair v }
+      end
+      
+      cond = []
+      conditions.each do |condition|
+        c = {}
+        condition.each do |pair|
+          pair.each do |k, v|
+            c[k] ||= []
+            c[k].concat v
+          end
+        end
+        c.keys.each { |k| c[k] = Hash[ c[k].each_slice(2).to_a ] }
+        cond << c
+      end 
+      cond.map! { |c| c[table.to_s] } if table
+      cond
+    end
+    
+    def combine_query(query, relations, opts = {})
+      conds = conditions(query).first || {}
+      models = relations.each_slice(3).map { |sec| sec.first }
+      foreign_keys = relations - models
+      
+      selected_records = filter_conditioned_records(models, foreign_keys, conds)
+      selected_records = remove_unlinked_records(selected_records, foreign_keys)
+      result = join(selected_records, foreign_keys)
+      
+      result.delete_if { |row| row.include? nil } unless opts[:accept_null]
+      result.map { |row| row.map { |rec| rec.attributes.keep_if { |k, _| k.to_s !~ /id$/ } } } unless opts[:reveal_id]
+      
+      result
+    end
+    
+    private
+    def remove_unlinked_records(selected_records, foreign_keys)
+      foreign_keys = foreign_keys.clone
+      
+      selected_records.each_with_index do |records, idx|
+        unless foreign_keys.empty?
+          delete_unlinked_records(records, foreign_keys.shift, selected_records[idx + 1], foreign_keys.shift)
+        end
+      end
+      
+      selected_records
+    end
+    
+    def delete_unlinked_records(tgt, fks1, ref, fks2)
+      ref_val = ref.map { |r| fks2.map { |fk| r.send(fk) } }
+      tgt.keep_if { |t| ref_val.include?(fks1.map { |fk| t.send(fk) }) }
+    end
+    
+    def filter_conditioned_records(models, foreign_keys, conds)
+      foreign_keys = foreign_keys.clone
+      
+      selected_records = []
+      determinate_values = nil
+      models.each do |m|
+        selected_records << m.where(conds[m.table_name]).all
+        if determinate_values
+          trim_records(selected_records.last, determinate_values, foreign_keys.shift)
+        end
+        if foreign_keys.empty?
+          determinate_values = nil
+        else
+          fks = foreign_keys.shift
+          determinate_values = selected_records.last.map { |r| fks.map { |fk| r.send(fk) } }
+        end
+      end
+      selected_records
+    end
+    
+    def trim_records(records, det_val, fks)
+      records.keep_if { |r| det_val.include?(fks.map { |fk| r[fk] }) }
+    end
+    
+    def condition_to_pair(cond)
+      table, column = cond[:column].split(/\./)
+      { table => ["#{column}.#{convert_op cond[:operator]}", convert_val(cond[:operator], cond[:value1], cond[:value2])] }
+    end
+    
+    def convert_val(op, val1, val2)
+      case op
+      when 'IN', 'NOT IN'
+        val1.split(/,/).delete_if { |word| word.blank? }.map { |word| word.strip }
+      when 'BETWEEN', 'NOT BETWEEN'
+        [val1, val2]
+      when 'IS NULL', 'IS NOT NULL'
+        nil
+      else
+        val1
+      end
+    end
+    
+    def convert_op(op)
+      case op
+      when '='
+        'eq'
+      when '>'
+        'gt'
+      when '>='
+        'ge'
+      when '<'
+        'lt'
+      when '<='
+        'le'
+      when '!='
+        'not_eq'
+      when 'LIKE'
+        'like'
+      when 'NOT LIKE'
+        'not_like'
+      when 'IN'
+        'in'
+      when 'NOT IN'
+        'not_in'
+      when 'BETWEEN'
+        'btw'
+      when 'NOT BETWEEN'
+        'not_btw'
+      when 'IS NULL'
+        'is'
+      when 'IS NOT NULL'
+        'is_not'
+      else
+        'eq'
+      end
+    end
+  end
+end

data/lib/dynamic_query/helper.rb

@@ -1,7 +1,21 @@
 module DynamicQuery
   module Helper
     def dynamic_query(panel, opt = {})
-      template = ERB.new(File.read(File.dirname(__FILE__) + '/../../app/helpers/dynamic_query.erb'))
+      html = ''
+      yield html if block_given?
+      template = ERB.new(File.read(File.dirname(__FILE__) + '/../../app/helpers/_dynamic_query.html.erb'))
+      content = template.result(binding)
+      content.html_safe
+    end
+    
+    def dynamic_result(result)
+      template = ERB.new(File.read(File.dirname(__FILE__) + '/../../app/helpers/_dynamic_result.html.erb'))
+      content = template.result(binding)
+      content.html_safe
+    end
+    
+    def combined_result(result)
+      template = ERB.new(File.read(File.dirname(__FILE__) + '/../../app/helpers/_combined_result.html.erb'))
       content = template.result(binding)
       content.html_safe
     end

data/lib/dynamic_query/joiner.rb

@@ -0,0 +1,47 @@
+module DynamicQuery
+  module Joiner
+    def join(records, keys)
+      result = []
+      li = find_logest_index(records)
+      result << records[li]
+      (1..li).to_a.reverse.each do |idx|
+        ref_ary = records[idx - 1]
+        new_ary = []
+        result.first.each do |record|
+          tgt_k = keys[idx * 2 - 1]
+          ref_k = keys[idx * 2 - 2]
+          new_ary << ref_ary.find { |r| ref_k.map { |rfk| r[rfk] } == tgt_k.map { |tfk| record[tfk] } }
+        end
+        result.unshift new_ary
+      end if li != 0
+      (li + 1..records.size - 1).each do |idx|
+        ref_ary = records[idx]
+        new_ary = []
+        result.last.each do |record|
+          if record.nil?
+            new_ary << nil
+            next
+          end
+          tgt_k = keys[idx * 2 - 2]
+          ref_k = keys[idx * 2 - 1]
+          new_ary << ref_ary.find { |r| ref_k.map { |rfk| r[rfk] } == tgt_k.map { |tfk| record[tfk] } }
+        end
+        result.unshift << new_ary
+      end
+      result.reduce(:zip).map! { |row| row.flatten }
+    end
+    
+    private
+    def find_logest_index(records)
+      index = 0
+      max = 0
+      records.each_with_index do |r, idx|
+        if r.size > max
+          max = r.size
+          index = idx
+        end
+      end
+      index
+    end
+  end
+end

data/lib/dynamic_query/validator.rb

@@ -0,0 +1,21 @@
+module DynamicQuery
+  module Validator
+    def filter_valid_info(query)
+      output = {}
+      
+      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
+      
+      output
+    end
+  end
+end

data/lib/dynamic_query/version.rb

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

data/lib/dynamic_query.rb

@@ -1,5 +1,7 @@
 require 'dynamic_query/railtie' if defined?(Rails)
 require 'generators/helper_generator' if defined?(Rails)
+require 'dynamic_query/combine_query'
+require 'dynamic_query/validator'
 
 module DynamicQuery
   OPERATOR = ['=', '>', '>=', '<', '<=', '!=',
@@ -11,6 +13,8 @@ module DynamicQuery
   end
               
   class DynamicQueryInstance
+    include CombineQuery, Validator
+    
     def initialize(*models, opt)
       @reveal_keys = false
       @white_list = []
@@ -163,24 +167,6 @@ module DynamicQuery
     end
     
     private
-    def filter_valid_info(query)
-      output = {}
-      
-      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
-      
-      output
-    end
-    
     def panel_action(panel, action)
       case action.keys.first
       when /^add_or$/

data/lib/generators/helper_generator.rb

@@ -6,7 +6,9 @@ module DynamicQuery
   
     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.html.erb', 'app/helpers/_dynamic_query.html.erb'
+      copy_file 'app/helpers/_dynamic_result.html.erb', 'app/helpers/_dynamic_result.html.erb'
+      copy_file 'app/helpers/_combined_result.html.erb', 'app/helpers/_combined_result.html.erb'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_query
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,140 +9,141 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-29 00:00:00.000000000 Z
+date: 2013-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: jquery-rails
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.3.2
+        version: 1.3.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.3.2
+        version: 1.3.7
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: shoulda
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: 3.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: 3.3.2
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: '3.12'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.3.7
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.3.7
+        version: '0'
 description: A dynamic query gui for ActiveRecord
 email: wnameless@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- LICENSE.txt
-- README.md
+extra_rdoc_files: []
 files:
-- LICENSE.txt
-- README.md
-- Rakefile
-- app/assets/javascripts/dynamic_query.js
-- app/helpers/dynamic_query.erb
-- app/helpers/dynamic_query_helper.rb
-- lib/dynamic_query.rb
+- lib/dynamic_query/combine_query.rb
 - lib/dynamic_query/helper.rb
+- lib/dynamic_query/joiner.rb
 - lib/dynamic_query/railtie.rb
+- lib/dynamic_query/validator.rb
 - lib/dynamic_query/version.rb
-- lib/generators/dynamic_query_generator.rb
+- lib/dynamic_query.rb
 - lib/generators/helper_generator.rb
+- app/helpers/_combined_result.html.erb
+- app/helpers/_dynamic_query.html.erb
+- app/helpers/_dynamic_result.html.erb
+- app/helpers/dynamic_query_helper.rb
+- LICENSE.txt
+- Rakefile
+- README.md
 homepage: http://github.com/wnameless/dynamic_query
 licenses:
 - Apache License, Version 2.0
@@ -153,22 +154,25 @@ require_paths:
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
       segments:
       - 0
-      hash: 974901957563084135
+      hash: 919103459980238385
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 919103459980238385
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: dynamic_query-0.4.0
+summary: dynamic_query-0.5.0
 test_files: []

data/app/assets/javascripts/dynamic_query.js

@@ -1,16 +0,0 @@
-$('.query_op').live('change', function() {
-  var _ref, _ref1;
-  if ((_ref = $(this).val()) === 'IS NULL' || _ref === 'IS NOT NULL') {
-    $('#' + $(this).attr('id').split(/_/).slice(0, -1).join('_') + '_value1').val('');
-    $('#' + $(this).attr('id').split(/_/).slice(0, -1).join('_') + '_value2').val('');
-    $('#' + $(this).attr('id').split(/_/).slice(0, -1).join('_') + '_value1').hide();
-    return $('#' + $(this).attr('id').split(/_/).slice(0, -1).join('_') + '_value2').hide();
-  } else if ((_ref1 = $(this).val()) === 'BETWEEN' || _ref1 === 'NOT BETWEEN') {
-    $('#' + $(this).attr('id').split(/_/).slice(0, -1).join('_') + '_value1').show();
-    return $('#' + $(this).attr('id').split(/_/).slice(0, -1).join('_') + '_value2').show();
-  } else {
-    $('#' + $(this).attr('id').split(/_/).slice(0, -1).join('_') + '_value1').show();
-    $('#' + $(this).attr('id').split(/_/).slice(0, -1).join('_') + '_value2').val('');
-    return $('#' + $(this).attr('id').split(/_/).slice(0, -1).join('_') + '_value2').hide();
-  }
-});

data/lib/generators/dynamic_query_generator.rb

@@ -1,9 +0,0 @@
-require 'rails/generators'
-
-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'
-  end
-end