filterable_sortable 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a228da8208d5bbc66fb236acaba76adc7ef07c67
-  data.tar.gz: deba473d42859866f8e55ce0396791d4d4ad90d5
+  metadata.gz: 215a0417e5f529bfcd31f0ce793324969f74c588
+  data.tar.gz: a1d9fd83f53b7ad492d0b2b61b4522f39d4baea5
 SHA512:
-  metadata.gz: 5a2b0f44ecd5692c3a26caef1de8cd2bfb92f8604198dcb07850065592c023f8503510501375027bb75fbde4c6d71346278f701a15d6e39b860166d9e6a4ad0c
-  data.tar.gz: c6384cee9741f9974c479f6b230888a246a4b2af86d1c22d812b5f362347a54f2535bd6637cd512933133b3cbc85a67e1bc77711875dbaf304763c4c2ccf34cc
+  metadata.gz: 1e1bd8db0afec93b38241a4ed4113aec01a7f6b79ed98b4e92eaf58b4f366400f9fd10620a15df234452080892917bfde299df3e2cb20215e5f6faf57b01fd3b
+  data.tar.gz: cb7288ec16696d96248ff5534aca161e1e3794e119837d475cb8dcbde6240aa00cd107eb0c86f179ae4c7bedaa40c8d84c2321e0f658b75d3b4e968bb85d95ce

data/lib/filterable_sortable.rb

@@ -10,19 +10,50 @@ module FilterableSortable
       if filter[:search]
         search(filter[:search])
       elsif filter[:custom] && filter[:custom] != 'all'
-        self.send(filter[:custom].to_sym) if self.methods.include?(filter[:custom].to_sym)
+        if methods.include?(filter[:custom].to_sym) &&
+          !dangerous_filtered_method?(filter[:custom])
+          readonly.send(filter[:custom].to_sym)
+        end
       end
     }
 
     scope :search, lambda { |term|
-      conditions = self.columns_hash.collect{|k,v| k unless v.type.in?([:datetime, :time, :date])}.compact.collect{|f| "#{self.table_name}.#{f} like '%#{term}%'"}.join(' OR ')
+      conditions =
+        columns_hash.
+        select { |_, v| !v.type.in?(excluded_search_types) }.
+        keys.
+        map do |f|
+          "#{table_name}.#{f} like " \
+          "#{ActiveRecord::Base.sanitize("%#{term}%")}"
+        end.
+        join(' OR ')
       where(conditions)
     }
 
     scope :ordered, lambda { |ordered|
-      ordered[:field] = "#{self.table_name}.#{ordered[:field]}" unless ordered[:field].match(/\./)
-      order("#{ordered[:field]} #{ordered[:direction]}") if ordered
+      ordered[:field] =
+        if ordered[:field] =~ /\./
+          ActiveRecord::Base.sanitize "#{table_name}.#{ordered[:field]}"
+        else
+          ActiveRecord::Base.sanitize ordered[:field]
+        end
+      if ordered
+        if ordered[:direction].to_s.capitalize == "DESC"
+          order(ordered[:field] => :DESC)
+        else
+          order(ordered[:field])
+        end
+      end
     }
 
+    private
+
+    def self.dangerous_filtered_method?(method)
+      method =~ /delete_|update_|create|drop_|destroy_|\!/
+    end
+
+    def self.excluded_search_types
+      [:datetime, :time, :date].freeze
+    end
   end
 end

data/lib/filterable_sortable/version.rb

@@ -1,3 +1,3 @@
 module FilterableSortable
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: filterable_sortable
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Anna Kazakova (gaar4ica)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-30 00:00:00.000000000 Z
+date: 2016-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Gem generates :filtered and :sorted scopes, can be easily used for building
@@ -60,7 +60,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -78,17 +78,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Model-based filterable and sortable functionality.