smile 0.4.3 → 0.4.4

data/.gitignore

@@ -3,6 +3,8 @@
 *.swo
 *.jpg
 .DS_Store
+.rvmrc
+.bundle/
 
 # Dir
 tmp/
@@ -11,6 +13,7 @@ scratch_directory/
 rdoc/
 pkg/
 doc/
+gems/
 
 *.gem
 .yardoc

data/Gemfile

@@ -0,0 +1,3 @@
+source 'http://rubygems.org'
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,50 @@
+PATH
+  remote: .
+  specs:
+    smile (0.4.4)
+      activesupport (>= 3.0)
+      i18n
+      rest-client
+      yajl-ruby (>= 0.7.8)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (3.0.0)
+    diff-lcs (1.1.2)
+    formatador (0.0.15)
+    gestalt (0.0.11)
+      formatador (>= 0.0.12)
+    i18n (0.4.1)
+    mime-types (1.16)
+    rest-client (1.6.1)
+      mime-types (>= 1.16)
+    rr (1.0.0)
+    rspec (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
+      rspec-mocks (~> 2.0.1)
+    rspec-core (2.0.1)
+    rspec-expectations (2.0.1)
+      diff-lcs (>= 1.1.2)
+    rspec-mocks (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
+    shindo (0.1.6)
+      formatador (>= 0.0.14)
+      gestalt (>= 0.0.11)
+    yajl-ruby (0.7.8)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (>= 3.0)
+  bundler (>= 1.0.0)
+  i18n
+  rest-client
+  rr
+  rspec
+  shindo
+  smile!
+  yajl-ruby (>= 0.7.8)

data/README.rdoc

@@ -62,7 +62,3 @@ This gem wraps the 1.2.0 interface.
 * Update Documentation ( getting there.  it's being published on rdoc.info now http://rdoc.info/projects/cajun/smile )
 * Plugin in Cucumber
 
-
-== Copyright
-
-Copyright (c) 2009 cajun. See LICENSE for details.

data/Rakefile

@@ -1,45 +1,11 @@
-require 'rubygems'
-require 'rake'
-require 'date'
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
-#############################################################################
-##
-## Helper functions
-##
-##############################################################################
-
-def name
-  @name ||= Dir['*.gemspec'].first.split('.').first
-end
-
-def version
-  line = File.read("lib/#{name}.rb")[/^\s*VERSION\s*=\s*.*/]
-  line.match(/.*VERSION\s*=\s*['"](.*)['"]/)[1]
-end
-
-def date
-  Date.today.to_s
-end
-
-def rubyforge_project
-  name
-end
-
-def gemspec_file
-  "#{name}.gemspec"
-end
-
-def gem_file
-  "#{name}-#{version}.gem"
-end
-
-def replace_header(head, header_name)
-  head.sub!(/(\.#{header_name}\s*= ').*'/) { "#{$1}#{send(header_name)}'"}
-end
+task :default => :test
 
 desc "Open an irb session preloaded with this library"
 task :console do
-    sh "irb -rubygems -r ./lib/#{name}.rb"
+    sh "irb -rubygems -r ./lib/smile.rb"
 end
 
 desc "Run Shindo rake tasks"
@@ -47,39 +13,3 @@ task :test do
   sh "shindo #{Dir.glob( 'test/**/*_test.rb' ).join(' ')}"
 end
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "smile"
-    gem.summary = %Q{Simple API for talking to SmugMug}
-    gem.email = "zac@kleinpeter.org"
-    gem.homepage = "http://github.com/cajun/smile"
-    gem.authors = ["cajun"]
-    gem.files << "lib/**/*"
-    gem.add_dependency( 'rest-client' )
-    gem.add_dependency( 'activesupport' )
-    gem.rubyforge_project = 'cajun-gems'
-    
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
-end
-
-task :default => :test 
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  if File.exist?('VERSION.yml')
-    config = YAML.load(File.read('VERSION.yml'))
-    version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
-  else
-    version = ""
-  end
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "smile #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-

data/lib/smile.rb

@@ -1,6 +1,10 @@
-require 'active_support'
+require 'rubygems'
+require 'bundler/setup'
+require 'active_support/core_ext/string/inflections'
 require 'restclient'
 require 'ostruct'
+require 'singleton'
+require 'logger'
 require File.dirname(__FILE__) + '/smile/session'
 require File.dirname(__FILE__) + '/smile/common'
 require File.dirname(__FILE__) + '/smile/base'
@@ -12,11 +16,11 @@ require File.dirname(__FILE__) + '/smile/exception'
 require File.dirname(__FILE__) + '/smile/json'
 require 'cgi'
 require 'rss'
-require 'json'
+require 'yajl'
 
 module Smile
   module_function
-  
+
   # Login to SmugMug using an anonymously account
   # This will allow you to execute many functions, but no user specific functions
   #
@@ -26,7 +30,7 @@ module Smile
     smug.auth_anonymously
     smug
   end
-  
+
   # Login to SmugMug using a specific user account.
   #
   # @param [String] email The username ( e-mail address ) for the SmugMug account
@@ -38,24 +42,24 @@ module Smile
     smug.auth( email, password )
     smug
   end
-  
-  
+
+
   def base_feed( options={} )
     options.merge!( :format => 'rss' )
     url = "http://api.smugmug.com/hack/feed.mg?"
     url_params =[]
     options.each_pair do |k,value|
       key, value = Smile::ParamConverter.convert( k, value )
-      
+
       url_params << "#{key.to_s}=#{ CGI.escape( value ) }"
     end
-    
+
     RestClient.get( url + url_params.join( "&" ) ).body
   end
   private( :base_feed )
-  
+
   # Search SmugMug for pics.  This search is slower than the others, but returns Smile::Photo objects
-  # 
+  #
   # @param [String] data This is the search term that you want to use
   # @param [optional, Hash] options Hash of options for the search method
   # @option options [optional, String] :keyword override the keyword search
@@ -73,20 +77,17 @@ module Smile
   # @option options [optional, String] :user_comments Use term nickname
   # @option options [optional, String] :geo_user Use term nickname
   # @option options [optional, String] :geo_album Use term nickname
-  # 
-  # @return [Array<Smile::Photo>] Smile::Photo objects will be returned.  This take longer due to
+  #
   # pulling more details from every photo.
   def search( data, options={} )
-    rss = search_rss( data, options )
-    
-    rss.items.map do |item| 
+    rss.items.map do |item|
       image_id, image_key = item.link.split('/').last.split('#').last.split('_')
       Smile::Photo.find( :image_id => image_id, :image_key => image_key )
     end
   end
-  
+
   # Search SmugMug for pics.  This search is slower than the others, but returns Smile::Photo objects
-  # 
+  #
   # @param [String] data This is the search term that you want to use
   # @param [optional, Hash] options Hash of options for the search method
   # @option options [optional, String] :keyword override the keyword search
@@ -104,15 +105,15 @@ module Smile
   # @option options [optional, String] :user_comments Use term nickname
   # @option options [optional, String] :geo_user Use term nickname
   # @option options [optional, String] :geo_album Use term nickname
-  # 
+  #
   # @return [Array<Smile::Photo>] RSS feed from the RSS::Parser.parse method
   def search_rss( data, options={} )
     raw = search_raw( data, options )
     RSS::Parser.parse( raw, false )
   end
-  
+
   # Raw feed from the SmugMug data feeds
-  # 
+  #
   # @param [String] data This is the search term that you want to use
   # @param [optional, Hash] options Hash of options for the search method
   # @option options [optional, String] :keyword override the keyword search
@@ -130,7 +131,7 @@ module Smile
   # @option options [optional, String] :user_comments Use term nickname
   # @option options [optional, String] :geo_user Use term nickname
   # @option options [optional, String] :geo_album Use term nickname
-  # 
+  #
   # @return [RestClientResponse] The response from a RestClient.get request
   def search_raw( data, options={} )
     options.merge!( :type => 'keyword', :data => data )

data/lib/smile/base.rb

@@ -1,20 +1,20 @@
-# 
+#
 #  base.rb
 #  smile
-#  
+#
 #  Created by Zac Kleinpeter on 2009-04-28.
 #  Copyright 2009 Cajun Country. All rights reserved.
-# 
+#
 module Smile
-  class Base 
+  class Base
     include Smile::Common
     attr_accessor :attributes
-    
+
     class << self
       include Smile::Common
 
       def configure
-        yield( session ) 
+        yield( session )
       end
 
       def clear_config!
@@ -27,7 +27,11 @@ module Smile
     end
 
     def method_missing( name, *args )
-      @attributes.send(name,args)
+      if args.nil?
+        @attributes.send(name,args)
+      else
+        @attributes.send(name)
+      end
     end
   end
 end

data/lib/smile/json.rb

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

data/lib/smile/param_converter.rb

@@ -34,7 +34,7 @@ module Smile::ParamConverter
         :AlbumID
       else
         key = param
-    end
+    end unless param.nil?
     
     [ key, value ]
   end

data/lib/smile/photo.rb

@@ -15,7 +15,7 @@ class Smile::Photo < Smile::Base
         image.merge!( :album_key => image["album"]["key"] )
         image.merge!( :album_id => image["album"]["id"] )
         image.delete( 'album' )
-
+                
         Smile::Photo.new( image )
       end
     end

data/lib/smile/version.rb

@@ -0,0 +1,3 @@
+module Smile
+    VERSION = "0.4.4"
+end

data/smile.gemspec

@@ -1,66 +1,43 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
+require File.expand_path("../lib/smile/version", __FILE__)
 
 Gem::Specification.new do |s|
-  s.name = %q{smile}
-  s.version = "0.4.3"
+  s.name     = %q{smile}
+  s.version  = Smile::VERSION
+  s.platform = Gem::Platform::RUBY
+  s.authors  = ["cajun"]
+  s.email    = %q{zac@kleinpeter.org}
+  s.date     = %q{2010-07-09}
+  s.homepage = %q{http://github.com/cajun/smile}
+  s.summary  = %q{Simple API for talking to SmugMug}
+
+  s.rdoc_options = ["--charset=UTF-8"]
+
+  s.required_rubygems_version = ">= 1.3.6"
+  s.rubyforge_project = 'smile'
+
+  s.add_dependency 'rest-client', ">= 0"
+  s.add_dependency 'activesupport', ">= 3.0"
+  s.add_dependency 'i18n'
+  s.add_dependency 'yajl-ruby', '>= 0.7.8'
+
+  s.add_development_dependency "bundler", ">= 1.0.0"
+  s.add_development_dependency "shindo"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "rr"
+
+
+  s.files        = `git ls-files`.split("\n")
+ # s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
+  s.require_path = 'lib'
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["cajun"]
-  s.date = %q{2010-07-09}
-  s.default_executable = %q{smile}
-  s.email = %q{zac@kleinpeter.org}
-  s.executables = ["smile"]
   s.extra_rdoc_files = [
     "LICENSE",
      "README.rdoc"
   ]
-  s.files = [
-    ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION.yml",
-     "lib/smile.rb",
-     "lib/smile/album.rb",
-     "lib/smile/base.rb",
-     "lib/smile/common.rb",
-     "lib/smile/exception.rb",
-     "lib/smile/json.rb",
-     "lib/smile/param_converter.rb",
-     "lib/smile/photo.rb",
-     "lib/smile/session.rb",
-     "lib/smile/smug.rb",
-     "smile.gemspec",
-     "test/smile_test.rb",
-     "test/test_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/cajun/smile}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{cajun-gems}
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Simple API for talking to SmugMug}
+
   s.test_files = [
     "test/smile_test.rb",
      "test/test_helper.rb"
   ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    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
-      s.add_dependency(%q<rest-client>, [">= 0"])
-      s.add_dependency(%q<activesupport>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<rest-client>, [">= 0"])
-    s.add_dependency(%q<activesupport>, [">= 0"])
-  end
 end

data/test/smile_test.rb

@@ -7,15 +7,22 @@ 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 = false
     end
 
     @smug = Smile::Smug.new
     @smug.auth_anonymously
   end
 
-  tests 'security checks', ['security'] do
-    test( 'testing basic auth anonymously' ) { @smug.auth_anonymously }
+  tests 'security checks', 'security' do
+    test( 'testing basic auth anonymously' ) do
+      begin
+        @smug.auth_anonymously
+        true
+      rescue
+        false
+      end
+    end
 
     test 'InvalidLogin will get raised on foo bar login' do
       all_good = false
@@ -29,12 +36,12 @@ Shindo.tests 'checking all the cool things smile can do'  do
     end
   end
 
-  tests 'album and photo checks' do
-    test( 'checking to see if we have some albums', ['album']) do 
-      @smug.albums( :nick_name => 'kleinpeter' ) 
+  tests 'album and photo checks', 'album', 'photos' do
+    test( 'checking to see if we have some albums') do 
+      !@smug.albums( :nick_name => 'kleinpeter' ).empty?
     end
     
-    test( 'we can reload albums from the site', ['album', 'reload']) do 
+    test( 'we can reload albums from the site') do 
       album = @smug.albums( :nick_name => 'kleinpeter' ).first
       old_title = album.title
       album.title = 'foo'
@@ -42,19 +49,19 @@ Shindo.tests 'checking all the cool things smile can do'  do
       old_title == album.title
     end
 
-    test 'checking to see if we have photos in the albums', ['album'] do 
+    test 'checking to see if we have photos in the albums' do 
       album = @smug.albums( :nick_name => 'kleinpeter' ).first
       !album.photos.empty?
     end
 
-    test 'a photo is connected to its album', ['photo'] do
+    test 'a photo is connected to its album'  do
       album = @smug.albums( :nick_name => 'kleinpeter' ).first
       photo = album.photos.first
       album.album_id == photo.album.album_id && 
       album.key == photo.album.key 
     end
 
-    test( 'we can reload photos from the site', ['photo', 'reload']) do 
+    test( 'we can reload photos from the site') do 
       album = @smug.albums( :nick_name => 'kleinpeter' ).first
       photo = album.photos.first
       old_url = photo.tinyurl
@@ -64,9 +71,9 @@ Shindo.tests 'checking all the cool things smile can do'  do
     end
   end
   
-  tests 'confirm configuration settings', ['config'] do
+  tests 'confirm configuration settings', 'config' do
     test 'there is a default api key' do
-      Smile::Base.session.api_key
+      !Smile::Base.session.api_key.nil?
     end
 
     test 'we can set the api key in the config' do
@@ -74,12 +81,12 @@ Shindo.tests 'checking all the cool things smile can do'  do
         config.api_key = 'foo'
       end
 
-      Smile::Base.session.api_key
+      !Smile::Base.session.api_key.nil?
     end
   end
 
   tests 'there is a logger and it does stuff' do 
-    test 'the logger is off by default', ['log'] do
+    test 'the logger is off by default' do
       Smile::Base.clear_config!
       !Smile::Base.logger_on?
     end
@@ -93,5 +100,60 @@ Shindo.tests 'checking all the cool things smile can do'  do
       @@error_got_called
     end
   end
+
+  tests 'looking at the params that we have to convert', ['convert'] do
+
+    test 'classify params with first letter lower'  do
+      param = [
+        :popular_category, :geo_all, :geo_keyword,
+        :geo_search, :geo_community, :open_search_keyword, :user_keyword,
+        :nickname_recent, :nickname_popular, :user_comments, :geo_user,
+        :geo_albums ]
+
+      correct_param = [
+        :popularCategory, :geoAll, :geoKeyword,
+        :geoSearch, :geoCommunity, :openSearchKeyword, :userKeyword,
+        :NicknameRecent, :NicknamePopular, :userComments, :geoUser,
+        :geoAlbums ]
+      
+      failed_params = []
+      correct_param.each_with_index do |correct,index|
+        failed_params << param[index] if( correct != Smile::ParamConverter.convert( param[index] ) )
+      end
+
+      failed_params.empty?
+    end
+
+=begin
+      when :size
+        value = value.titlecase
+        :Size
+      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, :image_key, :image_count, :nick_name, :category_id,
+        :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
+        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
+    
+    [ key, value ]
+  end
+=end 
+  end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: smile
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 4
-  - 3
-  version: 0.4.3
+  - 4
+  version: 0.4.4
 platform: ruby
 authors: 
 - cajun
@@ -16,7 +16,7 @@ bindir: bin
 cert_chain: []
 
 date: 2010-07-09 00:00:00 -05:00
-default_executable: smile
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client
@@ -36,6 +36,21 @@ dependencies:
   name: activesupport
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: i18n
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -45,11 +60,85 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: yajl-ruby
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 7
+        - 8
+        version: 0.7.8
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: shindo
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rr
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id008
 description: 
 email: zac@kleinpeter.org
-executables: 
-- smile
+executables: []
+
 extensions: []
 
 extra_rdoc_files: 
@@ -57,10 +146,13 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .gitignore
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
 - VERSION.yml
+- bin/smile
 - lib/smile.rb
 - lib/smile/album.rb
 - lib/smile/base.rb
@@ -71,10 +163,10 @@ files:
 - lib/smile/photo.rb
 - lib/smile/session.rb
 - lib/smile/smug.rb
+- lib/smile/version.rb
 - smile.gemspec
 - test/smile_test.rb
 - test/test_helper.rb
-- bin/smile
 has_rdoc: true
 homepage: http://github.com/cajun/smile
 licenses: []
@@ -98,13 +190,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 23
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
-rubyforge_project: cajun-gems
+rubyforge_project: smile
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3