grin 0.9.2 → 0.9.3

data/lib/grin.rb

@@ -3,6 +3,7 @@ require 'json'
 require File.expand_path(File.dirname(__FILE__) + '/grin/client')
 require File.expand_path(File.dirname(__FILE__) + '/grin/album')
 require File.expand_path(File.dirname(__FILE__) + '/grin/photo')
+require File.expand_path(File.dirname(__FILE__) + '/grin/category')
 
 module Grin
   class AccessDenied < StandardError; end

data/lib/grin/category.rb

@@ -0,0 +1,15 @@
+module Grin
+  class Category < Client
+    
+    def initialize(data, auth_string)
+      data.each do |key, value|
+        instance_variable_set("@#{key}", value)
+        Category.instance_eval do
+          attr_reader key.to_sym
+        end
+      end
+      @auth_string = auth_string
+    end
+    
+  end
+end

data/lib/grin/client.rb

@@ -20,13 +20,13 @@ module Grin
       end
     end
     
-    def create_album(title, category_id = nil)
+    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, @auth_string)
       end
     end
     
-    def find_or_create_album(title, category_id = nil)
+    def find_or_create_album(title, category_id)
       if album = albums.select { |a| a.title == title }.pop
         return album
       else
@@ -34,6 +34,32 @@ module Grin
       end
     end
     
+    def categories
+      categories = []
+      get('categories.json').each { |category| categories << Category.new(category, @auth_string) }
+      return categories
+    end
+    
+    def category(id)
+      if category = get("categories/#{id}.json")
+        Category.new(category, @auth_string)
+      end
+    end
+    
+    def create_category(name)
+      if category = post("categories.json", { :category => { :name => name } })
+        return Category.new(category, @auth_string)
+      end
+    end
+    
+    def find_or_create_category(name)
+      if category = categories.select { |c| c.name == name }.pop
+        return category
+      else
+        create_category(name)
+      end
+    end
+    
     private
   
     def get(path)

data/lib/test.rb

@@ -11,7 +11,12 @@ require 'smirk'
 fotogger = Grin::Client.new("amp", "witty@bensie.com", "littlebuddy")
 #album = fotogger.create_album("Test")
 #album = fotogger.album(15)
-puts fotogger.find_or_create_album("Dorman Family").inspect
+#puts fotogger.find_or_create_album("Dorman Family").inspect
+puts fotogger.categories.inspect
+
+puts fotogger.category(45).inspect
+
+puts fotogger.find_or_create_category("Test Category").inspect
 #puts fotogger.albums.select { |a| a.title == "Dorman Family"}.pop.inspect
 
 #puts album.create_photo(File.open("/Users/jkmiller/Desktop/Rome/Italy 2010-8157.jpg"))

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: grin
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: false
   segments: 
   - 0
   - 9
-  - 2
-  version: 0.9.2
+  - 3
+  version: 0.9.3
 platform: ruby
 authors: 
 - James Miller
@@ -50,7 +50,7 @@ dependencies:
         version: 1.4.3
   type: :runtime
   version_requirements: *id002
-description: Grin is a simple Ruby wrapper for the Fotogger API v1 specification. It currently supports finding and creating albums and photos.
+description: Grin is a simple Ruby wrapper for the Fotogger API v1 specification. It currently supports finding and creating albums, photos, and categories.
 email: james@jk-tech.com
 executables: []
 
@@ -63,6 +63,7 @@ files:
 - Rakefile
 - LICENSE
 - lib/grin/album.rb
+- lib/grin/category.rb
 - lib/grin/client.rb
 - lib/grin/photo.rb
 - lib/grin.rb