lunr 2.0.0 → 2.0.1

data/CHANGELOG.rdoc

@@ -1,3 +1,11 @@
+=== 2.0.1 / 2010-09-02
+
+* Clean up model and search.
+
+=== 2.0.0 / 2010-09-01
+
+* Reboot.
+
 === 1.0.1 / 2010-08-25
 
 * Handle missing :p value correctly.

data/Manifest.txt

@@ -7,6 +7,7 @@ Rakefile
 lib/lunr.rb
 lib/lunr/errors.rb
 lib/lunr/model.rb
+lib/lunr/model/klass.rb
 lib/lunr/search.rb
 lib/lunr/sunspot.rb
 test/test_lunr.rb

data/lib/lunr.rb

@@ -5,7 +5,8 @@ require "lunr/search"
 module Lunr
 
   # Duh.
-  VERSION = "2.0.0"
+
+  VERSION = "2.0.1"
 
 end
 

data/lib/lunr/model.rb

@@ -1,45 +1,15 @@
-require "lunr/search"
-require "lunr/sunspot"
+require "lunr/model/klass"
 
 module Lunr
   module Model
-    def self.included klass
-      klass.extend Klass
-    end
-
     attr_reader :id
 
-    module Klass
-      def properties
-        @properties ||= []
-      end
-
-      def scopes
-        @scopes ||= {}
-      end
-
-      def scope sym = :all, &block
-        scopes[sym] = block
-
-        unless sym == :all
-          class_eval <<-END, __FILE__, __LINE__ + 1
-            def self.#{sym}; search.#{sym} end
-          END
-        end
-      end
-
-      def search &block
-        Lunr::Search.new self, &block
-      end
-
-      alias_method :all, :search
-
-      def searches classname, &block
-        Sunspot::TypeField.alias self, classname
-        Sunspot.setup self, &block
+    def to_h
+      @to_h ||= {}.tap do |h|
+        h[:id] = id
 
-        properties.uniq.each do |prop|
-          attr_reader prop
+        self.class.properties.each do |name, type|
+          h[name] = send name
         end
       end
     end

data/lib/lunr/model/klass.rb

@@ -0,0 +1,45 @@
+require "lunr/search"
+require "lunr/sunspot"
+
+module Lunr
+  module Model
+    def self.included klass
+      klass.extend Klass
+    end
+
+    module Klass
+      def properties
+        @properties ||= {}
+      end
+
+      def scopes
+        @scopes ||= {}
+      end
+
+      def scope sym = :all, &block
+        scopes[sym] = block
+
+        unless sym == :all
+          class_eval <<-END, __FILE__, __LINE__ + 1
+            def self.#{sym}; search.#{sym} end
+          END
+        end
+      end
+
+      def search &block
+        Lunr::Search.new self, &block
+      end
+
+      alias_method :all, :search
+
+      def searches classname, &block
+        Sunspot::TypeField.alias self, classname
+        Sunspot.setup self, &block
+
+        properties.each do |name, type|
+          attr_reader name
+        end
+      end
+    end
+  end
+end

data/lib/lunr/search.rb

@@ -6,39 +6,6 @@ module Lunr
   class Search
     include Enumerable
 
-    def each &block
-      execute && @results.each(&block)
-    end
-
-    def total
-      execute && @search.total
-    end
-
-    alias_method :size, :total
-
-    def empty?
-      0 == total
-    end
-
-    # Acting like WillPaginate::Collection
-
-    def current_page
-      execute && @search.query.page
-    end
-
-    def per_page
-      execute && @search.query.per_page
-    end
-
-    def total_entries
-      total
-    end
-
-    def total_pages
-      total_entries / per_page +
-        (total_entries % per_page > 0 ? 1 : 0)
-    end
-
     attr_reader :klass
 
     def initialize klass, &block
@@ -46,16 +13,20 @@ module Lunr
 
       @executed = false
       @klass    = klass
-      @search   = Sunspot.new_search klass, &block
+      @search   = Sunspot.new_search klass
 
-      if all = @klass.scopes[:all]
-        scope &all
-      end
+      all = @klass.scopes[:all]
+
+      scope &all   if all
+      scope &block if block_given?
     end
 
-    def scope &block
-      executable!
-      @search.build &block
+    def each &block
+      execute && @results.each(&block)
+    end
+
+    def empty?
+      0 == total
     end
 
     def executable!
@@ -66,14 +37,8 @@ module Lunr
       @executed
     end
 
-    # :nodoc:
-
-    def params
-      @search.query.to_params
-    end
-
     def method_missing sym, *args
-      super unless scope = klass.scopes[sym]
+      return super unless scope = klass.scopes[sym]
 
       executable!
 
@@ -88,10 +53,45 @@ module Lunr
       self
     end
 
+    def page
+      @page ||= execute && @search.query.page
+    end
+
+    def pages
+      total / per +
+        (total_entries % per_page > 0 ? 1 : 0)
+    end
+
+    def params
+      @search.query.to_params
+    end
+
+    def per
+      @per ||= execute && @search.query.per_page
+    end
+
     def respond_to sym, include_private = false
       klass.scopes.key?(sym) || super
     end
 
+    def scope &block
+      executable!
+      @search.build &block
+    end
+
+    def total
+      @total ||= execute && @search.total
+    end
+
+    alias_method :size, :total
+
+    # Quack like WillPaginate::Collection
+
+    alias_method :current_page,  :page
+    alias_method :per_page,      :per
+    alias_method :total_entries, :total
+    alias_method :total_pages,   :pages
+
     private
 
     def execute
@@ -100,11 +100,20 @@ module Lunr
         @search.execute
 
         @results = @search.hits.map do |hit|
+          # FIX: this belongs in the model.
           klass.new.tap do |model|
             model.instance_variable_set :"@id", hit.primary_key
 
-            klass.properties.each do |prop|
-              model.instance_variable_set :"@#{prop}", hit.stored(prop)
+            klass.properties.each do |name, type|
+              value = hit.stored name
+
+              # For text fields, which always appear to be multiple.
+
+              if Array === value && value.length == 1 && type == :text
+                value = value.first
+              end
+
+              model.instance_variable_set :"@#{name}", value
             end
           end
         end

data/lib/lunr/sunspot.rb

@@ -4,7 +4,7 @@ module Sunspot
   module DSL
     class Fields
       def property name, type, options = {}
-        @setup.clazz.properties << name
+        @setup.clazz.properties[name] = type
         send type, name, options.merge(:stored => true)
       end
     end
@@ -30,12 +30,6 @@ module Sunspot
     end
   end
 
-  class Setup
-    def lunr_properties
-      @lunr_properties ||= []
-    end
-  end
-
   class TypeField
     class << self
       def alias(dest_class, source_class_name)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lunr
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 2
   - 0
-  - 0
-  version: 2.0.0
+  - 1
+  version: 2.0.1
 platform: ruby
 authors: 
 - John Barnette
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-01 00:00:00 -07:00
+date: 2010-09-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -192,6 +192,7 @@ files:
 - lib/lunr.rb
 - lib/lunr/errors.rb
 - lib/lunr/model.rb
+- lib/lunr/model/klass.rb
 - lib/lunr/search.rb
 - lib/lunr/sunspot.rb
 - test/test_lunr.rb