flickr_fu 0.3.1 → 0.3.2

data/Gemfile

@@ -3,8 +3,6 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
-gemspec
-
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
@@ -15,3 +13,8 @@ group :development do
   gem "rdoc"
 #  gem "rcov", ">= 0"
 end
+
+gem "mime-types"
+gem "xml-magic"
+
+#gemspec

data/Gemfile.lock

@@ -1,11 +1,3 @@
-PATH
-  remote: .
-  specs:
-    flickr_fu (0.3.1)
-      flickr_fu
-      mime-types (> 0.0.0)
-      xml-magic (> 0.0.0)
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -35,7 +27,8 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1)
-  flickr_fu!
   jeweler (~> 1.6.4)
+  mime-types
   rdoc
   rspec
+  xml-magic

data/README.md

@@ -0,0 +1,146 @@
+# flickr-fu
+
+## Contact
+
+  Author: Ben Wyrosdick
+  Email: ben [at] commonthread.com
+  Issue tracker: https://github.com/commonthread/flickr_fu/issues
+  Code Repository: http://github.com/commonthread/flickr_fu/tree/master
+
+## Getting Started
+
+  You need to first get an API key as detailed here:
+
+  http://www.flickr.com/services/api/misc.api_keys.html
+  
+## Installation
+
+  <code>sudo gem install flickr-fu</code>
+
+## Documentation
+
+  Documentation can be found here:
+  http://rubydoc.info/gems/flickr_fu/
+
+### Example flickr.yml
+<pre>
+--- !map:HashWithIndifferentAccess
+key: "YOUR KEY"
+secret: "YOUR SECRET"
+token_cache: "token_cache.yml"
+</pre>
+
+### Authorization
+
+To authorise your application to access Flickr using your API key you will need to access a specific URL.
+  
+To generate this URL run the following and when presented with the URL access it from your browser. Confirm the application has permission at the level you have specified.
+  
+Note that flickr has different types of keys. If you use one for a webapplication, which is most likely, you need to define a callback and somehow make sure that you connect the parameter :frob that flickr send via the callback is assigned  to the right user account. The best way to do this is to loop over all the current user's flickr accounts and try flickr.auth.token with the :frob.
+  
+Finally, cache the token (this will create the token cache file)
+  
+If you have an invalid API key you will see errors such as:
+  
+<code>"100: Invalid API Key"</code>
+  
+If you don't follow the process below to authorise your application you will see errors such as:
+  
+<pre>
+"98: Login failed / Invalid auth token" or 
+"99: User not logged in / Insufficient permissions"
+</pre>
+  
+### Authorization Example for non-webapplication
+
+<pre>
+require 'flickr_fu'
+ 
+flickr = Flickr.new('flickr.yml')
+  
+puts "visit the following url, then click <enter> once you have authorized:"
+
+ # request write permissions
+puts flickr.auth.url(:write)
+  
+gets
+  
+flickr.auth.cache_token
+</pre>
+
+### Authorization Example for a webapplication
+
+flickr.auth.token also contains the nsid and username, this example only stores the token and no other userdata.
+
+<pre>
+require 'flickr_fu'
+  class FlickrController < ActionController::Base
+    def create
+      flickr = Flickr.new('flickr.yml')
+      redirect_to flickr.auth.url(:write)
+    end
+    def flickr_callback
+      flickr = Flickr.new('flickr.yml')
+      flickr.auth.frob = params[:frob]
+      current_user.update_attribute :flickr_token, flickr.auth.token.token
+    end
+    def something_else_with_flickr
+      flickr = Flickr.new(YAML.load_file('flickr.yml').merge(:token => current_user.flickr_token))
+      # now you have full access on the user's data :)
+    end
+end
+</pre>
+
+### Search Example
+
+<pre>
+require 'flickr_fu'
+
+flickr = Flickr.new('flickr.yml')
+
+photos = flickr.photos.search(:tags => 'ruby-flickr')
+
+puts "found #{photos.size} photo(s)"
+
+photos.each do |photo|
+    puts photo.title
+    puts photo.description unless [nil, ''].include?(photo.description)
+    [:square, :thumbnail, :small, :medium, :large, :original].each do |size|
+      puts "#{size}: #{photo.url(size)}"
+    end
+    puts "comments: #{photo.comments.size}"
+    photo.comments.each do |comment|
+      intro = "#{comment.author_name} says - "
+      puts "#{intro}\"#{comment.comment.gsub("\n", "\n"+(" "*intro.length))}\""
+    end
+    puts "notes: #{photo.notes.size}"
+    photo.notes.each do |note|
+      puts "[#{note.x},#{note.y} ~ #{note.width}x#{note.height}] - \"#{note.note}\""
+    end
+    puts
+    puts
+  end
+</pre>
+  
+### Another Search Example
+
+If searching for photos by user id then you need to specify the 'alias' - without intervention this is usually set by Flickr and is an alphanumeric string. 
+  
+To find out the user id for a given user, you can use the tool at:
+
+http://idgettr.com/
+
+And replace the line in the above sample to query on user id:
+  
+<code>photos = flickr.photos.search(:user_id => 'your_user_id_here')</code>
+
+## Patch Contributers
+
+- Chris Ledet
+- Maciej Biłas
+- Mike Perham
+- Chris Anderton
+- Luke Francl
+- Thomas R. Koll
+- P. Mark Anderson
+- Josh Nichols

data/Rakefile

@@ -22,8 +22,8 @@ Jeweler::Tasks.new do |s|
   s.authors = ["Ben Wyrosdick", "Maciej Bilas"]
   s.rdoc_options = ["--main", "README"]
   s.extra_rdoc_files = ["README"]
-  s.add_dependency("mime-types", ["> 0.0.0"])
-  s.add_dependency("xml-magic", ["> 0.0.0"])
+#  s.add_dependency("mime-types", ["> 0.0.0"])
+#  s.add_dependency("xml-magic", ["> 0.0.0"])
 s.files.exclude("spec/spec.local.opts")
 end
 Jeweler::RubygemsDotOrgTasks.new

data/VERSION.yml

@@ -1,5 +1,5 @@
 ---
 :major: 0
 :minor: 3
-:patch: 1
-:build: !!null 
+:patch: 2
+:build: 

data/flickr_fu.gemspec

@@ -5,21 +5,18 @@
 
 Gem::Specification.new do |s|
   s.name = "flickr_fu"
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Wyrosdick", "Maciej Bilas"]
-  s.date = "2012-01-17"
+  s.date = "2012-08-11"
   s.description = "Provides a ruby interface to flickr via the REST api"
   s.email = "ben@commonthread.com"
-  s.extra_rdoc_files = [
-    "README"
-  ]
   s.files = [
     "Gemfile",
     "Gemfile.lock",
     "LICENSE",
-    "README",
+    "README.md",
     "Rakefile",
     "VERSION.yml",
     "flickr_fu.gemspec",
@@ -56,6 +53,7 @@ Gem::Specification.new do |s|
     "spec/fixtures/flickr/photos/get_sizes-0.xml",
     "spec/fixtures/flickr/photos/get_sizes-1.xml",
     "spec/fixtures/flickr/photos/licenses/get_info.xml",
+    "spec/fixtures/flickr/photosets/create-0.xml",
     "spec/fixtures/flickr/photosets/get_list-0.xml",
     "spec/fixtures/flickr/photosets/get_photos-0.xml",
     "spec/fixtures/flickr/test/echo-0.xml",
@@ -88,61 +86,34 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/commonthread/flickr_fu"
   s.rdoc_options = ["--main", "README"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.24"
   s.summary = "Provides a ruby interface to flickr via the REST api"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<flickr_fu>, [">= 0"])
+      s.add_runtime_dependency(%q<mime-types>, [">= 0"])
+      s.add_runtime_dependency(%q<xml-magic>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<rdoc>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<rdoc>, [">= 0"])
-      s.add_runtime_dependency(%q<mime-types>, ["> 0.0.0"])
-      s.add_runtime_dependency(%q<xml-magic>, ["> 0.0.0"])
     else
-      s.add_dependency(%q<flickr_fu>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<rdoc>, [">= 0"])
+      s.add_dependency(%q<mime-types>, [">= 0"])
+      s.add_dependency(%q<xml-magic>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<rdoc>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<rdoc>, [">= 0"])
-      s.add_dependency(%q<mime-types>, ["> 0.0.0"])
-      s.add_dependency(%q<xml-magic>, ["> 0.0.0"])
     end
   else
-    s.add_dependency(%q<flickr_fu>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<rdoc>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<rdoc>, [">= 0"])
+    s.add_dependency(%q<mime-types>, [">= 0"])
+    s.add_dependency(%q<xml-magic>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<rdoc>, [">= 0"])
-    s.add_dependency(%q<mime-types>, ["> 0.0.0"])
-    s.add_dependency(%q<xml-magic>, ["> 0.0.0"])
   end
 end
 

data/lib/flickr/auth.rb

@@ -7,43 +7,47 @@ class Flickr::Auth < Flickr::Base
   def frob
     @frob ||= get_frob
   end
-  
+
   # set the frob
   def frob= frob
     @frob=frob
   end
 
   # generates the authorization url to allow access to a flickr account.
-  # 
+  #
   # Params
   # * perms (Optional)
   #     sets the permision level to grant on the flickr account.
   #       :read - permission to read private information (DEFAULT)
   #       :write - permission to add, edit and delete photo metadata (includes 'read')
   #       :delete - permission to delete photos (includes 'write' and 'read')
-  # 
-  def url(perms = :read)
-    options = {:api_key => @flickr.api_key, :perms => perms, :frob => self.frob}
+  # * options (Optional)
+  #     additional parameters to pass to flickr.  The most common use-case for
+  #     this is to pass the (undocumented) :extra parameter that is returned
+  #     back from flickr during the callback.
+  #
+  def url(perms = :read, options = {})
+    options.merge!(:api_key => @flickr.api_key, :perms => perms, :frob => self.frob)
     @flickr.sign_request(options)
-    Flickr::Base::AUTH_ENDPOINT + "?" + options.collect{|k,v| "#{k}=#{v}"}.join('&')
+    Flickr::Base::AUTH_ENDPOINT + "?" + options.collect{|k,v| "#{k}=#{CGI.escape(v.to_s)}"}.join('&')
   end
 
   # gets the token object for the current frob
-  # 
+  #
   # Params
   # * pass_through (Optional)
   #     Boolean value that determines if a call will be made to flickr to find a taken for the current frob if empty
-  # 
+  #
   def token(pass_through = true)
     @token ||= get_token(pass_through) rescue nil
   end
 
   # saves the current token to the cache file if token exists
-  # 
+  #
   # Param
   # * filename (Optional)
   #     filename of the cache file. defaults to the file passed into Flickr.new
-  # 
+  #
   def cache_token(filename = @flickr.token_cache)
     if filename and self.token
       cache_file = File.open(filename, 'w+')
@@ -73,4 +77,4 @@ class Flickr::Auth < Flickr::Base
       Token.new(:token => rsp.auth.token.to_s, :permisions => rsp.auth.perms.to_s, :user_id => rsp.auth.user[:nsid], :username => rsp.auth.user[:username], :user_real_name => rsp.auth.user[:fullname])
     end
   end
-end
+end

data/lib/flickr/photo.rb

@@ -30,9 +30,13 @@ class Flickr::Photos::Photo
   #  * size (Optional)
   #    the size of the size instance to return.  Optional sizes are:
   #       :square - square 75x75
+  #       :large_square - square 150x150
   #       :thumbnail - 100 on longest side
   #       :small - 240 on longest side
+  #       :small_320 - 320 on longest side
   #       :medium - 500 on longest side
+  #       :medium_640 - 640 on longest side
+  #       :medium_800 - 800 on longest side
   #       :large - 1024 on longest side (only exists for very large original images)
   #       :original - original image, either a jpg, gif or png, depending on source format
   # Examples
@@ -48,9 +52,13 @@ class Flickr::Photos::Photo
   # * size (Optional)
   #     the size of the image to return. Optional sizes are:
   #       :square - square 75x75
+  #       :large_square - square 150x150
   #       :thumbnail - 100 on longest side
   #       :small - 240 on longest side
+  #       :small_320 - 320 on longest side
   #       :medium - 500 on longest side
+  #       :medium_640 - 640 on longest side
+  #       :medium_800 - 800 on longest side
   #       :large - 1024 on longest side (only exists for very large original images)
   #       :original - original image, either a jpg, gif or png, depending on source format
   #
@@ -86,10 +94,14 @@ class Flickr::Photos::Photo
   #     name of the new file omiting the extention (ex. photo_1)
   # * size (Optional)
   #     the size of the image to return. Optional sizes are:
-  #       :small - square 75x75
+  #       :square - square 75x75
+  #       :large_square - square 150x150
   #       :thumbnail - 100 on longest side
   #       :small - 240 on longest side
+  #       :small_320 - 320 on longest side
   #       :medium - 500 on longest side
+  #       :medium_640 - 640 on longest side
+  #       :medium_800 - 800 on longest side
   #       :large - 1024 on longest side (only exists for very large original images)
   #       :original - original image, either a jpg, gif or png, depending on source format
   # 
@@ -106,7 +118,14 @@ class Flickr::Photos::Photo
       f
     end
   end
-  
+ 
+  # Delete this photo
+  #
+  def delete()
+    @flickr.send_request('flickr.photos.delete', {:photo_id => self.id}, :post)
+    true
+  end
+ 
   # Add tags to a photo.
   # 
   # Params
@@ -282,9 +301,13 @@ class Flickr::Photos::Photo
   def size_key(size)
     case size.to_sym
     when :square then 's'
+    when :large_square then 'q'
     when :thumb, :thumbnail then 't'
     when :small then 'm'
+    when :small_320 then 'n'
     when :medium then ''
+    when :medium_640 then 'z'
+    when :medium_800 then 'c'
     when :large then 'b'
     when :original then 'o'
     else ''

data/spec/fixtures/flickr/photosets/create-0.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<photoset id="1234" url="http://www.flickr.com/photos/bees/sets/1234/" />

data/spec/flickr/photo_spec.rb

@@ -5,91 +5,105 @@ require File.dirname(__FILE__) + '/../spec_helper'
 module PhotoSpecHelper
   def valid_photo_attributes
     {
-      :id => 2984637736,
-      :owner => "80755658@N00",
-      :secret => "9e5762e027",
-      :server => 3180,
-      :farm => 4,
-      :title => "Demolition of Hotel Rzeszów",
-      :is_public => 1,
-      :is_friend => 0,
-      :is_family => 0
+        :id => 2984637736,
+        :owner => "80755658@N00",
+        :secret => "9e5762e027",
+        :server => 3180,
+        :farm => 4,
+        :title => "Demolition of Hotel Rzeszów",
+        :is_public => 1,
+        :is_friend => 0,
+        :is_family => 0
     }
   end
 end
 
 describe Flickr::Photos::Photo do
-  
+
   include PhotoSpecHelper
-  
+
   before :all do
     @info_xml = File.read(File.dirname(__FILE__) + "/../fixtures/flickr/photos/get_info-0.xml")
     @sizes_xml = File.read(File.dirname(__FILE__) + "/../fixtures/flickr/photos/get_sizes-0.xml")
   end
-  
+
   before :each do
     @flickr = SpecHelper.flickr
     #@flickr.stub!(:request_over_http).and_return(info_xml)
     @photo = Flickr::Photos::Photo.new(@flickr, valid_photo_attributes)
   end
-  
+
   describe ".description" do
     it "should return the description" do
       @flickr.should_receive(:request_over_http).and_return(@info_xml)
-      @photo.description.should == 
-        "The last picture from a quite old event. The demolition of the best known hotel in Rzeszów called Hotel Rzeszów."
+      @photo.description.should ==
+          "The last picture from a quite old event. The demolition of the best known hotel in Rzeszów called Hotel Rzeszów."
     end
   end
 
   describe ".photo_size" do
+
+    before :each do
+      sizes_xml = File.read(File.dirname(__FILE__) + "/../fixtures/flickr/photos/get_sizes-0.xml")
+      @flickr.stub!(:request_over_http).and_return(sizes_xml)
+    end
+
     it "should return the appropriate Flickr::Photos::Size instance when requested by symbol" do
-	  @photo.photo_size(:square).class.should == Flickr::Photos::Size
-	  @photo.photo_size(:square).label.should == "Square"
+      @photo.photo_size(:square).class.should == Flickr::Photos::Size
+      @photo.photo_size(:square).label.should == "Square"
     end
 
     it "should return the appropriate Flickr::Photos::Size instance when requested by string" do
-	  @photo.photo_size('square').class.should == Flickr::Photos::Size
-	  @photo.photo_size('square').label.should == "Square"
+      @photo.photo_size('square').class.should == Flickr::Photos::Size
+      @photo.photo_size('square').label.should == "Square"
     end
 
     it "should return the :medium Flickr::Photos::Size instance invalidly requested" do
-	  @photo.photo_size(:doubleplusbig).class.should == Flickr::Photos::Size
-	  @photo.photo_size(:doubleplusbig).label.should == "Medium"
+      @photo.photo_size(:doubleplusbig).class.should == Flickr::Photos::Size
+      @photo.photo_size(:doubleplusbig).label.should == "Medium"
     end
   end
 
   describe ".image_url" do
     it "should return all standard sizes (thumbnail, square, small, medium and large) when requested" do
-	  @photo.image_url(:square).should == "http://farm4.static.flickr.com/3180/2984637736_9e5762e027_s.jpg"
+      @photo.image_url(:square).should == "http://farm4.static.flickr.com/3180/2984637736_9e5762e027_s.jpg"
+      @photo.image_url(:large_square).should == "http://farm4.static.flickr.com/3180/2984637736_9e5762e027_q.jpg"
       @photo.image_url(:thumbnail).should == "http://farm4.static.flickr.com/3180/2984637736_9e5762e027_t.jpg"
       @photo.image_url(:small).should == "http://farm4.static.flickr.com/3180/2984637736_9e5762e027_m.jpg"
-	  @photo.image_url(:medium).should == "http://farm4.static.flickr.com/3180/2984637736_9e5762e027.jpg"
-	  @photo.image_url(:large).should == "http://farm4.static.flickr.com/3180/2984637736_9e5762e027_b.jpg"
-    end
-
-	it "should return the same image even if you pass a string as an argument" do
-	  @photo.image_url("square").should == @photo.image_url(:square)
-	  @photo.image_url("large").should == @photo.image_url(:large)
-	end
-
-	it "should not call getSizes if not requested the url of the original image" do
-	  @flickr.should_not_receive(:request_over_http)
-	  @photo.image_url :square
-	  @photo.image_url :thumbnail
-	  @photo.image_url :small
-	  @photo.image_url :medium
-	  @photo.image_url :large
-	end
-
-	it "should call getSizes if requested the url of the original image" do
-	  @flickr.should_receive(:request_over_http).and_return(@sizes_xml)
-	  @photo.image_url :original
-	end
-
-	it "should return nil if original image url not available" do
-	  @flickr.should_receive(:request_over_http).and_return(@sizes_xml)
-	  @photo.image_url(:original).should == nil
-	end
+      @photo.image_url(:small_320).should == "http://farm4.static.flickr.com/3180/2984637736_9e5762e027_n.jpg"
+      @photo.image_url(:medium).should == "http://farm4.static.flickr.com/3180/2984637736_9e5762e027.jpg"
+      @photo.image_url(:medium_640).should == "http://farm4.static.flickr.com/3180/2984637736_9e5762e027_z.jpg"
+      @photo.image_url(:medium_800).should == "http://farm4.static.flickr.com/3180/2984637736_9e5762e027_c.jpg"
+      @photo.image_url(:large).should == "http://farm4.static.flickr.com/3180/2984637736_9e5762e027_b.jpg"
+    end
+
+    it "should return the same image even if you pass a string as an argument" do
+      @photo.image_url("square").should == @photo.image_url(:square)
+      @photo.image_url("large").should == @photo.image_url(:large)
+    end
+
+    it "should not call getSizes if not requested the url of the original image" do
+      @flickr.should_not_receive(:request_over_http)
+      @photo.image_url :square
+      @photo.image_url :large_square
+      @photo.image_url :thumbnail
+      @photo.image_url :small
+      @photo.image_url :small_320
+      @photo.image_url :medium
+      @photo.image_url :medium_640
+      @photo.image_url :medium_800
+      @photo.image_url :large
+    end
+
+    it "should call getSizes if requested the url of the original image" do
+      @flickr.should_receive(:request_over_http).and_return(@sizes_xml)
+      @photo.image_url :original
+    end
+
+    it "should return nil if original image url not available" do
+      @flickr.should_receive(:request_over_http).and_return(@sizes_xml)
+      @photo.image_url(:original).should == nil
+    end
   end
 
   describe ".video_url" do
@@ -120,12 +134,12 @@ describe Flickr::Photos::Photo do
   describe Flickr::Photos::Photo, "but it's really a video" do
 
     include PhotoSpecHelper
-  
+
     before :all do
       @info_xml = File.read(File.dirname(__FILE__) + "/../fixtures/flickr/videos/get_info-0.xml")
       @sizes_xml = File.read(File.dirname(__FILE__) + "/../fixtures/flickr/videos/get_sizes-0.xml")
     end
-  
+
     before :each do
       @flickr = SpecHelper.flickr
       #@flickr.stub!(:request_over_http).and_return(info_xml)

data/spec/flickr/photosets_spec.rb

@@ -6,44 +6,67 @@ describe Flickr::Photosets do
         "/../fixtures/flickr/photosets/get_list-0.xml")
     @get_photos_xml = File.read(File.dirname(__FILE__) +
         "/../fixtures/flickr/photosets/get_photos-0.xml")
+    @create_xml = File.read(File.dirname(__FILE__) +
+        "/../fixtures/flickr/photosets/create-0.xml")
   end
-    
+
   before :each do
     @flickr = SpecHelper.flickr
   end
 
-  
+
   describe ".get_list" do
     it "should call flickr.photosets.getList" do
-      @flickr.should_receive(:send_request).with("flickr.photosets.getList", {})       
+      @flickr.should_receive(:send_request).with("flickr.photosets.getList", {})
       @flickr.photosets.get_list
     end
-    
+
     it "should return an array of photoset objects" do
-      @flickr.stub!(:request_over_http).and_return(@get_list_xml)  
+      @flickr.stub!(:request_over_http).and_return(@get_list_xml)
       photosets = @flickr.photosets.get_list
-      
-      photosets[0].should be_an_instance_of(Flickr::Photosets::Photoset)      
+
+      photosets[0].should be_an_instance_of(Flickr::Photosets::Photoset)
       photosets[0].title.should == 'Test'
     end
   end
-  
+
+  describe ".create" do
+    subject { Flickr::Photosets.new(@flickr) }
+    it "should call flick.photosets.create" do
+      @flickr.should_receive(:send_request).with("flickr.photosets.create",
+                                                 { :title => "new photoset", :primary_photo_id => 42 })
+      @flickr.stub!(:request_over_http).and_return(@create_xml)
+      subject.create("new photoset", 42)
+    end
+  end
+
   describe ".get_photos" do
     before :each do
       @photoset = Flickr::Photosets::Photoset.new(@flickr,{:id=>4})
     end
-    
+
     it "should call flickr.photosets.getPhotos" do
-      @flickr.should_receive(:send_request).with("flickr.photosets.getPhotos",{:photoset_id=>4})       
+      @flickr.should_receive(:send_request).with("flickr.photosets.getPhotos",{:photoset_id=>4})
       @photoset.get_photos
     end
-    
+
     it "should return an array of photo objects" do
-      @flickr.stub!(:request_over_http).and_return(@get_photos_xml)  
+      @flickr.stub!(:request_over_http).and_return(@get_photos_xml)
       photos = @photoset.get_photos
-      
+
       photos.should_not be_nil
-      photos[0].should be_an_instance_of(Flickr::Photos::Photo)    
+      photos[0].should be_an_instance_of(Flickr::Photos::Photo)
     end
   end
-end
+
+  describe ".add_photo" do
+     subject { Flickr::Photosets::Photoset.new(@flickr, {:id=>4}) }
+
+     it "should call flickr.photosets.addPhoto" do
+       @flickr.should_receive(:send_request).with("flickr.photosets.addPhoto",
+                                                 { :photo_id => 43, :photoset_id => 4 })
+       @flickr.stub!(:request_over_http).and_return("")
+       subject.add_photo(43)
+     end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flickr_fu
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-17 00:00:00.000000000Z
+date: 2012-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: flickr_fu
-  requirement: &70279932931440 !ruby/object:Gem::Requirement
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,54 +22,31 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70279932931440
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &70279932930860 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :development
-  prerelease: false
-  version_requirements: *70279932930860
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &70279932930220 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.4
-  type: :development
-  prerelease: false
-  version_requirements: *70279932930220
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70279932929620 !ruby/object:Gem::Requirement
+  name: xml-magic
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
-  version_requirements: *70279932929620
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: &70279932928900 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70279932928900
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70279932928320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,65 +54,31 @@ dependencies:
         version: '1'
   type: :development
   prerelease: false
-  version_requirements: *70279932928320
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &70279932920780 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.4
-  type: :development
-  prerelease: false
-  version_requirements: *70279932920780
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70279932920060 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70279932920060
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: &70279932919340 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70279932919340
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &70279932918740 !ruby/object:Gem::Requirement
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70279932918740
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &70279932918040 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.4
-  type: :development
-  prerelease: false
-  version_requirements: *70279932918040
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70279932917400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,51 +86,38 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70279932917400
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: &70279932916880 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70279932916880
 - !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: &70279932916180 !ruby/object:Gem::Requirement
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>'
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.0
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
-  version_requirements: *70279932916180
-- !ruby/object:Gem::Dependency
-  name: xml-magic
-  requirement: &70279932915480 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>'
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *70279932915480
+        version: '0'
 description: Provides a ruby interface to flickr via the REST api
 email: ben@commonthread.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- README
+extra_rdoc_files: []
 files:
 - Gemfile
 - Gemfile.lock
 - LICENSE
-- README
+- README.md
 - Rakefile
 - VERSION.yml
 - flickr_fu.gemspec
@@ -224,6 +154,7 @@ files:
 - spec/fixtures/flickr/photos/get_sizes-0.xml
 - spec/fixtures/flickr/photos/get_sizes-1.xml
 - spec/fixtures/flickr/photos/licenses/get_info.xml
+- spec/fixtures/flickr/photosets/create-0.xml
 - spec/fixtures/flickr/photosets/get_list-0.xml
 - spec/fixtures/flickr/photosets/get_photos-0.xml
 - spec/fixtures/flickr/test/echo-0.xml
@@ -268,7 +199,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3277112206446566161
+      hash: 2842306328355594278
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -277,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Provides a ruby interface to flickr via the REST api

data/README

@@ -1,147 +0,0 @@
-= flickr-fu
-
-== Contact
-
-  Author: Ben Wyrosdick
-  Email: ben [at] commonthread.com
-  Lighthouse: http://commonthread.lighthouseapp.com/projects/12069-flickr_fu/overview
-  Main Repository: http://github.com/commonthread/flickr_fu/tree/master
-
-== Getting Started
-
-  You need to first get an API key as detailed here:
-
-  http://www.flickr.com/services/api/misc.api_keys.html
-  
-== Installation
-
-  sudo gem install flickr-fu
-
-== Documentation
-
-  RDoc Documentation can be found here:
-
-  http://www.commonthread.com/projects/flickr_fu/rdoc/
-
-== Example flickr.yml
---- !map:HashWithIndifferentAccess
-key: "YOUR KEY"
-secret: "YOUR SECRET"
-token_cache: "token_cache.yml"
-
-== Authorization
-
-  To authorise your application to access Flickr using your API key you will
-  need to access a specific URL.
-  
-  To generate this URL run the following and when presented with the URL 
-  access it from your browser. Confirm the application has permission at 
-  the level you have specified.
-  
-  Note that flickr has different types of keys. If you use one for a webapplication,
-  which is most likely, you need to define a callback and somehow make sure that
-  you connect the parameter :frob that flickr send via the callback is assigned
-  to the right user account. The best way to do this is to loop over all the current
-  user's flickr accounts and try flickr.auth.token with the :frob.
-  
-  Finally, cache the token (this will create the token cache file)
-  
-  If you have an invalid API key you will see errors such as:
-  
-  "100: Invalid API Key"
-  
-  If you don't follow the process below to authorise your application
-  you will see errors such as:
-  
-  "98: Login failed / Invalid auth token" or 
-  "99: User not logged in / Insufficient permissions"
-  
-== Authorization Example for non-webapplication
-
-  require 'flickr_fu'
-  
-  flickr = Flickr.new('flickr.yml')
-  
-  puts "visit the following url, then click <enter> once you have authorized:"
-
-  # request write permissions
-  puts flickr.auth.url(:write)
-  
-  gets
-  
-  flickr.auth.cache_token
-
-== Authorization Example for a webapplication
-
-  flickr.auth.token also contains the nsid and username, this
-  example only stores the token and no other userdata.
-
-  require 'flickr_fu'
-  class FlickrController < ActionController::Base
-    def create
-      flickr = Flickr.new('flickr.yml')
-      redirect_to flickr.auth.url(:write)
-    end
-    def flickr_callback
-      flickr = Flickr.new('flickr.yml')
-      flickr.auth.frob = params[:frob]
-      current_user.update_attribute :flickr_token, flickr.auth.token.token
-    end
-    def something_else_with_flickr
-      flickr = Flickr.new(YAML.load_file('flickr.yml').merge(:token => current_user.flickr_token))
-      # now you have full access on the user's data :)
-    end
-  end
-
-== Search Example
-
-  require 'flickr_fu'
-
-  flickr = Flickr.new('flickr.yml')
-
-  photos = flickr.photos.search(:tags => 'ruby-flickr')
-
-  puts "found #{photos.size} photo(s)"
-
-  photos.each do |photo|
-    puts photo.title
-    puts photo.description unless [nil, ''].include?(photo.description)
-    [:square, :thumbnail, :small, :medium, :large, :original].each do |size|
-      puts "#{size}: #{photo.url(size)}"
-    end
-    puts "comments: #{photo.comments.size}"
-    photo.comments.each do |comment|
-      intro = "#{comment.author_name} says - "
-      puts "#{intro}\"#{comment.comment.gsub("\n", "\n"+(" "*intro.length))}\""
-    end
-    puts "notes: #{photo.notes.size}"
-    photo.notes.each do |note|
-      puts "[#{note.x},#{note.y} ~ #{note.width}x#{note.height}] - \"#{note.note}\""
-    end
-    puts
-    puts
-  end
-  
-== Another Search Example
-
-  If searching for photos by user id then you need to specify the 'alias' - without
-  intervention this is usually set by Flickr and is an alphanumeric string. 
-  
-  To find out the user id for a given user, you can use the tool at:
-  
-  http://idgettr.com/
-  
-  And replace the line in the above sample to query on user id:
-  
-  photos = flickr.photos.search(:user_id => 'your_user_id_here')
-
-== Patch Contributers
-
-  Chris Ledet
-  Maciej Biłas
-  Mike Perham
-  Chris Anderton
-  Luke Francl
-  Thomas R. Koll
-  P. Mark Anderson
-  Josh Nichols