flare 1.4.4 → 1.6.1

data/.gitignore

@@ -19,4 +19,5 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
-flare-solr.pid
+flare-solr.pid
+*.gemspec

data/Rakefile

@@ -10,7 +10,7 @@ begin
     gem.email = "mpdwan@gmail.com"
     gem.homepage = "http://github.com/michaeldwan/flare"
     gem.authors = ["Michael Dwan"]
-    gem.add_dependency('rsolr', '0.12.1')
+    gem.add_dependency('rsolr', '0.11.0')
     gem.add_dependency('escape', '>= 0.0.4')
     gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings

data/VERSION

@@ -1 +1 @@
-1.4.4
+1.6.1

data/lib/flare.rb

@@ -7,7 +7,7 @@ rescue LoadError
   require 'rsolr'
 end
 
-%w(configuration collection index_builder session active_record).each do |file|
+%w(collection index_builder session active_record).each do |file|
   require File.join(File.dirname(__FILE__), 'flare', file)
 end
 
@@ -15,8 +15,17 @@ ActiveRecord::Base.send(:include, Flare::ActiveRecord)
 
 module Flare
   class << self
+
+    attr_reader :solr_url
+    
+    def solr=(value)
+      @session = Flare::Session.new(value)
+    end
+    
     def session
-      @session ||= Flare::Session.new
+      return @session if @session
+      self.solr = "http://127.0.0.1:8983/solr"
+      @session
     end
     
     def indexed_models

data/lib/flare/active_record.rb

@@ -29,6 +29,7 @@ module Flare
     module ClassMethods
       def search_for_ids(*args)
         options = args.extract_options!
+        options.except!(:include)
         options[:types] ||= []
         options[:types] << self
         Flare.session.search_for_ids(*[args, options].flatten)
@@ -43,6 +44,7 @@ module Flare
 
       def search_count(*args)
         options = args.extract_options!
+        options.except!(:include)
         options[:types] ||= []
         options[:types] << self
         Flare.session.count(*[args, options].flatten)

data/lib/flare/collection.rb

@@ -20,11 +20,15 @@ module Flare
       # raise response.inspect
       collection = self.new(page, per_page, response['response']['numFound'] || 0)
       collection.response = response      
-      collection.replace(instantiate_objects(response))
+      collection.replace(instantiate_objects(response, options))
       return collection
     end
     
-    def previous_page
+    def max_pages=(value)
+      @total_pages = value if value < @total_pages
+    end
+    
+    def previous_page 
       current_page > 1 ? (current_page - 1) : nil
     end
     
@@ -37,11 +41,25 @@ module Flare
     end
     
     private
-      def self.instantiate_objects(response)
+      def self.instantiate_objects(response, options = {})
+        types = Hash.new{|h, k| h[k] = []}
+        results = Hash.new{|h, k| h[k] = {}}
         response['response']['docs'].map do |doc|
           type, id = doc['id'].split(':')
-          type.constantize.find(id)
+          types[type] << id
+        end
+        
+        types.each do |type, ids|
+          includes = options[:include]
+          type.constantize.find_all_by_id(ids, :include => includes).each do |item|
+            results[type][item.id] = item
+          end
         end
+
+        response['response']['docs'].map do |doc|
+          type, id = doc['id'].split(':')
+          results[type][id.to_i]
+        end.compact
       end
   end
 end

data/lib/flare/session.rb

@@ -3,20 +3,26 @@ module Flare
     RESULT_LIMIT = 1000
     PER_PAGE = 16
     
-    def connection
-      @connection ||= RSolr.connect(:url => Flare::Configuration.client.url)
+    def initialize(url)
+      @connection = RSolr.connect(:url => url)
     end
-
+    
+    attr_reader :connection
+    
     delegate :commit, :optimize, :to => :connection
 
     def search_for_ids(*args)
+      options = args.extract_options!
+      ar_options = { :include => options.delete(:include) }
       response = execute(*args)
       Flare::Collection.ids_from_response(response, response[:request][:page], response[:request][:per_page], response[:request])
     end
 
     def search(*args)
-      response = execute(*args)
-      Flare::Collection.create_from_response(response, response[:request][:page], response[:request][:per_page], response[:request])
+      options = args.extract_options!
+      ar_options = { :include => options.delete(:include) }
+      response = execute(options)
+      Flare::Collection.create_from_response(response, response[:request][:page], response[:request][:per_page], ar_options)
     end
 
     def count(*args)
@@ -26,7 +32,8 @@ module Flare
     def index(*objects)
       objects = ensure_searchable(objects)
       objects.collect(&:to_solr_doc).each do |doc|
-        connection.update(RSolr::Message::Generator.new.add(doc[:fields], doc[:attributes]))
+        # connection.update(RSolr::Message::Generator.new.add(doc[:fields], doc[:attributes]))
+        connection.update(RSolr::Message::Builder.new.add(doc[:fields], doc[:attributes]))
         # connection.add(doc[:fields], doc[:attributes])
       end
     end
