cajun-smile 0.2.1 → 0.3.0

data/README.rdoc

@@ -3,14 +3,21 @@
 Smile is a simple gem to talk to SmugMug.com.
 This gem wraps the 1.2.0 interface.
 
-== New Features
+== Features
+
+=== NEW Upload Images/Vids
+
+  smug = Smile.auth( 'foo@bar.com', 'pass' )
+  album = smug.albums.first
+  
+  album.add( '/path/to/image.ext' ) # => Smile::Photo (:
 
 === Search feeds
   Smile.search( 'blueberries' ) => [Smile::Photo] 
   Smile.search_rss( 'bison' ) => RSS::Parser Feed
   Smile.search_raw( 'grand' ) => Raw response from the feed
 
-===New auth accessors
+=== auth accessors
   smug = Smile.auth_anonymously
   smug = Smile.auth( 'nick', 'pass' )
 
@@ -34,9 +41,9 @@ This gem wraps the 1.2.0 interface.
 
 
 == TODO
-* Clean up params so they are not case sensitive
+* Clean up params so they are not case sensitive ( Lots of cases have been handled)
 * Create better exception handlers
-* Update Documentation ( getting there.  it's being published on rdoc.info now )
+* Update Documentation ( getting there.  it's being published on rdoc.info now http://rdoc.info/projects/cajun/smile )
 * Plugin in Cucumber
 
 

data/VERSION.yml

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

data/lib/smile/album.rb

@@ -112,6 +112,7 @@ class Smile::Album < Smile::Base
       json = RestClient.post Smile::Base::BASE, params
       
       album_upper = JSON.parse(json)
+    
       album = upper_hash_to_lower_hash( album_upper['Album'] )
       album.merge!( :album_id => album["id"] )
       
@@ -160,27 +161,44 @@ class Smile::Album < Smile::Base
     
     json = JSON.parse( json )
     raise json["message"] if json["stat"] == 'fail'
-      
-    image = upper_hash_to_lower_hash( json['Album'] )
-    OpenStruct.new( hash )
+
+    stat = upper_hash_to_lower_hash( json['Album'] )
+    OpenStruct.new( stat )
   end
   
-  def add( payload, options={} )
-    if( File.exists?( payload ) )
-    RestClient.put BASE, payload,
-      :content_length => File.size( payload ),
-      :content_md5 => '?',
-      :x_smug_sessionid => session_id,
-      :x_smug_version => VERSION,
-      :x_smug_albumid => album_id,
-      :x_smug_filename => File.basename( payload ),
-      :x_smug_caption => options[:caption],
-      :x_smug_keywords => options[:keywords],
-      :x_smug_latitude => options[:latitude],
-      :x_smug_longitude => options[:longitude],
-      :x_smug_altitude => options[:altitude]
+  # Add an image or vid to the existing album
+  # 
+  # @param [String] image path to image
+  # @param [options,Hash] options Extra params that are accepted 
+  # @option options [optional, String] :caption For multi-line captions, use a carriage return between lines
+  # @option options [optional, String] :keywords Sets the Keywords on the image
+  # @option options [optional, Decimal] :latitude Sets the Latitude of the image (in the form D.d, such as 37.430096)
+  # @option options [optional, Decimal] :longitude Sets the Longitude of the image (in the form D.d, such as -122.152269)
+  # @option options [optional, Decimal] :altitude Sets the Altitude of the image (in meters)
+  def add( image, options={} )
+    if( File.exists?( image ) )
+      json = RestClient.put UPLOAD + "/#{image}", File.read( image ),
+        :content_length => File.size( image ),
+        :content_md5 => MD5.hexdigest( File.read( image ) ),
+        :x_smug_sessionid => session_id,
+        :x_smug_version => VERSION,
+        :x_smug_responseType => "JSON",
+        :x_smug_albumid => album_id,
+        :x_smug_filename => File.basename( image ),
+        :x_smug_caption => options[:caption],
+        :x_smug_keywords => options[:keywords],
+        :x_smug_latitude => options[:latitude],
+        :x_smug_longitude => options[:longitude],
+        :x_smug_altitude => options[:altitude]
+      
+      image = JSON.parse( json )
+      if( image && image["Image"] && image["Image"]["id"] )
+        Smile::Photo.find( :image_id => image["Image"]["id"] )
+      else
+        raise Exception.new( "Failed to upload #{image}" )
+      end
     else
-      Exception.new( "Cannot find file #{payload}." )
+      raise Exception.new( "Cannot find file #{image}." )
     end
   end
   

data/lib/smile/base.rb

@@ -10,6 +10,7 @@ module Smile
     BASE = 'http://api.smugmug.com/hack/json/1.2.0/'
     BASE_SECURE = 'https://api.smugmug.com/hack/json/1.2.0/'
     API = 'HSoqGCJ8ilF42BeThMGDZqqqOgj1eXqN'
+    UPLOAD = "http://upload.smugmug.com/"
 
     VERSION = '1.2.0'
     

data/lib/smile/photo.rb

@@ -27,11 +27,11 @@ class Smile::Photo < Smile::Base
     
     # This will pull a single image from the smugmug
     #
-    # * int image_id
-    # * String Password optional
-    # * String SitePassword optional
-    # * String ImageKey
-    # 
+    # @param [options,Hash] options the hash of options that you have heard about so much in ruby
+    # @option options [int] :image_id The id of the image you want to find
+    # @option options [optional, String] :password The id of the image you want to find
+    # @option options [optional, String] :site_password password word for the site
+    # @option options [optional, String] :image_key image key maybe?
     def find( options={} )
       set_session if( session_id.nil? )
       options = Smile::ParamConverter.clean_hash_keys( options )

data/smile.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{smile}
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["cajun"]
-  s.date = %q{2009-08-21}
+  s.date = %q{2009-08-25}
   s.email = %q{zac@kleinpeter.org}
   s.extra_rdoc_files = [
     "LICENSE",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cajun-smile
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors: 
 - cajun
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-21 00:00:00 -07:00
+date: 2009-08-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency