it-logica-application-backbone 1.0.5 → 1.0.6

data/VERSION

@@ -1 +1 @@
-1.0.5
+1.0.6

data/it-logica-application-backbone.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "it-logica-application-backbone"
-  s.version = "1.0.5"
+  s.version = "1.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ladas"]

data/lib/model_mixins/table_builder_class_methods.rb

@@ -13,11 +13,11 @@ module ModelMixins
       params[:real_order_by] = params[:order_by]
       check_non_existing_colum_order_by(settings, params)
 
-      not_selected_items = object.filter(settings, params, per_page)
+      not_selected_items = object.filter(object, settings, params, per_page)
       items = not_selected_items.selection(settings)
       if params[:page].to_i > items.total_pages && items.total_pages > 0
         params[:page] = 1
-        not_selected_items = object.filter(settings, params, per_page)
+        not_selected_items = object.filter(object, settings, params, per_page)
         items = not_selected_items.selection(settings)
       end
 
@@ -131,7 +131,9 @@ module ModelMixins
     def selection(settings)
       select_string = ""
       settings[:columns].each do |col|
-        col[:table] = "unknown" if col[:table].blank?
+        col[:table] = "___unknown___" if col[:table].blank?
+        col[:table] = "___sql_expression___" unless col[:sql_expression].blank?
+
         if col[:column_method].blank? && col[:row_method].blank? && !col[:name].blank?
           if col[:sql_expression].blank?
             # I am selection col[:name]
@@ -163,16 +165,22 @@ module ModelMixins
       select_string += ", " unless select_string.blank?
       select_string += "#{settings[:row][:id]} AS row_id "
 
+
       select(select_string)
     end
 
-    def filter(settings, params, per_page = 10)
+    def filter(object, settings, params, per_page = 10)
       order_by = params[:real_order_by]
 
       cond_str = ""
       cond_hash = {}
+      having_cond_str = ""
+      having_cond_hash = {}
+
+
       if !params.blank? && params['find']
         params['find'].each_pair do |i, v|
+          i = i.gsub(/___unknown___\./, "") #some cleaning job
           unless v.blank?
             if i.match(/^.*?non_existing_column___.*$/i)
               identifier = i.split("non_existing_column___").second
@@ -194,17 +202,29 @@ module ModelMixins
                 end
               end
             else
-              cond_str += " AND " unless cond_str.blank?
-              cond_id = "find_#{i.gsub(/\./, '_')}"
-              cond_str += "#{i} LIKE :#{cond_id}" #OR guest_email LIKE :find"
-              cond_hash.merge!({cond_id.to_sym => "%#{v}%"})
+              if i.match(/^.*?___sql_expression___.*$/i)
+                i = i.gsub(/___sql_expression___\./, "") #some cleaning job
+
+                having_cond_str += " AND " unless cond_str.blank?
+                cond_id = "find_#{i.gsub(/\./, '_')}"
+                having_cond_str += "#{i} LIKE :#{cond_id}" #OR guest_email LIKE :find"
+                having_cond_hash.merge!({cond_id.to_sym => "%#{v}%"})
+              else
+                cond_str += " AND " unless cond_str.blank?
+                cond_id = "find_#{i.gsub(/\./, '_')}"
+                cond_str += "#{i} LIKE :#{cond_id}" #OR guest_email LIKE :find"
+                cond_hash.merge!({cond_id.to_sym => "%#{v}%"})
+              end
             end
           end
         end
       end
 
+      # ToDO ladas add number filter
+      # ToDo ladas add having condition to others
       if !params.blank? && params['multichoice']
         params['multichoice'].each_pair do |i, v|
+          i = i.gsub(/___unknown___\./, "") #some cleaning job
           unless v.blank?
             cond_str += " AND " unless cond_str.blank?
             cond_id = "multichoice_#{i.gsub(/\./, '_')}"
@@ -217,6 +237,7 @@ module ModelMixins
 
       if !params.blank? && params['date_from']
         params['date_from'].each_pair do |i, v|
+          i = i.gsub(/___unknown___\./, "") #some cleaning job
           unless v.blank?
             cond_str += " AND " unless cond_str.blank?
             cond_id = "date_from_#{i.gsub(/\./, '_')}"
@@ -228,6 +249,7 @@ module ModelMixins
 
       if !params.blank? && params['date_to']
         params['date_to'].each_pair do |i, v|
+          i = i.gsub(/___unknown___\./, "") #some cleaning job
           unless v.blank?
             cond_str += " AND " unless cond_str.blank?
             cond_id = "date_to_#{i.gsub(/\./, '_')}"
@@ -237,7 +259,8 @@ module ModelMixins
         end
       end
 
-      ret = where(cond_str, cond_hash).paginate(:page => params[:page], :per_page => per_page).order(order_by)
+      ret = where(cond_str, cond_hash).order(order_by)
+      ret = ret.having(having_cond_str, having_cond_hash) unless having_cond_str.blank?
       #items = self.joins("LEFT OUTER JOIN intranet_text_pages ON resource_id = intranet_text_pages.id").where(cond_str, cond_hash).paginate(:page => params[:page], :per_page => per_page).order(order_by).selection(settings)
       #if params[:page].to_i > items.total_pages && items.total_pages > 0
       #  params[:page] = 1
@@ -254,12 +277,25 @@ module ModelMixins
         end
       end
 
+
+      # fuck will paginate, if there are agregated queries that I use for condition, will_paginage will delete it
+      # i am counting rows on my own
+      if object.respond_to?(:klass)
+        mysql_count = object.klass.find_by_sql("SELECT COUNT(*) AS count_all FROM (" + ret.selection(settings).to_sql + ") count")
+      else
+        mysql_count = object.find_by_sql("SELECT COUNT(*) AS count_all FROM (" + ret.selection(settings).to_sql + ") count")
+      end
+      ret = ret.paginate(:page => params[:page], :per_page => per_page, :total_entries => mysql_count.first[:count_all])
+
       ret
     end
 
 
     def check_non_existing_colum_order_by(settings, params)
-      order_by_arr = params[:order_by].split(",")
+      order_by_params = params[:order_by].dup.gsub(/___unknown___\./, "") #some cleaning job
+      order_by_params = order_by_params.gsub(/___sql_expression___\./, "") #some cleaning job
+
+      order_by_arr = order_by_params.split(",")
       order_by_arr.each_with_index do |one_order_by, index|
         if one_order_by.match(/^.*?non_existing_column___.*$/i)
           identifier_and_direction = one_order_by.split("non_existing_column___").second

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: it-logica-application-backbone
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &78953680 !ruby/object:Gem::Requirement
+  requirement: &74655360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78953680
+  version_requirements: *74655360
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &77670010 !ruby/object:Gem::Requirement
+  requirement: &74654940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77670010
+  version_requirements: *74654940
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &77669710 !ruby/object:Gem::Requirement
+  requirement: &74176350 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *77669710
+  version_requirements: *74176350
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &77669430 !ruby/object:Gem::Requirement
+  requirement: &74176070 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *77669430
+  version_requirements: *74176070
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &77669150 !ruby/object:Gem::Requirement
+  requirement: &74175780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *77669150
+  version_requirements: *74175780
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &77668840 !ruby/object:Gem::Requirement
+  requirement: &74175470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77668840
+  version_requirements: *74175470
 description: longer description of your gem
 email: ladislav.smola@it-logica.cz
 executables: []
@@ -570,7 +570,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 539010931
+      hash: -1038174595
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: