grin 0.9.4 → 1.0.0

data/README.rdoc

@@ -4,11 +4,11 @@ Grin is a simple Ruby wrapper for the Fotogger API v1 specification. It currentl
 an authenticated account.
 
 == Usage
-  
+
 More documentation to come.
-  
+
 == Note on Patches/Pull Requests
- 
+
 * Fork the project.
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a

data/lib/grin/album.rb

@@ -1,6 +1,6 @@
 module Grin
   class Album < Client
-    
+
     def initialize(data)
       data.each do |key, value|
         instance_variable_set("@#{key}", value)
@@ -9,23 +9,23 @@ module Grin
         end
       end
     end
-    
+
     def photos
       photos = []
       get("albums/#{id}/photos.json").each { |photo| photos << Photo.new(photo) }
       return photos
     end
-    
+
     def photo(photo_id)
       if photo = get("albums/#{id}/photos/#{photo_id}.json")
         return Photo.new(photo)
       end
     end
-    
+
     def create_photo(image_data)
       post("albums/#{id}/photos.json", { :photo => { :image => image_data } })
     end
-    
+
     def find_or_create_photo(filename, image_data)
       if photo = photos.select { |p| p.filename == filename }.pop
         return photo
@@ -33,6 +33,6 @@ module Grin
         create_photo(image_data)
       end
     end
-    
+
   end
 end

data/lib/grin/category.rb

@@ -1,6 +1,6 @@
 module Grin
   class Category < Client
-    
+
     def initialize(data)
       data.each do |key, value|
         instance_variable_set("@#{key}", value)
@@ -9,12 +9,12 @@ module Grin
         end
       end
     end
-    
+
     def albums
       albums = []
       get('albums.json').select { |album| album['category']['id'] == id  }.each { |album| albums << Album.new(album) }
       return albums
     end
-    
+
   end
 end

data/lib/grin/client.rb

@@ -1,31 +1,33 @@
+require 'cgi'
 module Grin
 
   class Client
-  
+
     API_VERSION = "v1"
-     
+    DOMAIN = "fotogger.com"
+
     def initialize(subdomain, email, password)
       @@auth_string = CGI.escape(email) + ':' + CGI.escape(password) + "@" + subdomain
     end
-    
+
     def albums
       albums = []
       get('albums.json').each { |album| albums << Album.new(album) }
       return albums
     end
-    
+
     def album(id)
       if album = get("albums/#{id}.json")
         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)
       end
     end
-    
+
     def find_or_create_album(title, category_id)
       if album = albums.select { |a| a.title == title }.pop
         return album
@@ -33,25 +35,25 @@ module Grin
         create_album(title, category_id)
       end
     end
-    
+
     def categories
       categories = []
       get('categories.json').each { |category| categories << Category.new(category) }
       return categories
     end
-    
+
     def category(id)
       if category = get("categories/#{id}.json")
         Category.new(category)
       end
     end
-    
+
     def create_category(name)
       if category = post("categories.json", { :category => { :name => name } })
         return Category.new(category)
       end
     end
-    
+
     def find_or_create_category(name)
       if category = categories.select { |c| c.name == name }.pop
         return category
@@ -59,16 +61,16 @@ module Grin
         create_category(name)
       end
     end
-    
+
     private
-  
+
     def get(path)
-      JSON.parse(RestClient.get("http://#{@@auth_string}.fotogger.com/api/#{API_VERSION}/#{path}").body)
+      JSON.parse(RestClient.get("http://#{@@auth_string}.#{DOMAIN}/api/#{API_VERSION}/#{path}"))
     end
-    
+
     def post(path, params = {})
-      JSON.parse(RestClient.post("http://#{@@auth_string}.fotogger.com/api/#{API_VERSION}/#{path}", params).body)
+      JSON.parse(RestClient.post("http://#{@@auth_string}.#{DOMAIN}/api/#{API_VERSION}/#{path}", params))
     end
-    
+
   end
 end

data/lib/grin/photo.rb

@@ -1,6 +1,6 @@
 module Grin
   class Photo < Client
-    
+
     def initialize(data)
       data.each do |key, value|
         instance_variable_set("@#{key}", value)
@@ -9,6 +9,6 @@ module Grin
         end
       end
     end
-    
+
   end
 end

data/lib/test.rb

@@ -1,22 +1,5 @@
 require 'rubygems'
 require 'grin'
-require 'smirk'
 
-# smug = Smirk::Client.new("teamwylie@hotmail.com", "carter")
-# smug_album = smug.find_album(id, key)
-# smug_album.images(true).each do |image|
-#   `curl #{image.originalurl} -o #{image.filename}`
-# end
-
-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.categories.inspect
-
-puts fotogger.category(45).albums
-
-#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"))
+@fotogger = Grin::Client.new("bensie", "bensie@gmail.com", "jkmeslyl")
+p @fotogger.albums

data/test/test_grin.rb

@@ -1,4 +1,41 @@
 require 'helper'
 
 class TestGrin < Test::Unit::TestCase
+  SUBDOMAIN = ""
+  EMAIL     = ""
+  PASSWORD  = ""
+
+  context "New connection" do
+
+    setup do
+      @fotogger = Grin::Client.new(SUBDOMAIN, EMAIL, PASSWORD)
+    end
+
+    should "return albums and categories without errors" do
+      assert_nothing_raised do
+        @fotogger.albums
+        @fotogger.categories
+      end
+    end
+
+    context "creating 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_equal @category.name, "My Category"
+      end
+
+      should "return the album title and category name" do
+        @category = @fotogger.find_or_create_category("My Category")
+
+        assert_equal @album.title, "My Album"
+        assert_equal @album.category['name'], @category.name
+      end
+    end
+
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: grin
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 23
   prerelease: false
   segments: 
+  - 1
   - 0
-  - 9
-  - 4
-  version: 0.9.4
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - James Miller
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-16 00:00:00 -07:00
+date: 2010-08-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,14 +24,14 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 15
         segments: 
         - 1
-        - 5
-        - 1
-        version: 1.5.1
+        - 6
+        - 0
+        version: 1.6.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -40,7 +40,7 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 1
         segments: 
@@ -50,6 +50,20 @@ dependencies:
         version: 1.4.3
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
 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: []