picky-client 0.1.0 → 0.2.0

data/lib/picky-client.rb

@@ -2,10 +2,10 @@ $KCODE = 'UTF-8' unless RUBY_VERSION > '1.8.7'
 
 require 'rubygems'
 
-require 'active_support'
+# require 'active_support'
+require 'yajl'
 
 dir = File.dirname __FILE__
 require File.expand_path('picky-client/engine', dir)
-require File.expand_path('picky-client/serializer', dir)
 require File.expand_path('picky-client/convenience', dir)
 require File.expand_path('picky-client/helper', dir)

data/lib/picky-client/convenience.rb

@@ -8,14 +8,6 @@ module Picky
     def empty?
       allocations.empty?
     end
-    # The rendered results or AR instances if you
-    # have populated the results.
-    #
-    def entries limit = 20
-      entries = []
-      allocations.each { |allocation| allocation[5].each { |id| break if entries.size > limit; entries << id } }
-      entries
-    end
     # Returns the topmost limit results.
     #
     def ids limit = 20
@@ -71,6 +63,14 @@ module Picky
       
       objects
     end
+    # The rendered results or AR instances if you
+    # have populated the results.
+    #
+    def entries limit = 20
+      entries = []
+      allocations.each { |allocation| allocation[5].each { |id| break if entries.size > limit; entries << id } }
+      entries
+    end
     
     # The ids need to come in the order which the ids were returned by the ids method.
     #

data/lib/picky-client/engine.rb

@@ -68,18 +68,16 @@ module Picky
     end
 
     class Full < Base
-      default_configuration :host => 'localhost', :port => 4000, :path => '/searches/full'
-
-      # Full needs to deserialize the results.
-      #
-      def send_search params = {}
-        Serializer.deserialize super(params)
+      default_configuration :host => 'localhost', :port => 8080, :path => '/searches/full'
+      
+      @@parser_options = { :symbolize_keys => true }
+      def send_search params = {}                                                                                                                                 
+        Yajl::Parser.parse super(params), @@parser_options
       end
-
     end
 
     class Live < Base
-      default_configuration :host => 'localhost', :port => 4000, :path => '/searches/live'
+      default_configuration :host => 'localhost', :port => 8080, :path => '/searches/live'
     end
 
   end

data/spec/picky-client/engine_spec.rb

@@ -50,12 +50,26 @@ describe Picky::Client do
     before(:each) do
       @full = Picky::Client::Full.new
     end
+    describe "send_search" do
+      before(:each) do
+        Net::HTTP.stub! :get => "{\"allocations\":[[\"c\",17.53,275179,[[\"name\",\"s*\",\"s\"]],[]],[\"c\",15.01,164576,[[\"category\",\"s*\",\"s\"]],[]],[\"p\",12.94,415634,[[\"street\",\"s*\",\"s\"]],[]],[\"p\",12.89,398247,[[\"name\",\"s*\",\"s\"]],[]],[\"p\",12.67,318912,[[\"city\",\"s*\",\"s\"]],[]],[\"p\",12.37,235933,[[\"first_name\",\"s*\",\"s\"]],[]],[\"p\",11.76,128259,[[\"maiden_name\",\"s*\",\"s\"]],[]],[\"p\",11.73,124479,[[\"occupation\",\"s*\",\"s\"]],[]],[\"c\",11.35,84807,[[\"street\",\"s*\",\"s\"]],[]],[\"c\",11.15,69301,[[\"city\",\"s*\",\"s\"]],[]],[\"p\",4.34,77,[[\"street_number\",\"s*\",\"s\"]],[]],[\"c\",2.08,8,[[\"street_number\",\"s*\",\"s\"]],[]],[\"c\",1.61,5,[[\"adword\",\"s*\",\"s\"]],[]]],\"offset\":0,\"duration\":0.04,\"total\":2215417}"
+      end
+      it "should return a parsed hash" do
+        @full.send_search(:query => 'something').should == {:allocations=>[["c", 17.53, 275179, [["name", "s*", "s"]], []], ["c", 15.01, 164576, [["category", "s*", "s"]], []], ["p", 12.94, 415634, [["street", "s*", "s"]], []], ["p", 12.89, 398247, [["name", "s*", "s"]], []], ["p", 12.67, 318912, [["city", "s*", "s"]], []], ["p", 12.37, 235933, [["first_name", "s*", "s"]], []], ["p", 11.76, 128259, [["maiden_name", "s*", "s"]], []], ["p", 11.73, 124479, [["occupation", "s*", "s"]], []], ["c", 11.35, 84807, [["street", "s*", "s"]], []], ["c", 11.15, 69301, [["city", "s*", "s"]], []], ["p", 4.34, 77, [["street_number", "s*", "s"]], []], ["c", 2.08, 8, [["street_number", "s*", "s"]], []], ["c", 1.61, 5, [["adword", "s*", "s"]], []]], :offset=>0, :duration=>0.04, :total=>2215417}
+      end
+      it "should be fast" do
+        GC.disable
+        Benchmark.realtime { @full.send_search(:query => 'something') }.should < 0.00015
+        GC.enable
+      end
+    end
+    
     describe "defaults" do
       it "should set host to 'localhost'" do
         @full.host.should == 'localhost'
       end
-      it "should set port to 4000" do
-        @full.port.should == 4000
+      it "should set port to the right value" do
+        @full.port.should == 8080
       end
       it "should set path to '/searches/full'" do
         @full.path.should == '/searches/full'
@@ -123,8 +137,8 @@ describe Picky::Client do
       it "should set host to 'localhost'" do
         @live.host.should == 'localhost'
       end
-      it "should set port to 4000" do
-        @live.port.should == 4000
+      it "should set port to the right value" do
+        @live.port.should == 8080
       end
       it "should set path to '/searches/live'" do
         @live.path.should == '/searches/live'

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Florian Hanke
@@ -16,8 +16,22 @@ cert_chain: []
 
 date: 2010-10-12 00:00:00 +02:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: yajl-ruby
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 7
+        - 8
+        version: 0.7.8
+  type: :runtime
+  version_requirements: *id001
 description: 
 email: florian.hanke+picky-client@gmail.com
 executables: []
@@ -30,13 +44,11 @@ files:
 - lib/picky-client/convenience.rb
 - lib/picky-client/engine.rb
 - lib/picky-client/helper.rb
-- lib/picky-client/serializer.rb
 - lib/picky-client.rb
 - README.rdoc
 - spec/picky-client/convenience_spec.rb
 - spec/picky-client/engine_spec.rb
 - spec/picky-client/helper_spec.rb
-- spec/picky-client/serializer_spec.rb
 has_rdoc: false
 homepage: http://floere.github.com/picky
 licenses: []
@@ -73,4 +85,3 @@ test_files:
 - spec/picky-client/convenience_spec.rb
 - spec/picky-client/engine_spec.rb
 - spec/picky-client/helper_spec.rb
-- spec/picky-client/serializer_spec.rb

data/lib/picky-client/serializer.rb

@@ -1,25 +0,0 @@
-module Picky
-
-  # This class handles serialization and deserialization.
-  #
-  class Serializer
-
-    # Serialize the Results.
-    #
-    # Note: This code is executed on the search engine side.
-    #
-    def self.serialize serializable_results
-      Marshal.dump serializable_results.serialize
-    end
-
-    # Create new search results from serialized ones.
-    #
-    # Note: This code is executed on the client side.
-    #
-    def self.deserialize serialized_results
-      Marshal.load serialized_results
-    end
-
-  end
-
-end

data/spec/picky-client/serializer_spec.rb

@@ -1,39 +0,0 @@
-require 'spec_helper'
-
-describe Picky::Serializer do
-
-  describe "serialize-deserialize" do
-    it "should serialize and deserialize certain values" do
-      results = stub :results
-      results.stub! :serialize => {}
-
-      deserialized = Picky::Serializer.deserialize Picky::Serializer.serialize(results)
-
-      deserialized.should == {}
-    end
-  end
-
-  describe "serialize" do
-    it "should serialize" do
-      results = stub :results, :serialize => {
-        :allocations => [[nil, nil, nil, [1,2,3,4,5,6,7,8]],
-                         [nil, nil, nil, [9,10,11,12,13,14,15,16]],
-                         [nil, nil, nil, [17,18,19,20,21,22,23]]],
-        :offset => 123,
-        :total => 12345,
-        :duration => 0.12345
-      }
-
-      Picky::Serializer.serialize(results).should == "\x04\b{\t:\x10allocations[\b[\t000[\ri\x06i\ai\bi\ti\ni\vi\fi\r[\t000[\ri\x0Ei\x0Fi\x10i\x11i\x12i\x13i\x14i\x15[\t000[\fi\x16i\x17i\x18i\x19i\x1Ai\ei\x1C:\voffseti\x01{:\ntotali\x0290:\rdurationf\x0F0.12345\x00\xF2|"
-    end
-  end
-
-  describe "deserialize" do
-    it "should deserialize" do
-      results = Picky::Serializer.deserialize "\x04\b{\t:\x10allocations[\b[\t000[\ri\x06i\ai\bi\ti\ni\vi\fi\r[\t000[\ri\x0Ei\x0Fi\x10i\x11i\x12i\x13i\x14i\x15[\t000[\fi\x16i\x17i\x18i\x19i\x1Ai\ei\x1C:\voffseti\x01{:\ntotali\x0290:\rdurationf\x0F0.12345\x00\xF2|"
-
-      results.should be_kind_of(Hash)
-    end
-  end
-
-end