it-logica-application-backbone 1.0.8 → 1.0.9

data/VERSION

@@ -1 +1 @@
-1.0.8
+1.0.9

data/it-logica-application-backbone.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "it-logica-application-backbone"
-  s.version = "1.0.8"
+  s.version = "1.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ladas"]
-  s.date = "2012-08-03"
+  s.date = "2012-08-06"
   s.description = "longer description of your gem"
   s.email = "ladislav.smola@it-logica.cz"
   s.extra_rdoc_files = [

data/lib/model_mixins/table_builder_class_methods.rb

@@ -96,10 +96,23 @@ module ModelMixins
             attrs = i.attributes
             another_global_formats.each do |another_global_format|
               # todo udelat moznost predani dalsich parametru
-              attrs.merge!({"#{another_global_format[:table]}_#{another_global_format[:name]}" => i.send(another_global_format[:global_format_method].to_sym, attrs["#{another_global_format[:table]}_#{another_global_format[:name]}"])})
+              case another_global_format[:table]
+                when "___sql_expression___"
+                  col_name = "#{another_global_format[:name]}"
+                else
+                  col_name = "#{another_global_format[:table]}_#{another_global_format[:name]}"
+              end
+              attrs.merge!({col_name => i.send(another_global_format[:global_format_method].to_sym, col_name)})
             end
             another_formats.each do |another_format|
-              attrs.merge!({"#{another_format[:table]}_#{another_format[:name]}" => i.send(another_format[:format_method].to_sym, attrs["#{another_format[:table]}_#{another_format[:name]}"])})
+              case another_format[:table]
+                when "___sql_expression___"
+                  col_name = "#{another_format[:name]}"
+                else
+                  col_name = "#{another_format[:table]}_#{another_format[:name]}"
+              end
+
+              attrs.merge!({col_name => i.send(another_format[:format_method].to_sym, col_name)})
             end
             column_methods.each do |column_method|
               another_column_row = "-"
@@ -220,7 +233,7 @@ module ModelMixins
         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|

data/lib/table_settings/table_column.rb

@@ -31,7 +31,7 @@ class TableSettings
     ##
     # Defines select expression for column (ie. select count(id) as counter)
     #
-    def sql_expresssion(expression)
+    def sql_expression(expression)
       @column_hash[:sql_expression] = expression
       self
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: it-logica-application-backbone
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-03 00:00:00.000000000 Z
+date: 2012-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &75607660 !ruby/object:Gem::Requirement
+  requirement: &86421990 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75607660
+  version_requirements: *86421990
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &75007460 !ruby/object:Gem::Requirement
+  requirement: &86421720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75007460
+  version_requirements: *86421720
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &75007180 !ruby/object:Gem::Requirement
+  requirement: &86420930 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *75007180
+  version_requirements: *86420930
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &75006900 !ruby/object:Gem::Requirement
+  requirement: &86419830 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *75006900
+  version_requirements: *86419830
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &75006600 !ruby/object:Gem::Requirement
+  requirement: &86418420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *75006600
+  version_requirements: *86418420
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &75006300 !ruby/object:Gem::Requirement
+  requirement: &86418080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75006300
+  version_requirements: *86418080
 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: -477704751
+      hash: -505696493
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: