sinatra_resource 0.4.17 → 0.4.18

data/Rakefile

@@ -14,7 +14,7 @@ begin
     gem.add_dependency 'mongo_mapper', '>= 0.7'
     gem.add_dependency 'mongo', '>= 0.18.3'
     gem.add_dependency 'mongo_ext', '>= 0.18.3'
-    gem.add_dependency 'sinatra', '>= 0.9.4', '< 1.0'
+    gem.add_dependency 'sinatra', '>= 1.0'
     gem.add_dependency 'query_string_filter', '>= 0.1.4'
 
     gem.add_development_dependency 'crack', '>= 0.1.4'

data/VERSION

@@ -1 +1 @@
-0.4.17
+0.4.18

data/examples/datacatalog/app.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
 
-gem 'sinatra', '>= 0.9.4'
+gem 'sinatra', '>= 1.0'
 require 'sinatra/base'
 
 require File.dirname(__FILE__) + '/config/config'

data/examples/datacatalog/config/config.rb

@@ -10,7 +10,7 @@ gem 'mongo', "= 0.18.3", '< 1.0'
 gem 'mongo_ext', "= 0.18.3", '< 1.0'
 require 'mongo'
 
-gem 'mongo_mapper', '>= 0.7', '< 0.8'
+gem 'mongo_mapper', '= 0.7.0'
 require 'mongo_mapper'
 
 module Config

data/examples/datacatalog/test/resources/sources/sources_get_many_search_test.rb

@@ -121,4 +121,49 @@ class SourcesGetManySearchResourceTest < ResourceTestCase
     end
   end
 
+  context "search=flight delays" do
+    before do
+      @search_params = { :search => "flight delays" }
+    end
+  
+    %w(basic).each do |role|
+      context "#{role} : get /" do
+        before do
+          get "/", @search_params.merge(:api_key => api_key_for(role))
+          @members = parsed_response_body['members']
+        end
+  
+        use "return 200 Ok"
+        
+        test "body should have correct sources" do
+          titles = @members.map { |x| x['title'] }
+          assert_equal 1, titles.length
+          assert_include %{Airline On-Time Performance and Causes of Flight Delays}, titles
+        end
+      end
+    end
+  end
+
+  context "search=" do
+    before do
+      @search_params = { :search => "" }
+    end
+  
+    %w(basic).each do |role|
+      context "#{role} : get /" do
+        before do
+          get "/", @search_params.merge(:api_key => api_key_for(role))
+          @members = parsed_response_body['members']
+        end
+  
+        use "return 200 Ok"
+        
+        test "body should have no sources" do
+          titles = @members.map { |x| x['title'] }
+          assert_equal 0, titles.length
+        end
+      end
+    end
+  end
+
 end

data/lib/builder/mongo_helpers.rb

@@ -369,7 +369,8 @@ module SinatraResource
         if search_string && filter_string
           error 400, convert(body_for(:invalid_params, [FILTER_KEY]))
         elsif search_string
-          { :_keywords => search_string.downcase }
+          words = search_string.downcase.split(" ")
+          { :_keywords => { '$all' => words } }
         elsif filter_string
           begin
             unsafe = QS_FILTER.parse(filter_string)

data/sinatra_resource.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_resource}
-  s.version = "0.4.17"
+  s.version = "0.4.18"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David James"]
-  s.date = %q{2010-03-08}
+  s.date = %q{2010-04-05}
   s.description = %q{A DSL for creating RESTful actions with Sinatra and MongoMapper. It embraces the Resource Oriented Architecture as explained by Leonard Richardson and Sam Ruby.}
   s.email = %q{djames@sunlightfoundation.com}
   s.extra_rdoc_files = [
@@ -208,7 +208,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<mongo_mapper>, [">= 0.7"])
       s.add_runtime_dependency(%q<mongo>, [">= 0.18.3"])
       s.add_runtime_dependency(%q<mongo_ext>, [">= 0.18.3"])
-      s.add_runtime_dependency(%q<sinatra>, [">= 0.9.4", "< 1.0"])
+      s.add_runtime_dependency(%q<sinatra>, [">= 1.0"])
       s.add_runtime_dependency(%q<query_string_filter>, [">= 0.1.4"])
       s.add_development_dependency(%q<crack>, [">= 0.1.4"])
       s.add_development_dependency(%q<djsun-context>, [">= 0.5.6"])
@@ -219,7 +219,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<mongo_mapper>, [">= 0.7"])
       s.add_dependency(%q<mongo>, [">= 0.18.3"])
       s.add_dependency(%q<mongo_ext>, [">= 0.18.3"])
-      s.add_dependency(%q<sinatra>, [">= 0.9.4", "< 1.0"])
+      s.add_dependency(%q<sinatra>, [">= 1.0"])
       s.add_dependency(%q<query_string_filter>, [">= 0.1.4"])
       s.add_dependency(%q<crack>, [">= 0.1.4"])
       s.add_dependency(%q<djsun-context>, [">= 0.5.6"])
@@ -231,7 +231,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<mongo_mapper>, [">= 0.7"])
     s.add_dependency(%q<mongo>, [">= 0.18.3"])
     s.add_dependency(%q<mongo_ext>, [">= 0.18.3"])
-    s.add_dependency(%q<sinatra>, [">= 0.9.4", "< 1.0"])
+    s.add_dependency(%q<sinatra>, [">= 1.0"])
     s.add_dependency(%q<query_string_filter>, [">= 0.1.4"])
     s.add_dependency(%q<crack>, [">= 0.1.4"])
     s.add_dependency(%q<djsun-context>, [">= 0.5.6"])

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'rubygems'
 require 'sinatra_resource'
 require 'spec'
 require 'spec/autorun'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 17
-  version: 0.4.17
+  - 18
+  version: 0.4.18
 platform: ruby
 authors: 
 - David James
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-08 00:00:00 -05:00
+date: 2010-04-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,13 +64,6 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 4
-        version: 0.9.4
-    - - <
       - !ruby/object:Gem::Version 
         segments: 
         - 1