oedipus 0.0.1.pre1 → 0.0.1.pre2

data/spec/unit/comparison/outside_spec.rb

@@ -0,0 +1,36 @@
+# encoding: utf-8
+
+##
+# Oedipus Sphinx 2 Search.
+# Copyright © 2012 Chris Corbyn.
+#
+# See LICENSE file for details.
+##
+
+require "spec_helper"
+
+describe Oedipus::Comparison::Outside do
+  context "with an inclusive range" do
+    let(:comparison) { Oedipus::Comparison::Outside.new(42..100) }
+
+    it "draws as NOT BETWEEN x AND y" do
+      comparison.to_s.should == "NOT BETWEEN 42 AND 100"
+    end
+
+    it "inverses as BETWEEN x AND y" do
+      comparison.inverse.to_s.should == "BETWEEN 42 AND 100"
+    end
+  end
+
+  context "with an exclusive range" do
+    let(:comparison) { Oedipus::Comparison::Outside.new(42...100) }
+
+    it "draws as NOT BETWEEN x AND y-1" do
+      comparison.to_s.should == "NOT BETWEEN 42 AND 99"
+    end
+
+    it "inverses as BETWEEN x AND y-1" do
+      comparison.inverse.to_s.should == "BETWEEN 42 AND 99"
+    end
+  end
+end

data/spec/unit/comparison/shortcuts_spec.rb

@@ -0,0 +1,125 @@
+# encoding: utf-8
+
+##
+# Oedipus Sphinx 2 Search.
+# Copyright © 2012 Chris Corbyn.
+#
+# See LICENSE file for details.
+##
+
+require "spec_helper"
+
+describe Oedipus::Comparison::Shortcuts do
+  let(:s) { Object.new.tap { |o| o.extend subject } }
+
+  describe "#eq" do
+    it "returns the = comparison for v" do
+      s.eq(7).should == Oedipus::Comparison::Equal.new(7)
+    end
+  end
+
+  describe "#neq" do
+    it "returns the != comparison for v" do
+      s.neq(7).should == Oedipus::Comparison::NotEqual.new(7)
+    end
+  end
+
+
+  describe "#not" do
+    it "returns the NOT comparison for v" do
+      s.not(7).should == Oedipus::Comparison::Not.new(7)
+    end
+  end
+
+  describe "#gt" do
+    it "returns the > comparison for v" do
+      s.gt(7).should == Oedipus::Comparison::GT.new(7)
+    end
+  end
+
+  describe "#lt" do
+    it "returns the < comparison for v" do
+      s.lt(7).should == Oedipus::Comparison::LT.new(7)
+    end
+  end
+
+  describe "#gte" do
+    it "returns the >= comparison for v" do
+      s.gte(7).should == Oedipus::Comparison::GTE.new(7)
+    end
+  end
+
+  describe "#lte" do
+    it "returns the <= comparison for v" do
+      s.lte(7).should == Oedipus::Comparison::LTE.new(7)
+    end
+  end
+
+  describe "#between" do
+    context "with a range" do
+      it "returns the BETWEEN comparison for v" do
+        s.between(7..11).should == Oedipus::Comparison::Between.new(7..11)
+      end
+    end
+
+    context "with two bounds" do
+      it "returns the BETWEEN comparison for x and y" do
+        s.between(7, 11).should == Oedipus::Comparison::Between.new(7..11)
+      end
+    end
+  end
+
+  describe "#outside" do
+    context "with a range" do
+      it "returns the NOT BETWEEN comparison for v" do
+        s.outside(7..11).should == Oedipus::Comparison::Outside.new(7..11)
+      end
+    end
+
+    context "with two bounds" do
+      it "returns the NOT BETWEEN comparison for x and y" do
+        s.outside(7, 11).should == Oedipus::Comparison::Outside.new(7..11)
+      end
+    end
+  end
+
+  describe "#in" do
+    context "with an array" do
+      it "returns the IN comparison for v" do
+        s.in([1, 2, 3]).should == Oedipus::Comparison::In.new([1, 2, 3])
+      end
+    end
+
+    context "with a range" do
+      it "returns the IN comparison for v" do
+        s.in(1..3).should == Oedipus::Comparison::In.new([1, 2, 3])
+      end
+    end
+
+    context "with a variable arguments" do
+      it "returns the IN comparison for x, y, z" do
+        s.in(1, 2, 3).should == Oedipus::Comparison::In.new([1, 2, 3])
+      end
+    end
+  end
+
+  describe "#not_in" do
+    context "with an array" do
+      it "returns the NOT IN comparison for v" do
+        s.not_in([1, 2, 3]).should == Oedipus::Comparison::NotIn.new([1, 2, 3])
+      end
+    end
+
+    context "with a range" do
+      it "returns the NOT IN comparison for v" do
+        s.not_in(1..3).should == Oedipus::Comparison::NotIn.new([1, 2, 3])
+      end
+    end
+
+    context "with a variable arguments" do
+      it "returns the NOT IN comparison for x, y, z" do
+        s.not_in(1, 2, 3).should == Oedipus::Comparison::NotIn.new([1, 2, 3])
+      end
+    end
+  end
+end

