giraffesoft-classy_resources 0.2.1 → 0.3.0

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 1
+:patch: 0
 :major: 0
-:minor: 2
+:minor: 3

data/lib/classy_resources.rb

@@ -12,25 +12,8 @@ module ClassyResources
     ResourceBuilder.new(self, *options)
   end
 
-  def load_collection(resource, parent = nil)
-    parent.nil? ? load_shallow_collection(resource) : load_nested_collection(resource, parent)
-  end
-
-  def create_object(resource, object_params, parent = nil)
-    parent.nil? ? create_shallow_object(resource, object_params) : create_nested_object(resource, object_params, parent)
-  end
-
-  def load_parent_object(parent)
-    load_object(parent, params[parent_id_name(parent)])
-  end
-
-  def parent_id_name(parent)
-    :"#{parent.to_s.singularize}_id"
-  end
-
-  def collection_url_for(resource, format, parent = nil)
-    parent = parent.nil? ? "" : "/#{parent}/:#{parent_id_name(parent)}"
-    [parent, "/#{resource}.#{format}"].join
+  def collection_url_for(resource, format)
+    "/#{resource}.#{format}"
   end
 
   def object_route_url(resource, format)
@@ -75,22 +58,27 @@ module ClassyResources
 
     protected
       def define_collection_get(resource, format)
-        parent = options[:parent]
-        get collection_url_for(resource, format, parent) do
+        get collection_url_for(resource, format) do
           set_content_type(format)
-          serialize(load_collection(resource, parent), format)
+          serialize(load_collection(resource), format)
         end
       end
       
       def define_collection_post(resource, format)
-        parent = options[:parent]
-        post collection_url_for(resource, format, parent) do
+        post collection_url_for(resource, format) do
           set_content_type(format)
-          object = create_object(resource, params[resource.to_s.singularize] || {}, parent)
+          object = build_object(resource, params[resource.to_s.singularize] || {})
 
-          response['location'] = object_url_for(resource, format, object)
-          response.status      = 201
-          serialize(object, format)
+          if object.valid?
+            object.save
+
+            response['location'] = object_url_for(resource, format, object)
+            response.status      = 201
+            serialize(object, format)
+          else
+            response.status      = 422
+            serialize(object.errors, format)
+          end
         end
       end
 
@@ -107,7 +95,14 @@ module ClassyResources
           set_content_type(format)
           object = load_object(resource, params[:id])
           update_object(object, params[resource.to_s.singularize])
-          serialize(object, format)
+
+          if object.valid?
+            object.save
+            serialize(object, format)
+          else
+            response.status = 422
+            serialize(object.errors, format)
+          end
         end
       end
 

data/lib/classy_resources/active_record.rb

@@ -1,19 +1,11 @@
 module ClassyResources
   module ActiveRecord
-    def load_shallow_collection(resource)
+    def load_collection(resource)
       class_for(resource).all
     end
 
-    def load_nested_collection(resource, parent)
-      load_parent_object(parent).send(resource)
-    end
-
-    def create_shallow_object(resource, params)
-      class_for(resource).create!(params)
-    end
-
-    def create_nested_object(resource, params, parent)
-      load_parent_object(parent).send(resource).create!(params)
+    def build_object(resource, object_params)
+      class_for(resource).new(object_params)
     end
 
     def load_object(resource, id)
@@ -21,12 +13,16 @@ module ClassyResources
     end
 
     def update_object(object, params)
-      object.update_attributes(params)
+      object.attributes = params
     end
 
     def destroy_object(object)
       object.destroy
     end
+
+    error ::ActiveRecord::RecordNotFound do
+      response.status = 404
+    end
   end
 end
 

data/lib/classy_resources/sequel.rb

@@ -1,33 +1,34 @@
+require 'classy_resources/sequel_errors_to_xml'
+
 module ClassyResources
   module Sequel
-    def load_shallow_collection(resource)
-      class_for(resource).all
-    end
-
-    def load_nested_collection(resource, parent)
-      load_parent_object(parent).send(resource)
-    end
+    class ResourceNotFound < RuntimeError; end
 
-    def create_shallow_object(resource, object_params)
-      class_for(resource).create(object_params)
+    def load_collection(resource)
+      class_for(resource).all
     end
 
-    def create_nested_object(resource, object_params, parent)
-      c = class_for(resource).new(object_params)
-      load_parent_object(parent).send(:"add_#{resource.to_s.singularize}", c)
+    def build_object(resource, object_params)
+      class_for(resource).new(object_params)
     end
 
     def load_object(resource, id)
-      class_for(resource).find(:id => id)
+      r = class_for(resource).find(:id => id)
+      raise ResourceNotFound if r.nil?
+      r
     end
 
     def update_object(object, params)
