picky 4.4.2 → 4.5.0

data/lib/picky/backends/file/json.rb

@@ -26,7 +26,7 @@ module Picky
         def [] key
           length, offset = mapping[key]
           return unless length
-          result = Yajl::Parser.parse IO.read(cache_path, length, offset)
+          result = MultiJson.decode IO.read(cache_path, length, offset)
           result
         end
 
@@ -65,7 +65,7 @@ module Picky
           create_directory cache_path
           ::File.open(cache_path, 'w:utf-8') do |out_file|
             hash.each do |(key, object)|
-              encoded = Yajl::Encoder.encode object
+              encoded = MultiJson.encode object
               length  = encoded.size
               mapping[key] = [length, offset]
               offset += length

data/lib/picky/backends/memory/json.rb

@@ -17,7 +17,7 @@ module Picky
         # Loads the index hash from json format.
         #
         def load
-          Yajl::Parser.parse ::File.open(cache_path, 'r') # , symbolize_keys: true # TODO Symbols.
+          MultiJson.decode ::File.open(cache_path, 'r') # , symbolize_keys: true # TODO Symbols.
         end
 
         # Dumps the index internal backend in json format.
@@ -31,7 +31,7 @@ module Picky
         #
         def dump_json internal
           ::File.open(cache_path, 'w') do |out_file|
-            Yajl::Encoder.encode internal, out_file
+            MultiJson.encode internal, out_file
           end
         end
 

data/lib/picky/backends/sqlite/array.rb

@@ -19,7 +19,7 @@ module Picky
           unless array.empty?
             db.execute 'INSERT OR REPLACE INTO key_value (key,value) VALUES (?,?)',
                        key.to_s,
-                       Yajl::Encoder.encode(array)
+                       MultiJson.encode(array)
           end
 
           DirectlyManipulable.make self, array, key
@@ -30,7 +30,7 @@ module Picky
           res = db.execute "SELECT value FROM key_value WHERE key = ? LIMIT 1",
                            key.to_s
 
-          array = res.blank? ? [] : Yajl::Parser.parse(res.first.first)
+          array = res.blank? ? [] : MultiJson.decode(res.first.first)
           DirectlyManipulable.make self, array, key
           array
         end

data/lib/picky/backends/sqlite/basic.rb

@@ -52,7 +52,7 @@ module Picky
             #       implement each.
             #
             internal.each do |key, value|
-              encoded_value = Yajl::Encoder.encode value
+              encoded_value = MultiJson.encode value
               db.execute 'insert into key_value values (?,?)', key.to_s, encoded_value
             end
           end

data/lib/picky/backends/sqlite/value.rb

@@ -13,7 +13,7 @@ module Picky
         def []= key, value
           db.execute 'INSERT OR REPLACE INTO key_value (key, value) VALUES (?,?)',
                      key.to_s,
-                     Yajl::Encoder.encode(value)
+                     MultiJson.encode(value)
 
           value
         end
@@ -22,7 +22,7 @@ module Picky
           res = db.execute "SELECT value FROM key_value WHERE key = ? LIMIT 1;", key.to_s
           return nil if res.empty?
 
-          Yajl::Parser.parse res.first.first
+          MultiJson.decode res.first.first
         end
 
         def delete key

data/lib/picky/extensions/hash.rb

@@ -2,10 +2,10 @@
 #
 class Hash
 
-  # Use yajl's encoding.
+  # Use multi_json's encoding.
   #
   def to_json options = {}
-    Yajl::Encoder.encode self, options
+    MultiJson.encode self, options
   end
 
 end

data/lib/picky/query/allocation.rb

@@ -115,7 +115,7 @@ module Picky
       # Note: Delegates to to_result.
       #
       def to_json options = {}
-        Yajl::Encoder.encode to_result, options
+        MultiJson.encode to_result, options
       end
 
       #

data/lib/picky/results.rb

@@ -78,7 +78,7 @@ module Picky
     # Convert to json format.
     #
     def to_json options = {}
-      Yajl::Encoder.encode to_hash, options
+      MultiJson.encode to_hash, options
     end
 
     # For logging.

data/lib/picky/sinatra/index_actions.rb

@@ -17,7 +17,7 @@ module Picky
             index = Picky::Indexes[index_name.to_sym]
             data = params['data']
             return 400 unless data
-            data && index.replace_from(Yajl::Parser.parse data) && 200
+            data && index.replace_from(MultiJson.decode data) && 200
           rescue IdNotGivenException
             400
           rescue StandardError
@@ -36,7 +36,7 @@ module Picky
           index_name = params['index']
           begin
             index = Picky::Indexes[index_name.to_sym]
-            data = Yajl::Parser.parse params['data']
+            data = MultiJson.decode params['data']
             id = data['id']
             id ? index.remove(id) && 200 : 400
           rescue StandardError

data/lib/picky.rb

@@ -15,7 +15,7 @@ module Picky
   require 'active_support/core_ext/object/blank'
   require 'active_support/core_ext/enumerable'
   require 'active_support/multibyte'
-  require 'yajl'
+  require 'multi_json'
   require 'procrastinate'
   require 'rack_fast_escape' if defined? Rack
   require 'fileutils'

data/spec/integration/sinatra_index_actions_spec.rb

@@ -1,4 +1,4 @@
-require 'yajl'
+require 'multi_json'
 require 'sinatra'
 require_relative '../../../client/lib/picky-client'
 require_relative '../../../client/lib/picky-client/spec'
@@ -112,7 +112,7 @@ describe 'Sinatra Index Actions' do
           data: %Q{{ "id":"1", "name":"Florian", "surname":"Hanke" }}
         })
       
-        results = Yajl::Parser.parse request.get('/people', params: { query: 'florian' }).body
+        results = MultiJson.decode request.get('/people', params: { query: 'florian' }).body
         results['total'].should == 1
       
         request.post('/', params: {
@@ -120,7 +120,7 @@ describe 'Sinatra Index Actions' do
           data: %Q{{ "id":"2", "name":"Florian", "surname":"Meier" }}
         })
       
-        results = Yajl::Parser.parse request.get('/people', params: { query: 'florian' }).body
+        results = MultiJson.decode request.get('/people', params: { query: 'florian' }).body
         results['total'].should == 2
       end
       it 'updates the index correctly' do
@@ -129,10 +129,10 @@ describe 'Sinatra Index Actions' do
           data: %Q{{ "id":"1", "name":"Flarian", "surname":"Hanke" }}
         })
       
-        results = Yajl::Parser.parse request.get('/people', params: { query: 'hanke' }).body
+        results = MultiJson.decode request.get('/people', params: { query: 'hanke' }).body
         results['total'].should == 1
       
-        results = Yajl::Parser.parse request.get('/people', params: { query: 'florian' }).body
+        results = MultiJson.decode request.get('/people', params: { query: 'florian' }).body
         results['total'].should == 0
       
         # Whoops, typo. Let's fix it.
@@ -142,13 +142,13 @@ describe 'Sinatra Index Actions' do
           data: %Q{{ "id":"1", "name":"Florian", "surname":"Hanke" }}
         })
       
-        results = Yajl::Parser.parse request.get('/people', params: { query: 'hanke' }).body
+        results = MultiJson.decode request.get('/people', params: { query: 'hanke' }).body
         results['total'].should == 1
       
-        results = Yajl::Parser.parse request.get('/people', params: { query: 'flarian' }).body
+        results = MultiJson.decode request.get('/people', params: { query: 'flarian' }).body
         results['total'].should == 0
       
-        results = Yajl::Parser.parse request.get('/people', params: { query: 'florian' }).body
+        results = MultiJson.decode request.get('/people', params: { query: 'florian' }).body
         results['total'].should == 1
       end
       it 'deletes entries from the index correctly' do
@@ -161,7 +161,7 @@ describe 'Sinatra Index Actions' do
           data: %Q{{ "id":"2", "name":"Florian", "surname":"Meier" }}
         })
       
-        results = Yajl::Parser.parse request.get('/people', params: { query: 'florian' }).body
+        results = MultiJson.decode request.get('/people', params: { query: 'florian' }).body
         results['total'].should == 2
       
         request.delete('/', params: {
@@ -169,7 +169,7 @@ describe 'Sinatra Index Actions' do
           data: %Q{{ "id":"1" }}
         })
       
-        results = Yajl::Parser.parse request.get('/people', params: { query: 'florian' }).body
+        results = MultiJson.decode request.get('/people', params: { query: 'florian' }).body
         results['total'].should == 1
       end
       it 'has no problem with a superfluous delete' do
@@ -178,7 +178,7 @@ describe 'Sinatra Index Actions' do
           data: %Q{{ "id":"1" }}
         })
       
-        results = Yajl::Parser.parse request.get('/people', params: { query: 'florian' }).body
+        results = MultiJson.decode request.get('/people', params: { query: 'florian' }).body
         results['total'].should == 0
       end
       it 'works with the (test) client' do

data/spec/lib/bundle_indexed_spec.rb

@@ -117,7 +117,7 @@ describe Picky::Bundle do
     end
     describe "load_index" do
       it "uses the right file" do
-        Yajl::Parser.stub! :parse
+        MultiJson.stub! :decode
 
         File.should_receive(:open).once.with 'spec/test_directory/index/test/some_index/some_category_some_name_inverted.memory.json', 'r'
 
@@ -126,7 +126,7 @@ describe Picky::Bundle do
     end
     describe "load_weights" do
       it "uses the right file" do
-        Yajl::Parser.stub! :parse
+        MultiJson.stub! :decode
 
         File.should_receive(:open).once.with 'spec/test_directory/index/test/some_index/some_category_some_name_weights.memory.json', 'r'
 
@@ -144,7 +144,7 @@ describe Picky::Bundle do
     end
     describe "load_configuration" do
       it "uses the right file" do
-        Yajl::Parser.stub! :parse
+        MultiJson.stub! :decode
 
         File.should_receive(:open).once.with 'spec/test_directory/index/test/some_index/some_category_some_name_configuration.memory.json', 'r'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picky
 version: !ruby/object:Gem::Version
-  version: 4.4.2
+  version: 4.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-22 00:00:00.000000000 Z
+date: 2012-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70255381661400 !ruby/object:Gem::Requirement
+  requirement: &70173482973460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70255381661400
+  version_requirements: *70173482973460
 - !ruby/object:Gem::Dependency
   name: picky-client
-  requirement: &70255381659920 !ruby/object:Gem::Requirement
+  requirement: &70173482988980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.4.2
+        version: 4.5.0
   type: :development
   prerelease: false
-  version_requirements: *70255381659920
+  version_requirements: *70173482988980
 - !ruby/object:Gem::Dependency
   name: text
-  requirement: &70255381674980 !ruby/object:Gem::Requirement
+  requirement: &70173482988380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70255381674980
+  version_requirements: *70173482988380
 - !ruby/object:Gem::Dependency
-  name: yajl-ruby
-  requirement: &70255381674320 !ruby/object:Gem::Requirement
+  name: multi_json
+  requirement: &70173482987800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70255381674320
+  version_requirements: *70173482987800
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70255381673560 !ruby/object:Gem::Requirement
+  requirement: &70173482987160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70255381673560
+  version_requirements: *70173482987160
 - !ruby/object:Gem::Dependency
   name: procrastinate
-  requirement: &70255381672800 !ruby/object:Gem::Requirement
+  requirement: &70173482985880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70255381672800
+  version_requirements: *70173482985880
 - !ruby/object:Gem::Dependency
   name: rack_fast_escape
-  requirement: &70255381672420 !ruby/object:Gem::Requirement
+  requirement: &70173482985400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70255381672420
+  version_requirements: *70173482985400
 description: Fast Ruby semantic text search engine with comfortable single field interface.
 email: florian.hanke+picky@gmail.com
 executables: