sinatra_resource 0.3.4 → 0.3.5

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.3.5

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

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../helpers/resource_test_helper')
 
-class SourcesGetManyResourceTest < ResourceTestCase
+class SourcesGetManySearchResourceTest < ResourceTestCase
 
   include DataCatalog
 

data/examples/datacatalog/test/resources/sources_usages/sources_usages_get_search_test.rb

@@ -0,0 +1,87 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../helpers/resource_test_helper')
+
+class SourcesUsagesGetManySearchResourceTest < ResourceTestCase
+
+  include DataCatalog
+
+  def app; Sources end
+
+  SEARCH_FILTERS = [
+    { :filter => "description=academic" },
+    { :filter => "description:cad" },
+  ]
+
+  before do
+    @sources = 3.times.map do |i|
+      create_source(:title => "Source #{i}")
+    end
+    @sources.each do |source|
+      4.times do |i|
+        source.usages << new_usage(
+          :title       => "Usage #{i}",
+          :description => (i % 2 == 0) ? "academic" : "press"
+        )
+      end
+      source.save!
+    end
+    @source = @sources[1]
+    @search = SEARCH_FILTERS[0]
+  end
+  
+  after do
+    @sources.each { |x| x.destroy }
+  end
+
+  context "get /:id/usages" do
+    context "anonymous" do
+      before do
+        get "/#{@source.id}/usages", @search
+      end
+      
+      use "return 401 because the API key is missing"
+    end
+  
+    context "incorrect API key" do
+      before do
+        get "/#{@source.id}/usages", @search.merge(
+          :api_key => BAD_API_KEY)
+      end
+      
+      use "return 401 because the API key is invalid"
+    end
+  end
+
+  %w(basic curator admin).each do |role|
+    context "#{role} : get /:fake_id/usages" do
+      before do
+        get "/#{FAKE_ID}/usages", @search.merge(
+          :api_key => api_key_for(role))
+      end
+    
+      use "return 404 Not Found with empty response body"
+    end
+  
+    SEARCH_FILTERS.each do |search|
+      context "#{role} : get /:id/usages" do
+        before do
+          get "/#{@source.id}/usages", search.merge(
+            :api_key => api_key_for(role))
+        end
+      
+        use "return 200 Ok"
+      
+        test "body should have 2 sources" do
+          assert_equal 2, parsed_response_body.length
+        end
+      
+        test "body should have correct source titles" do
+          actual = parsed_response_body.map { |e| e["title"] }
+          assert_equal ["Usage 0", "Usage 2"], actual.sort
+        end
+      
+        docs_properties %w(title url description id)
+      end
+    end
+  end
+
+end

data/lib/builder/mongo_helpers.rb

@@ -232,7 +232,7 @@ module SinatraResource
           if params.empty?
             children
           else
-            children.all(make_conditions(params, child_model))
+            select_by(children, make_conditions(params, child_model))
           end
         else
           children = if params.empty?
@@ -352,6 +352,37 @@ module SinatraResource
         conditions # TODO: incomplete
       end
 
+      # Select +children+ that match +conditions+.
+      #
+      # This method is needed because MongoMapper does not have +all+
+      # defined on the proxy for an embedded document many association.
+      #
+      # It does not currently support conditions such as the following:
+      #   :value => { '$gte' => 3 }
+      #   :value => { '$in' => [24, 36, 48] }
+      #
+      # @params [<MongoMapper::EmbeddedDocument>] children
+      #
+      # @params [Hash] conditions
+      #
+      # @return [<MongoMapper::EmbeddedDocument>]
+      def select_by(children, conditions)
+        children.select do |child|
+          match = true
+          conditions.each_pair do |key, value|
+            match &&= case value
+            when String, Integer
+              child[key] == value
+            when Regexp
+              child[key] =~ value
+            else raise Error, "embedded document search does not " +
+              "support: #{value.inspect}"
+            end
+          end
+          match
+        end
+      end
+
       # Select only the +children+ that are related to the +parent+ by
       # way of the +association+.
       #

data/sinatra_resource.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_resource}
-  s.version = "0.3.4"
+  s.version = "0.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David James"]
@@ -86,6 +86,7 @@ Gem::Specification.new do |s|
      "examples/datacatalog/test/resources/sources_usages/sources_usages_delete_test.rb",
      "examples/datacatalog/test/resources/sources_usages/sources_usages_get_many_test.rb",
      "examples/datacatalog/test/resources/sources_usages/sources_usages_get_one_test.rb",
+     "examples/datacatalog/test/resources/sources_usages/sources_usages_get_search_test.rb",
      "examples/datacatalog/test/resources/sources_usages/sources_usages_post_test.rb",
      "examples/datacatalog/test/resources/sources_usages/sources_usages_put_test.rb",
      "examples/datacatalog/test/resources/users/users_delete_test.rb",
@@ -180,6 +181,7 @@ Gem::Specification.new do |s|
      "examples/datacatalog/test/resources/sources_usages/sources_usages_delete_test.rb",
      "examples/datacatalog/test/resources/sources_usages/sources_usages_get_many_test.rb",
      "examples/datacatalog/test/resources/sources_usages/sources_usages_get_one_test.rb",
+     "examples/datacatalog/test/resources/sources_usages/sources_usages_get_search_test.rb",
      "examples/datacatalog/test/resources/sources_usages/sources_usages_post_test.rb",
      "examples/datacatalog/test/resources/sources_usages/sources_usages_put_test.rb",
      "examples/datacatalog/test/resources/users/users_delete_test.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_resource
 version: !ruby/object:Gem::Version 
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors: 
 - David James
@@ -181,6 +181,7 @@ files:
 - examples/datacatalog/test/resources/sources_usages/sources_usages_delete_test.rb
 - examples/datacatalog/test/resources/sources_usages/sources_usages_get_many_test.rb
 - examples/datacatalog/test/resources/sources_usages/sources_usages_get_one_test.rb
+- examples/datacatalog/test/resources/sources_usages/sources_usages_get_search_test.rb
 - examples/datacatalog/test/resources/sources_usages/sources_usages_post_test.rb
 - examples/datacatalog/test/resources/sources_usages/sources_usages_put_test.rb
 - examples/datacatalog/test/resources/users/users_delete_test.rb
@@ -297,6 +298,7 @@ test_files:
 - examples/datacatalog/test/resources/sources_usages/sources_usages_delete_test.rb
 - examples/datacatalog/test/resources/sources_usages/sources_usages_get_many_test.rb
 - examples/datacatalog/test/resources/sources_usages/sources_usages_get_one_test.rb
+- examples/datacatalog/test/resources/sources_usages/sources_usages_get_search_test.rb
 - examples/datacatalog/test/resources/sources_usages/sources_usages_post_test.rb
 - examples/datacatalog/test/resources/sources_usages/sources_usages_put_test.rb
 - examples/datacatalog/test/resources/users/users_delete_test.rb