-      object.update(params)
+      object.set params
     end
 
     def destroy_object(object)
       object.destroy
     end
+
+    error ResourceNotFound do
+      response.status = 404
+    end
   end
 end
 

data/lib/classy_resources/sequel_errors_to_xml.rb

@@ -0,0 +1,19 @@
+# stolen from active record
+#
+module ClassyResources
+  module SequelErrorsToXml
+    def to_xml(options={})
+      options[:root] ||= "errors"
+      options[:indent] ||= 2
+      options[:builder] ||= Builder::XmlMarkup.new(:indent => options[:indent])
+
+      options[:builder].instruct! unless options.delete(:skip_instruct)
+      options[:builder].errors do |e|
+        full_messages.each { |msg| e.error(msg) }
+      end
+    end
+  end
+
+  ::Sequel::Model::Validation::Errors.send(:include, SequelErrorsToXml)
+end
+

data/test/active_record_test.rb

@@ -39,6 +39,18 @@ class ActiveRecordTest < Test::Unit::TestCase
     expect { assert_equal Post.first.to_xml, @response.body }
   end
 
+  context "on POST to /posts with invalid params" do
+    setup do
+      Post.destroy_all
+      post '/posts.xml', :post => {}
+    end
+
+    expect { assert_equal 422, @response.status }
+    expect { assert_equal "application/xml", @response.content_type }
+    expect { assert_equal Post.create.errors.to_xml, @response.body }
+    expect { assert_equal 0, Post.count }
+  end
+
   context "on GET to /posts/id" do
     setup do
       @post = create_post
@@ -50,6 +62,16 @@ class ActiveRecordTest < Test::Unit::TestCase
     expect { assert_equal "application/xml", @response.content_type }
   end
 
+  context "on GET to /posts/id with a missing post" do
+    setup do
+      get "/posts/doesntexist.xml"
+    end
+
+    expect { assert_equal 404, @response.status }
+    expect { assert @response.body.empty? }
+    expect { assert_equal "application/xml", @response.content_type }
+  end
+
   context "on PUT to /posts/id" do
     setup do
       @post = create_post
@@ -65,72 +87,80 @@ class ActiveRecordTest < Test::Unit::TestCase
     end
   end
 
-  context "on DELETE to /posts/id" do
+  context "on PUT to /posts/id with invalid params" do
     setup do
       @post = create_post
-      delete "/posts/#{@post.id}.xml"
+      put "/posts/#{@post.id}.xml", :post => {:title => ""}
     end
 
-    expect { assert_equal 200, @response.status }
+    expect { assert_equal 422, @response.status }
     expect { assert_equal "application/xml", @response.content_type }
+    expect { assert_equal Post.create.errors.to_xml, @response.body }
 
-    should "destroy the post" do
-      assert_nil Post.find_by_id(@post)
+    should "not update the post" do
+      assert_not_equal "", @post.reload.title
     end
   end
 
-  context "on GET to /posts/id/comments" do
+  context "on PUT to /posts/id with a missing post" do
+    setup do
+      put "/posts/missing.xml", :post => {:title => "Changed!"}
+    end
+
+    expect { assert_equal 404, @response.status }
+    expect { assert @response.body.empty? }
+    expect { assert_equal "application/xml", @response.content_type }
+  end
+
+  context "on DELETE to /posts/id" do
     setup do
       @post = create_post
-      2.times { @post.comments.create!(hash_for_comment) }
-      2.times { create_comment }
-      get "/posts/#{@post.id}/comments.xml"
+      delete "/posts/#{@post.id}.xml"
     end
 
     expect { assert_equal 200, @response.status }
     expect { assert_equal "application/xml", @response.content_type }
-    expect { assert_equal @post.comments.to_xml, @response.body }
+
+    should "destroy the post" do
+      assert_nil Post.find_by_id(@post)
+    end
   end
 
-  context "on POST to /posts/id/comments" do
+  context "on DELETE to /posts/id with a missing post" do
     setup do
-      Comment.destroy_all
-      @post = create_post
-      post "/posts/#{@post.id}/comments.xml", :comment => hash_for_comment
+      delete "/posts/missing.xml"
     end
 
-    expect { assert_equal 201, @response.status }
+    expect { assert_equal 404, @response.status }
     expect { assert_equal "application/xml", @response.content_type }
-    expect { assert_equal "/comments/#{@post.comments.reload.first.id}.xml", @response.location }
-    expect { assert_equal 1, @post.comments.reload.count }
-    expect { assert_equal Comment.first.to_xml, @response.body }
+    expect { assert @response.body.empty? }
   end
 
-  context "on POST to /posts/id/comments with a JSON post body" do
+  context "on POST to /comments with a JSON post body" do
     setup do
-      @post = create_post
-      post "/posts/#{@post.id}/comments.xml", {:comment => hash_for_comment(:author => 'james')}.to_json,
-                                              :content_type => 'application/json'
+      Comment.destroy_all
+      post "/comments.xml", {:comment => hash_for_comment(:author => 'james')}.to_json,
+                             :content_type => 'application/json'
     end
 
     expect { assert_equal 201, @response.status }
     expect { assert_equal "application/xml", @response.content_type }
-    expect { assert_equal "/comments/#{@post.comments.reload.first.id}.xml", @response.location }
-    expect { assert_equal 1, @post.comments.reload.count }
-    expect { assert_equal 'james', @post.comments.first.author }
+    expect { assert_equal "/comments/#{Comment.first.id}.xml", @response.location }
+    expect { assert_equal 1, Comment.count }
+    expect { assert_equal 'james', Comment.first.author }
   end
 
   context "on POST to /posts/id/comments with a XML post body" do
     setup do
-      @post = create_post
-      post "/posts/#{@post.id}/comments.xml", Comment.new(:author => 'james').to_xml,
-                                              :content_type => 'application/xml'
+      Comment.destroy_all
+      post "/comments.xml", Comment.new(:author => 'james').to_xml,
+                                        :content_type => 'application/xml'
     end
 
     expect { assert_equal 201, @response.status }
     expect { assert_equal "application/xml", @response.content_type }
-    expect { assert_equal "/comments/#{@post.comments.reload.first.id}.xml", @response.location }
-    expect { assert_equal 1, @post.comments.reload.count }
-    expect { assert_equal 'james', @post.comments.first.author }
+    expect { assert_equal "/comments/#{Comment.first.id}.xml", @response.location }
+    expect { assert_equal 1, Comment.count }
+    expect { assert_equal 'james', Comment.first.author }
   end
 end

data/test/fixtures/active_record_test_app.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
+require 'activerecord'
 require 'sinatra'
 require 'classy_resources/active_record'
-require 'activerecord'
 
 ActiveRecord::Base.configurations = {'sqlite3' => {:adapter  => 'sqlite3', 
                                                    :database => ':memory:'}}
@@ -23,19 +23,20 @@ end
 
 class Post < ActiveRecord::Base
   has_many :comments
+  validates_presence_of :title
 end
 
 class Comment < ActiveRecord::Base
   belongs_to :post
 end
 
+set :raise_errors, false
 
 define_resource :posts, :collection => [:get, :post],
                         :member     => [:get, :put, :delete],
                         :formats    => [:xml, :json]
 
-define_resource :comments, :collection => [:get, :post],
-                           :parent     => :posts
+define_resource :comments, :collection => [:get, :post]
 
 use ClassyResources::PostBodyParams
 

data/test/fixtures/sequel_test_app.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'sinatra'
-require 'classy_resources/sequel'
 require 'sequel'
+require 'classy_resources/sequel'
 
 Sequel::Model.db = Sequel.sqlite
 
@@ -20,6 +20,7 @@ end
 
 class User < Sequel::Model(:users)
   one_to_many :subscriptions
+  validates_presence_of :name
 end
 
 class Subscription < Sequel::Model(:subscriptions)
@@ -27,8 +28,9 @@ class Subscription < Sequel::Model(:subscriptions)
   validates_presence_of :user_id
 end
 
+set :raise_errors, false
+
 define_resource :users, :collection => [:get, :post],
                         :member     => [:put, :delete, :get]
 
-define_resource :subscriptions, :collection => [:get, :post],
-                                :parent     => :users
+define_resource :subscriptions, :collection => [:get, :post]

data/test/sequel_errors_to_xml_test.rb

@@ -0,0 +1,25 @@
+require File.dirname(__FILE__) + '/test_helper'
+require 'sinatra'
+require 'sinatra/test/unit'
+require File.dirname(__FILE__) + '/fixtures/sequel_test_app'
+require 'activesupport'
+
+class SequelErrorsToXmlTest < Test::Unit::TestCase
+  context "serializing a sequel errors object" do
+    before do
+      @subscription = Subscription.new
+      @subscription.valid?
+    end
+
+    should "serialize in a format that is active resource compatible" do
+      str =<<-__END__
+<?xml version="1.0" encoding="UTF-8"?>
+<errors>
+  <error>user_id is not present</error>
+</errors>
+__END__
+      assert_equal str, @subscription.errors.to_xml
+    end
+  end
+end
+

data/test/sequel_test.rb

@@ -45,6 +45,16 @@ class SequelTest < Test::Unit::TestCase
     expect { assert_equal "application/xml", @response.content_type }
   end
 
