smile 0.3.0 → 0.3.1

data/.gitignore

@@ -0,0 +1,14 @@
+# Files
+*.swp
+*.jpg
+.DS_Store
+
+# Dir
+tmp/
+coverage/
+scratch_directory/
+rdoc/
+pkg/
+doc/
+
+

data/Rakefile

@@ -1,5 +1,7 @@
 require 'rubygems'
 require 'rake'
+require 'metric_fu'
+require 'config/metric_fu_config'
 
 begin
   require 'jeweler'

data/VERSION.yml

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

data/bin/smile

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+# -*- mode: ruby -*-
+
+require 'optparse'
+require 'rubygems'
+#require File.join(File.dirname(__FILE__), '../lib/smile' )
+
+options ={}
+opts = OptionParser.new do |opts|
+  opts.banner = "Usage smile [command] [options]"
+end
+
+unless( Dir.exists?( '~/.smile/' ) )
+  puts 'it is not there'
+end
+
+
+if( ARGV.empty? )
+  puts opts
+  exit
+end

data/config/metric_fu_config.rb

@@ -0,0 +1,31 @@
+MetricFu::Configuration.run do |config|
+  #define which metrics you want to use
+  config.metrics  = [:churn, :saikuro, :flog, :flay, :reek, :roodi, :rcov]
+  config.graphs   = [:flog, :flay, :reek, :roodi, :rcov]
+  config.flay     = { :dirs_to_flay => ['lib'],
+    :minimum_score => 100  } 
+  config.flog     = { :dirs_to_flog => ['lib']  }
+  config.reek     = { :dirs_to_reek => ['lib']  }
+  config.roodi    = { :dirs_to_roodi => ['lib'] }
+  config.saikuro  = { :output_directory => 'scratch_directory/saikuro', 
+    :input_directory => ['lib'],
+    :cyclo => "",
+    :filter_cyclo => "0",
+    :warn_cyclo => "5",
+    :error_cyclo => "7",
+    :formater => "text"} #this needs to be set to "text"
+  config.churn    = { :start_date => "1 year ago", :minimum_churn_count => 10}
+  config.rcov     = { :environment => 'test',
+    :test_files => ['test/*_test.rb'],
+      :rcov_opts => ["--sort coverage", 
+        "--no-html", 
+        "--text-coverage",
+        "--profile",
+        "--exclude /gems/,/Library/,spec"]}
+  config.graph_engine = :bluff
+end
+
+namespace :metrics do
+TEST_PATHS_FOR_RCOV = ['test/*_test.rb']
+end
+

data/lib/smile/album.rb

@@ -1,86 +1,95 @@
- # Result
-  #     STANDARD RESPONSE
-  # 
-  # array Albums
-  # Album
-  #   integer id
-  #   string Key
-  #   string Title
-  #   struct Category
-  #   string id
-  #   string Name
-  #   struct SubCategory
-  #   string id
-  #   string Name
-  #
-  #     HEAVY RESPONSE
-  #   
-  # array Albums
-  # Album
-  #   integer id
-  #   string Key
-  #   string Title
-  #   struct Category
-  #     string id
-  #     string Name
-  #   struct SubCategory
-  #     string id
-  #     string Name
-  #   string Description
-  #   string Keywords
-  #   boolean Geography (owner)
-  #   integer Position
-  #   struct Hightlight (owner)
-  #     string id
-  #   integer ImageCount
-  #   string LastUpdated
-  #   boolean Header (owner, power & pro only)
-  #   boolean Clean (owner)
-  #   boolean EXIF (owner)
-  #   boolean Filenames (owner)
-  #   struct Template (owner)
-  #     string id
-  #   string SortMethod (owner)
-  #   boolean SortDirection (owner)
-  #   string Password (owner)
-  #   string PasswordHint (owner)
-  #   boolean Public (owner)
-  #   boolean WorldSearchable (owner)
-  #   boolean SmugSearchable (owner)
-  #   boolean External (owner)
-  #   boolean Protected (owner, power & pro only)
-  #   boolean Watermarking (owner, pro only)
-  #   struct Watermark (owner, pro only)
-  #     string id
-  #   boolean HideOwner (owner)
-  #   boolean Larges (owner, pro only)
-  #   boolean XLarges (owner, pro only)
-  #   boolean X2Larges (owner)
-  #   boolean X3Larges (owner)
-  #   boolean Originals (owner)
-  #   boolean CanRank (owner)
-  #   boolean FriendEdit (owner)
-  #   boolean FamilyEdit (owner)
-  #   boolean Comments (owner)
-  #   boolean Share (owner)
-  #   boolean Printable (owner)
-  #   int ColorCorrection (owner)
-  #   boolean DefaultColor (owner, pro only)  deprecated
-  #   integer ProofDays (owner, pro only)
-  #   string Backprinting (owner, pro only)
-  #   float UnsharpAmount (owner, power & pro only)
-  #   float UnsharpRadius (owner, power & pro only)
-  #   float UnsharpThreshold (owner, power & pro only)
-  #   float UnsharpSigma (owner, power & pro only)
-  #   struct Community (owner)
-  #     string id
-#  
-#  Created by Zac Kleinpeter on 2009-04-28.
-#  Copyright 2009 Cajun Country. All rights reserved.
+# The Album class will fetch any public/private album hosted on SmugMug.
+# The Album Objects will have the following fields on the response
+#
+# Result
+#
+# STANDARD RESPONSE
 # 
+# array Albums
+#   Album
+#     integer id
+#     string Key
+#     string Title
+#     struct Category
+#       string id
+#       string Name
+#     string id
+#     string Name
+#     struct SubCategory
+#       string id
+#       string Name
+#     string id
+#     string Name
+#
+# HEAVY RESPONSE
+#   
+# array Albums
+#   Album
+#     integer id
+#     string Key
+#     string Title
+#     struct Category
+#       string id
+#       string Name
+#     struct SubCategory
+#       string id
+#       string Name
+#     string Description
+#     string Keywords
+#     boolean Geography (owner)
+#     integer Position
+#     struct Hightlight (owner)
+#       string id
+#     integer ImageCount
+#     string LastUpdated
+#     boolean Header (owner, power & pro only)
+#     boolean Clean (owner)
+#     boolean EXIF (owner)
+#     boolean Filenames (owner)
+#     struct Template (owner)
+#       string id
+#     string SortMethod (owner)
+#     boolean SortDirection (owner)
+#     string Password (owner)
+#     string PasswordHint (owner)
+#     boolean Public (owner)
+#     boolean WorldSearchable (owner)
+#     boolean SmugSearchable (owner)
+#     boolean External (owner)
+#     boolean Protected (owner, power & pro only)
+#     boolean Watermarking (owner, pro only)
+#     struct Watermark (owner, pro only)
+#       string id
+#     boolean HideOwner (owner)
+#     boolean Larges (owner, pro only)
+#     boolean XLarges (owner, pro only)
+#     boolean X2Larges (owner)
+#     boolean X3Larges (owner)
+#     boolean Originals (owner)
+#     boolean CanRank (owner)
+#     boolean FriendEdit (owner)
+#     boolean FamilyEdit (owner)
+#     boolean Comments (owner)
+#     boolean Share (owner)
+#     boolean Printable (owner)
+#     int ColorCorrection (owner)
+#     boolean DefaultColor (owner, pro only)  deprecated
+#     integer ProofDays (owner, pro only)
+#     string Backprinting (owner, pro only)
+#     float UnsharpAmount (owner, power & pro only)
+#     float UnsharpRadius (owner, power & pro only)
+#     float UnsharpThreshold (owner, power & pro only)
+#     float UnsharpSigma (owner, power & pro only)
+#     struct Community (owner)
+#       string id
+#    
+#  @author Zac Kleinpeter 
+#  @date 2009-04-28.
 class Smile::Album < Smile::Base
 
   class << self
+    # Converts the json results from the web service into 
+    # Album object to use
     def from_json( json, session_id )
       result = JSON.parse( json )
       result["Albums"].map do |album_upcase|
@@ -94,22 +103,23 @@ class Smile::Album < Smile::Base
       end
     end
     
-    # This will pull a single album from the smugmug
+    # This will pull a single album from the smugmug.
+    # The Site ID is auto passed if you are logged in.
     #
-    # * SessionID - string. ( by default if logged in)
-    # * AlbumID - string.
-    # * Password - string (optional).
-    # * SitePassword - string (optional).
-    # * AlbumKey - string.
-    # 
+    # @param [Hash] :options yes this is the has you will put stuff
+    # @param options [String] :album_id This is the ID of the album you want to find
+    # @param options [String] :album_key This is the KEY for the albums
+    # @param options [optional, String] :password password for the albums
+    # @param options [optional, String] :site_password password for the site
     def find( options={} )
       params = default_params.merge(
           :method => 'smugmug.albums.getInfo'
       )
       
+      options = Smile::ParamConverter.clean_hash_keys( options )
       params.merge!( options ) if( options )
       
-      json = RestClient.post Smile::Base::BASE, params
+      json = RestClient.post( Smile::Base::BASE, params ).body
       
       album_upper = JSON.parse(json)
     
@@ -120,15 +130,172 @@ class Smile::Album < Smile::Base
       a.session_id = session_id
       a
     end
+    
+    # Update the album from the following params
+    #
+    # @param [String] title What you want to call it
+    # @param [optional, Hash] options wow it's a hash
+    #
+    # Essentials
+    # @option options [Fixnum] :category_id it is what it is
+    # @option options [optional, Fixnum] :sub_category_id ( 0 ) guess what this is
+    # @option options [optional, String] :description what am i looking at
+    # @option options [optional, String] :keywords space seperated or comman don't know
+    # @option options [optional, Fixnum] :album_template_id ( 1 ) yup
+    # @option options [optional, Boolean] :geography ( 0 ) huh?
+    # @option options [optional, Fixnum] :highlight_id you guess is as good as mine
+    # @option options [optional, Fixnum] :position I'm just the dev
+    #
+    # Look & Feel
+    # @option options [optional, Boolean] :header ( 0 ) yup
+    # @option options [optional, Boolean] :clean ( 0 ) @see http://smugmug.com
+    # @option options [optional, Boolean] :exif ( 1 ) @see http://smugmug.com
+    # @option options [optional, Boolean] :filenames ( 0 ) show file names
+    # @option options [optional, Boolean] :square_thumbs ( 1 ) user square ones
+    # @option options [optional, Fixnum] :template_id ( 0 ) 0:Viewer Choice 3:SmugMug 4:Traditional 7:All Thumbs 8:Slideshow 9:Journal 10:SmugMug Small 11:Filmstrip
+    # @option options [optional, String] :sort_method ( 'Position' ) %w( Position Caption FileName Date DateTime DateTimeOriginal )
+    # @option options [optional, 1 or 0] :sort_direction 0: Ascending (1-99, A-Z, 1980-2004, etc) 1: Descending (99-1, Z-A, 2004-1980, etc)
+    #
+    # Security & Privacy
+    # @option options [optional, String] :password want one?
+    # @option options [optional, String] :password_hint need one?
+    # @option options [optional, Boolean] :public ( 1 ) is it?
+    # @option options [optional, Boolean] :world_searchable ( 1 ) can i?
+    # @option options [optional, Boolean] :smug_searchable ( 1 ) please?
+    # @option options [optional, Boolean] :external ( 1 ) let everyone know
+    # @option options [optional, Boolean] :protected ( 0 ) MINE!!!
+    # @option options [optional, Boolean] :watermarking ( 0 ) kinda cool
+    # @option options [optional, Fixnum] :watermark_id ( 0 ) which one
+    # @option options [optional, Boolean] :hide_owner ( 0 ) you can't see me
+    # @option options [optional, Boolean] :larges ( 1 ) show bigens
+    # @option options [optional, Boolean] :x_larges ( 1 ) show X bigens
+    # @option options [optional, Boolean] :x2_larges ( 1 ) show XX bigens
+    # @option options [optional, Boolean] :x3_larges ( 1 ) show XXX bigens
+    # @option options [optional, Boolean] :originals ( 1 ) show what i uploaded
+    #
+    # Social
+    # @option options [optional, Boolean] :can_rank ( 1 ) well...yesss
+    # @option options [optional, Boolean] :friend_edit ( 0 ) yeah i have friends!!!
+    # @option options [optional, Boolean] :family_edit ( 0 ) go ahead ma
+    # @option options [optional, Boolean] :comments ( 1 ) I just wanted to say....
+    # @option options [optional, Boolean] :share ( 1 ) here you go
+    #
+    # Printing & Sales
+    # @option options [optional, Boolean] :printable ( 1 ) yes
+    # @option options [optional, Fixnum] :color_correction ( 2 ) 0:No 1:Yes 2:Injerit
+    # @option options [optional, Boolean] :default_color ( 0 ) ( pro only deprecated ) 1:Auto 0: True
+    # @option options [optional, Fixnum] :proof_days ( 0 ) yep ( pro only )
+    # @option options [optional, String] :back_printing what you want to see behind you
+    #
+    # Photo Sharpening
+    # @option options [optional, Float] :unsharp_amount ( 0.200 ) numbers
+    # @option options [optional, Float] :unsharp_radius ( 1.000 ) more numbers
+    # @option options [optional, Float] :unsharp_threshold ( 0.050 ) I'm a dev what does this mean?
+    # @option options [optional, Float] :unsharp_sigma ( 1.000 ) and more numbers
+    #
+    # Community
+    # @option options [optional, Fixnum] :community_id ( 0 ) join the group
+    def create( title, options )
+      params = default_params.merge(
+          :method => 'smugmug.albums.create',
+          :AlbumID => album_id
+      )
+      options = Smile::ParamConverter.clean_hash_keys( options )
+      params.merge!( options ) if( options )
+
+      json = RestClient.post( BASE, params ).body
+      json = JSON.parse( json )
+      raise json["message"] if json["stat"] == 'fail'
+      find( :album_id => json["Album"]["id"], :album_key => json["Album"]["key"] )
+      true
+    end
   end
 
+  # Update the album from the following params
+  #
+  # @param [optional, Hash] options wow it's a hash
+  #
+  # Essentials
+  # @option options [optional, String] :title the title maybe?
+  # @option options [optional, Fixnum] :category_id it is what it is
+  # @option options [optional, Fixnum] :sub_category_id guess what this is
+  # @option options [optional, String] :description what am i looking at
+  # @option options [optional, String] :keywords space seperated or comman don't know
+  # @option options [optional, Fixnum] :album_template_id yup
+  # @option options [optional, Boolean] :geography huh?
+  # @option options [optional, Fixnum] :highlight_id you guess is as good as mine
+  # @option options [optional, Fixnum] :position I'm just the dev
+  #
+  # Look & Feel
+  # @option options [optional, Boolean] :header yup
+  # @option options [optional, Boolean] :clean @see http://smugmug.com
+  # @option options [optional, Boolean] :exif @see http://smugmug.com
+  # @option options [optional, Boolean] :filenames show file names
+  # @option options [optional, Boolean] :square_thumbs user square ones
+  # @option options [optional, Fixnum] :template_id 0:Viewer Choice 3:SmugMug 4:Traditional 7:All Thumbs 8:Slideshow 9:Journal 10:SmugMug Small 11:Filmstrip
+  # @option options [optional, String] :sort_method %w( Position Caption FileName Date DateTime DateTimeOriginal )
+  # @option options [optional, 1 or 0] :sort_direction 0: Ascending (1-99, A-Z, 1980-2004, etc) 1: Descending (99-1, Z-A, 2004-1980, etc)
+  #
+  # Security & Privacy
+  # @option options [optional, String] :password want one?
+  # @option options [optional, String] :password_hint need one?
+  # @option options [optional, Boolean] :public is it?
+  # @option options [optional, Boolean] :world_searchable can i?
+  # @option options [optional, Boolean] :smug_searchable please?
+  # @option options [optional, Boolean] :external let everyone know
+  # @option options [optional, Boolean] :protected MINE!!!
+  # @option options [optional, Boolean] :watermarking kinda cool
+  # @option options [optional, Fixnum] :watermark_id which one
+  # @option options [optional, Boolean] :hide_owner you can't see me
+  # @option options [optional, Boolean] :larges show bigens
+  # @option options [optional, Boolean] :x_larges show X bigens
+  # @option options [optional, Boolean] :x2_larges show XX bigens
+  # @option options [optional, Boolean] :x3_larges show XXX bigens
+  # @option options [optional, Boolean] :originals show what i uploaded
+  #
+  # Social
+  # @option options [optional, Boolean] :can_rank well...yesss
+  # @option options [optional, Boolean] :friend_edit yeah i have friends!!!
+  # @option options [optional, Boolean] :family_edit go ahead ma
+  # @option options [optional, Boolean] :comments I just wanted to say....
+  # @option options [optional, Boolean] :share here you go
+  #
+  # Printing & Sales
+  # @option options [optional, Boolean] :printable yes
+  # @option options [optional, Fixnum] :color_correction 0:No 1:Yes 2:Injerit
+  # @option options [optional, Boolean] :default_color ( pro only deprecated ) 1:Auto 0: True
+  # @option options [optional, Fixnum] :proof_days yep ( pro only )
+  # @option options [optional, String] :back_printing what you want to see behind you
+  #
+  # Photo Sharpening
+  # @option options [optional, Float] :unsharp_amount numbers
+  # @option options [optional, Float] :unsharp_radius more numbers
+  # @option options [optional, Float] :unsharp_threshold I'm a dev what does this mean?
+  # @option options [optional, Float] :unsharp_sigma and more numbers
+  #
+  # Community
+  # @option options [optional, Fixnum] :community_id join the group
+  def update( options )
+    params = default_params.merge(
+        :method => 'smugmug.albums.changeSettings',
+        :AlbumID => album_id
+    )
+    options = Smile::ParamConverter.clean_hash_keys( options )
+    params.merge!( options ) if( options )
+    
+    json = RestClient.post( BASE, params ).body
+    json = JSON.parse( json )
+    raise json["message"] if json["stat"] == 'fail'
+    true
+  end
+  
   # This will pull all the photos for a given album
-  # * SessionID - string. ( by default if logged in)
-  # * AlbumID - integer.
-  # * Heavy - boolean (optional).
-  # * Password - string (optional).
-  # * SitePassword - string (optional).
-  # * AlbumKey - string.
+  #
+  # @param [optional, Hash] options wow it's a hash
+  # 
+  # @option options [optional, boolean] :heavy ( true ) default is true
+  # @option options [optional, string] :password password for the pics
+  # @option options [optional, string] :site_password access via site password
   def photos( options=nil )
     params = default_params.merge(
         :method => 'smugmug.images.get',
@@ -136,17 +303,20 @@ class Smile::Album < Smile::Base
         :AlbumKey => key,
         :Heavy => 1
     )
-
+    options = Smile::ParamConverter.clean_hash_keys( options )
     params.merge!( options ) if( options )
     
-    json = RestClient.post BASE, params
+    json = RestClient.post( BASE, params ).body
+
     Smile::Photo.from_json( json, session_id )
   end
   
-  # * integer AlbumID
-  # * integer Month
-  # * integer Year
-  # * boolean Heavy (optional)
+  # Pull stats for an Album for a given Month and Year
+  #
+  # @param [optional, Hash] options wow it's a hash
+  # @option options [optional, Fixnum] :month (Date.today.month) month field
+  # @option options [optional, Fixnum] :year (Date.today.year) the year and stuff
+  # @option options [optional, 1 or 0] :heavy more details
   def stats( options =nil )
     params = default_params.merge( 
       :method => 'smugmug.albums.getStats',
@@ -154,10 +324,11 @@ class Smile::Album < Smile::Base
       :month => Date.today.month,
       :year => Date.today.year
     )
+    options = Smile::ParamConverter.clean_hash_keys( options )
     
     params.merge!( options ) if( options )
     
-    json = RestClient.post Smile::Base::BASE, params
+    json = RestClient.post( Smile::Base::BASE, params ).body
     
     json = JSON.parse( json )
     raise json["message"] if json["stat"] == 'fail'
@@ -177,7 +348,8 @@ class Smile::Album < Smile::Base
   # @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 ),
+      options = Smile::ParamConverter.clean_hash_keys( options )
+      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,
@@ -189,7 +361,7 @@ class Smile::Album < Smile::Base
         :x_smug_keywords => options[:keywords],
         :x_smug_latitude => options[:latitude],
         :x_smug_longitude => options[:longitude],
-        :x_smug_altitude => options[:altitude]
+        :x_smug_altitude => options[:altitude] ).body
       
       image = JSON.parse( json )
       if( image && image["Image"] && image["Image"]["id"] )
@@ -202,7 +374,48 @@ class Smile::Album < Smile::Base
     end
   end
   
+  # Want to get rid of that album?  Call this guy and see what gets removed!
+  def delete!
+    params = default_params.merge( 
+      :method => 'smugmug.albums.delete',
+      :AlbumID => album_id
+    )
+    
+    options = Smile::ParamConverter.clean_hash_keys( options )
+    
+    params.merge!( options ) if( options )
+    
+    json = RestClient.post( Smile::Base::BASE, params ).body
+    
+    json = JSON.parse( json )
+    raise json["message"] if json["stat"] == 'fail'
+    
+    album_id = nil
+    album_key = nil
+    nil
+  end
+  
+  # This method will re-sort all the photos inside of the album specified by AlbumID.
+  #
+  # @option options [String] :by valid values: FileName, Caption, DateTime
+  # @option options [String] :direction valid values: ASC, DESC
+  def resort!( options =nil )
+    params = default_params.merge( 
+      :method => 'smugmug.albums.reSort',
+      :AlbumID => album_id
+    )
+    
+    json = RestClient.post( Smile::Base::BASE, params ).body
+    
+    json = JSON.parse( json )
+    raise json["message"] if json["stat"] == 'fail'
+    
+    album_id = nil
+    album_key = nil
+    nil
+  end
+  
   def category
     ['category']
   end
-end
+end

data/lib/smile/param_converter.rb

@@ -3,48 +3,102 @@ module Smile::ParamConverter
   
   def convert( param, value=nil )
     key = nil
-    case param.to_s.downcase.to_sym
+    key = case param.to_s.downcase.to_sym
       when :popular_category
-        key = :popularCategory
+        :popularCategory
       when :geo_all 
-        key = :geoAll
+        :geoAll
       when :geo_keyword 
-        key = :geoKeyword
+        :geoKeyword
       when :geo_search 
-        key = :geoSearch
+        :geoSearch
       when :geo_community
-        key = :geoCommunity 
+        :geoCommunity 
       when :open_search_keyword
-        key = :openSearchKeyword
+        :openSearchKeyword
       when :user_keyword 
-        key = :userkeyword
+        :userkeyword
       when :nickname_recent 
-        key = :nicknameRecent
+        :nicknameRecent
       when :nickname_popular 
-        key = :nicknamePopular
+        :nicknamePopular
       when :user_comments 
-        key = :userComments
+        :userComments
       when :geo_user 
-        key = :geoUser
+        :geoUser
       when :geo_album 
-        key = :geoAlbum
+        :geoAlbum
       when :size
-        key = :Size
         value = value.titlecase
+        :Size
       when :image_count
-        key = :ImageCount
-      when :data
-        key = :Data
-      when :type
-        key = :Type
+        :ImageCount
+      when :data, :type, :description, :keywords, :geography, :position, :header,
+        :clean, :filenames, :password, :public, :external, :protected, :watermarking,
+        :larges, :originals, :comments, :share, :printable, :backprinting
+        param.to_s.upcase.to_sym
       when :image_id
-        key = :ImageID
+        :ImageID
       when :image_key
-        key = :ImageKey
+        :ImageKey
       when :image_count
-        key = :ImageCount
+        :ImageCount
       when :nickname, :nick_name
-        key = :NickName
+        :NickName
+      when :category_id
+        :CategoryID
+      when :sub_categroy_id
+        :SubCategoryID
+      when :album_template_id
+        :AlbumTemplateID
+      when :highlight_id
+        :HighlightID
+      when :exif
+        :EXIF
+      when :square_thumbs
+        :Square_Thumbs
+      when :tempate_id
+        :TemplateID
+      when :sort_method
+        :SortMethod
+      when :sort_direction
+        :SortDirection
+      when :password_hint
+        :PasswordHint
+      when :word_searchable
+        :WordSearchable
+      when :smug_searchable
+        :SmugSearchable
+      when :watermark_id
+        :WatermarkID
+      when :hide_owner
+        :HideOwner
+      when :x_larges, :xlarges
+        :XLarges
+      when :x2_larges, :x2larges
+        :X2Larges
+      when :x3_larges, :x3larges
+        :X3Larges
+      when :can_rank
+        :CanRank
+      when :friend_edit
+        :FriendEdit
+      when :family_edit
+        :FamilyEdit
+      when :color_correction
+        :ColorCorrection
+      when :default_color
+        :DefaultColor
+      when :proof_days
+        :ProofDays
+      when :unsharp_amount
+        :UnsharpAmount
+      when :unsharp_radius
+        :UnsharpRadius
+      when :unsharp_sigma
+        :UnsharpSigma
+      when :community_id
+        :CommunityID
       else
         key = param
     end
@@ -56,8 +110,8 @@ module Smile::ParamConverter
     cleaned_hash ={}
     hash_to_clean.each_pair do |key,value|
       cleaned_hash[convert( key ).first] = value
-    end
+    end if( hash_to_clean )
     cleaned_hash
   end
   
-end
+end

data/lib/smile/photo.rb

@@ -3,8 +3,6 @@
 #  smile
 #  
 #  Created by Zac Kleinpeter on 2009-04-28.
-#  Copyright 2009 Cajun Country. All rights reserved.
-# 
 class Smile::Photo < Smile::Base
   
   class << self
@@ -41,7 +39,7 @@ class Smile::Photo < Smile::Base
       )
       
       params.merge!( options ) if( options )
-      json = RestClient.post Smile::Base::BASE, params
+      json = RestClient.post( Smile::Base::BASE, params ).body
       image_upper = JSON.parse( json )
       image = upper_hash_to_lower_hash( image_upper['Image'] )
       
@@ -64,40 +62,40 @@ class Smile::Photo < Smile::Base
   #
   # Arguments:* 
   # 
-  # String Password optional
-  # String SitePassword optional
-  #
   # Result:* struct "Image" [some, none, or all may be returned]
-  # 
-  # int "id"
-  # String "DateTime"
-  # String "DateTimeOriginal"
-  # String "DateTimeDigitized"
-  # String "Make"
-  # String "Model"
-  # String "ExposureTime"
-  # String "Aperture"
-  # int "ISO"
-  # String "FocalLength"
-  # int "FocalLengthIn35mmFilm"
-  # String "CCDWidth"
-  # String "CompressedBitsPerPixel"
-  # int "Flash"
-  # int "Metering"
-  # int "ExposureProgram"
-  # String "ExposureBiasValue"
-  # int "ExposureMode"
-  # int "LightSource"
-  # int "WhiteBalance"
-  # String "DigitalZoomRatio"
-  # int "Contrast"
-  # int "Saturation"
-  # int "Sharpness"
-  # String "SubjectDistance"
-  # int "SubjectDistanceRange"
-  # int "SensingMethod"
-  # String "ColorSpace"
-  # String "Brightness"
+  #   int "id"
+  #   String "DateTime"
+  #   String "DateTimeOriginal"
+  #   String "DateTimeDigitized"
+  #   String "Make"
+  #   String "Model"
+  #   String "ExposureTime"
+  #   String "Aperture"
+  #   int "ISO"
+  #   String "FocalLength"
+  #   int "FocalLengthIn35mmFilm"
+  #   String "CCDWidth"
+  #   String "CompressedBitsPerPixel"
+  #   int "Flash"
+  #   int "Metering"
+  #   int "ExposureProgram"
+  #   String "ExposureBiasValue"
+  #   int "ExposureMode"
+  #   int "LightSource"
+  #   int "WhiteBalance"
+  #   String "DigitalZoomRatio"
+  #   int "Contrast"
+  #   int "Saturation"
+  #   int "Sharpness"
+  #   String "SubjectDistance"
+  #   int "SubjectDistanceRange"
+  #   int "SensingMethod"
+  #   String "ColorSpace"
+  #   String "Brightness"
+  #
+  # @param [options,Hash] options ruby and hashes are like.......
+  # @option options [String] :password a password field
+  # @option options [String] :site_password site password field
   def details( options =nil )
     params = default_params.merge(
       :method => "smugmug.images.getEXIF",
@@ -106,7 +104,7 @@ class Smile::Photo < Smile::Base
     )
     
     params.merge!( options ) if( options )
-    json = RestClient.post Smile::Base::BASE, params
+    json = RestClient.post( Smile::Base::BASE, params ).body
     
     json = JSON.parse( json )
     raise json["message"] if json["stat"] == 'fail'
@@ -165,7 +163,7 @@ class Smile::Photo < Smile::Base
     )
     
     params.merge!( options ) if( options )
-    json = RestClient.post Smile::Base::BASE, params
+    json = RestClient.post( Smile::Base::BASE, params ).body
     
     json = JSON.parse( json )
     raise json["message"] if json["stat"] == 'fail'
@@ -216,7 +214,7 @@ class Smile::Photo < Smile::Base
     )
     
     params.merge!( options ) if( options )
-    json = RestClient.post Smile::Base::BASE, params
+    json = RestClient.post( Smile::Base::BASE, params ).body
     
     json = JSON.parse( json )
     raise json["message"] if json["stat"] == 'fail'
@@ -230,4 +228,4 @@ class Smile::Photo < Smile::Base
   def album
     Smile::Album.find( :AlbumID => album_id, :AlbumKey => album_key )
   end
-end
+end

data/lib/smile/smug.rb

@@ -21,7 +21,7 @@ module Smile
         :Password => pass
       )
 
-      json = RestClient.post( BASE, params )
+      json = RestClient.post( BASE, params ).body
       result = JSON.parse( json )
       
       self.session_id = result["Login"]["Session"]["id"]
@@ -39,7 +39,7 @@ module Smile
         :method => 'smugmug.login.anonymously'
       )
 
-      json = RestClient.post( BASE, params )
+      json = RestClient.post( BASE, params ).body
       result = JSON.parse( json )
       self.session_id = result["Login"]["Session"]["id"]
       result
@@ -53,7 +53,7 @@ module Smile
         :method => 'smugmug.logout'
       )
 
-      RestClient.post( BASE, params )
+      RestClient.post( BASE, params ).body
     end
 
     
@@ -77,12 +77,13 @@ module Smile
         :heavy => 1
       )      
 
+      options = Smile::ParamConverter.clean_hash_keys( options )
       params = params.merge( options ) if( options )
-      json = RestClient.post BASE, params
-      
+      json = RestClient.post( BASE, params ).body
+
       Smile::Album.from_json( json, session_id )
     rescue
       nil
     end
   end
-end
+end

data/lib/smile.rb

@@ -1,4 +1,4 @@
-require 'activesupport'
+require 'active_support'
 require 'restclient'
 require 'ostruct'
 require 'lib/smile/base'
@@ -46,7 +46,7 @@ module Smile
       url_params << "#{key.to_s}=#{ CGI.escape( value ) }"
     end
     
-    RestClient.get( url + url_params.join( "&" ) )
+    RestClient.get( url + url_params.join( "&" ) ).body
   end
   private( :base_feed )
   

data/smile.gemspec

@@ -1,23 +1,29 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{smile}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["cajun"]
-  s.date = %q{2009-08-25}
+  s.date = %q{2010-04-17}
+  s.default_executable = %q{smile}
   s.email = %q{zac@kleinpeter.org}
+  s.executables = ["smile"]
   s.extra_rdoc_files = [
     "LICENSE",
      "README.rdoc"
   ]
   s.files = [
-    ".yardoc",
+    ".gitignore",
      "LICENSE",
      "README.rdoc",
      "Rakefile",
      "VERSION.yml",
+     "config/metric_fu_config.rb",
      "lib/smile.rb",
      "lib/smile/album.rb",
      "lib/smile/base.rb",
@@ -32,7 +38,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.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Simple API for talking to SmugMug}
   s.test_files = [
     "test/smile_test.rb",

data/test/smile_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require File.dirname(__FILE__) + '/test_helper'
 
 class SmileTest < Test::Unit::TestCase
   def setup
@@ -12,20 +12,20 @@ class SmileTest < Test::Unit::TestCase
   
   def test_have_albums
     assert_nothing_raised(Exception) do
-      assert_not_nil( @smug.albums( :NickName => 'kleinpeter' ) )
+      assert_not_nil( @smug.albums( :nick_name => 'kleinpeter' ) )
     end
   end
   
   def test_have_photos
     assert_nothing_raised(Exception) do
-      album = @smug.albums( :NickName => 'kleinpeter' ).first
+      album = @smug.albums( :nick_name => 'kleinpeter' ).first
       assert_not_nil( album.photos )
     end
   end
   
   def test_photo_has_album
     assert_nothing_raised(Exception) do
-      album = @smug.albums( :NickName => 'kleinpeter' ).first
+      album = @smug.albums( :nick_name => 'kleinpeter' ).first
       photo = album.photos.first
       assert_equal( album.album_id, photo.album.album_id )
       assert_equal( album.key, photo.album.key )
@@ -34,7 +34,7 @@ class SmileTest < Test::Unit::TestCase
   
   def test_photo_has_album_has_photo
     assert_nothing_raised(Exception) do
-      album = @smug.albums( :NickName => 'kleinpeter' ).first
+      album = @smug.albums( :nick_name => 'kleinpeter' ).first
       photo = album.photos.first
       alt_photo = photo.album.photos.first
       
@@ -45,14 +45,14 @@ class SmileTest < Test::Unit::TestCase
   # NOTE have to be logged in to test this one
   # def test_album_stats
   #   assert_nothing_raised(Exception) do
-  #     album = @smug.albums( :NickName => 'kleinpeter' ).first
+  #     album = @smug.albums( :nick_name => 'kleinpeter' ).first
   #     assert_not_nil( album.stats )
   #   end
   # end
   
   def test_photo_extras
     assert_nothing_raised(Exception) do
-      album = @smug.albums( :NickName => 'kleinpeter' ).first
+      album = @smug.albums( :nick_name => 'kleinpeter' ).first
       photo = album.photos.first
       
       assert_not_nil( photo.details )

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: smile
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - cajun
@@ -9,44 +14,49 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-25 00:00:00 -05:00
-default_executable: 
+date: 2010-04-17 00:00:00 -05:00
+default_executable: smile
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: 
 email: zac@kleinpeter.org
-executables: []
-
+executables: 
+- smile
 extensions: []
 
 extra_rdoc_files: 
 - LICENSE
 - README.rdoc
 files: 
-- .yardoc
+- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
 - VERSION.yml
+- config/metric_fu_config.rb
 - lib/smile.rb
 - lib/smile/album.rb
 - lib/smile/base.rb
@@ -69,18 +79,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: cajun-gems
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Simple API for talking to SmugMug