data/spec/unit/comparison_spec.rb

@@ -0,0 +1,109 @@
+# encoding: utf-8
+
+##
+# Oedipus Sphinx 2 Search.
+# Copyright © 2012 Chris Corbyn.
+#
+# See LICENSE file for details.
+##
+
+require "spec_helper"
+
+describe Oedipus::Comparison do
+  subject { Oedipus::Comparison }
+
+  describe "#of" do
+    context "with a comparison" do
+      it "returns the comparison" do
+        subject.of(
+          Oedipus::Comparison::Equal.new(7)
+        ).should == Oedipus::Comparison::Equal.new(7)
+      end
+    end
+
+    context "with a Fixnum" do
+      it "returns an Equal comparison" do
+        subject.of(7).should == Oedipus::Comparison::Equal.new(7)
+      end
+    end
+
+    context "with a Float" do
+      it "returns an Equal comparison" do
+        subject.of(7.2).should == Oedipus::Comparison::Equal.new(7.2)
+      end
+    end
+
+    context "with a BigDecimal" do
+      it "returns an Equal comparison" do
+        subject.of(BigDecimal("7.2")).should == Oedipus::Comparison::Equal.new(7.2)
+      end
+    end
+
+    context "with a Rational" do
+      it "returns an Equal comparison" do
+        subject.of(Rational("1/3")).should == Oedipus::Comparison::Equal.new(Rational("1/3").to_f)
+      end
+    end
+
+    context "with a String" do
+      it "returns an Equal comparison" do
+        subject.of("test").should == Oedipus::Comparison::Equal.new("test")
+      end
+    end
+
+    context "with a Symbol" do
+      it "returns an Equal comparison" do
+        subject.of(:test).should == Oedipus::Comparison::Equal.new(:test)
+      end
+    end
+
+    context "with a range" do
+      context "starting at -Infinity" do
+        context "inclusive" do
+          it "returns a LTE comparison" do
+            subject.of(-Float::INFINITY..10).should == Oedipus::Comparison::LTE.new(10)
+          end
+        end
+
+        context "exclusive" do
+          it "returns a LT comparison" do
+            subject.of(-Float::INFINITY...10).should == Oedipus::Comparison::LT.new(10)
+          end
+        end
+      end
+
+      context "ending at -Infinity" do
+        context "inclusive" do
+          it "returns a GTE comparison" do
+            subject.of(10..Float::INFINITY).should == Oedipus::Comparison::GTE.new(10)
+          end
+        end
+
+        context "exclusive" do
+          it "returns a GT comparison" do
+            subject.of(10...Float::INFINITY).should == Oedipus::Comparison::GT.new(10)
+          end
+        end
+      end
+
+      context "of real numbers" do
+        it "returns a BETWEEN comparison" do
+          subject.of(10..20).should == Oedipus::Comparison::Between.new(10..20)
+        end
+      end
+    end
+
+    context "with an array" do
+      it "returns an IN comparison" do
+        subject.of([1, 2, 3]).should == Oedipus::Comparison::In.new([1, 2, 3])
+      end
+    end
+
+    context "with an Enumerable type" do
+      it "returns an IN comparison" do
+        require 'set'
+        subject.of(Set[1, 2, 3]).should == Oedipus::Comparison::In.new([1, 2, 3])
+      end
+    end
+  end
+end

data/spec/unit/query_builder_spec.rb

@@ -0,0 +1,150 @@
+# encoding: utf-8
+
+##
+# Oedipus Sphinx 2 Search.
+# Copyright © 2012 Chris Corbyn.
+#
+# See LICENSE file for details.
+##
+
+require "spec_helper"
+
+describe Oedipus::QueryBuilder do
+  let(:builder) { Oedipus::QueryBuilder.new(:posts) }
+
+  describe "#select" do
+    context "with a fulltext search" do
+      it "uses MATCH()" do
+        builder.select("dogs AND cats", {}).should =~ /SELECT .* FROM posts WHERE MATCH\('dogs AND cats'\)/
+      end
+    end
+
+    context "without conditions" do
+      it "does not add a where clause" do
+        builder.select("", {}).should_not =~ /WHERE/
+      end
+    end
+
+    context "with equal attribute filters" do
+      it "uses the '=' operator" do
+        builder.select("dogs", author_id: 7).should =~ /SELECT .* FROM posts WHERE .* author_id = 7/
+      end
+    end
+
+    context "with not equal attribute filters" do
+      it "uses the '!=' operator" do
+        builder.select("dogs", author_id: Oedipus.not(7)).should =~ /SELECT .* FROM posts WHERE .* author_id != 7/
+      end
+    end
+
+    context "with inclusive range-filtered attribute filters" do
+      it "uses the BETWEEN operator" do
+        builder.select("cats", views: 10..20).should =~ /SELECT .* FROM posts WHERE .* views BETWEEN 10 AND 20/
+      end
+    end
+
+    context "with exclusive range-filtered attribute filters" do
+      it "uses the BETWEEN operator" do
+        builder.select("cats", views: 10...20).should =~ /SELECT .* FROM posts WHERE .* views BETWEEN 10 AND 19/
+      end
+    end
+
+    context "with a greater than or equal comparison" do
+      it "uses the >= operator" do
+        builder.select("cats", views: 50..(1/0.0)).should =~ /SELECT .* FROM posts WHERE .* views >= 50/
+      end
+    end
+
+    context "with a greater than comparison" do
+      it "uses the > operator" do
+        builder.select("cats", views: 50...(1/0.0)).should =~ /SELECT .* FROM posts WHERE .* views > 50/
+      end
+    end
+
+    context "with a less than or equal comparison" do
+      it "uses the <= operator" do
+        builder.select("cats", views: -(1/0.0)..50).should =~ /SELECT .* FROM posts WHERE .* views <= 50/
+      end
+    end
+
+    context "with a less than comparison" do
+      it "uses the < operator" do
+        builder.select("cats", views: -(1/0.0)...50).should =~ /SELECT .* FROM posts WHERE .* views < 50/
+      end
+    end
+
+    context "with a negated range comparison" do
+      it "uses the NOT BETWEEN operator" do
+        builder.select("cats", views: Oedipus.not(50..100)).should =~ /SELECT .* FROM posts WHERE .* views NOT BETWEEN 50 AND 100/
+      end
+    end
+
+    context "with an attributed filtered by collection" do
+      it "uses the IN operator" do
+        builder.select("cats", author_id: [7, 11]).should =~ /SELECT .* FROM posts WHERE .* author_id IN \(7, 11\)/
+      end
+    end
+
+    context "with an attributed filtered by negated collection" do
+      it "uses the NOT IN operator" do
+        builder.select("cats", author_id: Oedipus.not([7, 11])).should =~ /SELECT .* FROM posts WHERE .* author_id NOT IN \(7, 11\)/
+      end
+    end
+
+    context "with a limit" do
+      it "applies a LIMIT with an offset of 0" do
+        builder.select("dogs", limit: 50).should =~ /SELECT .* FROM posts WHERE .* LIMIT 0, 50/
+      end
+
+      it "is not considered an attribute" do
+        builder.select("dogs", limit: 50).should_not =~ /limit = 50/
+      end
+    end
+
+    context "with an offset" do
+      it "applies a LIMIT with an offset" do
+        builder.select("dogs", limit: 50, offset: 200).should =~ /SELECT .* FROM posts WHERE .* LIMIT 200, 50/
+      end
+
+      it "is not considered an attribute" do
+        builder.select("dogs", limit: 50, offset: 200).should_not =~ /offset = 200/
+      end
+    end
+
+    context "with an order clause" do
+      it "applies an ORDER BY" do
+        builder.select("cats", order: {views: :desc}).should =~ /SELECT .* FROM posts WHERE .* ORDER BY views DESC/
+      end
+
+      it "defaults to ASC" do
+        builder.select("cats", order: :views).should =~ /SELECT .* FROM posts WHERE .* ORDER BY views ASC/
+      end
+
+      it "supports multiple orders" do
+        builder.select("cats", order: {views: :asc, author_id: :desc}).should =~ /SELECT .* FROM posts WHERE .* ORDER BY views ASC, author_id DESC/
+      end
+    end
+  end
+
+  describe "#insert" do
+    it "includes the ID and the attributes" do
+      builder.insert(3, title: "example", views: 9).should == "INSERT INTO posts (id, title, views) VALUES (3, 'example', 9)"
+    end
+  end
+
+  describe "#update" do
+    it "includes the ID in the WHERE clause" do
+      builder.update(3, title: "example", views: 9).should =~ /UPDATE posts SET .* WHERE id = 3/
+    end
+
+    it "includes the changed attributes" do
+      builder.update(3, title: "example", views: 9).should =~ /UPDATE posts SET title = 'example', views = 9/
+    end
+  end
+
+  describe "#replace" do
+    it "includes the ID and the attributes" do
+      builder.replace(3, title: "example", views: 9).should == "REPLACE INTO posts (id, title, views) VALUES (3, 'example', 9)"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oedipus
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre1
+  version: 0.0.1.pre2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-30 00:00:00.000000000 Z
+date: 2012-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ruby-mysql
-  requirement: &20332040 !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: &22480320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
-  version_requirements: *20332040
+  version_requirements: *22480320
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &20331620 !ruby/object:Gem::Requirement
+  name: rake-compiler
+  requirement: &22479900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,16 +32,16 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20331620
-description: ! "Oedipus brings full support for Sphinx 2 to Ruby:\n\n      * real-time
-  indexes\n      * faceted search\n      * multi-queries\n      * full attribute support\n
-  \     * optional model-style interaction\n\n    It works with 'stable' versions
-  of Sphinx 2 (>= 2.0.2). All\n    features are implemented entirely through the SphinxQL
-  interface."
+  version_requirements: *22479900
+description: ! "Oedipus brings full support for Sphinx 2 to Ruby:\n\n  * real-time
+  indexes\n  * faceted search\n  * multi-queries\n  * full attribute support\n  *
+  optional model-style interaction\n\nIt works with 'stable' versions of Sphinx 2
+  (>= 2.0.2). All\nfeatures are implemented entirely through the SphinxQL interface.\n"
 email:
 - chris@w3style.co.uk
 executables: []
