active-record-data-tables 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/active-record-data-tables.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "active-record-data-tables"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kaspernj"]
-  s.date = "2013-06-04"
+  s.date = "2013-07-09"
   s.description = "Helping functionality for filtering, sorting and stuff like that with data-tables and ActiveRecord."
   s.email = "k@spernj.org"
   s.extra_rdoc_files = [

data/lib/active-record-data-tables.rb

@@ -8,36 +8,36 @@ class ActiveRecordDataTables
     @force_filter_for = @args[:force_filter_for]
     @dts = @params[:dataTables]
     @columns = @args[:columns]
-    
+
     @model = @args[:model]
     raise "No ':model' was given." unless @model
     @model_method_name = StringCases.camel_to_snake(@model.name)
-    
+
     @joins = {}
     @sort_columns = [:title, :name]
     @executed = false
   end
-  
+
   def execute
     @executed = true
     @query = @model
-    
+
     filter
     sorting
     limit
-    
+
     return @query
   end
-  
+
   def json(final_query = nil)
     unless final_query
       execute unless @executed
       final_query = @query
     end
-    
-    dis_rec_count = final_query.limit(nil).count    
+
+    dis_rec_count = final_query.limit(nil).count
     dis_rec_count = dis_rec_count.length if dis_rec_count.is_a?(Hash)
-    
+
     res = {
       :sEcho => @dts[:sEcho] ? @dts[:sEcho].to_i : 1,
       :iTotalRecords => @model.count,
@@ -45,20 +45,27 @@ class ActiveRecordDataTables
       :aaData => []
     }
   end
-  
+
   private
-  
+
+  # Checks the given parameters for filters and manipulates the query based on it.
   def filter
     @filter_params.each do |key, val|
-      if key.start_with?("#{@model_method_name}_")
-        key = key.slice(@model_method_name.length + 1, key.length)
-      end
-      
+      # Strip empty values from the array if the given value is an array.
+      val.select!{ |val| !val.to_s.empty? } if val.is_a?(Array)
+
+      # Convert key if it starts with a column name.
+      key = key.slice(@model_method_name.length + 1, key.length) if key.start_with?("#{@model_method_name}_")
+
       if @force_filter_for && @force_filter_for.include?(key)
         ret = @args[:filter].call(:key => key, :val => val, :query => @query)
         @query = ret if ret
       elsif @model.column_names.include?(key)
-        @query = @query.where(key => val)
+        if val.is_a?(Array) && val.empty?
+          # Ignore.
+        else
+          @query = @query.where(key => val)
+        end
       elsif match = key.to_s.match(/^(.+)_like$/) and @model.column_names.include?(match[1])
         next if val.blank?
         table = @model.arel_table
@@ -71,48 +78,50 @@ class ActiveRecordDataTables
       end
     end
   end
-  
+
+  # Checks the given parameters for limits and manipulates the query based on it.
   def limit
     raise "'iDisplayStart' was not given? #{@dts}" unless @dts.key?("iDisplayStart")
     raise "'iDisplayEnd' was not given? #{@dts}" unless @dts.key?("iDisplayLength")
-    
+
     disp_start = @dts["iDisplayStart"].to_i
     disp_length = @dts["iDisplayLength"].to_i
-    
+
     @query = @query.page((disp_start / disp_length) + 1).per(disp_length)
   end
-  
+
+  # Checks the given parameters for sorting and manipulates the query based on it.
   def sorting
     sort_no = 0
     sorts = []
-    
+
     loop do
       sorted = false
       name_col = "iSortCol_#{sort_no}"
       name_mode = "sSortDir_#{sort_no}"
       sort_col = @dts[name_col]
       break if !sort_col
-      
+
       col_name = @columns[sort_col.to_i]
       next if !col_name
-      
+
       if @dts[name_mode] == "desc"
         sort_mode = "DESC"
       else
         sort_mode = "ASC"
       end
-      
+
       if match = col_name.to_s.match(/^(.+)_id$/)
         method_name = match[1]
         sub_model_name = StringCases.snake_to_camel(col_name.slice(0, col_name.length - 3))
-        
+
         if Kernel.const_defined?(sub_model_name)
           sub_model_const = Kernel.const_get(sub_model_name)
           unless @joins.key?(method_name)
             @query = @query.includes(method_name)
             @joins[method_name] = true
           end
-          
+
           @sort_columns.each do |sort_col_name|
             if sub_model_const.column_names.include?(sort_col_name.to_s)
               sorts << "`#{sub_model_const.table_name}`.`#{escape_col(sort_col_name)}` #{sort_mode}"
@@ -122,7 +131,7 @@ class ActiveRecordDataTables
           end
         end
       end
-      
+
       if @model.column_names.include?(col_name.to_s)
         sorts << "`#{@model.table_name}`.`#{escape_col(col_name)}` #{sort_mode}"
       elsif @args[:sort]
@@ -131,17 +140,19 @@ class ActiveRecordDataTables
       else
         raise "Unknown sort-column: '#{col_name}'."
       end
-      
+
       sort_no += 1
     end
-    
+
     @query = @query.order(sorts.join(", "))
   end
-  
+
+  # Escapes the given string to be used in a SQL statement.
   def escape(str)
     return ActiveRecord::Base.connection.quote(str).slice(1, str.length - 1)
   end
-  
+
+  # Escapes the given name as a column and checks for SQL-injections.
   def escape_col(name)
     raise "Possible SQL injection hack: '#{name}'." unless name.to_s.match(/\A[A-z\d_]+\Z/)
     return name

metadata

@@ -2,95 +2,95 @@
 name: active-record-data-tables
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - kaspernj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-04 00:00:00.000000000 Z
+date: 2013-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  name: string-cases
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: string-cases
-  type: :runtime
-  prerelease: false
-  requirement: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  name: rspec
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.8.0
-  name: rspec
-  type: :development
-  prerelease: false
-  requirement: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.8.0
+    none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  name: rdoc
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.12'
-  name: rdoc
-  type: :development
-  prerelease: false
-  requirement: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.12'
+    none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  name: bundler
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
-  name: bundler
-  type: :development
-  prerelease: false
-  requirement: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
+    none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  name: jeweler
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.4
-  name: jeweler
-  type: :development
-  prerelease: false
-  requirement: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.4
+    none: false
 description: Helping functionality for filtering, sorting and stuff like that with
   data-tables and ActiveRecord.
 email: k@spernj.org
@@ -120,20 +120,20 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 2526805225709928991
+      hash: -1808048283140226905
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23