solr_query 1.0.0 → 1.0.1

data/Rakefile

@@ -21,15 +21,9 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-
 require "rubygems"
 require "rake/gempackagetask"
 
-Spec::Rake::SpecTask.new do |t|
-  t.spec_opts = %w(--format specdoc --colour)
-  t.libs = ["spec"]
-end
-
 # This builds the actual gem. For details of what all these options
 # mean, and other ones you can add, check the documentation here:
 #
@@ -39,7 +33,7 @@ spec = Gem::Specification.new do |s|
 
   # Change these as appropriate
   s.name              = "solr_query"
-  s.version           = "1.0.0"
+  s.version           = "1.0.1"
   s.description       = "Build SOLR queries, properly escaped, with a nice API"
   s.summary           = "a ruby library designed to make building nested Solr queries simple and standardized. "
   s.author            = "Matthew Rudy"

data/lib/solr_query.rb

@@ -1,7 +1,3 @@
-unless nil.respond_to?(:blank?)
-  require File.join(File.dirname(__FILE__), "blank")
-end
-
 module SolrQuery
   class << self
     # build a query for solr
@@ -33,7 +29,7 @@ module SolrQuery
       conditions = conditions.dup # let's not accidentally kill our original params
       query_parts = []
       keyword = conditions.delete(keyword_key) # keyword is magical
-      unless keyword.blank?
+      if !blank?(keyword) # ie. !keyword.blank?
         query_parts << "#{solr_value(keyword, true)}"
       end
     
@@ -101,6 +97,16 @@ module SolrQuery
       string.gsub(SOLR_ESCAPE_REGEXP, "\\\\\\0").strip
     end
     protected :escape_solr_string
+    
+    def blank?(object) #:nodoc: quick rehash of rails' object.blank?
+      if object.is_a?(String)
+        object !~ /\S/
+      else
+        object.respond_to?(:empty?) ? object.empty? : !object
+      end
+    end
+    protected :blank?
+        
   end
   
   SOLR_ESCAPE_CHARACTERS = %w" \ + - ! ( ) : ; ^ [ ] { } ~ * ? "

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Matthew Rudy
@@ -41,7 +41,6 @@ files:
 - MIT-LICENSE
 - Rakefile
 - README
-- lib/blank.rb
 - lib/solr_query.rb
 has_rdoc: true
 homepage: http://github.com/matthewrudy/solr_query

data/lib/blank.rb

@@ -1,58 +0,0 @@
-class Object
-  # An object is blank if it's false, empty, or a whitespace string.
-  # For example, "", " ", +nil+, [], and {} are blank.
-  #
-  # This simplifies
-  #
-  # if !address.nil? && !address.empty?
-  #
-  # to
-  #
-  # if !address.blank?
-  def blank?
-    respond_to?(:empty?) ? empty? : !self
-  end
-    
-  # An object is present if it's not blank.
-  def present?
-    !blank?
-  end
-end
- 
-class NilClass #:nodoc:
-  def blank?
-    true
-  end
-end
- 
-class FalseClass #:nodoc:
-  def blank?
-    true
-  end
-end
- 
-class TrueClass #:nodoc:
-  def blank?
-    false
-  end
-end
- 
-class Array #:nodoc:
-  alias_method :blank?, :empty?
-end
- 
-class Hash #:nodoc:
-  alias_method :blank?, :empty?
-end
- 
-class String #:nodoc:
-  def blank?
-    self !~ /\S/
-  end
-end
- 
-class Numeric #:nodoc:
-  def blank?
-    false
-  end
-end