Rename everything; clean up Gemfile

Author: Mat Brown

Gemfile

@@ -1,6 +1,3 @@
-gem 'sunspot-query', :require => 'sunspot/query', :path => File.dirname(__FILE__)
+source :rubygems
 
-group :test do
-  gem 'rspec', '~> 2.0'
-  gem 'ZenTest'
-end
+gemspec

Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    sunspot-query (1.0.0.alpha.1)
+    soolr (2.0.pre.1)
 
 GEM
+  remote: http://rubygems.org/
   specs:
-    ZenTest (4.5.0)
     diff-lcs (1.1.2)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
@@ -20,6 +20,5 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  ZenTest
   rspec (~> 2.0)
-  sunspot-query!
+  soolr!

LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2011 sunspot-query contributors
+Copyright (c) 2011 Soolr contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.mkd

@@ -1,6 +1,6 @@
-# Sunspot::Query
+# Soolr
 
-sunspot-query is a library for constructing Solr queries using an
+Soolr is a library for constructing Solr queries using an
 object-oriented API. It is a (conceptual) extraction from the
 [Sunspot](http://github.com/outoftime/sunspot) library, but unlike Sunspot,
 it makes no assumptions about how you want to use Solr.
@@ -11,5 +11,5 @@ This is very much a work in progress. Contributions are welcome!
 
 ## License
 
-Sunspot::Query can be freely distributed under the MIT License. See the LICENSE
+Soolr can be freely distributed under the MIT License. See the LICENSE
 file in this repository for details.

lib/soolr.rb

@@ -0,0 +1,17 @@
+module Soolr
+  TypeMismatch = Class.new(StandardError)
+
+  autoload :Type, 'soolr/type'
+  autoload :StringType, 'soolr/string_type'
+  autoload :IntegerType, 'soolr/integer_type'
+  autoload :FloatType, 'soolr/float_type'
+  autoload :TimeType, 'soolr/time_type'
+  autoload :BooleanType, 'soolr/boolean_type'
+
+  autoload :Field, 'soolr/field'
+
+  autoload :Condition, 'soolr/condition'
+  autoload :Not, 'soolr/not'
+  autoload :EqualTo, 'soolr/equal_to'
+  autoload :LessThan, 'soolr/less_than'
+end

lib/soolr/boolean_type.rb

@@ -0,0 +1,7 @@
+module Soolr
+  class BooleanType < Type
+    def serialize(boolean)
+      (!!boolean).inspect
+    end
+  end
+end

lib/soolr/condition.rb

@@ -0,0 +1,32 @@
+module Soolr
+  class Condition
+    def initialize(field, value)
+      @field, @value, @inverted = field, value, inverted
+    end
+
+    def to_boolean_query
+      @boolean_query ||=
+        begin
+          query = "#{@field.name}:#{to_boolean_expression}"
+          if @inverted then "-#{query}"
+          else query
+          end
+        end
+    end
+
+    def ==(other)
+      !other.respond_to?(:to_boolean_query) ||
+        to_boolean_query == other.to_boolean_query
+    end
+
+    private
+
+    def serialized_value
+      @field.serialize(@value)
+    end
+
+    def escape(string)
+      string.gsub(/[ :\\\-]/) { |c| "\\#{c}" } #FIXME Escape all special characters; figure out how to do this with back-references
+    end
+  end
+end

lib/soolr/equal_to.rb

@@ -0,0 +1,11 @@
+module Soolr
+  class EqualTo < Condition
+    def inverse
+      Not.new(self)
+    end
+
+    def to_boolean_expression
+      escape(serialized_value)
+    end
+  end
+end

lib/soolr/field.rb

@@ -0,0 +1,13 @@
+module Soolr
+  class Field
+    attr_reader :name, :type
+
+    def initialize(name, type)
+      @name, @type = name, type
+    end
+
+    def serialize(value)
+      @type.serialize(value)
+    end
+  end
+end

lib/soolr/float_type.rb

@@ -0,0 +1,11 @@
+module Soolr
+  class FloatType < Type
+    def serialize(float)
+      if Float === float then float.to_s
+      else float.to_f.to_s
+      end
+    rescue NoMethodError
+      raise TypeMismatch, "Unable to cast #{float.inspect} to float"
+    end
+  end
+end

lib/soolr/integer_type.rb

@@ -0,0 +1,11 @@
+module Soolr
+  class IntegerType < Type
+    def serialize(integer)
+      if Integer === integer then integer.to_s
+      else integer.to_i.to_s
+      end
+    rescue NoMethodError
+      raise TypeMismatch, "Unable to cast #{integer.inspect} to integer"
+    end
+  end
+end

lib/soolr/less_than.rb

@@ -0,0 +1,9 @@
+module Soolr
+  class LessThan < Condition
+    private
+
+    def to_boolean_expression
+      "(..#{escape(serialized_value)})"
+    end
+  end
+end

lib/soolr/not.rb

@@ -0,0 +1,15 @@
+module Soolr
+  class Not
+    def initialize(condition)
+      @condition = condition
+    end
+
+    def to_boolean_query
+      "-#{@condition.to_boolean_query}"
+    end
+
+    def inverse
+      @condition
+    end
+  end
+end

lib/soolr/string_type.rb

@@ -0,0 +1,7 @@
+module Soolr
+  class StringType < Type
+    def serialize(string)
+      string.to_s
+    end
+  end
+end

lib/soolr/time_type.rb

@@ -0,0 +1,9 @@
+require 'time'
+
+module Soolr
+  class TimeType < Type
+    def serialize(time)
+      time.utc.xmlschema
+    end
+  end
+end

lib/soolr/type.rb

@@ -0,0 +1,17 @@
+require 'singleton'
+
+module Soolr
+  class Type
+    include Singleton
+
+    class <<self
+      def method_missing(method, *args, &block)
+        if instance.respond_to?(method)
+          instance.__send__(method, *args, &block)
+        else
+          super
+        end
+      end
+    end
+  end
+end

lib/soolr/version.rb

@@ -0,0 +1,3 @@
+module Soolr
+  VERSION = '2.0.pre.1'
+end