myflickr 0.1.2 → 0.1.3

data/History.txt

@@ -1,3 +1,8 @@
+== 0.1.3 2008-01-18
+
+* Machine tags aren't included in the tags for a photo any longer
+* 
+
 == 0.1.2 2008-01-15
 
 * Removed inbuilt memcached cache mechanism and replaced with my new gem `openuri_memcached`

data/Manifest.txt

@@ -12,6 +12,7 @@ lib/myflickr/query.rb
 lib/myflickr/set.rb
 lib/myflickr/size.rb
 lib/myflickr/tag.rb
+lib/myflickr/user.rb
 lib/myflickr/version.rb
 lib/vendor/parallel/parallel.rb
 spec/machine_tag_spec.rb
@@ -21,3 +22,4 @@ spec/set_spec.rb
 spec/size_spec.rb
 spec/spec_helper.rb
 spec/tag_spec.rb
+spec/user_spec.rb

data/lib/myflickr.rb

@@ -10,6 +10,6 @@ module Myflickr
   MAX_THREADS = 100
 end
 
-%w(query photo tag size set machine_tag version).each do |r|
+%w(query photo tag size set machine_tag user version).each do |r|
   require File.join(File.dirname(__FILE__), './myflickr/' + r)
 end

data/lib/myflickr/photo.rb

@@ -20,7 +20,7 @@ module Myflickr
       photo = Photo.new(id, *%w(title description).map {|a| (photo_call/a).inner_text })
       
       # Set tags for photo
-      photo.tags = (photo_call/:tag).map{|tag| Tag.new tag.inner_text}
+      photo.tags = (photo_call/:tag).map{|tag| Tag.new tag.inner_text unless /(.*)\:(.*)\=(.*)/ }
       photo.machine_tags = (photo_call/"tag[@machine_tag=1]").map{|tag| MachineTag.from_s tag.inner_text }
       
       return photo

data/lib/myflickr/user.rb

@@ -0,0 +1,10 @@
+module Myflickr
+  class User < Struct.new :username, :realname
+    class << self
+      def find
+        user_lookup = Query.api_call("flickr.people.getInfo")
+        User.new(*%w(username realname).map {|a| (user_lookup/a).inner_text.to_s })
+      end
+    end
+  end
+end

data/lib/myflickr/version.rb

@@ -2,7 +2,7 @@ module Myflickr
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/spec/user_spec.rb

@@ -0,0 +1,14 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+describe User, "class" do
+  before :each do
+    @user = User.find
+  end
+  it "should have a username" do
+    @user.username.should eql "Ben Schwarz"
+  end
+  
+  it "should have a realname" do
+    @user.realname.should eql "Ben Schwarz"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: myflickr
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Ben Schwarz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-17 00:00:00 +11:00
+date: 2008-01-18 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,6 +56,7 @@ files:
 - lib/myflickr/set.rb
 - lib/myflickr/size.rb
 - lib/myflickr/tag.rb
+- lib/myflickr/user.rb
 - lib/myflickr/version.rb
 - lib/vendor/parallel/parallel.rb
 - spec/machine_tag_spec.rb
@@ -65,6 +66,7 @@ files:
 - spec/size_spec.rb
 - spec/spec_helper.rb
 - spec/tag_spec.rb
+- spec/user_spec.rb
 has_rdoc: true
 homepage: http://germanforblack.com/
 post_install_message: