grin 0.9.3 → 0.9.4

data/lib/grin/album.rb

@@ -1,25 +1,24 @@
 module Grin
   class Album < Client
     
-    def initialize(data, auth_string)
+    def initialize(data)
       data.each do |key, value|
         instance_variable_set("@#{key}", value)
         Album.instance_eval do
           attr_reader key.to_sym
         end
       end
-      @auth_string = auth_string
     end
     
     def photos
       photos = []
-      get("albums/#{id}/photos.json").each { |photo| photos << Photo.new(photo, @auth_string) }
+      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, @auth_string)
+        return Photo.new(photo)
       end
     end
     

data/lib/grin/category.rb

@@ -1,14 +1,19 @@
 module Grin
   class Category < Client
     
-    def initialize(data, auth_string)
+    def initialize(data)
       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
+    
+    def albums
+      albums = []
+      get('albums.json').select { |album| album['category']['id'] == id  }.each { |album| albums << Album.new(album) }
+      return albums
     end
     
   end

data/lib/grin/client.rb

@@ -5,24 +5,24 @@ module Grin
     API_VERSION = "v1"
      
     def initialize(subdomain, email, password)
-      @auth_string = CGI.escape(email) + ':' + CGI.escape(password) + "@" + subdomain
+      @@auth_string = CGI.escape(email) + ':' + CGI.escape(password) + "@" + subdomain
     end
     
     def albums
       albums = []
-      get('albums.json').each { |album| albums << Album.new(album, @auth_string) }
+      get('albums.json').each { |album| albums << Album.new(album) }
       return albums
     end
     
     def album(id)
       if album = get("albums/#{id}.json")
-        Album.new(album, @auth_string)
+        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, @auth_string)
+        return Album.new(album)
       end
     end
     
@@ -36,19 +36,19 @@ module Grin
     
     def categories
       categories = []
-      get('categories.json').each { |category| categories << Category.new(category, @auth_string) }
+      get('categories.json').each { |category| categories << Category.new(category) }
       return categories
     end
     
     def category(id)
       if category = get("categories/#{id}.json")
-        Category.new(category, @auth_string)
+        Category.new(category)
       end
     end
     
     def create_category(name)
       if category = post("categories.json", { :category => { :name => name } })
-        return Category.new(category, @auth_string)
+        return Category.new(category)
       end
     end
     
@@ -63,11 +63,11 @@ module Grin
     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}.fotogger.com/api/#{API_VERSION}/#{path}").body)
     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}.fotogger.com/api/#{API_VERSION}/#{path}", params).body)
     end
     
   end

data/lib/grin/photo.rb

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

data/lib/test.rb

@@ -14,9 +14,9 @@ fotogger = Grin::Client.new("amp", "witty@bensie.com", "littlebuddy")
 #puts fotogger.find_or_create_album("Dorman Family").inspect
 puts fotogger.categories.inspect
 
-puts fotogger.category(45).inspect
+puts fotogger.category(45).albums
 
-puts fotogger.find_or_create_category("Test Category").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: 61
+  hash: 51
   prerelease: false
   segments: 
   - 0
   - 9
-  - 3
-  version: 0.9.3
+  - 4
+  version: 0.9.4
 platform: ruby
 authors: 
 - James Miller