sinatra_resource 0.2.6 → 0.3.0

data/Rakefile

@@ -14,7 +14,7 @@ begin
     gem.add_dependency 'djsun-mongo_mapper', '>= 0.5.6.3'
     gem.add_dependency 'mongo', '>= 0.15.1'
     gem.add_dependency 'sinatra', '>= 0.9.4'
-    gem.add_dependency 'query_string_filter', '>= 0.1.1'
+    gem.add_dependency 'query_string_filter', '>= 0.1.2'
 
     gem.add_development_dependency 'crack', '>= 0.1.4'
     gem.add_development_dependency 'djsun-context', '>= 0.5.6'

data/VERSION

@@ -1 +1 @@
-0.2.6
+0.3.0

data/examples/datacatalog/lib/resource.rb

@@ -62,7 +62,7 @@ module DataCatalog
         def user_for(api_key)
           user = User.first(:conditions => { :_api_key => api_key })
           return nil unless user
-          raise "API key found, but user has no role" unless user.role
+          raise Error, "API key found, but user has no role" unless user.role
           user
         end
       end

data/examples/datacatalog/models/note.rb

@@ -0,0 +1,38 @@
+module DataCatalog
+
+  class Note
+
+    include MongoMapper::Document
+
+    # == Attributes
+
+    key :text,      String
+    key :user_id,   String
+    timestamps!
+  
+    # == Indices
+
+    # == Associations
+
+    belongs_to :user
+
+    # == Validations
+
+    validates_presence_of :text
+    validates_presence_of :user_id
+
+    validate :general_validation
+
+    def general_validation
+      if user.nil?
+        errors.add(:user_id, "must be valid")
+      end
+    end
+
+    # == Class Methods
+
+    # == Various Instance Methods
+
+  end
+
+end

data/examples/datacatalog/resources/categories.rb

@@ -8,8 +8,11 @@ module DataCatalog
     # == Permissions
 
     roles Roles
+    permission :list   => :basic
     permission :read   => :basic
-    permission :modify => :curator
+    permission :create => :curator
+    permission :update => :curator
+    permission :delete => :curator
 
     # == Properties
     

data/examples/datacatalog/resources/categories_sources.rb

@@ -25,8 +25,11 @@ module DataCatalog
     # == Permissions
 
     roles Roles
+    permission :list   => :basic
     permission :read   => :basic
-    permission :modify => :curator
+    permission :create => :curator
+    permission :update => :curator
+    permission :delete => :curator
     
     # == Properties
 

data/examples/datacatalog/resources/notes.rb

@@ -0,0 +1,28 @@
+module DataCatalog
+
+  class Notes < Base
+    include Resource
+
+    model Note
+
+    # == Permissions
+
+    roles Roles
+    permission :list   => :basic
+    permission :read   => :owner
+    permission :create => :basic
+    permission :update => :owner
+    permission :delete => :owner
+
+    # == Properties
+
+    property :text
+    property :user_id
+
+    # == Callbacks
+
+  end
+  
+  Notes.build
+
+end

data/examples/datacatalog/resources/sources.rb

@@ -8,8 +8,11 @@ module DataCatalog
     # == Permissions
 
     roles Roles
+    permission :list   => :basic
     permission :read   => :basic
-    permission :modify => :curator
+    permission :create => :curator
+    permission :update => :curator
+    permission :delete => :curator
     
     # == Properties
 

data/examples/datacatalog/resources/users.rb

@@ -8,8 +8,11 @@ module DataCatalog
     # == Permissions
 
     roles Roles
+    permission :list   => :basic
     permission :read   => :basic
-    permission :modify => :owner
+    permission :create => :admin
+    permission :update => :owner
+    permission :delete => :owner
 
     # == Properties
   

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

@@ -19,6 +19,13 @@ module ModelFactories
       :category_id => "",
     })
   end
