sinatra_resource 0.4.8 → 0.4.9

data/VERSION

@@ -1 +1 @@
-0.4.8
+0.4.9

data/examples/datacatalog/config/config.rb

@@ -8,7 +8,7 @@ module Config
   end
   
   def self.setup_mongomapper
-    gem 'djsun-mongo_mapper', '>= 0.5.8.2', '< 0.6'
+    gem 'mongo_mapper', '>= 0.6.10', '< 0.7'
     require 'mongo_mapper'
     MongoMapper.connection = new_mongo_connection
     MongoMapper.database = environment_config['mongo_database']

data/examples/datacatalog/models/categorization.rb

@@ -6,8 +6,8 @@ module DataCatalog
 
     # == Attributes
 
-    key :source_id,   String
-    key :category_id, String
+    key :source_id,   Mongo::ObjectID
+    key :category_id, Mongo::ObjectID
     timestamps!
 
     # == Indices

data/examples/datacatalog/models/note.rb

@@ -7,7 +7,7 @@ module DataCatalog
     # == Attributes
 
     key :text,      String
-    key :user_id,   String
+    key :user_id,   Mongo::ObjectID
     timestamps!
   
     # == Indices

data/examples/datacatalog/models/user.rb

@@ -34,7 +34,8 @@ module DataCatalog
     
     # == Callbacks
     
-    def before_create
+    before_create :assign_api_key
+    def assign_api_key
       unless _api_key
         self._api_key = generate_api_key
       end

data/examples/datacatalog/test/helpers/lib/request_helpers.rb

@@ -61,8 +61,8 @@ module RequestHelpers
         base_uri = Config.environment_config["base_uri"]
         parent = instance_variable_get("@#{parent_ivar}")
         raise Error unless parent
-        path = parent_path + '/' + parent.id + '/' + child_path + '/' +
-          parsed_response_body["id"]
+        id = parsed_response_body['id']
+        path = "#{parent_path}/#{parent.id}/#{child_path}/#{id}"
         expected = URI.join(base_uri, path).to_s
         assert_equal expected, last_response.headers['Location']
       end

data/examples/datacatalog/test/resources/categories/categories_get_one_test.rb

@@ -62,7 +62,7 @@ class CategoriesGetOneResourceTest < ResourceTestCase
       test "body should have correct sources" do
         expected = [
           {
-            "id"    => @source.id,
+            "id"    => @source.id.to_s,
             "href"  => "/sources/#{@source.id}",
             "title" => @source.title,
             "url"   => @source.url,

data/examples/datacatalog/test/resources/categories_sources/categories_sources_delete_test.rb

@@ -48,7 +48,7 @@ class CategoriesSourcesDeleteResourceTest < ResourceTestCase
       use "return 401 because the API key is invalid"
     end
   end
-
+  
   %w(basic).each do |role|
     context "#{role} : delete /:fake_id/sources/:fake_id" do
       before do
@@ -124,7 +124,7 @@ class CategoriesSourcesDeleteResourceTest < ResourceTestCase
       use "return 404 Not Found with empty response body"
       use "no change in source count"
     end
-  
+      
     context "#{role} : delete /:id/sources/:not_related_id" do
       before do
         delete "/#{@category.id}/sources/#{@other_source.id}",
@@ -137,7 +137,8 @@ class CategoriesSourcesDeleteResourceTest < ResourceTestCase
   
     context "#{role} : delete /:id/sources/:id" do
       before do
-        delete "/#{@category.id}/sources/#{@source.id}", :api_key => api_key_for(role)
+        delete "/#{@category.id}/sources/#{@source.id}",
+          :api_key => api_key_for(role)
       end
       
       use "return 204 No Content"

data/examples/datacatalog/test/resources/categories_sources/categories_sources_post_test.rb

@@ -66,7 +66,7 @@ class CategoriesSourcesPostResourceTest < ResourceTestCase
       use "no change in source count"
     end
   end
-
+  
   %w(curator).each do |role|
     context "#{role} : post /:fake_id/sources" do
       before do
@@ -89,7 +89,7 @@ class CategoriesSourcesPostResourceTest < ResourceTestCase
         missing_param missing
       end
     end
-
+  
     [:raw, :id, :created_at, :updated_at, :junk].each do |invalid|
       context "#{role} : post /:id/sources but with #{invalid}" do
         before do
@@ -102,12 +102,12 @@ class CategoriesSourcesPostResourceTest < ResourceTestCase
         invalid_param invalid
       end
     end
-
+  
     context "#{role} : post /:id/sources with valid params" do
       before do
         post "/#{@category.id}/sources", valid_params_for(role)
       end
-
+  
       after do
         Source.find_by_id(parsed_response_body["id"]).destroy
       end
@@ -123,7 +123,7 @@ class CategoriesSourcesPostResourceTest < ResourceTestCase
       end
     end
   end
-
+  
   %w(admin).each do |role|
     context "#{role} : post /:fake_id/sources" do
       before do
@@ -148,7 +148,7 @@ class CategoriesSourcesPostResourceTest < ResourceTestCase
         missing_param missing
       end
     end
-
+  
     [:id, :created_at, :updated_at, :junk].each do |invalid|
       context "#{role} : post /:id/sources but with #{invalid}" do
         before do
@@ -161,13 +161,13 @@ class CategoriesSourcesPostResourceTest < ResourceTestCase
         invalid_param invalid
       end
     end
-
+  
     context "#{role} : post /:id/sources with valid params" do
       before do
         post "/#{@category.id}/sources",
           valid_params_for(role).merge(@extra_admin_params)
       end
-
+  
       after do
         Source.find_by_id(parsed_response_body["id"]).destroy
       end

data/examples/datacatalog/test/resources/notes/notes_post_test.rb

@@ -11,7 +11,7 @@ class NotesPostResourceTest < ResourceTestCase
     @user = create_user
     @valid_params = {
       :text    => "New Note",
-      :user_id => @user.id
+      :user_id => @user.id.to_s
     }
   end
   

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

@@ -62,7 +62,7 @@ class SourcesGetOneResourceTest < ResourceTestCase
       test "body should have correct categories" do
         expected = [
           {
-            "id"   => @category.id,
+            "id"   => @category.id.to_s,
             "href" => "/categories/#{@category.id}",
             "name" => @category.name,
           }

data/examples/datacatalog/test/resources/users/users_get_many_test.rb

@@ -78,7 +78,7 @@ class UsersGetManyResourceTest < ResourceTestCase
 
       test "body elements should be correct" do
         @members.each do |element|
-          if element["id"] == user_for(role).id
+          if element["id"] == user_for(role).id.to_s
             assert_properties(%w(name email role _api_key token
               id created_at updated_at), element)
           else

data/lib/builder.rb

@@ -175,7 +175,7 @@ module SinatraResource
           parent_document = document_for_get_one(parent_role, parent_model, parent_resource_config, false, parent_id, nil, nil)
           # ------
           role = role_for_nested(parent_document, child_assoc, model, id)
-          document_for_delete(role, model, resource_config, true, id, parent_document, child_assoc)
+          document = document_for_delete(role, model, resource_config, true, id, parent_document, child_assoc)
           display(:delete, "", resource_config, parent_id)
         end
       end

data/lib/builder/helpers.rb

@@ -355,9 +355,9 @@ module SinatraResource
         path = if c[:parent]
           raise Error, "expecting parent_id" unless parent_id
           pc = c[:parent].resource_config
-          pc[:path] + '/' + parent_id + '/' + c[:path] + '/' + o["id"]
+          "#{pc[:path]}/#{parent_id}/#{c[:path]}/#{o['id']}"
         else
-          c[:path] + '/' + o["id"]
+          "#{c[:path]}/#{o['id']}"
         end
         full_uri(path)
       end

data/lib/builder/mongo_helpers.rb

@@ -158,7 +158,8 @@ module SinatraResource
       # @return [MongoMapper::EmbeddedDocument]
       def find_child(children, child_id)
         raise Error, "children not true" unless children
-        children.detect { |x| x.id == child_id }
+        child_id = child_id.to_s
+        children.detect { |x| x.id.to_s == child_id }
       end
 
       # Find document with +child_id+ in +children+ or raise 404.
@@ -443,7 +444,9 @@ module SinatraResource
       # @return [MongoMapper::Document]
       def select_related(parent, child_assoc, children)
         children.select do |child|
-          parent.send(child_assoc).detect { |x| x.id == child.id }
+          parent.send(child_assoc).detect do |x|
+            x.id == child.id
+          end
         end
         # Note: This has O^2 complexity because of the nesting.
         # Can it be done more quickly?

data/sinatra_resource.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_resource}
-  s.version = "0.4.8"
+  s.version = "0.4.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David James"]
-  s.date = %q{2010-01-14}
+  s.date = %q{2010-02-03}
   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 = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_resource
 version: !ruby/object:Gem::Version 
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors: 
 - David James
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-14 00:00:00 -05:00
+date: 2010-02-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency