fotonauts-flickr_fu 0.3.2 → 0.3.3

data/Rakefile

@@ -19,7 +19,6 @@ begin
     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.files.exclude("spec/spec.local.opts")
   end
 rescue LoadError

data/VERSION.yml

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

data/flickr_fu.gemspec

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

data/lib/flickr_fu.rb

@@ -1,5 +1,4 @@
 require 'rubygems'
-require 'xml_magic'
 require 'net/http'
 require 'cgi'
 require 'uri'
@@ -37,7 +36,102 @@ require 'date'
   require File.join(File.dirname(__FILE__), 'flickr', file)
 end
 
-include CommonThread::XML
+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 CommonThread::XML::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
+            CommonThread::XML::XmlMagic.new(@element[index, count], @namespace)
+          else
+            CommonThread::XML::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
+          CommonThread::XML::XmlMagic.new(elements, @namespace)
+        end
+      end
+    end
+  end
+end  # module Flickr
+
 
 class Object
   # returning allows you to pass an object to a block that you can manipulate returning the manipulated object

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: fotonauts-flickr_fu
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: false
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Ben Wyrosdick
@@ -17,18 +16,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-19 00:00:00 +00:00
+date: 2009-05-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mime-types
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">"
       - !ruby/object:Gem::Version 
-        hash: 31
         segments: 
         - 0
         - 0
@@ -36,22 +33,6 @@ dependencies:
         version: 0.0.0
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: xml-magic
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 0
-        - 0
-        version: 0.0.0
-  type: :runtime
-  version_requirements: *id002
 description: Provides a ruby interface to flickr via the REST api
 email: ben@commonthread.com
 executables: []
@@ -139,27 +120,23 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Provides a ruby interface to flickr via the REST api