smile 0.4.0 → 0.4.1

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 4
-:patch: 0
+:patch: 1
 :major: 0

data/lib/smile/album.rb

@@ -77,6 +77,7 @@ class Smile::Album < Smile::Base
       json["albums"].map do |album_upper|
         album = upper_hash_to_lower_hash( album_upper )
         album.merge!( :album_id => album["id"] )
+        album.merge!( :album_key => album["key"] )
 
         Smile::Album.new( album )
       end
@@ -95,6 +96,7 @@ class Smile::Album < Smile::Base
       
       album = json['album'] 
       album.merge!( :album_id => album["id"] )
+      album.merge!( :album_key => album["key"] )
       
       Smile::Album.new( album )
     end
@@ -330,12 +332,12 @@ class Smile::Album < Smile::Base
   end
   
   def reload!
-    replace_with = Smile::Album.find(self.album_id, self.album_key )
-#    self = replace_with
+    @attributes = Smile::Album.find( { :AlbumID => self.album_id } ).attributes
+    self
   end
 
   def category
-    ['category']
+    @attributes['category']
   end
 
   def subcategory

data/lib/smile/base.rb

@@ -6,9 +6,10 @@
 #  Copyright 2009 Cajun Country. All rights reserved.
 # 
 module Smile
-  class Base < OpenStruct
+  class Base 
     include Smile::Common
-
+    attr_accessor :attributes
+    
     class << self
       include Smile::Common
 
@@ -21,5 +22,12 @@ module Smile
       end
     end
 
+    def initialize( options={} )
+      @attributes = OpenStruct.new( options )
+    end
+
+    def method_missing( name, *args )
+      @attributes.send(name,args)
+    end
   end
 end

data/lib/smile/common.rb

@@ -31,6 +31,19 @@ module Smile
       upper_hash_to_lower_hash(Smile::Json.parse( json ) )
     end
 
+    # This is the base work that will need to be done on ALL 
+    # web calls.  Given a set of web options and other params
+    # call the web service and convert it to json
+    def secure_web_method_call( web_options, options = {} )
+      params = default_params.merge( web_options )
+      options = Smile::ParamConverter.clean_hash_keys( options )
+      params.merge!( options ) if( options )
+
+      logger.info( params.inspect )
+
+      json = RestClient.post( BASE_SECURE, params ).body
+      upper_hash_to_lower_hash(Smile::Json.parse( json ) )
+    end
     # This converts a hash that has mixed case
     # into all lower case
     def upper_hash_to_lower_hash( upper )

data/lib/smile/photo.rb

@@ -32,6 +32,9 @@ class Smile::Photo < Smile::Base
           options
       )
       
+      image = image['image']
+      logger.info( image )
+
       image.merge!( :image_id => image["id"] )
       image.merge!( :album_key => image["album"]["key"] )
       image.merge!( :album_id => image["album"]["id"] )
@@ -189,6 +192,11 @@ class Smile::Photo < Smile::Base
   end
   
   def album
-    Smile::Album.find( :AlbumID => self.album_id, :AlbumKey => self.album_key )
+    @album ||= Smile::Album.find( :AlbumID => self.album_id, :AlbumKey => self.album_key )
+  end
+
+  def reload!
+    @attributes = Smile::Photo.find( { :ImageID => self.image_id, :ImageKey => self.key } ).attributes
+    self
   end
 end

data/lib/smile/smug.rb

@@ -15,7 +15,7 @@ module Smile
     #
     # @return [Smile::SmugMug.new] An Smug object that has been authenticated
     def auth( email, pass )
-     json = web_method_call(
+     json = secure_web_method_call(
         { :method => 'smugmug.login.withPassword', :EmailAddress => email, :Password => pass }
       )
 
@@ -28,7 +28,7 @@ module Smile
     #
     # @return [Smile::SmugMug.new] An Smug object that has been authenticated
     def auth_anonymously
-      json = web_method_call( { :method => 'smugmug.login.anonymously' } )
+      json = secure_web_method_call( { :method => 'smugmug.login.anonymously' } )
 
       self.session.id = json["login"]["session"]["id"]
       json 

data/smile.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{smile}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["cajun"]
-  s.date = %q{2010-05-13}
+  s.date = %q{2010-05-14}
   s.default_executable = %q{smile}
   s.email = %q{zac@kleinpeter.org}
   s.executables = ["smile"]

data/test/smile_test.rb

@@ -7,7 +7,7 @@ Shindo.tests 'checking all the cool things smile can do'  do
     # this resets the config to the base state before every test
     Smile::Base.clear_config!
     Smile::Base.configure do |config|
-      # config.logger_on = true
+    #  config.logger_on = true
     end
 
     @smug = Smile::Smug.new
@@ -34,8 +34,14 @@ Shindo.tests 'checking all the cool things smile can do'  do
       @smug.albums( :nick_name => 'kleinpeter' ) 
     end
     
-    test( 'we can reload albums from the site', ['album']) 
-    
+    test( 'we can reload albums from the site', ['album']) do 
+      album = @smug.albums( :nick_name => 'kleinpeter' ).first
+      old_title = album.title
+      album.title = 'foo'
+      album.reload!
+      old_title == album.title
+    end
+
     test 'checking to see if we have photos in the albums', ['album'] do 
       album = @smug.albums( :nick_name => 'kleinpeter' ).first
       !album.photos.empty?
@@ -47,6 +53,15 @@ Shindo.tests 'checking all the cool things smile can do'  do
       album.album_id == photo.album.album_id && 
       album.key == photo.album.key 
     end
+
+    test( 'we can reload photos from the site', ['photo']) do 
+      album = @smug.albums( :nick_name => 'kleinpeter' ).first
+      photo = album.photos.first
+      old_url = photo.tinyurl
+      photo.tinyurl = 'foo'
+      photo.reload!
+      old_url == photo.tinyurl
+    end
   end
   
   tests 'confirm configuration settings', ['config'] do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - cajun
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-13 00:00:00 -05:00
+date: 2010-05-14 00:00:00 -05:00
 default_executable: smile
 dependencies: 
 - !ruby/object:Gem::Dependency