it-logica-application-backbone 1.0.24 → 1.0.25

data/VERSION

@@ -1 +1 @@
-1.0.24
+1.0.25

data/app/assets/javascripts/backbone_js/ladas_table_sorting.js.coffee

@@ -1,4 +1,6 @@
 class TableSorting
+  @max_together = 2
+
   @change_sorting: (form_id, order_by_value, dir, obj) ->
     order_by_value = order_by_value.toLowerCase()
     dir = dir.toLowerCase()
@@ -37,6 +39,7 @@ class TableSorting
 
     else  # i am not ordering by element value, I will append it to end
       #console.log("pridavam")
+      order_by_array.pop() if order_by_array.length >= TableSorting.max_together
       order_by_array.push(order_by_value + " " + dir)
 
 

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.24"
+  s.version = "1.0.25"
 
   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

@@ -399,19 +399,37 @@ module ModelMixins
         end
       end
 
+
       if per_page && per_page > 0
         # only when i need pagination
         if total_count.blank?
           # if I call this more times, I can pass the total count and not count it multiple times
-
           # 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 (as sugested in will paginete gem, when the query got more complex)
-          if object.respond_to?(:klass)
-            mysql_count = object.klass.find_by_sql("SELECT COUNT(*) AS count_all FROM (" + ret.selection(settings).to_sql + ") count")
+          if (settings[:total_count_cache].blank?)
+            # I am not caching total count. Be advised in table cca. 200 000 rows total count take about 1 second to compute, it very much.
+            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])
           else
-            mysql_count = object.find_by_sql("SELECT COUNT(*) AS count_all FROM (" + ret.selection(settings).to_sql + ") count")
+            # I am caching total count
+            # todo find out how to cache this when everything can change, maybe I can cache only not filtered version
+            # !!!!!!1 dont turn this on till then
+            
+            total_count = Rails.cache.fetch(settings[:form_id] + "__cached_total_count", :expires_in => settings[:total_count_cache]) do
+              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
+              mysql_count.first[:count_all]
+            end
+            ret = ret.paginate(:page => params[:page], :per_page => per_page, :total_entries => total_count)
           end
-          ret = ret.paginate(:page => params[:page], :per_page => per_page, :total_entries => mysql_count.first[:count_all])
         else
           ret = ret.paginate(:page => params[:page], :per_page => per_page, :total_entries => total_count)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: it-logica-application-backbone
 version: !ruby/object:Gem::Version
-  version: 1.0.24
+  version: 1.0.25
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &77771630 !ruby/object:Gem::Requirement
+  requirement: &72605220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77771630
+  version_requirements: *72605220
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &77771290 !ruby/object:Gem::Requirement
+  requirement: &72604880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77771290
+  version_requirements: *72604880
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &77771030 !ruby/object:Gem::Requirement
+  requirement: &72604600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *77771030
+  version_requirements: *72604600
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &77770710 !ruby/object:Gem::Requirement
+  requirement: &72604290 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *77770710
+  version_requirements: *72604290
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &77770230 !ruby/object:Gem::Requirement
+  requirement: &72603880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *77770230
+  version_requirements: *72603880
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &77769710 !ruby/object:Gem::Requirement
+  requirement: &72603330 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77769710
+  version_requirements: *72603330
 description: longer description of your gem
 email: ladislav.smola@it-logica.cz
 executables: []
@@ -576,7 +576,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 349871475
+      hash: 779687315
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: