smirk 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/smirk.rb

@@ -3,6 +3,7 @@ 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')
+require File.expand_path(File.dirname(__FILE__) + '/smirk/category')
 
 module Smirk
   class AccessDenied < StandardError; end

data/lib/smirk/album.rb

@@ -13,8 +13,8 @@ module Smirk
     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"]
+      params = default_params.merge!({:method => "smugmug.images.get", :AlbumID => id, :AlbumKey => key})
+      json = get(HOST, params)["Album"]["Images"]
       json.inject([]) do |images, i|
         images << Smirk::Image.new(i["id"], i["Key"], session_id)
       end

data/lib/smirk/category.rb

@@ -0,0 +1,15 @@
+module Smirk
+  class Category < Client
+    
+    attr_reader :id, :name, :nice_name, :kind, :session_id
+    
+    def initialize(id, name, nice_name, kind, session_id)
+      @id = id
+      @name = name
+      @nice_name = nice_name
+      @kind = kind
+      @session_id = session_id
+    end
+    
+  end
+end

data/lib/smirk/client.rb

@@ -6,7 +6,7 @@ module Smirk
     HOST = "api.smugmug.com/services/api/json/1.2.2/"
   
     def self.version
-      '0.0.2'
+      '0.0.3'
     end
  
     def self.gem_version_string
@@ -19,30 +19,51 @@ module Smirk
       @user = user
       @password = password
       params = { :method => "smugmug.login.withPassword", :APIKey => API_KEY, :EmailAddress => user, :Password => password }
-      @session_id = JSON.parse(get("https://#{HOST}/", params))['Login']['Session']['id']
+      @session_id = get(HOST, params, true)['Login']['Session']['id']
     end
     
     def logout
       params = default_params.merge!(:method => "smugmug.logout")
-      JSON.parse(get("http://#{host}/", params))
+      get(HOST, params)
     end
     
     def albums
       params = default_params.merge!(:method => "smugmug.albums.get")
-      json = JSON.parse(get("http://#{HOST}/", params))["Albums"]
+      json = get(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
     
+    def categories
+      params = default_params.merge!(:method => "smugmug.categories.get")
+      json = get(HOST, params)["Categories"]
+      json.inject([]) do |categories, c|
+        categories << Smirk::Category.new(c["id"], c["Name"], c["NiceName"], c["Type"], session_id)
+      end
+    end
+    
+    def find_album(id, key)
+      params = default_params.merge!({:method => "smugmug.albums.getInfo", :AlbumID => id, :AlbumKey => key})
+      a = get(HOST, params)["Album"]
+      Smirk::Album.new(a["id"], a["Key"], a["Title"], a["Category"]["id"], a["Category"]["Name"], session_id)
+    end
+    
+    def find_image(id, key)
+      params = default_params.merge!({:method => "smugmug.images.getInfo", :ImageID => id, :ImageKey => key})
+      i = get(HOST, params)["Image"]
+      Smirk::Image.new(i["id"], i["Key"], session_id)
+    end
+    
     private
   
-    def get(uri, params = {})
-      RestClient.post uri, params
+    def get(uri, params = {}, ssl = false)
+      proto = ssl ? "https://" : "http://"
+      JSON.parse(RestClient.post proto+uri, params)
     end
     
     def default_params
-      { :APIKey => Smirk::Client::API_KEY, :SessionID => session_id }
+      { :APIKey => API_KEY, :SessionID => session_id }
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: smirk
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - James Miller
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-09 00:00:00 -08:00
+date: 2010-02-10 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,7 +42,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.2.0
     version: 
-description: Smirk is a simple ruby wrapper for the SmugMug 1.2.2 API specification. It currently supports initiating a session and getting all album information.
+description: Smirk is a simple ruby wrapper for the SmugMug 1.2.2 API specification. It currently supports initiating a session, finding albums, images, and categories.
 email: james@jk-tech.com
 executables: []
 
@@ -60,6 +60,7 @@ files:
 - lib/smirk/client.rb
 - lib/smirk/album.rb
 - lib/smirk/image.rb
+- lib/smirk/category.rb
 - test/helper.rb
 - test/test_smirk.rb
 has_rdoc: true