search_do 0.2.0 → 0.3.0

data/Gemfile

@@ -0,0 +1,13 @@
+source :rubygems
+
+gem 'activerecord'
+
+group :dev do
+  gem 'rails', ENV['RAILS']
+  gem 'sqlite3'
+  gem 'will_paginate'
+  gem 'rdoc'
+  gem 'rake'
+  gem 'rspec', '~>1'
+  gem 'jeweler'
+end

data/Gemfile.lock

@@ -0,0 +1,44 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (2.3.14)
+      actionpack (= 2.3.14)
+    actionpack (2.3.14)
+      activesupport (= 2.3.14)
+      rack (~> 1.1.0)
+    activerecord (2.3.14)
+      activesupport (= 2.3.14)
+    activeresource (2.3.14)
+      activesupport (= 2.3.14)
+    activesupport (2.3.14)
+    git (1.2.5)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+    rack (1.1.0)
+    rails (2.3.14)
+      actionmailer (= 2.3.14)
+      actionpack (= 2.3.14)
+      activerecord (= 2.3.14)
+      activeresource (= 2.3.14)
+      activesupport (= 2.3.14)
+      rake (>= 0.8.3)
+    rake (0.9.2.2)
+    rdoc (3.8)
+    rspec (1.3.1)
+    sqlite3 (1.3.5)
+    will_paginate (2.3.16)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord
+  jeweler
+  rails
+  rake
+  rdoc
+  rspec (~> 1)
+  sqlite3
+  will_paginate

data/README.rdoc

@@ -13,8 +13,12 @@ A working Hyper Estraier instance, setup instructions:
 
 
 == Install
-* script/plugin install git://github.com/grosser/search_do.git
-* install will_paginate to use "paginate_by_fulltext_search" (Instruction: http://github.com/mislav/will_paginate/wikis/installation)
+As Rails plugin(recommended <-> rake tasks/cap recipes):
+  rails plugin install git://github.com/grosser/search_do.git
+Or as Gem:
+  sudo gem install searh_do
+
+install will_paginate to use "paginate_by_fulltext_search" (Instruction: http://github.com/mislav/will_paginate/wikis/installation)
 
 
 == Usage
@@ -57,6 +61,10 @@ A working Hyper Estraier instance, setup instructions:
  - Built in P2P clustering of index servers
 
 
+== TODO
+ - make specs work with RSpec 2
+
+
 == Origin
 Original is written by scoop see
 * http://github.com/scoop/acts_as_searchable/tree/master

data/Rakefile

@@ -1,23 +1,14 @@
-require 'rake/rdoctask'
-require 'spec'
+require 'rdoc/task'
 
-desc 'Default: run specs_all.'
-task :default => :spec_all
-
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new {|t| t.spec_opts = ['--color']}
+task :spec do
+  sh "bundle exec spec spec"
+end
 
-desc "Run specs both AR-latest and AR-2.0.x"
-task :spec_all do
-  ar20xs = (::Gem.source_index.find_name("activerecord", "<2.1") & \
-            ::Gem.source_index.find_name("activerecord", ">=2.0"))
-  if ar20xs.empty?
-    Rake::Task[:spec].invoke
-  else
-    ar20 = ar20xs.sort_by(&:version).last
-    system("rake spec")
-    system("rake spec AR=#{ar20.version}")
-  end
+task :default do
+  sh "RAILS=2.3.14 && (bundle || bundle install) && bundle exec rake spec"
+  sh "RAILS=3.0.12 && (bundle || bundle install) && bundle exec rake spec"
+  sh "RAILS=3.1.3 && (bundle || bundle install) && bundle exec rake spec"
+  sh "git checkout Gemfile.lock"
 end
 
 desc 'Generate documentation for the acts_as_searchable plugin.'
@@ -38,7 +29,7 @@ begin
     gem.summary = "AR: Hyperestraier integration"
     gem.email = "moronatural@gmail.com"
     gem.homepage = "http://github.com/grosser/#{project_name}"
-    gem.authors = ["MOROHASHI Kyosuke"]
+    gem.authors = ["MOROHASHI Kyosuke", "Michael Grosser"]
   end
 
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/search_do.rb

@@ -118,7 +118,7 @@ module SearchDo
 
       cattr_accessor :search_indexer, :search_backend
 
-      self.search_indexer = returning(SearchDo::Indexer.new(self, configurations)) do |idx|
+      self.search_indexer = SearchDo::Indexer.new(self, configurations).tap do |idx|
         idx.searchable_fields   = options[:searchable_fields] || [ :body ]
         idx.attributes_to_store = options[:attributes] || {}
         idx.if_changed          = options[:if_changed] || []
@@ -173,7 +173,7 @@ module SearchDo
 
       ids_and_raw = matched_ids_and_raw(query, options)
       ids = ids_and_raw.map{|id,raw| id}
-      
+
       results = find_by_ids_scope(ids, find_options)
       add_snippets(results,ids_and_raw) unless query.blank?
       results
@@ -187,7 +187,7 @@ module SearchDo
         options[:offset]=(page.to_i-1)*per_page
         options.delete(:page)#acts_as cannot read this...
         options.delete(:per_page)#acts_as cannot read this...
-        
+
         #find results
         pager.replace fulltext_search(query,options)
 
@@ -216,7 +216,7 @@ module SearchDo
     def matched_ids_and_raw(query = "", options = {})
       search_backend.search_all_ids_and_raw(query, options)
     end
-    
+
     def matched_ids(query = "", options = {})
       matched_ids_and_raw(query,options).map{|id,raw|id}
     end
@@ -241,7 +241,7 @@ module SearchDo
     end
 
   private
-  
+
     def add_snippets(results,ids_and_raw)
       results.each do |result|
         raw = ids_and_raw.assoc(result.id)[1]
@@ -262,10 +262,10 @@ module SearchDo
       require 'action_controller'
       ::ActionController::Base.helpers.strip_tags(text)
     end
-  
+
     def connect_backend(active_record_config) #:nodoc:
-      backend_config = active_record_config[RAILS_ENV]['search'] || \
-                       active_record_config[RAILS_ENV]['estraier'] || {}
+      backend_config = active_record_config[Rails.env]['search'] || \
+                       active_record_config[Rails.env]['estraier'] || {}
       self.search_backend = Backends.connect(self, backend_config)
     end
 
@@ -277,7 +277,7 @@ module SearchDo
       end
       apply_ids_order_to(ids,results)
     end
-    
+
     def apply_ids_order_to(ids,results)
       #replace id with found item
       results.each {|item| ids[ids.index(item.id)] = item}
@@ -327,4 +327,4 @@ module SearchDo
   end
 end
 
-ActiveRecord::Base.send :include, SearchDo
+ActiveRecord::Base.send :include, SearchDo

data/lib/search_do/backends/hyper_estraier.rb

@@ -197,7 +197,7 @@ module SearchDo
       end
 
       def calculate_node_name(config)
-        node_prefix = config['node_prefix'] || config['node'] || RAILS_ENV
+        node_prefix = config['node_prefix'] || config['node'] || Rails.env
         "#{node_prefix}_#{@ar_class.table_name}"
       end
 

data/lib/search_do/dirty_tracking.rb

@@ -1,15 +1,20 @@
-require 'search_do/dirty_tracking/self_made'
-require 'search_do/dirty_tracking/bridge'
-
 module SearchDo
   module DirtyTracking
-    def self.included(base)
-      mod = if defined?(ActiveRecord::Dirty) && base.included_modules.include?(ActiveRecord::Dirty)
-              DirtyTracking::Bridge
-            else
-              DirtyTracking::SelfMade
-            end
-      base.send(:include, mod)
+    def need_update_index?(attr_name = nil)
+      return false unless changed?
+      cs = changed_attributes.keys
+      if attr_name
+        cs.include?(attr_name)
+      else
+        search_indexer.observing_fields.any?{|t| cs.include?(t) }
+      end
+    end
+
+    private
+    
+    def clear_changed_attributes
+      changed_attributes.clear
     end
   end
 end
+

data/lib/vendor/estraierpure.rb

@@ -936,7 +936,7 @@ module EstraierPure
                 sock.printf("%s\r\n", line)
               end
             end
-            sock.printf("Content-Length: %d\r\n", reqbody.length) if reqbody
+            sock.printf("Content-Length: %d\r\n", reqbody.bytesize) if reqbody
             sock.printf("\r\n")
             sock.write(reqbody) if reqbody
             line = sock.gets.chomp

data/search_do.gemspec

@@ -0,0 +1,69 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "search_do"
+  s.version = "0.3.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["MOROHASHI Kyosuke", "Michael Grosser"]
+  s.date = "2011-12-24"
+  s.email = "moronatural@gmail.com"
+  s.extra_rdoc_files = [
+    "README.rdoc"
+  ]
+  s.files = [
+    "CHANGELOG",
+    "Gemfile",
+    "Gemfile.lock",
+    "MIT-LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "TESTING",
+    "VERSION",
+    "examples/he_search.rb",
+    "examples/person.rb",
+    "init.rb",
+    "lib/estraier_admin.rb",
+    "lib/search_do.rb",
+    "lib/search_do/backends.rb",
+    "lib/search_do/backends/hyper_estraier.rb",
+    "lib/search_do/backends/hyper_estraier/estraier_pure_extention.rb",
+    "lib/search_do/dirty_tracking.rb",
+    "lib/search_do/indexer.rb",
+    "lib/search_do/utils.rb",
+    "lib/vendor/estraierpure.rb",
+    "lib/vendor/overview",
+    "recipes/mode_maintenance.rb",
+    "search_do.gemspec",
+    "spec/backends/hyper_estraier_spec.rb",
+    "spec/backends/result_document_spec.rb",
+    "spec/dirty_tracking/bridge_spec.rb",
+    "spec/estraier_admin_spec.rb",
+    "spec/fixtures/stories.yml",
+    "spec/indexer_spec.rb",
+    "spec/search_do_spec.rb",
+    "spec/setup_test_model.rb",
+    "spec/spec_helper.rb",
+    "tasks/acts_as_searchable_tasks.rake"
+  ]
+  s.homepage = "http://github.com/grosser/search_do"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.10"
+  s.summary = "AR: Hyperestraier integration"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activerecord>, [">= 0"])
+    else
+      s.add_dependency(%q<activerecord>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<activerecord>, [">= 0"])
+  end
+end
+

data/spec/spec_helper.rb

@@ -1,35 +1,18 @@
 # ---- requirements
 $KCODE = 'u' #activate regex unicode
-require 'rubygems'
 require 'spec'
 $LOAD_PATH << File.expand_path("../lib", File.dirname(__FILE__))
 
-
-# ---- bugfix
-#`exit?': undefined method `run?' for Test::Unit:Module (NoMethodError)
-#can be solved with require test/unit but this will result in extra test-output
-unless defined? Test::Unit
-  module Test
-    module Unit
-      def self.run?
-        true
-      end
-    end
-  end
-end
-
-
-# ---- load active record
-#gem 'activerecord', '2.0.2'
-if ENV["AR"]
-  gem 'activerecord', ENV["AR"]
-  $stderr.puts("Using ActiveRecord #{ENV["AR"]}")
-end
 require 'active_record'
 
 require File.expand_path("../init", File.dirname(__FILE__))
 
-RAILS_ENV = "test"
+module Rails
+  def self.env
+    'test'
+  end
+end
+
 ActiveRecord::Base.configurations = {"test" => {
   :adapter => "sqlite3",
   :database => ":memory:",

metadata

@@ -1,18 +1,37 @@
 --- !ruby/object:Gem::Specification 
 name: search_do
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  hash: 19
+  prerelease: 
+  segments: 
+  - 0
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - MOROHASHI Kyosuke
+- Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-12-24 00:00:00 +01:00
-default_executable: 
-dependencies: []
-
+date: 2011-12-24 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id001
+  prerelease: false
+  type: :runtime
+  name: activerecord
 description: 
 email: moronatural@gmail.com
 executables: []
@@ -23,6 +42,8 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - CHANGELOG
+- Gemfile
+- Gemfile.lock
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
@@ -37,13 +58,12 @@ files:
 - lib/search_do/backends/hyper_estraier.rb
 - lib/search_do/backends/hyper_estraier/estraier_pure_extention.rb
 - lib/search_do/dirty_tracking.rb
-- lib/search_do/dirty_tracking/bridge.rb
-- lib/search_do/dirty_tracking/self_made.rb
 - lib/search_do/indexer.rb
 - lib/search_do/utils.rb
 - lib/vendor/estraierpure.rb
 - lib/vendor/overview
 - recipes/mode_maintenance.rb
+- search_do.gemspec
 - spec/backends/hyper_estraier_spec.rb
 - spec/backends/result_document_spec.rb
 - spec/dirty_tracking/bridge_spec.rb
@@ -54,42 +74,38 @@ files:
 - spec/setup_test_model.rb
 - spec/spec_helper.rb
 - tasks/acts_as_searchable_tasks.rake
-has_rdoc: true
 homepage: http://github.com/grosser/search_do
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: "AR: Hyperestraier integration"
-test_files: 
-- spec/spec_helper.rb
-- spec/backends/result_document_spec.rb
-- spec/backends/hyper_estraier_spec.rb
-- spec/indexer_spec.rb
-- spec/setup_test_model.rb
-- spec/estraier_admin_spec.rb
-- spec/search_do_spec.rb
-- spec/dirty_tracking/bridge_spec.rb
-- examples/person.rb
-- examples/he_search.rb
+test_files: []
+

data/lib/search_do/dirty_tracking/bridge.rb

@@ -1,22 +0,0 @@
-module SearchDo
-  module DirtyTracking
-    module Bridge
-
-      def need_update_index?(attr_name = nil)
-        return false unless changed?
-        cs = changed_attributes.keys
-        if attr_name
-          cs.include?(attr_name)
-        else
-          search_indexer.observing_fields.any?{|t| cs.include?(t) }
-        end
-      end
-
-      private
-      def clear_changed_attributes
-        changed_attributes.clear
-      end
-    end
-  end
-end
-

data/lib/search_do/dirty_tracking/self_made.rb

@@ -1,36 +0,0 @@
-
-module SearchDo
-  module DirtyTracking
-    module SelfMade
-      def self.included(base)
-        base.class_eval do
-          attr_accessor :changed_attributes
-
-          search_indexer.observing_fields.each do |attr_name|
-            define_method("#{attr_name}=") do |value|
-              write_changed_attribute attr_name, value
-            end
-          end
-        end
-      end
-
-      # If called with no parameters, gets whether the current model has changed and needs to updated in the index.
-      # If called with a single parameter, gets whether the parameter has changed.
-      def need_update_index?(attr_name = nil)
-        changed_attributes and (attr_name.nil? ?
-          (not changed_attributes.length.zero?) : (changed_attributes.include?(attr_name.to_s)) )
-      end
-
-      private
-      def clear_changed_attributes #:nodoc:
-        self.changed_attributes = []
-      end
-
-      def write_changed_attribute(attr_name, attr_value) #:nodoc:
-        (self.changed_attributes ||= []) << attr_name.to_s unless self.need_update_index?(attr_name) or self.send(attr_name) == attr_value
-        write_attribute(attr_name.to_s, attr_value)
-      end
-    end
-  end
-end
-