fotonauts-flickr_fu 0.3.8 → 0.3.9

data/README.md

@@ -15,7 +15,7 @@
   
 ## Installation
 
-  <code>sudo gem install flickr-fu</code>
+  <code>sudo gem install flickr_fu</code>
 
 ## Documentation
 

data/VERSION.yml

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

data/flickr_fu.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fotonauts-flickr_fu}
-  s.version = "0.3.8"
+  s.version = "0.3.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Wyrosdick", "Maciej Bilas", "Fotonauts"]
@@ -105,6 +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"])
     else
       s.add_dependency(%q<mime-types>, ["> 0.0.0"])
     end

data/lib/flickr/base.rb

@@ -81,19 +81,20 @@ module Flickr
     # * endpoint (Optional)
     #     url of the api endpoint
     # 
+    require 'nokogiri'
     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)
       
-      rsp = '<rsp stat="ok"></rsp>' if rsp == ""
-      xm = XmlMagic.new(rsp)
-      
-      if xm[:stat] == 'ok'
-        xm
+      rsp = '<?xml version="1.0" encoding="utf-8" ?><rsp stat="ok"></rsp>' if rsp == ""
+      xm = Nokogiri.Slop(rsp, nil, nil, Nokogiri::XML::ParseOptions::NOBLANKS)
+
+      if xm.rsp['stat'] == 'ok'
+        xm.rsp
       else
-        raise Flickr::Errors.error_for(xm.err[:code].to_i, xm.err[:msg])
+        Flickr::Errors.error_for(xm.rsp.err["code"].to_i, xm.rsp.err["msg"])
       end
     end
     

data/lib/flickr/errors.rb

@@ -10,7 +10,7 @@ module Flickr
       # Currently raises only Flickr::Error
       def self.error_for(code, message)
         raise RuntimeError.new("Internal error. Flickr API error not identified or unknown error.") if (code.nil? || message.nil? || message.empty?)
-        raise RuntimeError.new("Internal error. Unknown error.") if code.to_i == 0 # We assume that error code 0 is never returned
+        raise RuntimeError.new("Internal error. Unknown error: #{code.inspect}") if code.to_i == 0 # We assume that error code 0 is never returned
         e = Flickr::Error.new("#{code}: #{message}")
         e.code = code
         raise e

data/lib/flickr/person.rb

@@ -52,29 +52,7 @@ class Flickr::People::Person
                                 :method => 'public_photos',
                                 :options => options) do |photos|
       rsp.photos.photo.each do |photo|
-        attributes = {:id => photo[:id], 
-                      :owner => photo[:owner], 
-                      :secret => photo[:secret], 
-                      :server => photo[:server], 
-                      :farm => photo[:farm], 
-                      :title => photo[:title], 
-                      :is_public => photo[:ispublic], 
-                      :is_friend => photo[:isfriend], 
-                      :is_family => photo[:isfamily],
-                      :license_id => photo[:license].to_i,
-                      :uploaded_at => (Time.at(photo[:dateupload].to_i) rescue nil),
-                      :taken_at => (Time.parse(photo[:datetaken]) rescue nil),
-                      :owner_name => photo[:ownername],
-                      :icon_server => photo[:icon_server],
-                      :original_format => photo[:originalformat],
-                      :updated_at => (Time.at(photo[:lastupdate].to_i) rescue nil),
-                      :geo => photo[:geo],
-                      :tags => photo[:tags],
-                      :machine_tags => photo[:machine_tags],
-                      :o_dims => photo[:o_dims],
-                      :views => photo[:views].to_i,
-                      :media => photo[:media]}
-
+        attributes = Flickr::Photos.create_attributes(photo)
         photos << Flickr::Photos::Photo.new(@flickr, attributes)
       end if rsp.photos.photo
     end

data/lib/flickr/photo.rb

@@ -1,8 +1,37 @@
 # wrapping class to hold an flickr photo
 class Flickr::Photos::Photo
-  attr_accessor :id, :owner, :secret, :server, :farm, :title, :is_public, :is_friend, :is_family # standard attributes
-  attr_accessor :license_id, :uploaded_at, :taken_at, :owner_name, :icon_server, :original_format, :updated_at, :geo, :tags, :machine_tags, :o_height, :o_width, :o_dims, :views, :media, :rotation # extra attributes
-  attr_accessor :info_added, :description, :original_secret, :owner_username, :owner_realname, :url_photopage, :notes # info attributes
+  attr_accessor :id, 
+    :owner, 
+    :secret, 
+    :server, 
+    :farm, 
+    :title, 
+    :is_public, 
+    :is_friend, 
+    :is_family # standard attributes
+  attr_accessor :license_id, 
+    :uploaded_at, 
+    :taken_at, 
+    :owner_name,
+    :owner_realname, 
+    :icon_server, 
+    :original_format, 
+    :updated_at, 
+    :geo, 
+    :tags, 
+    :machine_tags, 
+    :o_height, 
+    :o_width, 
+    :o_dims, 
+    :views, 
+    :media, 
+    :rotation # extra attributes
+  attr_accessor :info_added, 
+    :description, 
+    :original_secret, 
+    :owner_username, 
+    :url_photopage, 
+    :notes # info attributes
   attr_accessor :comments # comment attributes
   
   # create a new instance of a flickr photo.
@@ -18,7 +47,36 @@ class Flickr::Photos::Photo
       send("#{k}=", v)
     end
   end
+  def self.create_attributes(photo)
+    {:id => photo['id'].to_i, 
+      :secret => photo['secret'], 
+      :server => photo['server'], 
+      :farm => photo['farm'],
+      :license_id => photo['license'].to_i,
+      :rotation => photo['rotation'].to_i,
+      :uploaded_at => (Time.at(photo['dateuploaded'].to_i) rescue nil),
+      :owner => photo.owner['nsid'],
+      :owner_username => photo.owner['username'],
+      :owner_realname => photo.owner['realname'],
+      :icon_server => photo.owner['iconserver'],
+      :title => (photo.title.text rescue ''),
+      :description => photo.at_xpath("description").text, # description is a method of XML::Node, so we use at_xpath instead
+      :original_secret => photo['originalsecret'],
 
+      :is_public => photo.visibility['ispublic'].to_i, 
+      :is_friend => photo.visibility['isfriend'].to_i, 
+      :is_family => photo.visibility['isfamily'].to_i,
+
+      :taken_at => (Time.parse(photo.dates['taken']) rescue nil),
+      :updated_at => (Time.at(photo.dates['lastupdate'].to_i) rescue nil),
+      :tags => photo.tags.tag.map { |t|
+        { :id => t['id'], :author => t['author'], 
+          :raw => t['raw'], :machine_tag => t['machine_tag'],
+          :text => t.text }},
+
+      :url_photopage => photo.urls.url.text
+   }
+  end
   # Alias to image_url method
   def url(size = :medium)
     image_url(size)
@@ -271,8 +329,8 @@ class Flickr::Photos::Photo
       
       _sizes = []
       rsp.sizes.size.each do |size|
-        _sizes << Flickr::Photos::Size.new(:label => size[:label], :width => size[:width],
-          :height => size[:height], :source => size[:source], :url => size[:url])
+        _sizes << Flickr::Photos::Size.new(:label => size[:label], :width => size[:width].to_i,
+          :height => size[:height].to_i, :source => size[:source], :url => size[:url])
       end
       _sizes
     end
@@ -319,25 +377,23 @@ class Flickr::Photos::Photo
       rsp = @flickr.send_request('flickr.photos.getInfo', :photo_id => self.id, :secret => self.secret)
 
       self.info_added = true
-      self.description = rsp.photo.description.to_s.strip
-      self.original_secret = rsp.photo[:originalsecret]
-      self.owner_username = rsp.photo.owner[:username]
-      self.owner_realname = rsp.photo.owner[:realname]
-      self.url_photopage = rsp.photo.urls.url.to_s
-      self.comment_count = rsp.photo.comments.to_s.to_i
+
+      ::Flickr::Photos::Photo.create_attributes(rsp.photo).each do |k,v|
+       send("#{k}=", v)
+      end
 
       self.notes = []
 
-      rsp.photo.notes.note.each do |note|
+      rsp.photo.notes.each do |note|
         self.notes << Flickr::Photos::Note.new(:id => note[:id],
-		  :note => note.to_s,
-		  :author => note[:author],
-		  :author_name => note[:authorname],
-		  :x => note[:x],
-		  :y => note[:y],
-		  :width => note[:w],
-		  :height => note[:h])
-      end if rsp.photo.notes.note
+          :note => note.to_s,
+          :author => note[:author],
+          :author_name => note[:authorname],
+          :x => note[:x],
+          :y => note[:y],
+          :width => note[:w],
+          :height => note[:h])
+      end
     end
   end
 end

data/lib/flickr/photos.rb

@@ -215,39 +215,41 @@ class Flickr::Photos < Flickr::Base
   # Raises an error if photo not found
   def find_by_id(photo_id)
     rsp = @flickr.send_request('flickr.photos.getInfo', :photo_id => photo_id)
-    Photo.new(@flickr, :id => rsp.photo[:id].to_i, :owner => rsp.photo.owner,
-      :secret => rsp.photo[:secret], :server => rsp.photo[:server].to_i, :farm => rsp.photo[:farm], 
-      :title => rsp.photo.title,
-      :is_public => rsp.photo.visibility[:public], :is_friend => rsp.photo.visibility[:is_friend], :is_family => rsp.photo.visibility[:is_family])
+
+    attributes = Photo.create_attributes(rsp.photo)
+
+    Photo.new(@flickr, attributes)
   end
   
   protected
+
+
   def create_attributes(photo)
-    {:id => photo[:id], 
-     :owner => photo[:owner], 
-     :secret => photo[:secret], 
-     :server => photo[:server], 
-     :farm => photo[:farm], 
-     :title => photo[:title], 
-     :is_public => photo[:ispublic], 
-     :is_friend => photo[:isfriend], 
-     :is_family => photo[:isfamily],
-     :license_id => photo[:license].to_i,
-     :uploaded_at => (Time.at(photo[:dateupload].to_i) rescue nil),
-     :taken_at => (Time.parse(photo[:datetaken]) rescue nil),
-     :owner_name => photo[:ownername],
-     :icon_server => photo[:icon_server],
-     :original_format => photo[:originalformat],
-     :updated_at => (Time.at(photo[:lastupdate].to_i) rescue nil),
-     :rotation => photo[:rotation],
-     :geo => photo[:geo],
-     :tags => photo[:tags],
-     :machine_tags => photo[:machine_tags],
-     :o_dims => photo[:o_dims],
-     :o_height => photo[:o_height],
-     :o_width => photo[:o_width],
-     :views => photo[:views].to_i,
-     :media => photo[:media]}
+    {:id => photo['id'].to_i, 
+     :owner => photo['owner'], 
+     :secret => photo['secret'], 
+     :server => photo['server'], 
+     :farm => photo['farm'], 
+     :title => photo['title'], 
+     :is_public => photo['ispublic'], 
+     :is_friend => photo['isfriend'], 
+     :is_family => photo['isfamily'],
+     :license_id => photo['license'].to_i,
+     :uploaded_at => (Time.at(photo['dateupload'].to_i) rescue nil),
+     :taken_at => (Time.parse(photo['datetaken']) rescue nil),
+     :owner_name => photo['ownername'],
+     :icon_server => photo['icon_server'],
+     :original_format => photo['originalformat'],
+     :updated_at => (Time.at(photo['lastupdate'].to_i) rescue nil),
+     :rotation => photo['rotation'],
+     :geo => photo['geo'],
+     :tags => photo['tags'],
+     :machine_tags => photo['machine_tags'],
+     :o_dims => photo['o_dims'],
+     :o_height => photo['o_height'],
+     :o_width => photo['o_width'],
+     :views => photo['views'].to_i,
+     :media => photo['media']}
   end
   
 end

data/lib/flickr/photosets.rb

@@ -40,8 +40,8 @@ class Flickr::Photosets < Flickr::Base
       {
         :id => photoset[:id],
         :num_photos => photoset[:photos],
-        :title => photoset.title.to_s,
-        :description => photoset.description.to_s
+        :title => photoset.title.text.to_s,
+        :description => photoset.at_xpath("description").text
        }
     end
 

data/lib/flickr/urls.rb

@@ -32,8 +32,8 @@ class Flickr::Urls < Flickr::Base
 
   def lookup_user url
     rsp = @flickr.send_request('flickr.urls.lookupUser', {:url => url})
-    user_id = UserLookupResult.new(rsp.user[:id])
-    user_id.username = rsp.user.username
+    user_id = UserLookupResult.new(rsp.user['id'])
+    user_id.username = rsp.user.username.text
     user_id
   end
 

data/lib/flickr_fu.rb

@@ -36,101 +36,6 @@ require 'date'
   require File.join(File.dirname(__FILE__), 'flickr', file)
 end
 
-module Flickr
-
-  if RUBY_VERSION =~ /1.8/
-  # Credit to Jim Weirich at http://onestepback.org/index.cgi/Tech/Ruby/BlankSlate.rdoc
-    class BlankSlate
-      instance_methods.each { |m| undef_method m unless m =~ /^__/ }
-    end
-  else
-    BlankSlate = BasicObject
-  end
-
-  # Class that makes accessing xml objects more like any other ruby object
-  # thanks to the magic of method missing
-  class XmlMagic < BlankSlate
-    require 'rexml/document'
-    
-    def initialize(xml, namespace="")
-      if xml.class == ::REXML::Element or xml.class == ::Array
-        @element = xml
-      else
-        @xml = ::REXML::Document.new(xml)
-        @element = @xml.root
-      end
-      @namespace = namespace
-    end
-
-    def each
-      @element.each {|e| yield ::Flickr::XmlMagic.new(e, @namespace)}
-    end
-
-    def method_missing(method, selection=nil)
-      evaluate(method.to_s, selection)
-    end
-
-    def namespace=(namespace)
-      if namespace and namespace.length > 0 # caca
-        @namespace = namespace + ":"
-      else
-        @namespace = ""
-      end
-    end
-    
-    def to_s
-      if @element.class == ::Array
-        @element.collect{|e| e.text}.join
-      else
-        @element.text
-      end
-    end
-
-    def [](index, count = nil)
-      if index.is_a?(::Fixnum) or index.is_a?(::Bignum) or index.is_a?(::Integer) or index.is_a?(::Range) 
-        if @element.is_a?(::Array)
-          if count
-            ::Flickr::XmlMagic.new(@element[index, count], @namespace)
-          else
-            ::Flickr::XmlMagic.new(@element[index], @namespace)
-          end
-        else
-          nil
-        end
-      elsif index.is_a?(::Symbol)
-        if @element.is_a?(::Array)
-          if @element.empty?
-            nil
-          else
-            @element[0].attributes[index.to_s]
-          end
-        else
-          @element.attributes[index.to_s]
-        end
-      end
-    end
-
-    private
-    def evaluate(name, selection)
-      
-      if @element.is_a?(::Array)
-        elements = @element[0].get_elements(@namespace + name)
-      else
-        elements = @element.get_elements(@namespace + name)
-      end
-      
-      if elements.empty?
-        nil
-      else
-        if selection == :count
-          elements.length
-        else
-          ::Flickr::XmlMagic.new(elements, @namespace)
-        end
-      end
-    end
-  end
-end  # module Flickr
 
 
 class Object

data/spec/flickr/photo_spec.rb

@@ -37,7 +37,7 @@ describe Flickr::Photos::Photo 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."
+          "\nThe last picture from a quite old event. The demolition of the best known hotel in Rzeszów called Hotel Rzeszów.\n\t\t"
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fotonauts-flickr_fu
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
   prerelease: 
 platform: ruby
 authors:
@@ -29,6 +29,22 @@ dependencies:
     - - ! '>'
       - !ruby/object:Gem::Version
         version: 0.0.0
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: 1.5.5
+  type: :runtime
+  prerelease: false
+  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
 email: ben@commonthread.com
 executables: []