-extensions: []
+extensions:
+- ext/oedipus/extconf.rb
 extra_rdoc_files: []
 files:
 - .gitignore
@@ -50,18 +50,48 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- ext/oedipus/extconf.rb
+- ext/oedipus/oedipus.c
+- ext/oedipus/oedipus.h
 - lib/oedipus.rb
+- lib/oedipus/comparison.rb
+- lib/oedipus/comparison/between.rb
+- lib/oedipus/comparison/equal.rb
+- lib/oedipus/comparison/gt.rb
+- lib/oedipus/comparison/gte.rb
+- lib/oedipus/comparison/in.rb
+- lib/oedipus/comparison/lt.rb
+- lib/oedipus/comparison/lte.rb
+- lib/oedipus/comparison/not.rb
+- lib/oedipus/comparison/not_equal.rb
+- lib/oedipus/comparison/not_in.rb
+- lib/oedipus/comparison/outside.rb
+- lib/oedipus/comparison/shortcuts.rb
 - lib/oedipus/connection.rb
+- lib/oedipus/connection_error.rb
 - lib/oedipus/index.rb
-- lib/oedipus/mysql/client.rb
 - lib/oedipus/query_builder.rb
 - lib/oedipus/version.rb
 - oedipus.gemspec
 - spec/data/.gitkeep
+- spec/integration/connection_spec.rb
+- spec/integration/index_spec.rb
 - spec/spec_helper.rb
 - spec/support/test_harness.rb
-- spec/unit/connection_spec.rb
-- spec/unit/index_spec.rb
+- spec/unit/comparison/between_spec.rb
+- spec/unit/comparison/equal_spec.rb
+- spec/unit/comparison/gt_spec.rb
+- spec/unit/comparison/gte_spec.rb
+- spec/unit/comparison/in_spec.rb
+- spec/unit/comparison/lt_spec.rb
+- spec/unit/comparison/lte_spec.rb
+- spec/unit/comparison/not_equal_spec.rb
+- spec/unit/comparison/not_in_spec.rb
+- spec/unit/comparison/not_spec.rb
+- spec/unit/comparison/outside_spec.rb
+- spec/unit/comparison/shortcuts_spec.rb
+- spec/unit/comparison_spec.rb
+- spec/unit/query_builder_spec.rb
 homepage: https://github.com/d11wtq/oedipus
 licenses: []
 post_install_message: 
@@ -86,4 +116,23 @@ rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Sphinx 2 Search Client for Ruby
-test_files: []
+test_files:
+- spec/data/.gitkeep
+- spec/integration/connection_spec.rb
+- spec/integration/index_spec.rb
+- spec/spec_helper.rb
+- spec/support/test_harness.rb
+- spec/unit/comparison/between_spec.rb
+- spec/unit/comparison/equal_spec.rb
+- spec/unit/comparison/gt_spec.rb
+- spec/unit/comparison/gte_spec.rb
+- spec/unit/comparison/in_spec.rb
+- spec/unit/comparison/lt_spec.rb
+- spec/unit/comparison/lte_spec.rb
+- spec/unit/comparison/not_equal_spec.rb
+- spec/unit/comparison/not_in_spec.rb
+- spec/unit/comparison/not_spec.rb
+- spec/unit/comparison/outside_spec.rb
+- spec/unit/comparison/shortcuts_spec.rb
+- spec/unit/comparison_spec.rb
+- spec/unit/query_builder_spec.rb

