smirk 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/smirk/album.rb

@@ -1,14 +1,15 @@
 module Smirk
   class Album < Client
     
-    attr_reader :id, :key, :title, :category_id, :category_name, :session_id
+    attr_reader :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
+    def initialize(session_id, info)
+      info.each do |key, value|
+        instance_variable_set("@#{key.downcase}", value)
+        Album.instance_eval do
+          attr_reader key.downcase.to_sym
+        end
+      end
       @session_id = session_id
     end
     
@@ -16,7 +17,7 @@ module Smirk
       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)
+        images << Smirk::Image.new(session_id, i)
       end
     end
     

data/lib/smirk/category.rb

@@ -1,13 +1,15 @@
 module Smirk
   class Category < Client
     
-    attr_reader :id, :name, :nice_name, :kind, :session_id
+    attr_reader :session_id
     
-    def initialize(id, name, nice_name, kind, session_id)
-      @id = id
-      @name = name
-      @nice_name = nice_name
-      @kind = kind
+    def initialize(session_id, info)
+      info.each do |key, value|
+        instance_variable_set("@#{key.downcase}", value)
+        Category.instance_eval do
+          attr_reader key.downcase.to_sym
+        end
+      end
       @session_id = session_id
     end
     

data/lib/smirk/client.rb

@@ -5,14 +5,6 @@ module Smirk
     API_KEY = "26Kw6kit9TBk2yFcYEwv2wWajATGYs1F"
     HOST = "api.smugmug.com/services/api/json/1.2.2/"
   
-    def self.version
-      '0.0.3'
-    end
- 
-    def self.gem_version_string
-      "smirk-gem/#{version}"
-    end
-  
     attr_reader :user, :password, :session_id
  
     def initialize(user, password)
@@ -31,7 +23,7 @@ module Smirk
       params = default_params.merge!(:method => "smugmug.albums.get")
       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)
+        albums << Smirk::Album.new(session_id, a)
       end
     end
     
@@ -39,20 +31,20 @@ module Smirk
       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)
+        categories << Smirk::Category.new(session_id, c)
       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)
+      Smirk::Album.new(session_id, a)
     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)
+      Smirk::Image.new(session_id, i)
     end
     
     private

data/lib/smirk/image.rb

@@ -1,11 +1,15 @@
 module Smirk
   class Image < Client
     
-    attr_reader :id, :key, :session_id
+    attr_reader :session_id
     
-    def initialize(id, key, session_id)
-      @id = id
-      @key = key
+    def initialize(session_id, info)
+      info.each do |key, value|
+        instance_variable_set("@#{key.downcase}", value)
+        Image.instance_eval do
+          attr_reader key.downcase.to_sym
+        end
+      end
       @session_id = session_id
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: smirk
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - James Miller
@@ -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, finding albums, images, and categories.
+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: []