dm-lucene-adapter 0.1.0-java → 0.1.1-java

data/lib/dm-lucene-adapter.rb

@@ -1,8 +1,22 @@
 require 'java'
 begin
-  include_class "de.saumya.lucene.LuceneService"
-rescue
   require 'dm-lucene-adapter_ext'
-  retry
+  include_class "de.saumya.lucene.LuceneService"
+  puts "using lucene from classpath"
+rescue NameError => e
+
+  begin
+    require 'org.apache.lucene.lucene-core'
+    puts "using lucene from gem"
+  rescue LoadError => ee
+    LUCENE_VERSION = '3.0.0'
+
+    require "#{File.expand_path('~/')}/.m2/repository/org/apache/lucene/lucene-core/#{LUCENE_VERSION}/lucene-core-#{LUCENE_VERSION}.jar"
+    puts "using lucene from jar"
+  end
+
+  puts "load"
+  include_class "de.saumya.lucene.LuceneService"
 end
+
 require 'dm_lucene_adapter/dm_lucene_adapter'

data/lib/dm_lucene_adapter/dm_lucene_adapter.rb

@@ -72,8 +72,7 @@ module DataMapper
       def do_read(offset, limit, query)
         reader = lucene(query.model).create_reader
         if(query.conditions.nil?)
-          result = []
-          
+          result = [] 
 #p query
 # TODO set limit, offset to default of sorting is non default
           reader.read_all(offset, limit).each do |resource|
@@ -86,9 +85,9 @@ module DataMapper
           result
         else
           ops = query.conditions.operands
-          if(ops.size == 1 && ops[0].class == DataMapper::Query::Conditions::EqualToComparison && ops[0].subject.name == :id)
+          if(ops.size == 1 && ops.first == :eql && ops.first.subject.name == :id)
             map = {}
-            reader.read(query.conditions.operands[0].value).each do |k,v|
+            reader.read(query.conditions.operands.first.value).each do |k,v|
               map[k] = v
             end
             [map]
@@ -117,11 +116,13 @@ module DataMapper
         ops.each do |comp|
           case comp.slug
           when :like
-            lquery += "#{comp.subject.name.to_s}:#{comp.value}"
-            unless comp.value =~ /%|_|\?|\*/
-              lquery += "~"
+            comp.value.split(/\s/).each do |value|
+              lquery += "#{comp.subject.name.to_s}:#{value}"
+              unless comp.value =~ /%|_|\?|\*/
+                lquery += "~"
+              end
+              lquery += " #{operator} "
             end
-            lquery += " #{operator} "
           when :eql
             lquery += "#{comp.subject.name.to_s}:\"#{comp.value}\" #{operator} "
           when :not
@@ -150,7 +151,6 @@ module DataMapper
       #
       # @api semipublic
       def update(attributes, collection)
-        count = 0
         service = lucene(collection.model)
         deleter = service.create_deleter
         resources = read(collection.query)
@@ -167,7 +167,7 @@ module DataMapper
           resource.each { |k,v| map[k.to_s] = v.to_s}
           indexer.index(map)
         end
-        count
+        resources.size
       ensure
         indexer.close if indexer
         deleter.close if deleter

data/spec/dm_lucene_adapter_spec.rb

@@ -91,6 +91,12 @@ describe DataMapper::Adapters::LuceneAdapter do
         @books.each { |b| b.author.should =~ /sanuka/ }
       end
 
+      it 'should find 5 with fuzzy query on total' do
+        @books = Book.all(:total.like => "sanaku corner")
+        @books.size.should == @size + @len
+        @books.each { |b| b.author.should =~ /sanuka/ }
+      end
+
       it 'should find 5 with single char wildcards query' do
         @books = Book.all(:author.like => "san?k?")
         @books.size.should == @size + @len

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
 
-gem 'dm-core', ">0.10.0"
+#gem 'dm-core', ">0.10.0"
 require 'pathname'
 $LOAD_PATH << Pathname(__FILE__).dirname.parent.expand_path + 'lib'
 
@@ -19,6 +19,11 @@ class Book
 
   property :published, Boolean, :default => true
 
+  property :total, Text
+
+  before :save do
+    attribute_set(:total, "#{id} #{author} #{title} #{published}");
+  end
 end
 
 DataMapper.setup(:default, :adapter => :lucene, :path => "tmp")

metadata

@@ -1,39 +1,21 @@
 --- !ruby/object:Gem::Specification 
 name: dm-lucene-adapter
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: java
-authors: []
-
+authors: 
+  - Kristian Meier
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-11-28 00:00:00 +05:30
+date: 2009-12-29 00:00:00 +05:30
 default_executable: 
-dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: dm-core
-    type: :runtime
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Requirement 
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 0.10.1
-      version: 
-  - !ruby/object:Gem::Dependency 
-    name: rspec
-    type: :development
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Requirement 
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: "1.2"
-      version: 
+dependencies: []
+
 description: datamapper adapter for search index lucene
 email: 
+  - m.kristian@web.de
 executables: []
 
 extensions: []
@@ -41,14 +23,13 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-  - lib/dm-lucene-adapter.rb
   - lib/dm-lucene-adapter_ext.jar
+  - lib/dm-lucene-adapter.rb
   - lib/dm_lucene_adapter/dm_lucene_adapter.rb
   - lib/dm_lucene_adapter/version.rb
   - spec/dm_lucene_adapter_spec.rb
   - spec/spec_helper.rb
   - spec/spec.opts
-  - MIT-LICENSE
 has_rdoc: true
 homepage: http://github.com/mkristian/dm-lucene-adapter
 licenses: []

data/MIT-LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2008 Kristian Meier
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.