xapor 0.1.6 → 0.2.0

data/Gemfile

@@ -0,0 +1,2 @@
+source :rubygems
+gemspec

data/Gemfile.lock

@@ -0,0 +1,45 @@
+PATH
+  remote: .
+  specs:
+    xapor (0.1.4)
+      xapian-fu (>= 1.1.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    builder (3.0.0)
+    cucumber (1.1.3)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (~> 2.6.7)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.6)
+    diff-lcs (1.1.3)
+    gherkin (2.6.8)
+      json (>= 1.4.6)
+    git (1.2.5)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+    json (1.6.2)
+    rake (0.9.2.2)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.7.0)
+    term-ansicolor (1.0.7)
+    xapian-fu (1.3.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  cucumber
+  jeweler
+  rspec (>= 1.2.9)
+  xapor!

data/Rakefile

@@ -20,30 +20,8 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :spec => :check_dependencies
-
-begin
-  require 'cucumber/rake/task'
-  Cucumber::Rake::Task.new(:features)
-
-  task :features => :check_dependencies
-rescue LoadError
-  task :features do
-    abort "Cucumber is not available. In order to run features, you must: sudo gem install cucumber"
-  end
-end
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
 

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.2.0

data/lib/xapor/model_integration.rb

@@ -12,49 +12,46 @@ module Xapor::XapianFuIntegration
 
   module ClassMethods
     def xapor
-      class << self
-        attr_accessor :xapor_config
-        attr_accessor :xapor_db
-      end
-
       include XapianFu
 
-      def self.search(query)
+      def search(query)
         xapor_db.search(query)
       end
 
-      def self.reset_index
-        if self.xapor_db
-          self.xapor_db.flush
-          self.xapor_db.ro.close
-          self.xapor_db.rw.close
+      def reset_index
+        if @db
+          @db.flush
+          @db.ro.close
+          @db.rw.close
         end
-        self.xapor_db = ::XapianFu::XapianDb.new(self.xapor_config.xapian_fu_db.merge(:overwrite => true))
+        @db = XapianDb.new(xapor_config.xapian_fu_db.merge(:overwrite => true))
         if block_given?
-          yield self.xapor_db
+          yield @db
         end
       end
 
-      self.xapor_config = Xapor::Config.new
-      if block_given?
-        yield self.xapor_config
+      def xapor_config
+        self.class.instance_variable_get(:@config)
       end
-      self.xapor_db = ::XapianFu::XapianDb.new(self.xapor_config.xapian_fu_db.merge(:create => true))
 
-      eigenclass = class << self
-        self
+      def xapor_db
+        @db ||= XapianDb.new(xapor_config.xapian_fu_db.merge(:create => true))
       end
-      self.xapor_config.search_fields.each do |field|
-        eigenclass.send(:define_method, :"search_by_#{field}") do |query|
-          self.search(query)
-        end
+
+      @config = Xapor::Config.new
+      if block_given?
+        yield @config
+      end
+
+      @config.search_fields.each do |field|
+        class_eval("def self.search_by_#{field}(query)\nself.search(query)\nend")
       end
 
       if defined? ActiveRecord && ancestors.includes(ActiveRecord::Base)
         after_save :add_to_index
         after_destroy :remove_from_index
         #in-memory index, needs to be indexed on startup
-        all.each {|o| o.add_to_index} unless self.xapor_config.directory_config
+        all.each {|o| o.add_to_index} unless @config.directory_config
       end
     end
   end

data/xapor.gemspec

@@ -1,70 +1,78 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{xapor}
-  s.version = "0.1.6"
+  s.name = "xapor"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Workman"]
-  s.date = %q{2010-06-01}
-  s.description = %q{Rails plugin for Xapian search, built on XapianFu and DelayedJob.}
-  s.email = %q{workmad3@hedtek.com}
+  s.date = "2011-11-30"
+  s.description = "Rails plugin for Xapian search, built on XapianFu and DelayedJob."
+  s.email = "workmad3@hedtek.com"
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.textile"
+    "README.textile"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.textile",
-     "Rakefile",
-     "VERSION",
-     "features/step_definitions/xapor_steps.rb",
-     "features/support/env.rb",
-     "features/xapor.feature",
-     "generators/xapor_initializer/templates/xapor.rb",
-     "generators/xapor_initializer/xapor_initializer_generator.rb",
-     "init.rb",
-     "lib/xapor.rb",
-     "lib/xapor/config.rb",
-     "lib/xapor/model_integration.rb",
-     "spec/lib/xapor/config_spec.rb",
-     "spec/lib/xapor/model_integration_spec.rb",
-     "spec/lib/xapor_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "xapor.gemspec"
-  ]
-  s.homepage = %q{http://github.com/hedtekltd/xapor}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Rails plugin for Xapian search}
-  s.test_files = [
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE",
+    "README.textile",
+    "Rakefile",
+    "VERSION",
+    "features/step_definitions/xapor_steps.rb",
+    "features/support/env.rb",
+    "features/xapor.feature",
+    "lib/xapor.rb",
+    "lib/xapor/config.rb",
+    "lib/xapor/model_integration.rb",
     "spec/lib/xapor/config_spec.rb",
-     "spec/lib/xapor/model_integration_spec.rb",
-     "spec/lib/xapor_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/lib/xapor/model_integration_spec.rb",
+    "spec/lib/xapor_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb",
+    "xapor.gemspec"
   ]
+  s.homepage = "http://github.com/hedtekltd/xapor"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.10"
+  s.summary = "Rails plugin for Xapian search"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<xapor>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<cucumber>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<cucumber>, [">= 0"])
       s.add_runtime_dependency(%q<xapian-fu>, [">= 1.1.0"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_development_dependency(%q<cucumber>, [">= 0"])
     else
+      s.add_dependency(%q<xapor>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<cucumber>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<cucumber>, [">= 0"])
       s.add_dependency(%q<xapian-fu>, [">= 1.1.0"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_dependency(%q<cucumber>, [">= 0"])
     end
   else
+    s.add_dependency(%q<xapor>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<cucumber>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<cucumber>, [">= 0"])
     s.add_dependency(%q<xapian-fu>, [">= 1.1.0"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
     s.add_dependency(%q<cucumber>, [">= 0"])

metadata

@@ -1,74 +1,126 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: xapor
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 6
-  version: 0.1.6
+version: !ruby/object:Gem::Version
+  version: 0.2.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - David Workman
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-06-01 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: xapian-fu
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        - 0
-        version: 1.1.0
+date: 2011-11-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: xapor
+  requirement: &2155939280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *2155939280
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: &2155937380 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.9
+  type: :development
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 9
+  version_requirements: *2155937380
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: &2155960600 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2155960600
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &2155958360 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2155958360
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2155956840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.2.9
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *2155956840
+- !ruby/object:Gem::Dependency
   name: cucumber
+  requirement: &2155955740 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *2155955740
+- !ruby/object:Gem::Dependency
+  name: xapian-fu
+  requirement: &2155954600 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *2155954600
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2155953580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.9
+  type: :development
+  prerelease: false
+  version_requirements: *2155953580
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: &2155987540 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *2155987540
 description: Rails plugin for Xapian search, built on XapianFu and DelayedJob.
 email: workmad3@hedtek.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.textile
-files: 
+files:
 - .document
-- .gitignore
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.textile
 - Rakefile
@@ -76,9 +128,6 @@ files:
 - features/step_definitions/xapor_steps.rb
 - features/support/env.rb
 - features/xapor.feature
-- generators/xapor_initializer/templates/xapor.rb
-- generators/xapor_initializer/xapor_initializer_generator.rb
-- init.rb
 - lib/xapor.rb
 - lib/xapor/config.rb
 - lib/xapor/model_integration.rb
@@ -88,38 +137,28 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - xapor.gemspec
-has_rdoc: true
 homepage: http://github.com/hedtekltd/xapor
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+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'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Rails plugin for Xapian search
-test_files: 
-- spec/lib/xapor/config_spec.rb
-- spec/lib/xapor/model_integration_spec.rb
-- spec/lib/xapor_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/.gitignore

@@ -1,24 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## RUBYMINE
-.idea/*
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC

data/generators/xapor_initializer/xapor_initializer_generator.rb

@@ -1,8 +0,0 @@
-class XaporInitializerGenerator < Rails::Generator::Base
-  def manifest
-    record do |m|
-      m.directory 'config/initializers'
-      m.template 'xapor.rb', 'config/initializers/xapor.rb'
-    end
-  end
-end

data/init.rb

@@ -1 +0,0 @@
-require 'xapor'