+  context "on GET to /users/id with a missing user" do
+    setup do
+      get "/users/missing.xml"
+    end
+
+    expect { assert_equal 404, @response.status }
+    expect { assert @response.body.empty? }
+    expect { assert_equal "application/xml", @response.content_type }
+  end
+
   context "on PUT to /users/id" do
     setup do
       @user = create_user
@@ -60,51 +70,68 @@ class SequelTest < Test::Unit::TestCase
     end
   end
 
-  context "on DELETE to /users/id" do
+  context "on PUT to /users/id with invalid params" do
     setup do
       @user = create_user
-      delete "/users/#{@user.id}.xml"
+      put "/users/#{@user.id}.xml", :user => {:name => ""}
+      @invalid_user = User.new
+      @invalid_user.valid?
     end
 
-    expect { assert_equal 200, @response.status }
+    expect { assert_equal 422, @response.status }
+    expect { assert_equal @invalid_user.errors.to_xml, @response.body }
     expect { assert_equal "application/xml", @response.content_type }
 
-    should "destroy the user" do
-      assert_nil User.find(:id => @user.id)
+    should "not update the user" do
+      assert_not_equal "Changed!", @user.reload.name
     end
   end
 
-  context "on GET to /users/id/comments" do
+  context "on PUT to /users/id with a missing user" do
+    setup do
+      put "/users/missing.xml", :user => {:name => "Changed!"}
+    end
+
+    expect { assert_equal 404, @response.status }
+    expect { assert @response.body.empty? }
+    expect { assert_equal "application/xml", @response.content_type }
+  end
+
+  context "on DELETE to /users/id" do
     setup do
       @user = create_user
-      2.times { @user.add_subscription(Subscription.new(hash_for_subscription)) }
-      2.times { create_subscription(:user_id => 9) }
-      get "/users/#{@user.id}/subscriptions.xml"
+      delete "/users/#{@user.id}.xml"
     end
 
     expect { assert_equal 200, @response.status }
     expect { assert_equal "application/xml", @response.content_type }
-    expect { assert_equal @user.subscriptions.to_xml, @response.body }
+
+    should "destroy the user" do
+      assert_nil User.find(:id => @user.id)
+    end
   end
 
-  context "on POST to /users/id/subscriptions" do
+  context "on DELETE to /users/id with a missing user" do
     setup do
-      @user = create_user
-      post "/users/#{@user.id}/subscriptions.xml", :subscription => hash_for_subscription
+      delete "/users/missing.xml"
     end
 
-    expect { assert_equal 201, @response.status }
+    expect { assert_equal 404, @response.status }
     expect { assert_equal "application/xml", @response.content_type }
-    expect { assert_equal "/subscriptions/#{@user.reload.subscriptions.first.id}.xml", @response.location }
-    expect { assert_equal 1, @user.reload.subscriptions.length }
+    expect { assert @response.body.empty? }
   end
 
-  context "on POST to /users/id/subscriptions with no params" do
-    should "not raise" do
-      @user = create_user
-      assert_nothing_raised {
-        post "/users/#{@user.id}/subscriptions.xml", :subscription => {}
-      }
+  context "on POST to /subscriptions with invalid params" do
+    setup do
+      Subscription.destroy_all
+      @subscription = Subscription.new
+      @subscription.valid?
+      post "/subscriptions.xml", :subscription => {}
     end
+
+    expect { assert_equal 422, @response.status }
+    expect { assert_equal "application/xml", @response.content_type }
+    expect { assert_equal 0, Subscription.count }
+    expect { assert_equal @subscription.errors.to_xml, @response.body }
   end
 end

data/test/test_helper.rb

@@ -8,7 +8,7 @@ require 'mocha'
 class Test::Unit::TestCase
   protected
     def create_post(opts = {})
-      Post.create!({}.merge(opts))
+      Post.create!({:title => 'awesome'}.merge(opts))
     end
 
     def hash_for_comment(opts = {})
@@ -20,7 +20,7 @@ class Test::Unit::TestCase
     end
 
     def create_user(opts = {})
-      u = User.new({}.merge(opts))
+      u = User.new({:name => 'james'}.merge(opts))
       u.save
       u
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: giraffesoft-classy_resources
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors: 
 - James Golick
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-29 00:00:00 -08:00
+date: 2009-01-30 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -30,11 +30,13 @@ files:
 - lib/classy_resources/post_body_param_parsing.rb
 - lib/classy_resources/post_body_params.rb
 - lib/classy_resources/sequel.rb
+- lib/classy_resources/sequel_errors_to_xml.rb
 - lib/classy_resources.rb
 - test/active_record_test.rb
 - test/fixtures
 - test/fixtures/active_record_test_app.rb
 - test/fixtures/sequel_test_app.rb
+- test/sequel_errors_to_xml_test.rb
 - test/sequel_test.rb
 - test/test_helper.rb
 has_rdoc: false