+  
+  def create_note(custom={})
+    create_model!(DataCatalog::Note, custom, {
+      :text    => "Sample Note",
+      :user_id => "",
+    })
+  end
 
   def create_user(custom={})
     create_model!(DataCatalog::User, custom, {

data/examples/datacatalog/test/helpers/shared/model_counts.rb

@@ -26,6 +26,32 @@ class ResourceTestCase
     end
   end
 
+  # == notes
+
+  shared "no change in note count" do
+    test "should not change number of note documents in database" do
+      assert_equal @note_count, DataCatalog::Note.all.length
+    end
+  end
+
+  shared "one less note" do
+    test "should remove one note document from database" do
+      assert_equal @note_count - 1, DataCatalog::Note.all.length
+    end
+  end
+
+  shared "one new note" do
+    test "should add one note document to database" do
+      assert_equal @note_count + 1, DataCatalog::Note.all.length
+    end
+  end
+
+  shared "note unchanged" do
+    test "should not change note in database" do
+      assert_equal @note_copy, DataCatalog::Note.find_by_id(@note.id)
+    end
+  end
+
   # == sources
 
   shared "no change in source count" do

data/examples/datacatalog/test/models/note_test.rb

@@ -0,0 +1,42 @@
+require File.expand_path(File.dirname(__FILE__) + '/../helpers/model_test_helper')
+
+class NoteTest < ModelTestCase
+  
+  include DataCatalog
+
+  context "Note" do
+    before do
+      @user = create_user
+      @required = {
+        :text    => "Example Note",
+        :user_id => @user.id
+      }
+    end
+    
+    after do
+      @user.destroy
+    end
+  
+    context "correct params" do
+      before do
+        @note = Note.new(@required)
+      end
+      
+      test "should be valid" do
+        assert_equal true, @note.valid?
+      end
+    end
+
+    [:text, :user_id].each do |missing|
+      context "missing #{missing}" do
+        before do
+          @note = Note.new(@required.delete_if { |k, v| k == missing })
+        end
+        
+        missing_key(:note, missing)
+      end
+    end
+
+  end
+  
+end

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

@@ -0,0 +1,102 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../helpers/resource_test_helper')
+
+class NotesGetManyResourceTest < ResourceTestCase
+
+  include DataCatalog
+
+  def app; Notes end
+
+  before do
+    Note.destroy_all unless Note.count == 0
+    @users = 3.times.map do |i|
+      create_user(
+        :name => "User #{i}"
+      )
+    end
+    @notes = 3.times.map do |i|
+      create_note(
+        :text    => "Note #{i}",
+        :user_id => @users[i].id
+      )
+    end
+    @note_texts = ["Note 0", "Note 1", "Note 2"].sort
+  end
+  
+  after do
+    @notes.each { |x| x.destroy } if @notes
+    @users.each { |x| x.destroy }
+  end
+  
+  context "get /" do
+    context "anonymous" do
+      before do
+        get "/"
+      end
+    
+      use "return 401 because the API key is missing"
+    end
+  
+    context "incorrect API key" do
+      before do
+        get "/", :api_key => BAD_API_KEY
+      end
+  
+      use "return 401 because the API key is invalid"
+    end
+  end
+  
+  %w(basic curator).each do |role|
+    context "#{role} : get /" do
+      before do
+        get "/", :api_key => api_key_for(role)
+      end
+  
+      use "return 200 Ok"
+      
+      test "body should have an empty list" do
+        assert_equal [], parsed_response_body
+      end
+    end
+  end
+
+  context "owner : get /" do
+    before do
+      get "/", :api_key => @users[0]._api_key
+    end
+    
+    use "return 200 Ok"
+  
+    test "body should have 1 note" do
+      assert_equal 1, parsed_response_body.length
+    end
+    
+    test "body should have correct note text" do
+      actual = parsed_response_body.map { |e| e["text"] }
+      assert_equal ["Note 0"], actual.sort
+    end
+    
+    docs_properties %w(text user_id id created_at updated_at)
+  end
+
+  %w(admin).each do |role|
+    context "#{role} : get /" do
+      before do
+        get "/", :api_key => api_key_for(role)
+      end
+  
+      use "return 200 Ok"
+      
+      test "body should have 3 notes" do
+        assert_equal 3, parsed_response_body.length
+      end
+      
+      test "body should have correct note text" do
+        actual = parsed_response_body.map { |e| e["text"] }
+        assert_equal @note_texts, actual.sort
+      end
+      
+      docs_properties %w(text user_id id created_at updated_at)
+    end
+  end
+
+end

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

@@ -0,0 +1,85 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../helpers/resource_test_helper')
+
+class NotesGetOneResourceTest < ResourceTestCase
+
+  include DataCatalog
+
+  def app; Notes end
+  
+  before do
+    @user = create_user
+    @note = create_note(
+      :user_id => @user.id
+    )
+  end
+
+  after do
+    @note.destroy
+    @user.destroy
+  end
+
+  context "get /:id" do
+    context "anonymous" do
+      before do
+        get "/#{@note.id}"
+      end
+    
+      use "return 401 because the API key is missing"
+    end
+
+    context "incorrect API key" do
+      before do
+        get "/#{@note.id}", :api_key => BAD_API_KEY
+      end
+  
+      use "return 401 because the API key is invalid"
+    end
+  end
+
+  %w(basic curator).each do |role|
+    context "#{role} : get /:fake_id" do
+      before do
+        get "/#{FAKE_ID}", :api_key => api_key_for(role)
+      end
+    
+      use "return 401 because the API key is unauthorized"
+    end
+  
+    context "#{role} : get /:id" do
+      before do
+        get "/#{@note.id}", :api_key => api_key_for(role)
+      end
+      
+      use "return 401 because the API key is unauthorized"
+    end
+  end
+
+  context "owner : get /:id" do
+    before do
+      get "/#{@note.id}", :api_key => @user._api_key
+    end
+
+    use "return 200 Ok"
+    doc_properties %w(text user_id id created_at updated_at)
+  end
+
+  %w(admin).each do |role|
+    context "#{role} : get /:fake_id" do
+      before do
+        get "/#{FAKE_ID}", :api_key => api_key_for(role)
+      end
+    
+      use "return 404 Not Found with empty response body"
+    end
+
+    context "#{role} : get /:id" do
+      before do
+        get "/#{@note.id}", :api_key => api_key_for(role)
+      end
+
+      use "return 200 Ok"
+      doc_properties %w(text user_id id created_at updated_at)
+    end
+  end
+
+end

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

@@ -0,0 +1,91 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../helpers/resource_test_helper')
+
+class NotesPostResourceTest < ResourceTestCase
+  
+  include DataCatalog
+
+  def app; Notes end
+  
+  before do
+    @note_count = Note.all.length
+    @user = create_user
+    @valid_params = {
+      :text    => "New Note",
+      :user_id => @user.id
+    }
+  end
+  
+  after do
+    @user.destroy
+  end
+
+  context "post /" do
+    context "anonymous" do
+      before do
+        post "/", @valid_params
+      end
+    
+      use "return 401 because the API key is missing"
+      use "no change in note count"
+    end
+
+    context "incorrect API key" do
+      before do
+        post "/", @valid_params.merge(:api_key => BAD_API_KEY)
+      end
+  
+      use "return 401 because the API key is invalid"
+      use "no change in note count"
+    end
+  end
+
+  %w(basic curator admin).each do |role|
+    [:text, :user_id].each do |missing|
+      context "#{role} : post / but missing #{missing}" do
+        before do
+          post "/", valid_params_for(role).delete_if { |k, v| k == missing }
+        end
+  
+        use "return 400 Bad Request"
+        use "no change in note count"
+        missing_param missing
+      end
+    end
+  
+    [:id, :created_at, :updated_at, :junk].each do |invalid|
+      context "#{role} : post / but with #{invalid}" do
+        before do
+          post "/", valid_params_for(role).merge(invalid => 9)
+        end
+  
+        use "return 400 Bad Request"
+        use "no change in note count"
+        invalid_param invalid
+      end
+    end
+  
+    context "#{role} : post / with valid params" do
+      before do
+        post "/", valid_params_for(role)
+      end
+  
+      after do
+        Note.find_by_id(parsed_response_body["id"]).destroy
+      end
+  
+      use "return 201 Created"
+      location_header "notes"
+      use "one new note"
+      doc_properties %w(text user_id id created_at updated_at)
+  
+      test "should set all fields in database" do
+        note = Note.find_by_id(parsed_response_body["id"])
+        raise "Cannot find note" unless note
+        @valid_params.each_pair do |key, value|
+          assert_equal value, note[key]
+        end
+      end
+    end
+  end
+
+end

data/lib/builder/action_definitions.rb

@@ -14,9 +14,11 @@ module SinatraResource
       end
       
       def documents_for_get_many(role, model, resource_config, leaf, parent_document, association)
-        check_permission(:read, role, resource_config)
-        check_params(:read, role, resource_config, leaf)
-        documents = find_documents!(model)
+        check_permission(:list, role, resource_config)
+        check_params(:list, role, resource_config, leaf)
+        documents = find_documents!(model).select do |document|
+          authorized?(:read, lookup_role(document), resource_config)
+        end
         # TODO: A more performant approach would be to modify find_documents!
         # so that it returns the correct results in one query.
         if resource_config[:parent]

data/lib/builder/helpers.rb

@@ -45,7 +45,7 @@ module SinatraResource
       # Halt unless the current params are ok for +action+ and +role+.
       #
       # @param [Symbol] action
-      #   :read, :create, :update, or :delete
+      #   :list, :read, :create, :update, or :delete
       #
       # @param [Symbol] role
       #   a role (such as :anonymous, :basic, or :admin)
@@ -66,7 +66,7 @@ module SinatraResource
       # Halt unless the current role has permission to carry out +action+
       #
       # @param [Symbol] action
-      #   :read, :create, :update, or :delete
+      #   :list, :read, :create, :update, or :delete
       #
       # @param [Symbol] role
       #   a role (such as :anonymous, :basic, or :admin)
@@ -97,11 +97,17 @@ module SinatraResource
 
       # Display +object+ as appropriate for +action+.
       #
+      # @param [Symbol] action
+      #   :list, :read, :create, :update, or :delete
+      #
       # @param [Object] object
       #
+      # @param [Hash] resource_config
+      #
       # @return [String]
       def display(action, object, resource_config)
         case action
+        when :list
         when :read
         when :create
           response.status = 201
@@ -110,6 +116,8 @@ module SinatraResource
         when :update
         when :delete
           response.status = 204
+        else
+          raise Error, "Unexpected: #{action.inspect}"
         end
         convert(object)
       end
@@ -151,7 +159,7 @@ module SinatraResource
       # +property+.
       #
       # @param [Symbol] action
-      #   :read, :create, :update, or :delete
+      #   :list, :read, :create, :update, or :delete
       #
       # @param [Hash] resource_config
       #
@@ -161,7 +169,9 @@ module SinatraResource
       #   a role (such as :anonymous, :basic, or :admin)
       def minimum_role(action, resource_config, property=nil)
         if property.nil?
-          resource_config[:permission][to_read_or_modify(action)]
+          p = resource_config[:permission]
+          raise Error, "undefined #{action.inspect} permission" unless p
+          p[action]
         else
           hash = resource_config[:properties][property]
           hash ? hash[to_r_or_w(action)] : :nobody
@@ -176,7 +186,7 @@ module SinatraResource
       #   a role (such as :anonymous, :basic, or :admin)
       #
       # @param [Symbol] action
-      #   :read, :create, :update, or :delete
+      #   :list, :read, :create, :update, or :delete
       #
       # @param [Hash] resource_config
       #
@@ -199,7 +209,7 @@ module SinatraResource
       # Applications must override this method.
       # 
       # @param [Symbol] action
-      #   :read, :create, :update, or :delete
+      #   :list, :read, :create, :update, or :delete
       #
       # @param [Symbol] role
       #   a role (such as :anonymous, :basic, or :admin)
@@ -253,7 +263,7 @@ module SinatraResource
       # Are the params suitable for +action+? Raise 400 Bad Request if not.
       #
       # @param [Symbol] action
-      #   :read, :create, :update, or :delete
+      #   :list, :read, :create, :update, or :delete
       #
       # @param [Boolean] leaf
       #   If a simple resource, should be true.
@@ -262,6 +272,8 @@ module SinatraResource
       # @return [undefined]
       def params_check_action(action)
         case action
+        when :list
+          # TODO: is anything needed here?
         when :read
           unless params.reject { |k, v| k == FILTER_KEY }.empty?
             error 400, convert(body_for(:non_empty_params))
@@ -277,6 +289,8 @@ module SinatraResource
           unless params.empty?
             error 400, convert(body_for(:non_empty_params))
           end
+        else
+          raise Error, "Unexpected: #{action.inspect}"
         end
       end
 
@@ -284,7 +298,7 @@ module SinatraResource
       # +role+. Raises a 400 Bad Request if not authorized.
       #
       # @param [Symbol] action
-      #   :read, :create, :update, or :delete
+      #   :list, :read, :create, :update, or :delete
       #
       # @param [Symbol] role
       #   a role (such as :anonymous, :basic, or :admin)
@@ -321,23 +335,6 @@ module SinatraResource
         end
       end
 
-      # Converts +action+ to (:read or :modify).
-      #
-      # @param [Symbol] action
-      #   :read, :create, :update, or :delete
-      #
-      # @return [Symbol]
-      #   :read or :modify
-      def to_read_or_modify(action)
-        case action
-        when :read   then :read
-        when :create then :modify
-        when :update then :modify
-        when :delete then :modify
-        else raise "Unexpected action : #{action.inspect}"
-        end
-      end
-
       # Lookup +attribute+ in +document+
       #
       # @param [Symbol] attribute

data/lib/builder/mongo_helpers.rb

@@ -1,4 +1,4 @@
-gem 'query_string_filter', '>= 0.1.1'
+gem 'query_string_filter', '>= 0.1.2'
 require 'query_string_filter'
 
 module SinatraResource

data/lib/builder.rb

@@ -63,7 +63,7 @@ module SinatraResource
           role = get_role(model)
           documents = documents_for_get_many(role, model, resource_config, true, nil, nil)
           resources = build_resources(documents, resource_config)
-          display(:read, resources, resource_config)
+          display(:list, resources, resource_config)
         end
       else
         association            = @child_association
@@ -78,7 +78,7 @@ module SinatraResource
           role = get_role(model)
           documents = documents_for_get_many(role, model, resource_config, true, parent_document, association)
           resources = build_resources(documents, resource_config)
-          display(:read, resources, resource_config)
+          display(:list, resources, resource_config)
         end
       end
     end

data/lib/resource.rb

@@ -109,16 +109,21 @@ module SinatraResource
       # or writing.
       #
       # @example
+      #   permission :list   => :basic
       #   permission :read   => :basic
-      #   permission :modify => :owner
+      #   permission :create => :basic
+      #   permission :update => :owner
+      #   permission :delete => :owner
       #
       # @param [Hash<Symbol => Symbol>] access_rules
-      #   valid keys are :read or :modify
+      #   valid keys are:
+      #     :list, :read, :create, :update, :delete
       #   values should be a role (such as :admin)
       #
       # @return [undefined]
       def permission(access_rules)
         access_rules.each_pair do |verb, role|
+          @resource_config[:roles].validate_role(role)
           @resource_config[:permission][verb] = role
         end
       end
@@ -145,6 +150,7 @@ module SinatraResource
           @resource_config[:properties][name][:read_proc] = block
         else
           access_rules.each_pair do |kind, role|
+            @resource_config[:roles].validate_role(role)
             @resource_config[:properties][name][kind] = role
           end
         end

data/lib/roles.rb

@@ -71,13 +71,18 @@ module SinatraResource
       def setup
         @role_config = {}
         @satisfies_cache = {}
+        create_role(:nobody)
       end
 
-      # Halt if +role+ is undefined.
+      # Return +role+ if it is defined, raise exception otherwise.
       #
       # @raise [UndefinedRole] if role undefined
+      #
+      # @return [Symbol]
       def validate_role(role)
-        unless @role_config.include?(role)
+        if @role_config.include?(role)
+          role
+        else
           raise UndefinedRole, "#{role.inspect} not defined"
         end
       end

data/sinatra_resource.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_resource}
-  s.version = "0.2.6"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David James"]
-  s.date = %q{2009-10-27}
+  s.date = %q{2009-10-28}
   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 = [
@@ -33,10 +33,12 @@ Gem::Specification.new do |s|
      "examples/datacatalog/lib/roles.rb",
      "examples/datacatalog/models/categorization.rb",
      "examples/datacatalog/models/category.rb",
+     "examples/datacatalog/models/note.rb",
      "examples/datacatalog/models/source.rb",
      "examples/datacatalog/models/user.rb",
      "examples/datacatalog/resources/categories.rb",
      "examples/datacatalog/resources/categories_sources.rb",
+     "examples/datacatalog/resources/notes.rb",
      "examples/datacatalog/resources/sources.rb",
      "examples/datacatalog/resources/users.rb",
      "examples/datacatalog/tasks/db.rake",
@@ -57,6 +59,7 @@ Gem::Specification.new do |s|
      "examples/datacatalog/test/helpers/test_helper.rb",
      "examples/datacatalog/test/models/categorization_test.rb",
      "examples/datacatalog/test/models/category_test.rb",
+     "examples/datacatalog/test/models/note_test.rb",
      "examples/datacatalog/test/models/source_test.rb",
      "examples/datacatalog/test/models/user_test.rb",
      "examples/datacatalog/test/resources/categories/categories_delete_test.rb",
@@ -69,6 +72,9 @@ Gem::Specification.new do |s|
      "examples/datacatalog/test/resources/categories_sources/categories_sources_get_one_test.rb",
      "examples/datacatalog/test/resources/categories_sources/categories_sources_post_test.rb",
      "examples/datacatalog/test/resources/categories_sources/categories_sources_put_test.rb",
+     "examples/datacatalog/test/resources/notes/notes_get_many_test.rb",
+     "examples/datacatalog/test/resources/notes/notes_get_one_test.rb",
+     "examples/datacatalog/test/resources/notes/notes_post_test.rb",
      "examples/datacatalog/test/resources/sources/sources_delete_test.rb",
      "examples/datacatalog/test/resources/sources/sources_get_many_search_test.rb",
      "examples/datacatalog/test/resources/sources/sources_get_many_test.rb",
@@ -116,10 +122,12 @@ Gem::Specification.new do |s|
      "examples/datacatalog/lib/roles.rb",
      "examples/datacatalog/models/categorization.rb",
      "examples/datacatalog/models/category.rb",
+     "examples/datacatalog/models/note.rb",
      "examples/datacatalog/models/source.rb",
      "examples/datacatalog/models/user.rb",
      "examples/datacatalog/resources/categories.rb",
      "examples/datacatalog/resources/categories_sources.rb",
+     "examples/datacatalog/resources/notes.rb",
      "examples/datacatalog/resources/sources.rb",
      "examples/datacatalog/resources/users.rb",
      "examples/datacatalog/test/helpers/assertions/assert_include.rb",
@@ -138,6 +146,7 @@ Gem::Specification.new do |s|
      "examples/datacatalog/test/helpers/test_helper.rb",
      "examples/datacatalog/test/models/categorization_test.rb",
      "examples/datacatalog/test/models/category_test.rb",
+     "examples/datacatalog/test/models/note_test.rb",
      "examples/datacatalog/test/models/source_test.rb",
      "examples/datacatalog/test/models/user_test.rb",
      "examples/datacatalog/test/resources/categories/categories_delete_test.rb",
@@ -150,6 +159,9 @@ Gem::Specification.new do |s|
      "examples/datacatalog/test/resources/categories_sources/categories_sources_get_one_test.rb",
      "examples/datacatalog/test/resources/categories_sources/categories_sources_post_test.rb",
      "examples/datacatalog/test/resources/categories_sources/categories_sources_put_test.rb",
+     "examples/datacatalog/test/resources/notes/notes_get_many_test.rb",
+     "examples/datacatalog/test/resources/notes/notes_get_one_test.rb",
+     "examples/datacatalog/test/resources/notes/notes_post_test.rb",
      "examples/datacatalog/test/resources/sources/sources_delete_test.rb",
      "examples/datacatalog/test/resources/sources/sources_get_many_search_test.rb",
      "examples/datacatalog/test/resources/sources/sources_get_many_test.rb",
@@ -171,7 +183,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<djsun-mongo_mapper>, [">= 0.5.6.3"])
       s.add_runtime_dependency(%q<mongo>, [">= 0.15.1"])
       s.add_runtime_dependency(%q<sinatra>, [">= 0.9.4"])
-      s.add_runtime_dependency(%q<query_string_filter>, [">= 0.1.1"])
+      s.add_runtime_dependency(%q<query_string_filter>, [">= 0.1.2"])
       s.add_development_dependency(%q<crack>, [">= 0.1.4"])
       s.add_development_dependency(%q<djsun-context>, [">= 0.5.6"])
       s.add_development_dependency(%q<jeremymcanally-pending>, [">= 0.1"])
@@ -181,7 +193,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<djsun-mongo_mapper>, [">= 0.5.6.3"])
       s.add_dependency(%q<mongo>, [">= 0.15.1"])
       s.add_dependency(%q<sinatra>, [">= 0.9.4"])
-      s.add_dependency(%q<query_string_filter>, [">= 0.1.1"])
+      s.add_dependency(%q<query_string_filter>, [">= 0.1.2"])
       s.add_dependency(%q<crack>, [">= 0.1.4"])
       s.add_dependency(%q<djsun-context>, [">= 0.5.6"])
       s.add_dependency(%q<jeremymcanally-pending>, [">= 0.1"])
@@ -192,7 +204,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<djsun-mongo_mapper>, [">= 0.5.6.3"])
     s.add_dependency(%q<mongo>, [">= 0.15.1"])
     s.add_dependency(%q<sinatra>, [">= 0.9.4"])
-    s.add_dependency(%q<query_string_filter>, [">= 0.1.1"])
+    s.add_dependency(%q<query_string_filter>, [">= 0.1.2"])
     s.add_dependency(%q<crack>, [">= 0.1.4"])
     s.add_dependency(%q<djsun-context>, [">= 0.5.6"])
     s.add_dependency(%q<jeremymcanally-pending>, [">= 0.1"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_resource
 version: !ruby/object:Gem::Version 
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors: 
 - David James
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-27 00:00:00 -04:00
+date: 2009-10-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.1
+        version: 0.1.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: crack
@@ -128,10 +128,12 @@ files:
 - examples/datacatalog/lib/roles.rb
 - examples/datacatalog/models/categorization.rb
 - examples/datacatalog/models/category.rb
+- examples/datacatalog/models/note.rb
 - examples/datacatalog/models/source.rb
 - examples/datacatalog/models/user.rb
 - examples/datacatalog/resources/categories.rb
 - examples/datacatalog/resources/categories_sources.rb
+- examples/datacatalog/resources/notes.rb
 - examples/datacatalog/resources/sources.rb
 - examples/datacatalog/resources/users.rb
 - examples/datacatalog/tasks/db.rake
@@ -152,6 +154,7 @@ files:
 - examples/datacatalog/test/helpers/test_helper.rb
 - examples/datacatalog/test/models/categorization_test.rb
 - examples/datacatalog/test/models/category_test.rb
+- examples/datacatalog/test/models/note_test.rb
 - examples/datacatalog/test/models/source_test.rb
 - examples/datacatalog/test/models/user_test.rb
 - examples/datacatalog/test/resources/categories/categories_delete_test.rb
@@ -164,6 +167,9 @@ files:
 - examples/datacatalog/test/resources/categories_sources/categories_sources_get_one_test.rb
 - examples/datacatalog/test/resources/categories_sources/categories_sources_post_test.rb
 - examples/datacatalog/test/resources/categories_sources/categories_sources_put_test.rb
+- examples/datacatalog/test/resources/notes/notes_get_many_test.rb
+- examples/datacatalog/test/resources/notes/notes_get_one_test.rb
+- examples/datacatalog/test/resources/notes/notes_post_test.rb
 - examples/datacatalog/test/resources/sources/sources_delete_test.rb
 - examples/datacatalog/test/resources/sources/sources_get_many_search_test.rb
 - examples/datacatalog/test/resources/sources/sources_get_many_test.rb
@@ -233,10 +239,12 @@ test_files:
 - examples/datacatalog/lib/roles.rb
 - examples/datacatalog/models/categorization.rb
 - examples/datacatalog/models/category.rb
+- examples/datacatalog/models/note.rb
 - examples/datacatalog/models/source.rb
 - examples/datacatalog/models/user.rb
 - examples/datacatalog/resources/categories.rb
 - examples/datacatalog/resources/categories_sources.rb
+- examples/datacatalog/resources/notes.rb
 - examples/datacatalog/resources/sources.rb
 - examples/datacatalog/resources/users.rb
 - examples/datacatalog/test/helpers/assertions/assert_include.rb
@@ -255,6 +263,7 @@ test_files:
 - examples/datacatalog/test/helpers/test_helper.rb
 - examples/datacatalog/test/models/categorization_test.rb
 - examples/datacatalog/test/models/category_test.rb
+- examples/datacatalog/test/models/note_test.rb
 - examples/datacatalog/test/models/source_test.rb
 - examples/datacatalog/test/models/user_test.rb
 - examples/datacatalog/test/resources/categories/categories_delete_test.rb
@@ -267,6 +276,9 @@ test_files:
 - examples/datacatalog/test/resources/categories_sources/categories_sources_get_one_test.rb
 - examples/datacatalog/test/resources/categories_sources/categories_sources_post_test.rb
 - examples/datacatalog/test/resources/categories_sources/categories_sources_put_test.rb
+- examples/datacatalog/test/resources/notes/notes_get_many_test.rb
+- examples/datacatalog/test/resources/notes/notes_get_one_test.rb
+- examples/datacatalog/test/resources/notes/notes_post_test.rb
 - examples/datacatalog/test/resources/sources/sources_delete_test.rb
 - examples/datacatalog/test/resources/sources/sources_get_many_search_test.rb
 - examples/datacatalog/test/resources/sources/sources_get_many_test.rb