lunr 2.0.3 → 2.0.4

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+=== 2.0.4 / 2010-09-07
+
+* Unbreak model instantiation, switch to Hash backing store.
+
 === 2.0.3 / 2010-09-07
 
 * Cleanups, squash warnings.

data/README.rdoc

@@ -47,7 +47,7 @@ to the original data store, Lunr might be what you're looking for.
 
 === Including the Module
 
-All model class must <code>include Lunr::Model</code>.
+All model classes must <code>include Lunr::Model</code>.
 
 === Define the Search Index
 
@@ -109,7 +109,7 @@ first param must be the Sunspot query object.
 
 == Searching
 
-Use Sunspot's excellent search DSL for ad hock searches.
+Use Sunspot's excellent search DSL for ad hoc searches.
 
     My::SimpleTrack.search
     My::SimpleTrack.all # same thing

data/lib/lunr.rb

@@ -6,7 +6,7 @@ module Lunr
 
   # Duh.
 
-  VERSION = "2.0.3"
+  VERSION = "2.0.4"
 
 end
 

data/lib/lunr/model.rb

@@ -2,16 +2,16 @@ require "lunr/model/klass"
 
 module Lunr
   module Model
-    attr_accessor :id
+    def initialize hash
+      @hash = hash
+    end
 
-    def to_h
-      @to_h ||= {}.tap do |h|
-        h[:id] = id
+    def id
+      @hash[:id]
+    end
 
-        self.class.properties.each do |name, type|
-          h[name] = send name
-        end
-      end
+    def to_h
+      @hash
     end
   end
 end

data/lib/lunr/model/klass.rb

@@ -9,23 +9,20 @@ module Lunr
 
     module Klass
       def create hit
-        new.tap do |instance|
-          instance.id = hit.primary_key
+        hash = { :id => hit.primary_key }
 
-          properties.each do |name, type|
-            value = hit.stored name
+        properties.each do |name, type|
+          value = hit.stored name
 
+          if Array === value && value.length == 1 && type == :text
             # For text fields, which always appear to be multiple.
-
-            if Array === value && value.length == 1 && type == :text
-              value = value.first
-            end
-
-            instance.send "#{name}=", value
+            value = value.first
           end
 
-          instance.freeze
+          hash[name] = value
         end
+
+        new(hash).freeze
       end
 
       def first &block
@@ -45,7 +42,9 @@ module Lunr
 
         unless name == :all
           class_eval <<-END, __FILE__, __LINE__ + 1
-            def self.#{name}; search.#{name} end
+            def self.#{name}
+              search.#{name}
+            end
           END
         end
       end
@@ -61,7 +60,11 @@ module Lunr
         Sunspot.setup self, &block
 
         properties.each do |name, type|
-          attr_accessor name
+          class_eval <<-END, __FILE__, __LINE__ + 1
+            def #{name}
+              @hash[#{name.inspect}]
+            end
+          END
         end
       end
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lunr
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: false
   segments: 
   - 2
   - 0
-  - 3
-  version: 2.0.3
+  - 4
+  version: 2.0.4
 platform: ruby
 authors: 
 - John Barnette