smirk 0.2.1 → 0.2.2

data/lib/smirk/album.rb

@@ -1,21 +1,20 @@
 module Smirk
   class Album < Client
     
-    def initialize(session_id, info)
+    def initialize(info)
       info.each do |key, value|
         instance_variable_set("@#{key}", value)
         Album.instance_eval do
           attr_reader key.to_sym
         end
       end
-      @session_id = session_id
     end
     
     def images(heavy = false)
       params = default_params.merge!({:method => "smugmug.images.get", :AlbumID => id, :AlbumKey => key, :Heavy => heavy})
       json = get(params)["Album"]["Images"]
       json.inject([]) do |images, i|
-        images << Smirk::Image.new(@session_id, upper_hash_to_lower_hash(i))
+        images << Smirk::Image.new(upper_hash_to_lower_hash(i))
       end
     end
     

data/lib/smirk/category.rb

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

data/lib/smirk/client.rb

@@ -4,14 +4,10 @@ module Smirk
   
     API_KEY = "26Kw6kit9TBk2yFcYEwv2wWajATGYs1F"
     HOST = "api.smugmug.com/services/api/json/1.2.2/"
-  
-    attr_reader :session_id
- 
+   
     def initialize(user, password)
-      @user = user
-      @password = password
       params = { :method => "smugmug.login.withPassword", :APIKey => API_KEY, :EmailAddress => user, :Password => password }
-      @session_id = get(params, true)['Login']['Session']['id']
+      @@session_id = get(params, true)['Login']['Session']['id']
     end
     
     def logout
@@ -23,7 +19,7 @@ module Smirk
       params = default_params.merge!({:method => "smugmug.albums.get", :Heavy => heavy})
       json = get(params)["Albums"]
       json.inject([]) do |albums, a|
-        albums << Smirk::Album.new(session_id, upper_hash_to_lower_hash(a))
+        albums << Smirk::Album.new(upper_hash_to_lower_hash(a))
       end
     end
     
@@ -31,26 +27,26 @@ module Smirk
       params = default_params.merge!(:method => "smugmug.categories.get")
       json = get(params)["Categories"]
       json.inject([]) do |categories, c|
-        categories << Smirk::Category.new(session_id, upper_hash_to_lower_hash(c))
+        categories << Smirk::Category.new(upper_hash_to_lower_hash(c))
       end
     end
     
     def find_album(id, key)
       params = default_params.merge!({:method => "smugmug.albums.getInfo", :AlbumID => id, :AlbumKey => key})
       a = get(params)["Album"]
-      Smirk::Album.new(session_id, upper_hash_to_lower_hash(a))
+      Smirk::Album.new(upper_hash_to_lower_hash(a))
     end
     
     def find_image(id, key)
       params = default_params.merge!({:method => "smugmug.images.getInfo", :ImageID => id, :ImageKey => key})
       i = get(params)["Image"]
-      Smirk::Image.new(session_id, upper_hash_to_lower_hash(i))
+      Smirk::Image.new(upper_hash_to_lower_hash(i))
     end
     
     def find_image_exif(id, key)
       params = default_params.merge!({:method => "smugmug.images.getEXIF", :ImageID => id, :ImageKey => key})
       i = get(params)["Image"]
-      Smirk::Image.new(session_id, upper_hash_to_lower_hash(i))
+      Smirk::Image.new(upper_hash_to_lower_hash(i))
     end
     
     private
@@ -61,7 +57,7 @@ module Smirk
     end
     
     def default_params
-      { :APIKey => API_KEY, :SessionID => session_id }
+      { :APIKey => API_KEY, :SessionID => @@session_id }
     end
     
     def upper_hash_to_lower_hash(upper)

data/lib/smirk/image.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: smirk
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - James Miller
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-18 00:00:00 -07:00
+date: 2010-07-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -68,7 +68,6 @@ files:
 - lib/smirk/client.rb
 - lib/smirk/image.rb
 - lib/smirk.rb
-- lib/try.rb
 - test/helper.rb
 - test/test_smirk.rb
 has_rdoc: true

data/lib/try.rb

@@ -1,26 +0,0 @@
-require 'rubygems'
-require 'smirk'
-
-def test
-  smug = Smirk::Client.new("info@studiocastillero.com", "freestyle")
-  
-  smug.albums(true).each do |a|
-    puts a.title
-    # puts a.id
-    # puts [a.id, a.key].join(" - ")
-    # puts a.images(true).map(&:filename).join(", ")
-    # if a.respond_to? :highlight
-    #   puts a.highlight[:key]
-    # end
-    # puts a.inspect
-  end
-
-  puts smug.find_image_exif("519912731", "pNN8q").model
-  puts smug.find_album(10992869, "9x9Xe").title
-  
-  puts smug.categories.map(&:nicename).join(", ")
-ensure
-  smug.logout
-end
-
-test