grin 1.1.1 → 1.2.0

data/lib/grin/album.rb

@@ -17,8 +17,11 @@ module Grin
     end
 
     def photo(photo_id)
-      if photo = get("albums/#{id}/photos/#{photo_id}.json")
-        return Photo.new(photo)
+      photo = get("albums/#{id}/photos/#{photo_id}.json")
+      if photo.respond_to?(:[]) && photo['status'] == 'error'
+        return photo
+      else
+        Photo.new(photo)
       end
     end
 

data/lib/grin/client.rb

@@ -17,14 +17,20 @@ module Grin
     end
 
     def album(id)
-      if album = get("albums/#{id}.json")
+      album = get("albums/#{id}.json")
+      if album.respond_to?(:[]) && album['status'] == 'error'
+        return album
+      else
         Album.new(album)
       end
     end
 
     def create_album(title, category_id = categories.first.id)
-      if album = post("albums.json", { :album => { :title => title, :category_id => category_id } })
-        return Album.new(album)
+      album = post("albums.json", { :album => { :title => title, :category_id => category_id } })
+      if album.respond_to?(:[]) && album['status'] == 'error'
+        return album
+      else
+        Album.new(album)
       end
     end
 
@@ -43,19 +49,26 @@ module Grin
     end
 
     def category(id)
-      if category = get("categories/#{id}.json")
+      category = get("categories/#{id}.json")
+      if category.respond_to?(:[]) && category['status'] == 'error'
+        return category
+      else
         Category.new(category)
       end
     end
 
     def create_category(name)
-      if category = post("categories.json", { :category => { :name => name } })
-        return Category.new(category)
+      category = post("categories.json", { :category => { :name => name } })
+      if category.respond_to?(:[]) && category['status'] == 'error'
+        return category
+      else
+        Category.new(category)
       end
     end
 
     def find_or_create_category(name)
-      if category = categories.select { |c| c.name == name }.pop
+      category = categories.select { |c| c.name == name }.pop
+      if category
         return category
       else
         create_category(name)
@@ -65,15 +78,19 @@ module Grin
     private
 
     def get(path)
-      JSON.parse(RestClient.get("http://#{@@auth_string}.#{DOMAIN}/api/#{API_VERSION}/#{path}"))
+      JSON.parse(RestClient.get(url(path)))
     end
 
     def post(path, params = {})
-      JSON.parse(RestClient.post("http://#{@@auth_string}.#{DOMAIN}/api/#{API_VERSION}/#{path}", params))
+      JSON.parse(RestClient.post(url(path), params))
     end
 
     def delete(path)
-      JSON.parse(RestClient.delete("http://#{@@auth_string}.#{DOMAIN}/api/#{API_VERSION}/#{path}"))
+      JSON.parse(RestClient.delete(url(path)))
+    end
+
+    def url(path)
+      "http://#{@@auth_string}.#{DOMAIN}/api/#{API_VERSION}/#{path}"
     end
 
   end

data/lib/test.rb

@@ -2,5 +2,8 @@ require 'rubygems'
 require 'grin'
 
 @fotogger = Grin::Client.new("bensie", "bensie@gmail.com", "jkmeslyl")
-p @fotogger.albums
-p @fotogger.category(17).destroy
+#p @fotogger.categories.first.destroy
+p @fotogger.category(234)
+p x = @fotogger.find_or_create_category("Test") # 34
+p x.destroy
+

data/test/test_grin.rb

@@ -37,7 +37,7 @@ class TestGrin < Test::Unit::TestCase
 
       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']
+        assert_equal "Cannot delete record because of dependent albums", response['error']
       end
 
       should "delete the album followed by the category" do

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: grin
 version: !ruby/object:Gem::Version 
-  hash: 17
   prerelease: false
   segments: 
   - 1
-  - 1
-  - 1
-  version: 1.1.1
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - James Miller
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-27 00:00:00 -07:00
+date: 2010-09-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 1
         - 6
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
         segments: 
         - 1
         - 4
@@ -58,7 +55,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -98,7 +94,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -107,7 +102,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"