tomk32-flickr_fu 0.3.1 → 0.3.2

data/CHANGELOG

@@ -0,0 +1,3 @@
+2010-04-17: 0.3.1 (tomk32-flickr_fu)
+  * Allows to add extra fields to flickr.photos.search (and other in this flickr.photo)
+    that are requested from flickr. This can be used to e.g. get the original_url quicker.

data/Rakefile

@@ -10,12 +10,12 @@ begin
     require 'jeweler'
   end
   Jeweler::Tasks.new do |s|
-    s.name = "flickr_fu"
+    s.name = "tomk32-flickr_fu"
     s.summary = "Provides a ruby interface to flickr via the REST api"
-    s.email = "ben@commonthread.com"
-    s.homepage = "http://github.com/commonthread/flickr_fu"
+    s.email = "tomk32@gmx.de"
+    s.homepage = "http://github.com/tomk32/flickr_fu"
     s.description = "Provides a ruby interface to flickr via the REST api"
-    s.authors = ["Ben Wyrosdick", "Maciej Bilas"]
+    s.authors = ["Ben Wyrosdick", "Maciej Bilas", "Thomas R. Koll"]
     s.rdoc_options = ["--main", "README"]
     s.extra_rdoc_files = ["README"]
     s.add_dependency("mime-types", ["> 0.0.0"])

data/VERSION.yml

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

data/lib/flickr/base.rb

@@ -84,9 +84,8 @@ module Flickr
     def send_request(method, options = {}, http_method = :get, endpoint = REST_ENDPOINT)
       options.merge!(:api_key => @api_key, :method => method)
       sign_request(options)
+      
       rsp = request_over_http(options, http_method, endpoint)
-puts y options
-puts y rsp
       
       rsp = '<rsp stat="ok"></rsp>' if rsp == ""
       xm = XmlMagic.new(rsp)

data/lib/flickr/photo.rb

@@ -65,6 +65,7 @@ class Flickr::Photos::Photo
 	# Retrieving 30 search results means calling the API 31 times if you call getSizes every time.
 	# Mind that you still need to call getSizes if you go out for the original image.
 	if size == :original
+	  return original_url if respond_to?(:original_url) and !original_url.blank?
 	  size_hash[size.to_s].source if size_hash.has_key? size.to_s
 	else
 	  key = "_#{size_key(size.to_sym)}"

data/lib/flickr/photos.rb

@@ -16,7 +16,8 @@ class Flickr::Photos < Flickr::Base
       :tags => :tags,
       :o_dims => :o_dims,
       :views => :views,
-      :media => :media
+      :media => :media,
+      :url_o => :original_url
     }
   end
 

data/{flickr_fu.gemspec → tomk32-flickr_fu.gemspec}

@@ -1,12 +1,15 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{tomk32-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", "Thomas R. Koll"]
-  s.date = %q{2010-04-17}
+  s.date = %q{2010-04-18}
   s.description = %q{Provides a ruby interface to flickr via the REST api}
   s.email = %q{tomk32@gmx.de}
   s.extra_rdoc_files = [
@@ -14,11 +17,11 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
+     "CHANGELOG",
      "LICENSE",
      "README",
      "Rakefile",
      "VERSION.yml",
-     "flickr_fu.gemspec",
      "lib/flickr/auth.rb",
      "lib/flickr/base.rb",
      "lib/flickr/comment.rb",
@@ -79,24 +82,25 @@ Gem::Specification.new do |s|
      "spec/flickr/test_spec.rb",
      "spec/flickr/urls_spec.rb",
      "spec/spec.opts",
-     "spec/spec_helper.rb"
+     "spec/spec_helper.rb",
+     "tomk32-flickr_fu.gemspec"
   ]
   s.homepage = %q{http://github.com/tomk32/flickr_fu}
   s.rdoc_options = ["--main", "README"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.3}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Provides a ruby interface to flickr via the REST api}
   s.test_files = [
-    "spec/spec_helper.rb",
-     "spec/flickr/test_spec.rb",
-     "spec/flickr/geo_spec.rb",
+    "spec/flickr/base_spec.rb",
      "spec/flickr/contacts_spec.rb",
-     "spec/flickr/urls_spec.rb",
      "spec/flickr/errors_spec.rb",
-     "spec/flickr/base_spec.rb",
+     "spec/flickr/geo_spec.rb",
      "spec/flickr/photo_spec.rb",
+     "spec/flickr/photos_spec.rb",
      "spec/flickr/photosets_spec.rb",
-     "spec/flickr/photos_spec.rb"
+     "spec/flickr/test_spec.rb",
+     "spec/flickr/urls_spec.rb",
+     "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -115,3 +119,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<xml-magic>, ["> 0.0.0"])
   end
 end
+

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Ben Wyrosdick
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-17 00:00:00 +02:00
+date: 2010-04-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,11 +57,11 @@ extra_rdoc_files:
 - README
 files: 
 - .gitignore
+- CHANGELOG
 - LICENSE
 - README
 - Rakefile
 - VERSION.yml
-- flickr_fu.gemspec
 - lib/flickr/auth.rb
 - lib/flickr/base.rb
 - lib/flickr/comment.rb
@@ -123,6 +123,7 @@ files:
 - spec/flickr/urls_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- tomk32-flickr_fu.gemspec
 has_rdoc: true
 homepage: http://github.com/tomk32/flickr_fu
 licenses: []
@@ -155,13 +156,13 @@ signing_key:
 specification_version: 3
 summary: Provides a ruby interface to flickr via the REST api
 test_files: 
-- spec/spec_helper.rb
-- spec/flickr/test_spec.rb
-- spec/flickr/geo_spec.rb
+- spec/flickr/base_spec.rb
 - spec/flickr/contacts_spec.rb
-- spec/flickr/urls_spec.rb
 - spec/flickr/errors_spec.rb
-- spec/flickr/base_spec.rb
+- spec/flickr/geo_spec.rb
 - spec/flickr/photo_spec.rb
-- spec/flickr/photosets_spec.rb
 - spec/flickr/photos_spec.rb
+- spec/flickr/photosets_spec.rb
+- spec/flickr/test_spec.rb
+- spec/flickr/urls_spec.rb
+- spec/spec_helper.rb