data/lib/oedipus/mysql/client.rb

@@ -1,136 +0,0 @@
-# encoding: utf-8
-
-##
-# Oedipus Sphinx 2 Search.
-# Copyright © 2012 Chris Corbyn.
-#
-# See LICENSE file for details.
-##
-
-require "socket"
-require "net/protocol"
-
-module Oedipus
-  module Mysql
-    # Limited subset of MySQL protocol for communication with SphinxQL.
-    #
-    # This needs to exist since other ruby MySQL clients do not provide the relevant features.
-    class Client
-      # Connect to the SphinxQL server.
-      #
-      # @param [Hash]
-      #   a Hash containing :host and :port
-      def initialize(options)
-        @sock = TCPSocket.new(options[:host], options[:port])
-        @seq  = 0
-        perform_handshake
-      end
-
-      def execute(sql)
-        p send_packet(query_packet(sql))
-      end
-
-      private
-
-      def perform_handshake
-        auth_pkt = clnt_authentication_packet(serv_initialization_packet)
-        raise "Some sort of error" unless send_packet(auth_pkt)[:type] == :ok
-      end
-
-      def incr_seq(seq)
-        raise ProtocolError, "Invalid packet sequence value #{seq} != #{@seq}" unless seq == @seq
-        @seq = (seq + 1) % 256
-      end
-
-      def recv_packet
-        a, b, seq = @sock.read(4).unpack("CvC")
-        incr_seq(seq)
-        @sock.read(a | (b << 8))
-      end
-
-      def send_packet(pkt)
-        while chunk = pkt.read(2**24 - 1)
-          @sock.write([chunk.length % 256, chunk.length / 256, @seq, chunk].pack("CvCZ*"))
-          incr_seq(@seq)
-        end
-
-        serv_result_packet
-      end
-
-      def serv_result_packet
-        pkt = recv_packet
-        case pkt[0]
-        when "\x00" then ok_packet(pkt)
-        else raise ProtocolError, "Unknown packet type #{pkt[0]}"
-        end
-      end
-
-      def scan_lcb(str)
-        case v = str.slice!(0)
-        when "\xFB" then nil
-        when "\xFC" then str.slice!(0, 2).unpack("v").first
-        when "\xFD"
-          a, b = str.slice!(0, 3).unpack("Cv")
-          a | (b << 8)
-        when "\xFE"
-          a, b = str.slice!(0, 8).unpack("VV")
-          a | (b << 32)
-        else v.ord
-        end
-      end
-
-      def ok_packet(str)
-        Hash[
-          [
-            :field_count,
-            :affected_rows,
-            :insert_id,
-            :serv_stat,
-            :warning_count,
-            :message
-          ].zip([scan_lcb(str), scan_lcb(str), scan_lcb(str)] + str.unpack("vva*"))
-        ].tap { |pkt| pkt[:type] = :ok }
-      end
-
-      def serv_initialization_packet
-        Hash[
-          [
-            :prot_ver,
-            :serv_ver,
-            :thread_id,
-            :scramble_buf_a,
-            :filler_a,
-            :serv_cap_a,
-            :serv_enc,
-            :serv_stat,
-            :serv_cap_b,
-            :scramble_len,
-            :filler_b,
-            :scramble_buf_b
-          ].zip(recv_packet.unpack("CZ*Va8CvCvvCa10Z*"))
-        ].tap do |pkt|
-          raise ProtocolError, "Unsupported MySQL protocol version #{pkt[:prot_ver]}" unless pkt[:prot_ver] == 0x0A
-        end
-      end
-
-      def clnt_authentication_packet(init_pkt)
-        StringIO.new [
-          197120,  # clnt_cap (prot 4.1, multi-stmt, multi-rs)
-          1024**3, # max pkt size
-          0,       # charset not used
-          '',      # filler 23 bytes
-          '',      # username not used
-          '',      # scramble buf (no password)
-          ''       # dbname not used
-        ].pack("VVCa23Z*A*Z*")
-      end
-
-      def query_packet(sql)
-        StringIO.new [
-          0x03,  # COM_QUERY type
-          sql
-        ].pack("Ca*")
-      end
-    end
-  end
-end