acts_as_ferret 0.5 → 0.5.1

data/doc/demo/app/models/stats.rb

@@ -9,7 +9,7 @@ class Stats < ActiveRecord::Base
       where kind=? group by time;
   END
     result = connection.execute sanitize_sql([sql, start_date, start_date, kind.to_s])
-    returning [] do |res|
+    [].tap do |res|
       while row = result.fetch_row
         data = row.last.split(',').map{|t|t.to_i}
         median = data.size.odd? ? data[data.size/2] : ((data[data.size/2-1]+data[data.size/2]) / 2.0)

data/lib/acts_as_ferret.rb

@@ -493,14 +493,13 @@ module ActsAsFerret
   
   # combine our conditions with those given by user, if any
   def self.combine_conditions(conditions, additional_conditions = [])
-    returning conditions do
-      if additional_conditions && additional_conditions.any?
-        cust_opts = (Array === additional_conditions) ? additional_conditions.dup : [ additional_conditions ]
-        logger.debug "cust_opts: #{cust_opts.inspect}"
-        conditions.first << " and " << cust_opts.shift
-        conditions.concat(cust_opts)
-      end
+    if additional_conditions && additional_conditions.any?
+      cust_opts = (Array === additional_conditions) ? additional_conditions.dup : [ additional_conditions ]
+      logger.debug "cust_opts: #{cust_opts.inspect}"
+      conditions.first << " and " << cust_opts.shift
+      conditions.concat(cust_opts)
     end
+    return conditions
   end
 
   def self.build_field_config(fields)

data/lib/acts_as_ferret/instance_methods.rb

@@ -125,7 +125,7 @@ module ActsAsFerret #:nodoc:
     # fieldname => value pairs)
     def to_doc
       logger.debug "creating doc for class: #{self.ferret_key}"
-      returning Ferret::Document.new do |doc|
+      Ferret::Document.new.tap do |doc|
         # store the id and class name of each item, and the unique key used for identifying the record
         # even in multi-class indexes.
         doc[:key] = self.ferret_key

data/lib/acts_as_ferret/local_index.rb

@@ -16,9 +16,9 @@ module ActsAsFerret
     # The 'real' Ferret Index instance
     def ferret_index
       ensure_index_exists
-      returning @ferret_index ||= Ferret::Index::Index.new(index_definition[:ferret]) do
-        @ferret_index.batch_size = index_definition[:reindex_batch_size]
-        @ferret_index.logger = logger
+      (@ferret_index ||= Ferret::Index::Index.new(index_definition[:ferret])).tap do |idx|
+        idx.batch_size = index_definition[:reindex_batch_size]
+        idx.logger = logger
       end
     end
 
@@ -151,7 +151,7 @@ module ActsAsFerret
       return Ferret::Search::TermQuery.new(:key, key.to_s)
       # if shared?
       #   raise InvalidArgumentError.new("shared index needs class_name argument") if class_name.nil?
-      #   returning bq = Ferret::Search::BooleanQuery.new do
+      #   Ferret::Search::BooleanQuery.new.tap do |bq|
       #     bq.add_query(Ferret::Search::TermQuery.new(:id,         id.to_s),    :must)
       #     bq.add_query(Ferret::Search::TermQuery.new(:class_name, class_name), :must)
       #   end

data/lib/acts_as_ferret/server/server.rb

@@ -182,7 +182,7 @@ module ActsAsFerret
                             :create      => true,
                             :field_infos => ActsAsFerret::field_infos(index_definition),
                             :path        => File.join(index_definition[:index_base_dir], 'rebuild')
-          returning Ferret::Index::Index.new(ferret_cfg) do |i|
+          Ferret::Index::Index.new(ferret_cfg).tap do |i|
             i.batch_size = index_definition[:reindex_batch_size]
             i.logger = @logger
           end

data/lib/acts_as_ferret/version.rb

@@ -1,3 +1,3 @@
 module ActsAsFerret
-  VERSION = '0.5'
+  VERSION = '0.5.1'
 end

metadata

@@ -1,11 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_ferret
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 5
-  version: "0.5"
+  version: 0.5.1
 platform: ruby
 authors: 
 - Jens Kraemer
@@ -18,33 +14,24 @@ default_executable: aaf_install
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: jk-ferret
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 11
-        - 8
         version: 0.11.8
-  type: :runtime
-  version_requirements: *id001
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rails
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
         version: "3.0"
-  type: :runtime
-  version_requirements: *id002
+    version: 
 description: Rails plugin that adds powerful full text search capabilities to ActiveRecord models.
 email: jk@jkraemer.net
 executables: 
@@ -226,27 +213,21 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 8
-      - 7
       version: 1.8.7
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: acts_as_ferret
-rubygems_version: 1.3.7
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: acts_as_ferret - Ferret based full text search for any ActiveRecord model