grin 1.0.0 → 1.1.1

data/lib/grin/album.rb

@@ -34,5 +34,9 @@ module Grin
       end
     end
 
+    def destroy
+      delete("albums/#{id}.json")
+    end
+
   end
 end

data/lib/grin/category.rb

@@ -16,5 +16,9 @@ module Grin
       return albums
     end
 
+    def destroy
+      delete("categories/#{id}.json")
+    end
+
   end
 end

data/lib/grin/client.rb

@@ -72,5 +72,9 @@ module Grin
       JSON.parse(RestClient.post("http://#{@@auth_string}.#{DOMAIN}/api/#{API_VERSION}/#{path}", params))
     end
 
+    def delete(path)
+      JSON.parse(RestClient.delete("http://#{@@auth_string}.#{DOMAIN}/api/#{API_VERSION}/#{path}"))
+    end
+
   end
 end

data/lib/test.rb

@@ -3,3 +3,4 @@ require 'grin'
 
 @fotogger = Grin::Client.new("bensie", "bensie@gmail.com", "jkmeslyl")
 p @fotogger.albums
+p @fotogger.category(17).destroy

data/test/test_grin.rb

@@ -18,22 +18,35 @@ class TestGrin < Test::Unit::TestCase
       end
     end
 
-    context "creating albums and categories" do
+    context "creating and deleting albums and categories" do
       setup do
         @category = @fotogger.find_or_create_category("My Category")
         @album = @fotogger.find_or_create_album("My Album", @category.id)
       end
 
       should "return the category name" do
+        assert_kind_of Grin::Category, @category
         assert_equal @category.name, "My Category"
       end
 
       should "return the album title and category name" do
-        @category = @fotogger.find_or_create_category("My Category")
-
+        assert_kind_of Grin::Album, @album
         assert_equal @album.title, "My Album"
         assert_equal @album.category['name'], @category.name
       end
+
+      should "not allow you to delete the category when the album exists" do
+        response = @category.destroy
+        assert_equal "Cannot delete category that contains albums", response['error']
+      end
+
+      should "delete the album followed by the category" do
+        album_response = @album.destroy
+        category_response = @category.destroy
+        assert_equal "ok", album_response['status']
+        assert_equal "ok", category_response['status']
+      end
+
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: grin
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 17
   prerelease: false
   segments: 
   - 1
-  - 0
-  - 0
-  version: 1.0.0
+  - 1
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - James Miller
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-26 00:00:00 -07:00
+date: 2010-08-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency