smile 0.4.1 → 0.4.3

data/README.rdoc

@@ -5,7 +5,23 @@ This gem wraps the 1.2.0 interface.
 
 == Features
 
-=== NEW Upload Images/Vids
+=== Configure
+  Smile::Base.configure do |config|
+    config.log = Log.new( STDOUT )
+    config.logger_on = true
+    config.api_key = 'your key from smugmug'
+  end
+    
+
+  new methods
+
+  album.reload!
+  photo.reload!
+
+  Exceptions!!!!
+  Hey it shows you better exceptions now when something goes wrong from the site or lib
+
+=== Upload Images/Vids
 
   smug = Smile.auth( 'foo@bar.com', 'pass' )
   album = smug.albums.first

data/VERSION.yml

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

data/lib/smile/album.rb

@@ -166,7 +166,7 @@ class Smile::Album < Smile::Base
     # Community
     # @option options [optional, Fixnum] :community_id ( 0 ) join the group
     def create( title, options )
-      json = web_method_call( { :method => 'smugmug.albums.create', :AlbumID => album_id })
+      json = web_method_call( { :method => 'smugmug.albums.create', :album_id => album_id })
 
       self.from_json( json )
     end
@@ -237,7 +237,7 @@ class Smile::Album < Smile::Base
   # Community
   # @option options [optional, Fixnum] :community_id join the group
   def update( options )
-    json = web_method_call( { :method => 'smugmug.albums.changeSettings', :AlbumID => album_id } )
+    json = web_method_call( { :method => 'smugmug.albums.changeSettings', :album_id => album_id } )
 
     true
   end
@@ -253,9 +253,9 @@ class Smile::Album < Smile::Base
     json = web_method_call(
         {
           :method => 'smugmug.images.get',
-          :AlbumID => self.album_id,
-          :AlbumKey => self.key,
-          :Heavy => 1
+          :album_id => album_id,
+          :album_key => key,
+          :heavy => 1
         },
         options
     )
@@ -270,7 +270,7 @@ class Smile::Album < Smile::Base
   # @option options [optional, 1 or 0] :heavy more details
   def stats( options =nil )
     json = web_method_call( 
-      { :method => 'smugmug.albums.getStats', :AlbumID => album_id, :month => Date.today.month, :year => Date.today.year },
+      { :method => 'smugmug.albums.getStats', :album_id => album_id, :month => Date.today.month, :year => Date.today.year },
       options
     )
 
@@ -316,23 +316,23 @@ class Smile::Album < Smile::Base
   
   # Want to get rid of that album?  Call this guy and see what gets removed!
   def delete!
-    json = web_method_call( { :method => 'smugmug.albums.delete', :AlbumID => album_id })
+    json = web_method_call( { :method => 'smugmug.albums.delete', :album_id => album_id })
 
     nil
   end
   
-  # This method will re-sort all the photos inside of the album specified by AlbumID.
+  # This method will re-sort all the photos inside of the album specified by album_id.
   #
   # @option options [String] :by valid values: FileName, Caption, DateTime
   # @option options [String] :direction valid values: ASC, DESC
   def resort!( options =nil )
-    json = web_method_call( { :method => 'smugmug.albums.reSort', :AlbumID => album_id }, options)
+    json = web_method_call( { :method => 'smugmug.albums.reSort', :album_id => album_id }, options)
 
     nil
   end
   
   def reload!
-    @attributes = Smile::Album.find( { :AlbumID => self.album_id } ).attributes
+    @attributes = Smile::Album.find( { :album_id => album_id } ).attributes
     self
   end
 

data/lib/smile/common.rb

@@ -12,17 +12,19 @@ module Smile
 
     # This will be included in every request once you have logged in
     def default_params
-      @params ||= { :APIKey => session.api_key }
-      @params.merge!( :SessionID => session.id ) if( session.id )
-      @params
+      @params ||= { :api_key => session.api_key }
+      @params.merge!( :session_id => session.id ) if( session.id )
+      @params = Smile::ParamConverter.clean_hash_keys( @params )
     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 web_method_call( web_options, options = {} )
-      params = default_params.merge( web_options )
       options = Smile::ParamConverter.clean_hash_keys( options )
+      web_options = Smile::ParamConverter.clean_hash_keys( web_options )
+
+      params = default_params.merge( web_options )
       params.merge!( options ) if( options )
 
       logger.info( params.inspect )
@@ -35,8 +37,10 @@ module Smile
     # 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 )
