dynamic_query 0.7.1 → 0.7.2

data/app/helpers/_combined_result.html.erb

@@ -2,71 +2,116 @@
 
 <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>
+  <table id="combined_result_table" style="text-align: center">
+  <% if completed_row %>
+    <tr>
+      <%= completed_row.map { |rec|
+            rec.attributes.map { |k, _| "<th>#{k}</th>" }
+          }.flatten.join.html_safe %>
+    </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] )
+    <% 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>
+    $( 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 = $("#combined_result_table tr > th:eq(" + value + ")");
+        header.attr( 'title', header.text() );
+        header.text( '●' );
+        $('#combined_result_table tr').find( "td:eq(" + value +")" ).each( function() {
+          $( this ).attr( 'title', $( this ).text() );
+          $( this ).text( '' );
+        });
+      });
+      
+      $( '#combined_result_table th' ).each( function( index ) {
+        $( this ).on( 'click', function() {
+          var header = $("#combined_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', '' );
+            $('#combined_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( '●' );
+            $('#combined_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;
+      }
+      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"
       }
-      csv += "\n"
-    }
-    return csv;
-  };
+      return csv;
+    };
+    
+    var saveCSV = function( csv ) {
+      var href = 'data:application/csv;charset=utf-8,'
+      href += encodeURIComponent( csv );
+      window.open( href );
+    };
   
-  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 ) {
+    $( '#table2csv' ).on( 'click', function() {
+      var hide_ary = jQuery.parseJSON( sessionStorage.getItem( 'toggle_columns' ) );
+      var table = [];
+      $( '#combined_result_table tr' ).each( function( index ) {
         var row = [];
-        $( this ).children().each( function() {
-          row.push( $( this ).text() );
+        $( this ).children().each( function( index ) {
+          if ( $.inArray( index, hide_ary ) == -1 ) {
+            row.push( $( this ).text() );
+          }
         });
         table.push( row );
-      }
+      });
+      
+      saveCSV( ary2CSV( table ) );
     });
-    
-    saveCSV( ary2CSV( table ) );
-  });
-</script>
+  </script>
 
 </center>

data/app/helpers/_dynamic_result.html.erb

@@ -1,4 +1,5 @@
-<center>
+<center id="dynamic_result">
+  
   <table id="dynamic_result_table" style="text-align: center">
     <% if result.first %>
     <tr>
@@ -22,7 +23,7 @@
       console.log( sessionStorage.getItem( 'toggle_columns' ) );
       var hide_ary = jQuery.parseJSON( sessionStorage.getItem( 'toggle_columns' ) );
       
-      $.each( hide_ary, function(index, value) {
+      $.each( hide_ary, function( index, value ) {
         var header = $("#dynamic_result_table tr > th:eq(" + value + ")");
         header.attr( 'title', header.text() );
         header.text( '●' );
@@ -32,7 +33,7 @@
         });
       });
       
-      $( '#dynamic_result_table th' ).each( function(index) {
+      $( '#dynamic_result_table th' ).each( function( index ) {
         $( this ).on( 'click', function() {
           var header = $("#dynamic_result_table tr > th:eq(" + index + ")");
           if ( header.text() == '●' ) {
@@ -106,4 +107,5 @@
       saveCSV( ary2CSV( table ) );
     });
   </script>
+  
 </center>

data/lib/dynamic_query.rb

@@ -10,6 +10,7 @@ module DynamicQuery
               'BETWEEN', 'NOT BETWEEN', 'IS NULL', 'IS NOT NULL']
               
   def dynamic_query(*models, opt)
+    models.flatten!
     DynamicQueryInstance.new(*models, opt)
   end
   
@@ -51,6 +52,66 @@ module DynamicQuery
   def all_columns_in(*models)
     models.map { |m| m.columns.map { |col| "#{m.table_name}.#{col.name}" } }.flatten.join ', '
   end
+  
+  def estimate_total(dq, query)
+    models = dq.models
+    et = models.map { |m| { :table => m.table_name, :total => m.count, :conditioned => conditioned_count(dq, query, m) } }
+    major = et.max_by { |i| i[:total] }
+    et.delete major
+    estimate = major[:conditioned] * et.map { |i| i[:conditioned].to_f / i[:total] }.reduce(:*)
+    estimate = estimate.to_i
+  end
+  
+  def conditioned_count(dq, query, model)
+    conditions = dq.conditions query, model.table_name
+    statement = Querier.statement conditions
+    model.where(statement).count
+  end
+  
+  class Querier
+    STMT_SUFFIX_DICT = {
+      nil           => '= ?',
+      'eq'          => '= ?',
+      'not_eq'      => '!= ?',
+      'gt'          => '> ?',
+      'ge'          => '>= ?',
+      'lt'          => '< ?',
+      'le'          => '<= ?',
+      'in'          => 'IN (?)',
+      'not_in'      => 'NOT IN (?)',
+      'like'        => 'LIKE ?',
+      'not_like'    => 'NOT LIKE ?',
+      'btw'         => 'BETWEEN ? AND ?',
+      'not_btw'     => 'NOT BETWEEN ? AND ?',
+      'between'     => 'BETWEEN ? AND ?',
+      'not_between' => 'NOT BETWEEN ? AND ?',
+      'is'          => 'IS ?',
+      'is_not'      => 'IS NOT ?'
+    }
+    
+    def self.statement(conditions)
+      conditions ||= []
+      statement = []
+      values = []
+      
+      conditions.each do |conds|
+        and_conds = []
+        conds.each do |key, val|
+          col, op = key.to_s.split(/\./)
+          op = STMT_SUFFIX_DICT[op]
+          and_conds << "#{col} #{op}"
+          if ['BETWEEN ? AND ?', 'NOT BETWEEN ? AND ?'].include? op
+            values << val[0] << val[1]
+          else
+            values << val
+          end
+        end
+        statement << and_conds.join(' AND ')
+      end
+      
+      values.unshift statement.map { |s| "(#{s})" }.join(' OR ')
+    end
+  end
     
   class DynamicQueryInstance
     include CombinedQuery, Validator
@@ -71,6 +132,8 @@ module DynamicQuery
         opt = {}
       end
       
+      @origin_models = models.dup
+      
       models.map! do |m|
         if [String, Symbol].include? m.class
           m.to_s.split(/_/).map { |word| word.capitalize }.join.constantize
@@ -149,6 +212,10 @@ module DynamicQuery
       @aliases = used_aliases
     end
     
+    def models
+      @origin_models
+    end
+    
     def panel(query)
       query ||= { 'or_1' => { 'and_1' => { :column => '', :operator => '', :value1 => '', :value2 => '' } } }
       query = query.clone

data/lib/dynamic_query/combined_query.rb

@@ -27,7 +27,10 @@ module DynamicQuery
         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
+      if table
+        cond.map! { |c| c[table.to_s] }
+        cond.delete nil
+      end
       cond
     end
     

data/lib/dynamic_query/version.rb

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

data/lib/generators/helper_generator.rb

@@ -8,7 +8,7 @@ module DynamicQuery
       copy_file 'app/helpers/dynamic_query_helper.rb', 'app/helpers/dynamic_query_helper.rb'
       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'
+      #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.7.1
+  version: 0.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-08 00:00:00.000000000 Z
+date: 2013-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -191,7 +191,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1676575374639160798
+      hash: -309352636508812369
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -200,11 +200,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1676575374639160798
+      hash: -309352636508812369
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: dynamic_query-0.7.1
+summary: dynamic_query-0.7.2
 test_files: []