smirk 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/smirk.rb

@@ -1,4 +1,8 @@
+require 'rest_client'
+require 'json'
 require File.expand_path(File.dirname(__FILE__) + '/smirk/client')
+require File.expand_path(File.dirname(__FILE__) + '/smirk/album')
+require File.expand_path(File.dirname(__FILE__) + '/smirk/image')
 
 module Smirk
   class AccessDenied < StandardError; end

data/lib/smirk/album.rb

@@ -0,0 +1,24 @@
+module Smirk
+  class Album < Client
+    
+    attr_reader :id, :key, :title, :category_id, :category_name, :session_id
+    
+    def initialize(id, key, title, category_id, category_name, session_id)
+      @id = id
+      @key = key
+      @title = title
+      @category_id = category_id
+      @category_name = category_name
+      @session_id = session_id
+    end
+    
+    def images
+      params = {:APIKey => Smirk::Client::API_KEY, :method => "smugmug.images.get", :SessionID => session_id, :AlbumID => id, :AlbumKey => key }
+      json = JSON.parse(get("http://#{Smirk::Client::HOST}/", params))["Album"]["Images"]
+      json.inject([]) do |images, i|
+        images << Smirk::Image.new(i["id"], i["Key"], session_id)
+      end
+    end
+    
+  end
+end

data/lib/smirk/client.rb

@@ -1,53 +1,48 @@
-require 'rubygems'
-require 'rest_client'
-require 'json'
- 
-# A Ruby class to call the SmugMug REST API.
-
 module Smirk
 
-  class Smirk::Client
+  class Client
   
     API_KEY = "26Kw6kit9TBk2yFcYEwv2wWajATGYs1F"
+    HOST = "api.smugmug.com/services/api/json/1.2.2/"
   
     def self.version
-      '0.0.1'
+      '0.0.2'
     end
  
     def self.gem_version_string
       "smirk-gem/#{version}"
     end
   
-    attr_reader :host, :user, :password, :session_id
+    attr_reader :user, :password, :session_id
  
     def initialize(user, password)
       @user = user
       @password = password
-      @host = "api.smugmug.com/services/api/json/1.2.2/"
-      params = { :method => "smugmug.login.withPassword", :APIKey => API_KEY, :EmailAddress => @user, :Password => @password }
-      @session_id = JSON.parse(get("https://#{@host}/", params))['Login']['Session']['id']
+      params = { :method => "smugmug.login.withPassword", :APIKey => API_KEY, :EmailAddress => user, :Password => password }
+      @session_id = JSON.parse(get("https://#{HOST}/", params))['Login']['Session']['id']
     end
     
     def logout
       params = default_params.merge!(:method => "smugmug.logout")
-      JSON.parse(get("http://#{@host}/", params))
-    end
-    
-    def default_params
-      { :APIKey => API_KEY, :SessionID => session_id }
+      JSON.parse(get("http://#{host}/", params))
     end
     
-    # Albums
     def albums
       params = default_params.merge!(:method => "smugmug.albums.get")
-      JSON.parse(get("http://#{@host}/", params))["Albums"]
+      json = JSON.parse(get("http://#{HOST}/", params))["Albums"]
+      json.inject([]) do |albums, a|
+        albums << Smirk::Album.new(a["id"], a["Key"], a["Title"], a["Category"]["id"], a["Category"]["Name"], session_id)
+      end
     end
     
     private
   
     def get(uri, params = {})
-      # POST requests are the only ones that accept parameters -- ick
       RestClient.post uri, params
     end
+    
+    def default_params
+      { :APIKey => Smirk::Client::API_KEY, :SessionID => session_id }
+    end
   end
 end

data/lib/smirk/image.rb

@@ -0,0 +1,13 @@
+module Smirk
+  class Image < Client
+    
+    attr_reader :id, :key, :session_id
+    
+    def initialize(id, key, session_id)
+      @id = id
+      @key = key
+      @session_id = session_id
+    end
+    
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: smirk
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - James Miller
@@ -58,6 +58,8 @@ files:
 - VERSION
 - lib/smirk.rb
 - lib/smirk/client.rb
+- lib/smirk/album.rb
+- lib/smirk/image.rb
 - test/helper.rb
 - test/test_smirk.rb
 has_rdoc: true