+      web_options = Smile::ParamConverter.clean_hash_keys( web_options )
+
+      params = default_params.merge( web_options )
       params.merge!( options ) if( options )
 
       logger.info( params.inspect )

data/lib/smile/json.rb

@@ -3,6 +3,7 @@ module Smile
   
     class << self
       def parse( text )
+        Smile::Base.logger.info( text )
         @result = JSON.parse(text) # This is the default JSON parse
         raise_exception! if has_error?
         @result  

data/lib/smile/param_converter.rb

@@ -9,22 +9,29 @@ module Smile::ParamConverter
         :nickname_recent, :nickname_popular, :user_comments, :geo_user,
         :geo_album
         first_letter_downcase( param.to_s.classify ).to_sym
-      when :size
+      when :size 
         value = value.titlecase
         :Size
       when :data, :type, :description, :keywords, :geography, :position, :header,
-        :clean, :filenames, :password, :public, :external, :protected, :watermarking,
+        :clean, :filenames, :public, :external, :protected, :watermarking,
         :larges, :originals, :comments, :share, :printable, :backprinting
         param.to_s.upcase.to_sym
       when :image_id, :image_key, :image_count, :nick_name, :category_id,
-        :sub_category_id, :album_template_id, :highlight_id, :square_thumbs,
+        :sub_category_id, :album_key, :album_template_id, :highlight_id, :square_thumbs,
         :template_id, :sort_method, :sort_direction, :password_hint, :word_searchable,
         :smug_searchable, :watermark_id, :hide_owner, :x_larges, :x2_larges, :x3_larges,
         :can_rank, :friend_edit, :family_edit, :color_correction, :default_color, :proof_days,
-        :unsharp_amount, :unsharp_radius, :unsharp_sigma, :community_id
+        :unsharp_amount, :unsharp_radius, :unsharp_sigma, :community_id, :password, :email_address,
+        :heavy
         param.to_s.classify.to_sym
       when :exif
         :EXIF
+      when :api_key
+        :APIKey
+      when :session_id
+        :SessionID
+      when :album_id
+        :AlbumID
       else
         key = param
     end

data/lib/smile/photo.rb

@@ -8,6 +8,7 @@ class Smile::Photo < Smile::Base
   class << self
     # Convert the given xml into photo objects to play with
     def from_json( json )
+      logger.info( json )
       json["images"].map do |image_upper|
         image = upper_hash_to_lower_hash( image_upper )
         image.merge!( :image_id => image["id"] )
@@ -199,4 +200,9 @@ class Smile::Photo < Smile::Base
     @attributes = Smile::Photo.find( { :ImageID => self.image_id, :ImageKey => self.key } ).attributes
     self
   end
+
+  def encode64( size = :smallurl )
+    url = @attributes.send( size )
+    [open(url){ |io| io.read }].pack('m')
+  end
 end

data/smile.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{smile}
-  s.version = "0.4.1"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["cajun"]
-  s.date = %q{2010-05-14}
+  s.date = %q{2010-07-09}
   s.default_executable = %q{smile}
   s.email = %q{zac@kleinpeter.org}
   s.executables = ["smile"]
@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{cajun-gems}
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Simple API for talking to SmugMug}
   s.test_files = [
     "test/smile_test.rb",
@@ -52,7 +52,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rest-client>, [">= 0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
     else

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,7 +34,7 @@ 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']) do 
+    test( 'we can reload albums from the site', ['album', 'reload']) do 
       album = @smug.albums( :nick_name => 'kleinpeter' ).first
       old_title = album.title
       album.title = 'foo'
@@ -54,7 +54,7 @@ Shindo.tests 'checking all the cool things smile can do'  do
       album.key == photo.album.key 
     end
 
-    test( 'we can reload photos from the site', ['photo']) do 
+    test( 'we can reload photos from the site', ['photo', 'reload']) do 
       album = @smug.albums( :nick_name => 'kleinpeter' ).first
       photo = album.photos.first
       old_url = photo.tinyurl

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: smile
 version: !ruby/object:Gem::Version 
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - cajun
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-14 00:00:00 -05:00
+date: 2010-07-09 00:00:00 -05:00
 default_executable: smile
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -33,9 +36,11 @@ dependencies:
   name: activesupport
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -69,6 +74,7 @@ files:
 - smile.gemspec
 - test/smile_test.rb
 - test/test_helper.rb
+- bin/smile
 has_rdoc: true
 homepage: http://github.com/cajun/smile
 licenses: []
@@ -79,23 +85,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: cajun-gems
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Simple API for talking to SmugMug