flare 1.2.0 → 1.3.0

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.3.0

data/flare.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{flare}
-  s.version = "1.2.0"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Dwan"]
-  s.date = %q{2010-01-26}
+  s.date = %q{2010-02-10}
   s.description = %q{This needs to get updated}
   s.email = %q{mpdwan@gmail.com}
   s.extra_rdoc_files = [

data/lib/flare/session.rb

@@ -61,6 +61,8 @@ module Flare
       def execute(*args)
         options = args.extract_options!
         
+        options.assert_valid_keys(:q, :fq, :types, :page, :per_page, :limit, :fl, :sort, :facet)
+        
         options.reverse_merge!({
           :page => 1,
           :per_page => PER_PAGE,
@@ -68,29 +70,28 @@ module Flare
           :fields => '* score',
         })
 
-        options.assert_valid_keys(:filter, :types, :page, :per_page, :limit, :fields, :order, :facet)
-
         args << '*:*' if args.reject{|x| x.blank?}.empty?
 
         query = {
-          :q => args,
-          :fq => Array(options[:filter]).flatten,
+          :q => args.blank?,
+          :fq => Array(options[:fq]).flatten,
           :fl => options[:fields],
           :start => start = (options[:page] -1) * options[:per_page],
-          :rows => options[:per_page]
+          :rows => options[:per_page],
+          :sort => options[:sort]
         }
         
-        if options[:facets]
-          query[:facets] = true
-          query['facet.field'] = options[:facets][:fields]
-          query['facet.query'] = options[:facets][:queries]
-          query['facet.mincount'] = options[:facets][:mincount] || 1
-          query["facet.limit"] = options[:facets][:limit]
+        if options[:facet]
+          query["facet"] = true
+          query["facet.field"] = options[:facet][:fields]
+          query["facet.query"] = options[:facet][:queries]
+          query["facet.mincount"] = options[:facet][:mincount] || 1
+          query["facet.limit"] = options[:facet][:limit]
           
-          query["facet.missing"] = @params[:facets][:missing]
-          query["facet.mincount"] = @params[:facets][:mincount]
-          query["facet.prefix"] = @params[:facets][:prefix]
-          query["facet.offset"] = @params[:facets][:offset]
+          query["facet.missing"] = @params[:facet][:missing]
+          query["facet.mincount"] = @params[:facet][:mincount]
+          query["facet.prefix"] = @params[:facet][:prefix]
+          query["facet.offset"] = @params[:facet][:offset]
         end        
         
         
@@ -98,11 +99,11 @@ module Flare
           query[:fq] << Array(options[:types]).map {|type| "type:#{type}"}.join(" OR ")
         end
         
-        ::ActiveRecord::Base.logger.debug(<<-SOLR.squish)
+        Flare.log(<<-SOLR.squish)
           \e[4;32mSolr Query:\e[0;1m 
           #{query[:q].join(', ')} 
           #{"(#{query[:fq].join(' AND ')})," if query[:fq] } 
-          sort: #{query[:order]} 
+          sort: #{query[:sort]} 
           start: #{query[:start]}, 
           rows: #{query[:rows]}
         SOLR
@@ -111,6 +112,7 @@ module Flare
         response[:request] = query
         response[:request][:page] = options[:page]
         response[:request][:per_page] = options[:per_page]
+
         response.with_indifferent_access
       end
       

data/lib/flare.rb

@@ -22,5 +22,13 @@ module Flare
     def indexed_models
       @@indexed_models ||= []
     end
+    
+    def log(message)
+      if Object.const_defined?("ActiveRecord")
+        ActiveRecord::Base.logger.debug(message)
+      else
+        puts message
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: flare
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Michael Dwan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-26 00:00:00 -06:00
+date: 2010-02-10 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency