fotonauts-flickr_fu 0.3.11 → 0.3.13

data/VERSION.yml

@@ -1,5 +1,5 @@
 ---
 :major: 0
 :minor: 3
-:patch: 11
+:patch: 13
 

data/flickr_fu.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fotonauts-flickr_fu}
-  s.version = "0.3.11"
+  s.version = "0.3.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Wyrosdick", "Maciej Bilas", "Fotonauts"]
@@ -105,7 +105,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<mime-types>, ["> 0.0.0"])
-      s.add_runtime_dependency(%q<nokogiri>, ["> 1.5.5"])
+      s.add_runtime_dependency(%q<nokogiri>, [">= 1.5.5"])
     else
       s.add_dependency(%q<mime-types>, ["> 0.0.0"])
     end

data/lib/flickr/auth.rb

@@ -74,7 +74,7 @@ class Flickr::Auth < Flickr::Base
     elsif pass_through
       rsp = @flickr.send_request('flickr.auth.getToken', {:frob => self.frob})
 
-      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])
+      Token.new(:token => rsp.auth.token.text, :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

data/lib/flickr/people.rb

@@ -19,7 +19,7 @@ class Flickr::People < Flickr::Base
                         :icon_farm => rsp.person[:iconfarm],
                         :username => rsp.person.username.to_s,
                         :realname => rsp.person.realname.to_s,
-                        :mbox_sha1sum => rsp.person.mbox_sha1sum.to_s,
+                        :mbox_sha1sum => (rsp.person.mbox_sha1sum.to_s rescue nil),
                         :location => rsp.person.location.to_s,
                         :photos_url => rsp.person.photosurl.to_s,
                         :profile_url => rsp.person.profileurl.to_s,

data/lib/flickr/person.rb

@@ -51,10 +51,10 @@ class Flickr::People::Person
                                 :api => self,
                                 :method => 'public_photos',
                                 :options => options) do |photos|
-      rsp.photos.photo.each do |photo|
+      rsp.photos.xpath("photo").each do |photo|
         attributes = Flickr::Photos.create_attributes(photo)
         photos << Flickr::Photos::Photo.new(@flickr, attributes)
-      end if rsp.photos.photo
+      end if rsp.photos.at_xpath("photo")
     end
   end
 end

data/lib/flickr/photos.rb

@@ -131,11 +131,10 @@ class Flickr::Photos < Flickr::Base
                                 :api => self,
                                 :method => 'search',
                                 :options => options) do |photos|
-      rsp.photos.photo.each do |photo|
+      rsp.photos.xpath("photo").each do |photo|
         attributes = create_attributes(photo)
-
         photos << Photo.new(@flickr, attributes)
-      end if rsp.photos.photo
+      end if rsp.photos.at_xpath("photo")
     end
   end
     
@@ -164,11 +163,11 @@ class Flickr::Photos < Flickr::Base
                                 :photos => [], :api => self,
                                 :method => 'flickr.photos.getRecent',
                                 :options => options) do |photos|
-      rsp.photos.photo.each do |photo|
+      rsp.photos.xpath("photo").each do |photo|
         attributes = create_attributes(photo)
 
         photos << Photo.new(@flickr, attributes)
-      end if rsp.photos.photo
+      end if rsp.photos.at_xpath("photo")
     end
   end
   
@@ -185,12 +184,12 @@ class Flickr::Photos < Flickr::Base
                                 :api => self,
                                 :method => 'flickr.interestingness.getList',
                                 :options => options) do |photos|
-      rsp.photos.photo.each do |photo|
+      rsp.photos.xpath("photo").each do |photo|
         attributes = create_attributes(photo)
 
 
         photos << Photo.new(@flickr, attributes)
-      end if rsp.photos.photo
+      end if rsp.photos.at_xpath("photo")
     end
   end
   

data/lib/flickr/photoset.rb

@@ -22,12 +22,10 @@ class Flickr::Photosets::Photoset
     def collect_photos(rsp)
       photos = []
       return photos unless rsp
-      if rsp.photoset.photo
-        rsp.photoset.photo.each do |photo|
-          attributes = create_attributes(photo)
-          photos << Flickr::Photos::Photo.new(@flickr,attributes)
-        end
-      end
+      rsp.photos.xpath("photo").each do |photo|
+        attributes = create_attributes(photo)
+        photos << Flickr::Photos::Photo.new(@flickr,attributes)
+      end if rsp.photos.at_xpath("photo")
       return photos
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fotonauts-flickr_fu
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.13
   prerelease: 
 platform: ruby
 authors:
@@ -34,7 +34,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>'
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.5.5
   type: :runtime
@@ -42,7 +42,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>'
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.5.5
 description: Provides a ruby interface to flickr via the REST api