flare 1.3.0 → 1.4.0

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.4.0

data/flare.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{flare}
-  s.version = "1.3.0"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Dwan"]

data/lib/flare/session.rb

@@ -70,10 +70,8 @@ module Flare
           :fields => '* score',
         })
 
-        args << '*:*' if args.reject{|x| x.blank?}.empty?
-
         query = {
-          :q => args.blank?,
+          :q => Array(options[:q] || (args.blank? ? "*:*" : args)).flatten,
           :fq => Array(options[:fq]).flatten,
           :fl => options[:fields],
           :start => start = (options[:page] -1) * options[:per_page],

data/lib/flare.rb

@@ -25,7 +25,7 @@ module Flare
     
     def log(message)
       if Object.const_defined?("ActiveRecord")
-        ActiveRecord::Base.logger.debug(message)
+        ::ActiveRecord::Base.logger.debug(message)
       else
         puts message
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: flare
 version: !ruby/object:Gem::Version 
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Michael Dwan