@@ -61,7 +68,7 @@ module Flare
       def execute(*args)
         options = args.extract_options!
         
-        options.assert_valid_keys(:q, :fq, :types, :page, :per_page, :limit, :fl, :sort, :facet, :mlt)
+        options.assert_valid_keys(:q, :fq, :types, :page, :per_page, :limit, :fl, :sort, :facet, :mlt, :mm)
         
         options.reverse_merge!({
           :page => 1,
@@ -96,6 +103,11 @@ module Flare
         if options[:mlt]
           query['mlt'] = true
           query['mlt.fl'] = Array(options[:mlt][:fields]).flatten.join(',')
+          query['mlt.count'] = options[:mlt][:count] if options[:mlt][:count]
+        end
+        
+        if options[:mm]
+          query['mm'] = options[:mm]
         end
 
         if options[:types]

data/lib/flare/tasks.rb

@@ -15,4 +15,9 @@ namespace :flare do
     Flare.session.commit
     Flare.session.optimize
   end
+  
+  desc "Optimize the index"
+  task :optimize => :environment do
+    Flare.session.optimize
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: flare
 version: !ruby/object:Gem::Version 
-  version: 1.4.4
+  version: 1.6.1
 platform: ruby
 authors: 
 - Michael Dwan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-15 00:00:00 -06:00
+date: 2010-04-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.12.1
+        version: 0.11.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: escape
@@ -58,11 +58,9 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- flare.gemspec
 - lib/flare.rb
 - lib/flare/active_record.rb
 - lib/flare/collection.rb
-- lib/flare/configuration.rb
 - lib/flare/index_builder.rb
 - lib/flare/session.rb
 - lib/flare/tasks.rb

data/flare.gemspec

@@ -1,66 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{flare}
-  s.version = "1.4.4"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Michael Dwan"]
-  s.date = %q{2010-02-15}
-  s.description = %q{This needs to get updated}
-  s.email = %q{mpdwan@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "flare.gemspec",
-     "lib/flare.rb",
-     "lib/flare/active_record.rb",
-     "lib/flare/collection.rb",
-     "lib/flare/configuration.rb",
-     "lib/flare/index_builder.rb",
-     "lib/flare/session.rb",
-     "lib/flare/tasks.rb",
-     "test/helper.rb",
-     "test/test_flare.rb"
-  ]
-  s.homepage = %q{http://github.com/michaeldwan/flare}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{This needs to get updated}
-  s.test_files = [
-    "test/helper.rb",
-     "test/test_flare.rb"
-  ]
-
-  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
-      s.add_runtime_dependency(%q<rsolr>, ["= 0.12.1"])
-      s.add_runtime_dependency(%q<escape>, [">= 0.0.4"])
-      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-    else
-      s.add_dependency(%q<rsolr>, ["= 0.12.1"])
-      s.add_dependency(%q<escape>, [">= 0.0.4"])
-      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<rsolr>, ["= 0.12.1"])
-    s.add_dependency(%q<escape>, [">= 0.0.4"])
-    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-  end
-end
-

data/lib/flare/configuration.rb

@@ -1,76 +0,0 @@
-require 'yaml'
-
-module Flare
-  class Configuration
-    class << self
-      attr_reader :client, :server
-      
-      def server(reload = false)
-        @server = nil if reload
-        @server ||= Server.new
-      end
-
-      def client(reload = false)
-        @client = nil if reload
-        @client = Client.new
-      end
-    end
-
-    private
-      class Server
-        def initialize
-          @config = YAML::load_file(File.join(Rails.root, 'config', 'solr.yml'))[Rails.env]
-        end
-
-        def port
-          @port ||= (@config['port'] || 8983).to_i
-        end
-
-        def log_dir
-          @log_dir ||= File.expand_path(@config['log_dir'] || 'log')
-        end
-
-        def log_level
-          @log_level ||= @config['log_level'] || 'INFO'
-        end
-
-        def data_dir
-          @data_dir ||= File.expand_path(@config['data_dir'] || File.join('solr', 'data', Rails.env))
-        end
-
-        def solr_home
-          @solr_home ||= File.expand_path(@config['solr_home'] || File.join(File.dirname(__FILE__), '..', '..', 'solr', 'solr'))
-        end
-
-        def pid_dir
-          @pid_dir ||= File.expand_path(@config['pid_dir'] || 'tmp/pids')
-        end
-
-        def jvm_options
-          @jvm_options ||= @config['jvm_options']
-        end        
-      end
-
-      class Client
-        def initialize
-          @config = YAML::load_file(File.join(Rails.root, 'config', 'flare.yml'))[Rails.env]
-        end
-
-        def port
-          @port ||= (@config['port'] || 8983).to_i
-        end
-
-        def host
-          @host ||= @config['host'] || '127.0.0.1'
-        end
-
-        def path
-          @path ||= @config['path'] || 'solr'
-        end
-        
-        def url
-          @url ||= "http://#{host}:#{port}/#{path}"
-        end
-      end
-  end
-end