dynamic_query 0.6.0 → 0.7.0

data/README.md

@@ -17,9 +17,7 @@ rails g dynamic_query:helper
 
 ``` ruby
 ## controller of Rails 3
-dq = dynamic_query(:list, :entry) # list models you wish to be queried. e.g. List => :list, AbcDef => :abc_def
-# Since version 0.4.0, you can use model's names directly.
-dq = dynamic_query(List, Entry)
+dq = dynamic_query(List, Entry) # put models you wish to be queried here.
 
 @panel = dq.panel(params[:query])
 @lists = List.includes(:entries).where(dq.statement(params[:query])).all
@@ -36,20 +34,30 @@ dq = dynamic_query(List, Entry)
 ``` ruby
 # columns with name 'id' or name ended with '_id' are hided by default
 # :reveal_keys => true reveals those columns in the query panel
-dq = dynamic_query(:list, :entry, :reveal_keys => true)
-# Works for version >= 0.4.0
 dq = dynamic_query(List, Entry, :reveal_keys => true)
 
 # a white list or a black list can be defined by following options
-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
-# Works for version >= 0.4.0
 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' })
+dq = dynamic_query(List, Entry, :alias => { 'lists.name' =>  'Full Name' })
 # those names are used in the html select tag
 
+## join tables with arbitrary columns and query
+dq = dynamic_query(Model1, Mode2)
+@panel = dq.panel(params[:query])
+@records = Model1.
+  select(all_columns_in(Model1, Model2)).
+  # all_columns_in is a method to help user select all columns within models
+  # you must select columns of tables you joined, otherwise columns won't show in the result
+  joins(tables_joined_by(Model1, [Model2, [:col1, :col1], [:my_col, :your_col], :col3, :col4])).
+  # tables_joined_by is a method to help user build inner join SQL statement between tables
+  # this demonstrates how to join two tables by following correspondence columns
+  # :col1 -> :col1, :my_col -> :your_col, :col3 -> :col3, :col4 -> :col4
+  # if columns have the same name in 2 tables, you can simply only enter there common name
+  where(dq.statement(params[:query])).all
+  
 ## query panel is simply a rails form_tag which means it can accept the same hash options
 <%= dynamic_query @panel, :remote => true %>
 ```

data/Rakefile

@@ -1,7 +1,6 @@
 #!/usr/bin/env rake
 begin
   require 'bundler/setup'
-  require 'bundler/gem_tasks'
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end

data/app/helpers/_dynamic_result.html.erb

@@ -1,5 +1,5 @@
 <center>
-  <table id="dynamic_result_table">
+  <table id="dynamic_result_table" style="text-align: center">
     <% if result.first %>
     <tr>
       <%= result.first.attributes.map { |k, _| "<th>#{k}</th>" }.join.html_safe %>
@@ -15,6 +15,53 @@
   <button id="table2csv">Download CSV</button>
   
   <script>
+    $( function() {
+      if ( sessionStorage.getItem( 'toggle_columns' ) == null ) {
+        sessionStorage.setItem( 'toggle_columns', '[]' )
+      }
+      console.log( sessionStorage.getItem( 'toggle_columns' ) );
+      var hide_ary = jQuery.parseJSON( sessionStorage.getItem( 'toggle_columns' ) );
+      
+      $.each( hide_ary, function(index, value) {
+        var header = $("#dynamic_result_table tr > th:eq(" + value + ")");
+        header.attr( 'title', header.text() );
+        header.text( '●' );
+        $('#dynamic_result_table tr').find( "td:eq(" + value +")" ).each( function() {
+          $( this ).attr( 'title', $( this ).text() );
+          $( this ).text( '' );
+        });
+      });
+      
+      $( '#dynamic_result_table th' ).each( function(index) {
+        $( this ).on( 'click', function() {
+          var header = $("#dynamic_result_table tr > th:eq(" + index + ")");
+          if ( header.text() == '●' ) {
+            var hide_ary = jQuery.parseJSON( sessionStorage.getItem( 'toggle_columns' ) );
+            hide_ary.splice( hide_ary.indexOf(index), 1 );
+            sessionStorage.setItem( 'toggle_columns', JSON.stringify( hide_ary ) )
+            
+            header.text( header.attr( 'title' ) );
+            header.attr( 'title', '' );
+            $('#dynamic_result_table tr').find( "td:eq(" + index +")" ).each( function() {
+              $( this ).text( $( this ).attr( 'title' ) );
+              $( this ).attr( 'title', '' );
+            });
+          } else {
+            var hide_ary = jQuery.parseJSON( sessionStorage.getItem( 'toggle_columns' ) );
+            hide_ary.push( index );
+            sessionStorage.setItem( 'toggle_columns', JSON.stringify( hide_ary ) )
+            
+            header.attr( 'title', header.text() );
+            header.text( '●' );
+            $('#dynamic_result_table tr').find( "td:eq(" + index +")" ).each( function() {
+              $( this ).attr( 'title', $( this ).text() );
+              $( this ).text( '' );
+            });
+          }
+        });
+      });
+    });
+  
     var regulateCSVCell = function( cell ) {
       if ( cell.indexOf( ',' ) == -1 ) {
         return cell;

data/lib/dynamic_query.rb

@@ -1,7 +1,8 @@
 require 'dynamic_query/railtie' if defined?(Rails)
 require 'generators/helper_generator' if defined?(Rails)
-require 'dynamic_query/combine_query'
+require 'dynamic_query/combined_query'
 require 'dynamic_query/validator'
+require 'arel'
 
 module DynamicQuery
   OPERATOR = ['=', '>', '>=', '<', '<=', '!=',
@@ -11,9 +12,48 @@ module DynamicQuery
   def dynamic_query(*models, opt)
     DynamicQueryInstance.new(*models, opt)
   end
-              
+  
+  def tables_joined_by(from, *to_tables)
+    sql = ''
+    from_table = from.table_name
+    to_tables_count = Hash.new(0)
+    to_tables.each do |to|
+      to_table = to.first.table_name
+      if to_tables_count[to_table] == 0
+        sql << "INNER JOIN `#{to_table}` ON "
+        mappings = []
+        to.drop(1).each do |mapping|
+          if mapping.kind_of? Array
+            mappings << "`#{from_table}`.`#{mapping.first}` = `#{to_table}`.`#{mapping.last}`"
+          else
+            mappings << "`#{from_table}`.`#{mapping}` = `#{to_table}`.`#{mapping}`"
+          end
+        end
+        sql << "(#{mappings.join(' AND ')})"
+        to_tables_count[to_table] += 1
+      else
+        sql << "INNER JOIN `#{to_table}` `#{to_table}_#{to_tables_count[to_table]}` ON "
+        mappings = []
+        to.drop(1).each do |mapping|
+          if mapping.kind_of? Array
+            mappings << "`#{from_table}`.`#{mapping.first}` = `#{to_table}_#{to_tables_count[to_table]}`.`#{mapping.last}`"
+          else
+            mappings << "`#{from_table}`.`#{mapping}` = `#{to_table}_#{to_tables_count[to_table]}`.`#{mapping}`"
+          end
+        end
+        sql << "(#{mappings.join(' AND ')})"
+        to_tables_count[to_table] += 1
+      end
+    end
+    sql
+  end
+  
+  def all_columns_in(*models)
+    models.map { |m| m.columns.map { |col| "#{m.table_name}.#{col.name}" } }.flatten.join ', '
+  end
+    
   class DynamicQueryInstance
-    include CombineQuery, Validator
+    include CombinedQuery, Validator
     
     def initialize(*models, opt)
       @reveal_keys = false

data/lib/dynamic_query/{combine_query.rb → combined_query.rb}

@@ -2,7 +2,7 @@ require 'dynamic_query/validator'
 require 'dynamic_query/joiner'
 
 module DynamicQuery
-  module CombineQuery
+  module CombinedQuery
     include Validator, Joiner
     
     def conditions(query, table = nil)

data/lib/dynamic_query/version.rb

@@ -1,6 +1,6 @@
-class DynamicQuery
+module DynamicQuery
   MAJOR = 0
-  MINOR = 6
+  MINOR = 7
   PATCH = 0
   
   VERSION = [MAJOR, MINOR, PATCH].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_query
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-05 00:00:00.000000000 Z
+date: 2013-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -43,6 +43,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.2.0
+- !ruby/object:Gem::Dependency
+  name: will_paginate
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +75,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.7
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.11
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.11
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -129,7 +161,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/dynamic_query/combine_query.rb
+- lib/dynamic_query/combined_query.rb
 - lib/dynamic_query/helper.rb
 - lib/dynamic_query/joiner.rb
 - lib/dynamic_query/railtie.rb
@@ -159,7 +191,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1017995843201086013
+      hash: 310380793727581897
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -168,11 +200,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1017995843201086013
+      hash: 310380793727581897
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: dynamic_query-0.6.0
+summary: dynamic_query-0.7.0
 test_files: []