rails-simple-search 0.9.7 → 0.9.8

checksums.yaml

@@ -0,0 +1,7 @@
+--- 
+SHA1: 
+  metadata.gz: 1fa87087dc4f0c9095a6e1e393ba3a697124ac0b
+  data.tar.gz: 04a6a6e9efeeb75a451b0e0a934af16c61ceca6a
+SHA512: 
+  metadata.gz: 05cca30064e8497ebac3d6b01058f8dfa4f5bd9e1e7da1017db3b5acebc3c06dfd770392149a5d7a26b6d3496888e3bf11cea758174ed2ca9d9fb1cae690ac8b
+  data.tar.gz: c5072f099210ab82d751ee2220c64a29298fd338e885ce48066a8c4b87f60650fc3e814289d09821f21acde36b69292f1730449301ffc893060ebe46319b8667

data/README.rdoc

@@ -71,7 +71,11 @@ The following is how we implement this searching function with rails-simple-sear
 
 == Note
 
-For rails 2.x.x applications, you might want to use the version 0.9.0. Since version 0.9.1, this gem started to support rails 3 now. The latest version 0.9.4 is tested under rails 3.2.6.
+For rails 2.x.x applications, you might want to use the version 0.9.0. 
+
+From version 0.9.1 to 0.9.7, Rails 3 is supported.
+
+From version 0.9.8 on, this gem started to support Rails 4. Version 0.9.8 is tested under Rails 4.1.1.
 
 There is a real demo application which you can download and run immediately: https://github.com/yzhanginwa/demo_app_for_rails_simple_search
 

data/lib/sql_handler.rb

@@ -18,11 +18,14 @@ module RailsSimpleSearch
 
     def run
       run_criteria
+
+      query = @model_class.joins(@joins_str)
+      if @conditions
+        query = query.where(@conditions)
+      end
+
       if @config[:paginate]
-        @count = @model_class.count({:select => "distinct #{@model_class.table_name}.#{@model_class.primary_key}", 
-                                     :conditions => @conditions,
-                                     :joins => @joins_str }
-                 )
+        @count = query.count
         offset = [((@page || 0) - 1) * @config[:per_page], 0].max
         limit = @config[:per_page]
       else
@@ -30,14 +33,8 @@ module RailsSimpleSearch
         limit = @config[:limit]
       end
 
-      execute_hash = {:select => "distinct #{@model_class.table_name}.*", 
-                      :conditions => @conditions,
-                      :joins => @joins_str, 
-                      :offset => offset,
-                      :limit => limit
-      }
-      execute_hash[:order] = @order if @order
-      @model_class.all(execute_hash)
+      query.order(@order) if @order
+      query.select("distinct #{@model_class.table_name}.*").offset(offset).limit(limit)
     end
 
     private

metadata

@@ -1,49 +1,55 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rails-simple-search
-version: !ruby/object:Gem::Version
-  version: 0.9.7
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  version: 0.9.8
 platform: ruby
-authors:
+authors: 
 - Yi Zhang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-29 00:00:00.000000000 Z
+
+date: 2014-06-28 00:00:00 Z
 dependencies: []
-description: rails-simple-search is a light and easy to use gem. It could help developers
-  quickly build a search page.
+
+description: rails-simple-search is a light and easy to use gem. It could help developers quickly build a search page.
 email: yzhang.wa@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - README.rdoc
 - lib/rails-simple-search.rb
 - lib/sql_handler.rb
 homepage: http://github.com/yzhanginwa/rails-simple-search
 licenses: []
+
+metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - &id001 
+    - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id001
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.1.10
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A very simple and light get to quick build search function in rails
 test_files: []
+
 has_rdoc: