rest-sinatra 0.3.2 → 0.3.3

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/lib/rest-sinatra.rb

@@ -1,287 +1,287 @@
-module RestSinatra
-
-  def self.included(includer)
-    includer.extend(ClassMethods)
-  end
-
-  module ClassMethods
-    
-    attr_reader :config
-  
-    def resource(name, &block)
-      _resource(name, :regular, &block)
-    end
-    
-    def nestable_resource(name, &block)
-      _resource(name, :nestable, &block)
-    end
-    
-    protected
-    
-    def _resource(name, resource_type, &block)
-      config = evaluate_block(name, resource_type, &block)
-      validate(config)
-      build_resource(config)
-      config
-    end
-    
-    def evaluate_block(name, resource_type, &block)
-      scope = Object.new
-      scope.extend(ResourceMethods)
-      scope.instance_eval do
-        @c = {
-          :name             => name,
-          :resource_type    => resource_type,
-          :model            => nil,
-          :read_only        => [],
-          :permission       => nil,
-          :callbacks        => {},
-          :nested_resources => []
-        }
-      end
-      scope.instance_eval(&block)
-      scope.instance_variable_get("@c")
-    end
-    
-    def validate(c)
-      raise "name required" unless c[:name]
-      raise "model required" unless c[:model]
-      c[:nested_resources].each do |resource|
-        unless resource[:association]
-          raise "association required for #{resource[:class]}"
-        end
-      end
-    end
-    
-    def build_resource(config)
-      case config[:resource_type]
-      when :regular
-        build_parent_resource(config)
-        build_nested_resources(config)
-      when :nestable
-        save_nestable_config(config)
-      else
-        raise "Unexpected resource_type"
-      end
-    end
-
-    def build_parent_resource(config)
-      callbacks = config[:callbacks]
-      model     = config[:model]
-      name      = config[:name]
-      read_only = config[:read_only]
-
-      get '/?' do
-        require_at_least(:basic)
-        validate_before_find_all(params, model)
-        @documents = find_with_filters(params, model)
-        @documents.to_json
-      end
-
-      get '/:id/?' do |id|
-        require_at_least(:basic)
-        id = params.delete("id")
-        validate_before_find_one(params, model)
-        @document = find_document!(model, id)
-        @document.to_json
-      end
-
-      post '/?' do
-        require_at_least(:curator)
-        validate_before_create(params, model, read_only)
-        callback(callbacks[:before_save])
-        callback(callbacks[:before_create])
-        @document = model.new(params)
-        unless @document.valid?
-          error 400, { "errors" => @document.errors.errors }.to_json
-        end
-        @document.save
-        callback(callbacks[:after_create])
-        callback(callbacks[:after_save])
-        response.status = 201
-        response.headers['Location'] = full_uri "/#{name}/#{@document.id}"
-        @document.to_json
-      end
-
-      put '/:id/?' do
-        require_at_least(:curator)
-        id = params.delete("id")
-        @document = find_document!(model, id)
-        validate_before_update(params, model, read_only)
-        callback(callbacks[:before_save])
-        callback(callbacks[:before_update])
-        @document = model.update(id, params)
-        unless @document.valid?
-          error 400, { "errors" => @document.errors.errors }.to_json
-        end
-        callback(callbacks[:after_update])
-        callback(callbacks[:after_save])
-        @document.to_json
-      end
-
-      delete '/:id/?' do
-        require_at_least(:curator)
-        id = params.delete("id")
-        @document = find_document!(model, id)
-        callback(callbacks[:before_destroy])
-        @document.destroy
-        callback(callbacks[:after_destroy])
-        { "id" => id }.to_json
-      end
-
-      helpers do
-        def find_document!(model, id)
-          document = model.find_by_id(id)
-          error 404, [].to_json unless document
-          document
-        end
-      end
-
-    end
-
-    def build_nested_resources(parent_config)
-      parent_config[:nested_resources].each do |resource|
-        nested_res_class = resource[:class]
-        assoc            = resource[:association]
-        nested_config    = restore_nestable_config(nested_res_class)
-        build_nested_resource(nested_res_class, assoc, parent_config, nested_config)
-      end
-    end
-
-    # klass       : nested resource class
-    # association : a method on the parent model that will return child models
-    def build_nested_resource(klass, association, parent_config, child_config)
-      callbacks       = child_config[:callbacks]
-      child_model     = child_config[:model]
-      child_name      = child_config[:name]
-      permission      = child_config[:permission]
-      read_only       = child_config[:read_only]
-
-      parent_model    = parent_config[:model]
-      parent_name     = parent_config[:name]
-
-      get "/:parent_id/#{child_name}/?" do
-        parent_id = params.delete("parent_id")
-        permission_check(:basic, permission, parent_id)
-        @parent_document = find_parent!(parent_model, parent_id)
-        all_child_documents = @parent_document.send(association)
-        validate_before_find_all(params, child_model) # ?
-        @child_documents = nested_find_with_filters(all_child_documents, params, parent_model)
-        @child_documents.to_json
-      end
-
-      get "/:parent_id/#{child_name}/:child_id/?" do
-        parent_id = params.delete("parent_id")
-        permission_check(:basic, permission, parent_id)
-        child_id = params.delete("child_id")
-        validate_before_find_one(params, child_model) # ?
-        @parent_document, @child_document = find_documents!(parent_model, parent_id, association, child_id)
-        @child_document.to_json
-      end
-
-      post "/:parent_id/#{child_name}/?" do
-        parent_id = params.delete("parent_id")
-        permission_check(:curator, permission, parent_id)
-        @parent_document = find_parent!(parent_model, parent_id)
-        validate_before_create(params, child_model, read_only)
-        callback(callbacks[:before_save])
-        callback(callbacks[:before_create])
-        @child_document = child_model.new(params)
-        @parent_document.send(association) << @child_document
-        error 500, [].to_json unless @parent_document.save
-        callback(callbacks[:after_create])
-        callback(callbacks[:after_save])
-        response.status = 201
-        response.headers['Location'] = full_uri(
-          "/#{parent_name}/#{parent_id}/#{child_name}/#{@child_document.id}"
-        )
-        @child_document.to_json
-      end
-
-      put "/:parent_id/#{child_name}/:child_id/?" do
-        parent_id = params.delete("parent_id")
-        permission_check(:curator, permission, parent_id)
-        child_id = params.delete("child_id")
-        @parent_document, @child_document = find_documents!(parent_model, parent_id, association, child_id)
-        validate_before_update(params, child_model, read_only)
-        callback(callbacks[:before_save])
-        callback(callbacks[:before_update])
-        @child_document.attributes = params
-        child_index = @parent_document.send(association).index(@child_document)
-        @parent_document.send(association)[child_index] = @child_document
-        error 500, [].to_json unless @parent_document.save
-        callback(callbacks[:after_update])
-        callback(callbacks[:after_save])
-        @child_document.to_json
-      end
-
-      delete "/:parent_id/#{child_name}/:child_id/?" do
-        parent_id = params.delete("parent_id")
-        permission_check(:curator, permission, parent_id)
-        child_id = params.delete("child_id")
-        @parent_document, @child_document = find_documents!(parent_model, parent_id, association, child_id)
-        callback(callbacks[:before_destroy])
-        @parent_document.send(association).delete(@child_document)
-        callback(callbacks[:after_destroy])
-        error 500, [].to_json unless @parent_document.save
-        { "id" => child_id }.to_json
-      end
-
-      helpers do
-        def find_parent!(parent_model, parent_id)
-          parent_document = parent_model.find_by_id(parent_id)
-          error 404, [].to_json unless parent_document
-          parent_document
-        end
-
-        def find_child!(parent_document, association, child_id)
-          child_document = parent_document.send(association).detect { |x| x.id == child_id }
-          error 404, [].to_json unless child_document
-          child_document
-        end
-
-        def find_documents!(parent_model, parent_id, association, child_id)
-          parent_document = find_parent!(parent_model, parent_id)
-          child_document = find_child!(parent_document, association, child_id)
-          [parent_document, child_document]
-        end
-      end
-    end
-
-    def save_nestable_config(config)
-      @nestable_resource_config = config
-    end
-    
-    def restore_nestable_config(klass)
-      klass.instance_variable_get("@nestable_resource_config")
-    end
-
-  end
-  
-  module ResourceMethods
-    
-    def model(model)
-      raise "model already declared" if @c[:model]
-      @c[:model] = model
-    end
-
-    def read_only(attribute)
-      @c[:read_only] << attribute
-    end
-    
-    def permission(level)
-      raise "permission already declared" if @c[:permission]
-      @c[:permission] = level
-    end
-    
-    def callback(name, &block)
-      @c[:callbacks][name] = block
-    end
-    
-    def nested_resource(klass, options)
-      @c[:nested_resources] << options.merge({:class => klass})
-    end
-    
-  end
-  
-end
+module RestSinatra
+
+  def self.included(includer)
+    includer.extend(ClassMethods)
+  end
+
+  module ClassMethods
+    
+    attr_reader :config
+  
+    def resource(name, &block)
+      _resource(name, :regular, &block)
+    end
+    
+    def nestable_resource(name, &block)
+      _resource(name, :nestable, &block)
+    end
+    
+    protected
+    
+    def _resource(name, resource_type, &block)
+      config = evaluate_block(name, resource_type, &block)
+      validate(config)
+      build_resource(config)
+      config
+    end
+    
+    def evaluate_block(name, resource_type, &block)
+      scope = Object.new
+      scope.extend(ResourceMethods)
+      scope.instance_eval do
+        @c = {
+          :name             => name,
+          :resource_type    => resource_type,
+          :model            => nil,
+          :read_only        => [],
+          :permission       => nil,
+          :callbacks        => {},
+          :nested_resources => []
+        }
+      end
+      scope.instance_eval(&block)
+      scope.instance_variable_get("@c")
+    end
+    
+    def validate(c)
+      raise "name required" unless c[:name]
+      raise "model required" unless c[:model]
+      c[:nested_resources].each do |resource|
+        unless resource[:association]
+          raise "association required for #{resource[:class]}"
+        end
+      end
+    end
+    
+    def build_resource(config)
+      case config[:resource_type]
+      when :regular
+        build_parent_resource(config)
+        build_nested_resources(config)
+      when :nestable
+        save_nestable_config(config)
+      else
+        raise "Unexpected resource_type"
+      end
+    end
+
+    def build_parent_resource(config)
+      callbacks = config[:callbacks]
+      model     = config[:model]
+      name      = config[:name]
+      read_only = config[:read_only]
+
+      get '/?' do
+        require_at_least(:basic)
+        validate_before_find_all(params, model)
+        @documents = find_with_filters(params, model)
+        @documents.render
+      end
+
+      get '/:id/?' do |id|
+        require_at_least(:basic)
+        id = params.delete("id")
+        validate_before_find_one(params, model)
+        @document = find_document!(model, id)
+        @document.render
+      end
+
+      post '/?' do
+        require_at_least(:curator)
+        validate_before_create(params, model, read_only)
+        callback(callbacks[:before_save])
+        callback(callbacks[:before_create])
+        @document = model.new(params)
+        unless @document.valid?
+          error 400, { "errors" => @document.errors.errors }.to_json
+        end
+        error 500, [].to_json unless @document.save
+        callback(callbacks[:after_create])
+        callback(callbacks[:after_save])
+        response.status = 201
+        response.headers['Location'] = full_uri "/#{name}/#{@document.id}"
+        @document.render
+      end
+
+      put '/:id/?' do
+        require_at_least(:curator)
+        id = params.delete("id")
+        @document = find_document!(model, id)
+        validate_before_update(params, model, read_only)
+        callback(callbacks[:before_save])
+        callback(callbacks[:before_update])
+        @document = model.update(id, params)
+        unless @document.valid?
+          error 400, { "errors" => @document.errors.errors }.to_json
+        end
+        callback(callbacks[:after_update])
+        callback(callbacks[:after_save])
+        @document.render
+      end
+
+      delete '/:id/?' do
+        require_at_least(:curator)
+        id = params.delete("id")
+        @document = find_document!(model, id)
+        callback(callbacks[:before_destroy])
+        @document.destroy
+        callback(callbacks[:after_destroy])
+        { "id" => id }.to_json
+      end
+
+      helpers do
+        def find_document!(model, id)
+          document = model.find_by_id(id)
+          error 404, [].to_json unless document
+          document
+        end
+      end
+
+    end
+
+    def build_nested_resources(parent_config)
+      parent_config[:nested_resources].each do |resource|
+        nested_res_class = resource[:class]
+        assoc            = resource[:association]
+        nested_config    = restore_nestable_config(nested_res_class)
+        build_nested_resource(nested_res_class, assoc, parent_config, nested_config)
+      end
+    end
+
+    # klass       : nested resource class
+    # association : a method on the parent model that will return child models
+    def build_nested_resource(klass, association, parent_config, child_config)
+      callbacks       = child_config[:callbacks]
+      child_model     = child_config[:model]
+      child_name      = child_config[:name]
+      permission      = child_config[:permission]
+      read_only       = child_config[:read_only]
+
+      parent_model    = parent_config[:model]
+      parent_name     = parent_config[:name]
+
+      get "/:parent_id/#{child_name}/?" do
+        parent_id = params.delete("parent_id")
+        permission_check(:basic, permission, parent_id)
+        @parent_document = find_parent!(parent_model, parent_id)
+        all_child_documents = @parent_document.send(association)
+        validate_before_find_all(params, child_model) # ?
+        @child_documents = nested_find_with_filters(all_child_documents, params, parent_model)
+        @child_documents.render
+      end
+
+      get "/:parent_id/#{child_name}/:child_id/?" do
+        parent_id = params.delete("parent_id")
+        permission_check(:basic, permission, parent_id)
+        child_id = params.delete("child_id")
+        validate_before_find_one(params, child_model) # ?
+        @parent_document, @child_document = find_documents!(parent_model, parent_id, association, child_id)
+        @child_document.render
+      end
+
+      post "/:parent_id/#{child_name}/?" do
+        parent_id = params.delete("parent_id")
+        permission_check(:curator, permission, parent_id)
+        @parent_document = find_parent!(parent_model, parent_id)
+        validate_before_create(params, child_model, read_only)
+        callback(callbacks[:before_save])
+        callback(callbacks[:before_create])
+        @child_document = child_model.new(params)
+        @parent_document.send(association) << @child_document
+        error 500, [].to_json unless @parent_document.save
+        callback(callbacks[:after_create])
+        callback(callbacks[:after_save])
+        response.status = 201
+        response.headers['Location'] = full_uri(
+          "/#{parent_name}/#{parent_id}/#{child_name}/#{@child_document.id}"
+        )
+        @child_document.render
+      end
+
+      put "/:parent_id/#{child_name}/:child_id/?" do
+        parent_id = params.delete("parent_id")
+        permission_check(:curator, permission, parent_id)
+        child_id = params.delete("child_id")
+        @parent_document, @child_document = find_documents!(parent_model, parent_id, association, child_id)
+        validate_before_update(params, child_model, read_only)
+        callback(callbacks[:before_save])
+        callback(callbacks[:before_update])
+        @child_document.attributes = params
+        child_index = @parent_document.send(association).index(@child_document)
+        @parent_document.send(association)[child_index] = @child_document
+        error 500, [].to_json unless @parent_document.save
+        callback(callbacks[:after_update])
+        callback(callbacks[:after_save])
+        @child_document.render
+      end
+
+      delete "/:parent_id/#{child_name}/:child_id/?" do
+        parent_id = params.delete("parent_id")
+        permission_check(:curator, permission, parent_id)
+        child_id = params.delete("child_id")
+        @parent_document, @child_document = find_documents!(parent_model, parent_id, association, child_id)
+        callback(callbacks[:before_destroy])
+        @parent_document.send(association).delete(@child_document)
+        callback(callbacks[:after_destroy])
+        error 500, [].to_json unless @parent_document.save
+        { "id" => child_id }.to_json
+      end
+
+      helpers do
+        def find_parent!(parent_model, parent_id)
+          parent_document = parent_model.find_by_id(parent_id)
+          error 404, [].to_json unless parent_document
+          parent_document
+        end
+
+        def find_child!(parent_document, association, child_id)
+          child_document = parent_document.send(association).detect { |x| x.id == child_id }
+          error 404, [].to_json unless child_document
+          child_document
+        end
+
+        def find_documents!(parent_model, parent_id, association, child_id)
+          parent_document = find_parent!(parent_model, parent_id)
+          child_document = find_child!(parent_document, association, child_id)
+          [parent_document, child_document]
+        end
+      end
+    end
+
+    def save_nestable_config(config)
+      @nestable_resource_config = config
+    end
+    
+    def restore_nestable_config(klass)
+      klass.instance_variable_get("@nestable_resource_config")
+    end
+
+  end
+  
+  module ResourceMethods
+    
+    def model(model)
+      raise "model already declared" if @c[:model]
+      @c[:model] = model
+    end
+
+    def read_only(attribute)
+      @c[:read_only] << attribute
+    end
+    
+    def permission(level)
+      raise "permission already declared" if @c[:permission]
+      @c[:permission] = level
+    end
+    
+    def callback(name, &block)
+      @c[:callbacks][name] = block
+    end
+    
+    def nested_resource(klass, options)
+      @c[:nested_resources] << options.merge({:class => klass})
+    end
+    
+  end
+  
+end

data/rest-sinatra.gemspec

@@ -1,63 +1,63 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{rest-sinatra}
-  s.version = "0.3.2"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["David James"]
-  s.date = %q{2009-10-04}
-  s.description = %q{Provides a DSL for making RESTful Sinatra actions with MongoMapper models.}
-  s.email = %q{djames@sunlightfoundation.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.md"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.md",
-     "Rakefile",
-     "VERSION",
-     "lib/rest-sinatra.rb",
-     "rest-sinatra.gemspec",
-     "spec/spec_helper.rb",
-     "spec/unit/helpers/comments.rb",
-     "spec/unit/helpers/posts.rb",
-     "spec/unit/helpers/sinatra_stubs.rb",
-     "spec/unit/helpers/sources.rb",
-     "spec/unit/posts_and_comments_spec.rb",
-     "spec/unit/sources_spec.rb"
-  ]
-  s.homepage = %q{http://github.com/djsun/rest-sinatra}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Easily write RESTful actions with Sinatra and MongoMapper}
-  s.test_files = [
-    "spec/spec_helper.rb",
-     "spec/unit/helpers/comments.rb",
-     "spec/unit/helpers/posts.rb",
-     "spec/unit/helpers/sinatra_stubs.rb",
-     "spec/unit/helpers/sources.rb",
-     "spec/unit/posts_and_comments_spec.rb",
-     "spec/unit/sources_spec.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-    else
-      s.add_dependency(%q<rspec>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<rspec>, [">= 0"])
-  end
-end
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{rest-sinatra}
+  s.version = "0.3.3"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["David James"]
+  s.date = %q{2009-10-11}
+  s.description = %q{Provides a DSL for making RESTful Sinatra actions with MongoMapper models.}
+  s.email = %q{djames@sunlightfoundation.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.md"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "LICENSE",
+     "README.md",
+     "Rakefile",
+     "VERSION",
+     "lib/rest-sinatra.rb",
+     "rest-sinatra.gemspec",
+     "spec/spec_helper.rb",
+     "spec/unit/helpers/comments.rb",
+     "spec/unit/helpers/posts.rb",
+     "spec/unit/helpers/sinatra_stubs.rb",
+     "spec/unit/helpers/sources.rb",
+     "spec/unit/posts_and_comments_spec.rb",
+     "spec/unit/sources_spec.rb"
+  ]
+  s.homepage = %q{http://github.com/djsun/rest-sinatra}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Easily write RESTful actions with Sinatra and MongoMapper}
+  s.test_files = [
+    "spec/spec_helper.rb",
+     "spec/unit/helpers/comments.rb",
+     "spec/unit/helpers/posts.rb",
+     "spec/unit/helpers/sinatra_stubs.rb",
+     "spec/unit/helpers/sources.rb",
+     "spec/unit/posts_and_comments_spec.rb",
+     "spec/unit/sources_spec.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+    else
+      s.add_dependency(%q<rspec>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<rspec>, [">= 0"])
+  end
+end

data/spec/unit/posts_and_comments_spec.rb

@@ -1,148 +1,148 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
-require File.expand_path(File.dirname(__FILE__) + '/helpers/posts.rb')
-require File.expand_path(File.dirname(__FILE__) + '/helpers/comments.rb')
-
-describe "Posts" do
-  
-  before do
-    @config = Posts.instance_variable_get("@r")
-  end
-  
-  describe "DSL methods" do
-    it "resource should be 'posts'" do
-      @config[:name].should == "posts"
-    end
-
-    it "model should be Post" do
-      @config[:model].should == Post
-    end
-
-    it "read_only should be correct" do
-      @config[:read_only].should == [:created_at, :updated_at]
-    end
-
-    it "callback :before_create should be correct" do
-      @config[:callbacks][:before_save].call.should == "before saving posts"
-    end
-    
-    it "callback :before_update should return nil" do
-      @config[:callbacks][:before_update].should == nil
-    end
-  end
-
-  describe "actions" do
-    before do
-      @actions = Posts.actions
-    end
-    
-    describe "get" do
-      before do
-        @acts = @actions[:get]
-      end
-
-      it "get /?" do
-        @acts.should include("/?")
-      end
-
-      it "get /:id/?" do
-        @acts.should include("/:id/?")
-      end
-
-      it "get /:parent_id/comments/?" do
-        @acts.should include("/:parent_id/comments/?")
-      end
-
-      it "get /:parent_id/comments/:child_id/?" do
-        @acts.should include("/:parent_id/comments/:child_id/?")
-      end
-
-      it "exactly 4 actions" do
-        @acts.length.should == 4
-      end
-    end
-
-    describe "post" do
-      before do
-        @acts = @actions[:post]
-      end
-    
-      it "post /?" do
-        @acts.should include("/?")
-      end
-
-      it "post /:parent_id/comments/?" do
-        @acts.should include("/:parent_id/comments/?")
-      end
-    
-      it "exactly 2 actions" do
-        @acts.length.should == 2
-      end
-    end
-
-    describe "put" do
-      before do
-        @acts = @actions[:put]
-      end
-    
-      it "put /:id/?" do
-        @acts.should include("/:id/?")
-      end
-      
-      it "put /:parent_id/comments/:child_id/?" do
-        @acts.should include("/:parent_id/comments/:child_id/?")
-      end
-    
-      it "exactly 2 actions" do
-        @acts.length.should == 2
-      end
-    end
-
-    describe "delete" do
-      before do
-        @acts = @actions[:delete]
-      end
-    
-      it "delete /:id/?" do
-        @acts.should include("/:id/?")
-      end
-      
-      it "delete /:parent_id/comments/:child_id/?" do
-        @acts.should include("/:parent_id/comments/:child_id/?")
-      end
-    
-      it "exactly 2 actions" do
-        @acts.length.should == 2
-      end
-    end
-  end
-
-end
-
-describe "Comments" do
-  
-  before do
-    @config = Comments.instance_variable_get("@r")
-  end
-  
-  describe "DSL methods" do
-    it "resource should be 'comments'" do
-      @config[:name].should == "comments"
-    end
-
-    it "model should be Comment" do
-      @config[:model].should == Comment
-    end
-
-    it "read_only should be correct" do
-      @config[:read_only].should == [:created_at]
-    end
-
-    it "callback :before_create should be correct" do
-      @config[:callbacks][:before_save].call.should == "before saving comments"
-    end
-    
-    it "callback :before_update should return nil" do
-      @config[:callbacks][:before_update].should == nil
-    end
-  end
-end
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + '/helpers/posts.rb')
+require File.expand_path(File.dirname(__FILE__) + '/helpers/comments.rb')
+
+describe "Posts" do
+  
+  before do
+    @config = Posts.instance_variable_get("@r")
+  end
+  
+  describe "DSL methods" do
+    it "resource should be 'posts'" do
+      @config[:name].should == "posts"
+    end
+
+    it "model should be Post" do
+      @config[:model].should == Post
+    end
+
+    it "read_only should be correct" do
+      @config[:read_only].should == [:created_at, :updated_at]
+    end
+
+    it "callback :before_create should be correct" do
+      @config[:callbacks][:before_save].call.should == "before saving posts"
+    end
+    
+    it "callback :before_update should return nil" do
+      @config[:callbacks][:before_update].should == nil
+    end
+  end
+
+  describe "actions" do
+    before do
+      @actions = Posts.actions
+    end
+    
+    describe "get" do
+      before do
+        @acts = @actions[:get]
+      end
+
+      it "get /?" do
+        @acts.should include("/?")
+      end
+
+      it "get /:id/?" do
+        @acts.should include("/:id/?")
+      end
+
+      it "get /:parent_id/comments/?" do
+        @acts.should include("/:parent_id/comments/?")
+      end
+
+      it "get /:parent_id/comments/:child_id/?" do
+        @acts.should include("/:parent_id/comments/:child_id/?")
+      end
+
+      it "exactly 4 actions" do
+        @acts.length.should == 4
+      end
+    end
+
+    describe "post" do
+      before do
+        @acts = @actions[:post]
+      end
+    
+      it "post /?" do
+        @acts.should include("/?")
+      end
+
+      it "post /:parent_id/comments/?" do
+        @acts.should include("/:parent_id/comments/?")
+      end
+    
+      it "exactly 2 actions" do
+        @acts.length.should == 2
+      end
+    end
+
+    describe "put" do
+      before do
+        @acts = @actions[:put]
+      end
+    
+      it "put /:id/?" do
+        @acts.should include("/:id/?")
+      end
+      
+      it "put /:parent_id/comments/:child_id/?" do
+        @acts.should include("/:parent_id/comments/:child_id/?")
+      end
+    
+      it "exactly 2 actions" do
+        @acts.length.should == 2
+      end
+    end
+
+    describe "delete" do
+      before do
+        @acts = @actions[:delete]
+      end
+    
+      it "delete /:id/?" do
+        @acts.should include("/:id/?")
+      end
+      
+      it "delete /:parent_id/comments/:child_id/?" do
+        @acts.should include("/:parent_id/comments/:child_id/?")
+      end
+    
+      it "exactly 2 actions" do
+        @acts.length.should == 2
+      end
+    end
+  end
+
+end
+
+describe "Comments" do
+  
+  before do
+    @config = Comments.instance_variable_get("@r")
+  end
+  
+  describe "DSL methods" do
+    it "resource should be 'comments'" do
+      @config[:name].should == "comments"
+    end
+
+    it "model should be Comment" do
+      @config[:model].should == Comment
+    end
+
+    it "read_only should be correct" do
+      @config[:read_only].should == [:created_at]
+    end
+
+    it "callback :before_create should be correct" do
+      @config[:callbacks][:before_save].call.should == "before saving comments"
+    end
+    
+    it "callback :before_update should return nil" do
+      @config[:callbacks][:before_update].should == nil
+    end
+  end
+end

data/spec/unit/sources_spec.rb

@@ -1,94 +1,94 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require File.expand_path(File.dirname(__FILE__) + '/helpers/sources')
-
-describe "Sources" do
-  
-  describe "DSL methods" do
-    before do
-      @config = Sources.instance_variable_get("@r")
-    end
-
-    it "name should be 'sources'" do
-      @config[:name].should == "sources"
-    end
-
-    it "model should be Source" do
-      @config[:model].should == Source
-    end
-
-    it "read_only should be empty" do
-      @config[:read_only].should == []
-    end
-
-    it "callbacks should be empty" do
-      @config[:callbacks].should == {}
-    end
-  end
-
-  describe "actions" do
-    before do
-      @actions = Sources.actions
-    end
-    
-    describe "get" do
-      before do
-        @acts = @actions[:get]
-      end
-
-      it "get /?" do
-        @acts.should include("/?")
-      end
-
-      it "get /:id/?" do
-        @acts.should include("/:id/?")
-      end
-    
-      it "exactly 2 actions" do
-        @acts.length.should == 2
-      end
-    end
-    
-    describe "post" do
-      before do
-        @acts = @actions[:post]
-      end
-
-      it "post /?" do
-        @acts.should include("/?")
-      end
-
-      it "exactly 1 action" do
-        @acts.length.should == 1
-      end
-    end
-    
-    describe "put" do
-      before do
-        @acts = @actions[:put]
-      end
-
-      it "put /:id/?" do
-        @acts.should include("/:id/?")
-      end
-
-      it "exactly 1 action" do
-        @acts.length.should == 1
-      end
-    end
-    
-    describe "delete" do
-      before do
-        @acts = @actions[:delete]
-      end
-
-      it "delete /:id/?" do
-        @acts.should include("/:id/?")
-      end
-
-      it "exactly 1 action" do
-        @acts.length.should == 1
-      end
-    end
-  end
-
-end
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/helpers/sources')
+
+describe "Sources" do
+  
+  describe "DSL methods" do
+    before do
+      @config = Sources.instance_variable_get("@r")
+    end
+
+    it "name should be 'sources'" do
+      @config[:name].should == "sources"
+    end
+
+    it "model should be Source" do
+      @config[:model].should == Source
+    end
+
+    it "read_only should be empty" do
+      @config[:read_only].should == []
+    end
+
+    it "callbacks should be empty" do
+      @config[:callbacks].should == {}
+    end
+  end
+
+  describe "actions" do
+    before do
+      @actions = Sources.actions
+    end
+    
+    describe "get" do
+      before do
+        @acts = @actions[:get]
+      end
+
+      it "get /?" do
+        @acts.should include("/?")
+      end
+
+      it "get /:id/?" do
+        @acts.should include("/:id/?")
+      end
+    
+      it "exactly 2 actions" do
+        @acts.length.should == 2
+      end
+    end
+    
+    describe "post" do
+      before do
+        @acts = @actions[:post]
+      end
+
+      it "post /?" do
+        @acts.should include("/?")
+      end
+
+      it "exactly 1 action" do
+        @acts.length.should == 1
+      end
+    end
+    
+    describe "put" do
+      before do
+        @acts = @actions[:put]
+      end
+
+      it "put /:id/?" do
+        @acts.should include("/:id/?")
+      end
+
+      it "exactly 1 action" do
+        @acts.length.should == 1
+      end
+    end
+    
+    describe "delete" do
+      before do
+        @acts = @actions[:delete]
+      end
+
+      it "delete /:id/?" do
+        @acts.should include("/:id/?")
+      end
+
+      it "exactly 1 action" do
+        @acts.length.should == 1
+      end
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rest-sinatra
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
 - David James
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-04 00:00:00 -04:00
+date: 2009-10-11 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency