picky 0.1.0 → 0.2.0

data/lib/picky/extensions/hash.rb

@@ -4,8 +4,16 @@ class Hash
   
   # Dumps binary self to the path given.
   #
+  # TODO Still used? If yes, spec!
+  #
   def dump_to path
     File.open(path, 'w:binary') { |out_file| Marshal.dump self, out_file }
   end
   
+  # Use yajl's encoding.
+  #
+  def to_json options = {}
+    Yajl::Encoder.encode self, options
+  end
+  
 end

data/lib/picky/results/base.rb

@@ -1,6 +1,7 @@
 module Results
 
-  # This is the internal results object. Usually, to_marshal, or to_json is called on it.
+  # This is the internal results object. Usually, to_marshal, or to_json
+  # is called on it to get a string for the answer.
   #
   class Base
 
@@ -32,10 +33,10 @@ module Results
                   :duration    => duration,
                   :total       => total)
     end
-    # Convert to marshal format.
+    # The default format is json.
     #
-    def to_marshal
-      Marshal.dump serialize
+    def to_response options = {}
+      to_json options
     end
     # Convert to json format.
     #

data/lib/picky/results/full.rb

@@ -9,11 +9,5 @@ module Results
       ?> + super
     end
     
-    # The default response style for full results is to_marshal.
-    #
-    def to_response
-      to_marshal
-    end
-    
   end
 end

data/prototype_project/Gemfile

@@ -7,6 +7,7 @@ gem 'bundler',          '>=0.9.26'
 gem 'rack',             '1.2.1'
 gem 'rack-mount',       '0.6.9'
 gem 'text',             '0.2.0'
+gem 'yajl-ruby',        '0.7.8', :require => 'yajl'
 
 # Should be optional.
 #

data/spec/lib/extensions/hash_spec.rb

@@ -4,7 +4,42 @@ describe Hash do
 
   describe 'dump_to' do
     it 'should description' do
-
+      # TODO
+    end
+  end
+  
+  describe "to_json" do
+    before(:each) do
+      # A very realistic example.
+      #
+      @obj = { :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 correct" do
+      @obj.to_json.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 take options" do
+      lambda { @obj.to_json(:some => :option) }.should_not raise_error
+    end
+    it "should be fast" do
+      Benchmark.realtime { @obj.to_json }.should < 0.00006
     end
   end
 

data/spec/lib/results/base_spec.rb

@@ -30,17 +30,6 @@ describe Results do
       end
     end
   end
-  
-  describe 'to_marshal' do
-    before(:each) do
-      @results = Results::Base.new
-    end
-    it 'should do it correctly' do
-      @results.stub! :serialize => :serialized
-
-      @results.to_marshal.should == "\x04\b:\x0Fserialized"
-    end
-  end
 
   describe 'to_json' do
     before(:each) do

data/spec/lib/routing_spec.rb

@@ -88,7 +88,7 @@ describe Routing do
       @routing.route '/searches/some_route' => Query::Full.new(:some_index, :some_other_index)
       
       @routing.routes.freeze
-      @routing.call(env).should == [200, {"Content-Type"=>"application/octet-stream", "Content-Length"=>"50"}, ["\x04\b{\t:\x10allocations[\x00:\voffseti\x00:\rdurationi\x00:\ntotali\x00"]]
+      @routing.call(env).should == [200, {"Content-Type"=>"application/octet-stream", "Content-Length"=>"52"}, ["{\"allocations\":[],\"offset\":0,\"duration\":0,\"total\":0}"]]
     end
     it 'should route correctly' do
       env = rack_defaults_for '/searches/some_route?query=some_query&type=some_type'
@@ -100,7 +100,7 @@ describe Routing do
       @routing.route '/searches/some_route' => Query::Full.new(:some_index, :some_other_index), :query => { :type => :some_type }
       
       @routing.routes.freeze
-      @routing.call(env).should == [200, {"Content-Type"=>"application/octet-stream", "Content-Length"=>"50"}, ["\x04\b{\t:\x10allocations[\x00:\voffseti\x00:\rdurationi\x00:\ntotali\x00"]]
+      @routing.call(env).should == [200, {"Content-Type"=>"application/octet-stream", "Content-Length"=>"52"}, ["{\"allocations\":[],\"offset\":0,\"duration\":0,\"total\":0}"]]
     end
     it 'should route correctly' do
       env = rack_defaults_for '/searches/some_wrong_route?query=some_query'

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