picky 4.0.7 → 4.0.8

data/lib/picky/sinatra/index_actions.rb

@@ -5,15 +5,16 @@ module Picky
       
       def self.extended base
         base.post '/' do
-          index_name = params[:index]
+          index_name = params['index']
           index = Picky::Indexes[index_name.to_sym]
-          data = params[:data]
-          index.replace_from data if data
+          data = params['data']
+          index.replace_from Yajl::Parser.parse(data) if data
         end
         base.delete '/' do
-          index_name = params[:index]
+          index_name = params['index']
           index = Picky::Indexes[index_name.to_sym]
-          id = params[:data][:id]
+          data = Yajl::Parser.parse params['data']
+          id = data['id']
           index.remove id if id
         end
       end

data/spec/integration/sinatra_index_actions_spec.rb

@@ -0,0 +1,61 @@
+require 'Yajl'
+require 'sinatra'
+require 'picky-client'
+require 'spec_helper'
+
+describe 'Sinatra Index Actions' do
+  
+  # This is the application that is tested.
+  #
+  class MyPickyServer < Sinatra::Base
+    extend Picky::Sinatra::IndexActions
+    
+    data = Picky::Index.new :index do
+      category :name
+      category :surname
+    end
+    people = Picky::Search.new data
+    
+    get '/people' do
+      results = people.search params[:query], params[:ids] || 20, params[:offset] || 0
+      results.to_json
+    end
+  end
+  
+  describe 'updating' do
+    before(:each) do
+      Picky::Indexes.clear
+    end
+    let(:request) { ::Rack::MockRequest.new MyPickyServer }
+    it 'should update the index correctly' do
+      request.post('/', params: { index: 'index', data: %Q{{ "id":"1", "name":"Florian", "surname":"Hanke" }} })
+      
+      results = Yajl::Parser.parse request.get('/people', params: { query: 'florian' }).body
+      results['total'].should == 1
+      
+      request.post('/', params: { index: 'index', data: %Q{{ "id":"2", "name":"Florian", "surname":"Meier" }} })
+      
+      results = Yajl::Parser.parse request.get('/people', params: { query: 'florian' }).body
+      results['total'].should == 2
+    end
+    it 'should delete entries from the index correctly' do
+      request.post('/', params: { index: 'index', data: %Q{{ "id":"1", "name":"Florian", "surname":"Hanke" }} })
+      request.post('/', params: { index: 'index', data: %Q{{ "id":"2", "name":"Florian", "surname":"Meier" }} })
+      
+      results = Yajl::Parser.parse request.get('/people', params: { query: 'florian' }).body
+      results['total'].should == 2
+      
+      request.delete('/', params: { index: 'index', data: %Q{{ "id":"1" }} })
+      
+      results = Yajl::Parser.parse request.get('/people', params: { query: 'florian' }).body
+      results['total'].should == 1
+    end
+    it 'should have no problem with a superfluous delete' do
+      request.delete('/', params: { index: 'index', data: %Q{{ "id":"1" }} })
+      
+      results = Yajl::Parser.parse request.get('/people', params: { query: 'florian' }).body
+      results['total'].should == 0
+    end
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picky
 version: !ruby/object:Gem::Version
-  version: 4.0.7
+  version: 4.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70160585740240 !ruby/object:Gem::Requirement
+  requirement: &70173949808360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70160585740240
+  version_requirements: *70173949808360
 - !ruby/object:Gem::Dependency
   name: picky-client
-  requirement: &70160585738100 !ruby/object:Gem::Requirement
+  requirement: &70173949807420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.7
+        version: 4.0.8
   type: :development
   prerelease: false
-  version_requirements: *70160585738100
+  version_requirements: *70173949807420
 - !ruby/object:Gem::Dependency
   name: text
-  requirement: &70160585737280 !ruby/object:Gem::Requirement
+  requirement: &70173949821340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70160585737280
+  version_requirements: *70173949821340
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70160585735700 !ruby/object:Gem::Requirement
+  requirement: &70173949819100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70160585735700
+  version_requirements: *70173949819100
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70160585734980 !ruby/object:Gem::Requirement
+  requirement: &70173949818100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70160585734980
+  version_requirements: *70173949818100
 - !ruby/object:Gem::Dependency
   name: procrastinate
-  requirement: &70160585749640 !ruby/object:Gem::Requirement
+  requirement: &70173949814720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70160585749640
+  version_requirements: *70173949814720
 - !ruby/object:Gem::Dependency
   name: rack_fast_escape
-  requirement: &70160585748580 !ruby/object:Gem::Requirement
+  requirement: &70173949830000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70160585748580
+  version_requirements: *70173949830000
 description: Fast Ruby semantic text search engine with comfortable single field interface.
 email: florian.hanke+picky@gmail.com
 executables:
@@ -253,6 +253,7 @@ files:
 - spec/functional/regression_spec.rb
 - spec/functional/speed_spec.rb
 - spec/functional/terminate_early_spec.rb
+- spec/integration/sinatra_index_actions_spec.rb
 - spec/lib/analytics_spec.rb
 - spec/lib/analyzer_spec.rb
 - spec/lib/api/category/partial_spec.rb
@@ -397,6 +398,7 @@ test_files:
 - spec/functional/regression_spec.rb
 - spec/functional/speed_spec.rb
 - spec/functional/terminate_early_spec.rb
+- spec/integration/sinatra_index_actions_spec.rb
 - spec/lib/analytics_spec.rb
 - spec/lib/analyzer_spec.rb
 - spec/lib/api/category/partial_spec.rb