myflickr 0.1.4 → 0.1.5

data/History.txt

@@ -1,3 +1,13 @@
+== 0.1.6 2008-01-28
+
+* Fixed up a goof in the last release
+
+== 0.1.5 2008-01-19
+
+* Removed parallel map usage for listing the photos within a set
+* Machine tags are now available for a set of photos
+* Machine and regular variety tags are now parsed from the raw entry. We love spaces, don't we?
+
 == 0.1.4 2008-01-18
 
 * Added a user class for retrieval of username, realname

data/lib/myflickr/photo.rb

@@ -12,6 +12,12 @@ module Myflickr
       parse(Query.api_call('flickr.photos.search', "text=#{search_string}"))
     end
     
+    # Find photos by tag
+    # Tags should be an Array
+    def self.search_tags(tags=[])
+      tags.empty? ? [] : parse(Query.api_call('flickr.photos.search', "tags=#{tags.join(',')}"))
+    end
+    
     # Find will grab all sizes of images, process the tags and standard attributes of a photo
     def self.find(id)
       photo_call = Query.api_call('flickr.photos.getInfo', "photo_id=#{id}")
@@ -21,8 +27,8 @@ module Myflickr
       photo.taken = Time.parse(photo_call.at(:dates)['taken'])
       
       # Set tags for photo
-      photo.tags = (photo_call/"tag[@machine_tag=0]").map{|tag| Tag.new tag.inner_text }
-      photo.machine_tags = (photo_call/"tag[@machine_tag=1]").map{|tag| MachineTag.from_s tag.inner_text }
+      photo.tags = (photo_call/"tag[@machine_tag=0]").map{|tag| Tag.new tag['raw'] }
+      photo.machine_tags = (photo_call/"tag[@machine_tag=1]").map{|tag| MachineTag.from_s tag['raw'] }
       
       return photo
     end
@@ -30,7 +36,7 @@ module Myflickr
     # Get the photo sizes for the photo in an array
     def sizes
       hash = {}
-      (Query.api_call('flickr.photos.getSizes', "photo_id=#{id}")/:size).parallel_each(MAX_THREADS) do |size|
+      (Query.api_call('flickr.photos.getSizes', "photo_id=#{id}")/:size).each do |size|
         hash[size['label'].downcase.to_sym] = Size.new(*%w(width height source url).map{|a| size[a]})
       end
       hash
@@ -40,7 +46,7 @@ module Myflickr
     # Parse applies Hpricot to the photos and maps them to a Photo class instance
     def self.parse collection
       photos = (collection/:photo)
-      photos.empty? ? [] : photos.parallel_map(MAX_THREADS) do |photo|
+      photos.empty? ? [] : photos.map do |photo|
         self.find(photo[:id])
       end
     end

data/lib/myflickr/set.rb

@@ -15,12 +15,15 @@ module Myflickr
     # > photosets.getPhotos (1 call)
     # > Photo.find ID (n calls)
     def photos
-      (Query.api_call('flickr.photosets.getPhotos', "photoset_id=#{id}")/:photo).parallel_map(MAX_THREADS) do |photo|
+      (Query.api_call('flickr.photosets.getPhotos', "photoset_id=#{id}")/:photo).map do |photo|
         Photo.find photo[:id]
       end
     end
     
     # Return a list of tags for the set (This is rough as guts as far as queries go)
+    # Queries:
+    # > photosets.getPhotos (1 call)
+    # > Photo.find ID (n calls)
     def tags
       tags = []
       photos.each do |photo|
@@ -31,10 +34,34 @@ module Myflickr
       tags.uniq
     end
     
+    # Return a list of machine_tags for the set (This is rough as guts as far as queries go)
+    # Queries:
+    # > photosets.getPhotos (1 call)
+    # > Photo.find ID (n calls)
+    def machine_tags
+      tags = []
+      photos.each do |photo|
+        photo.machine_tags.each do |tag|
+          tags << tag
+        end
+      end
+      tags.uniq
+    end
+    
+    # Search for photos that may tags that the current set collectivly owns from its photos' tags.
+    # Then search for those photos within sets, return an array of sets or an empty array
+    def similar
+      sets = []
+      Set.list.each do |set|
+        sets << set unless (self.tags & set.tags).empty? or set == self
+      end
+      sets.uniq
+    end
+    
     private 
     def self.parse(collection)
       photosets = (collection/:photoset)
-      photosets.empty? ? [] : photosets.parallel_map(MAX_THREADS) do |set|
+      photosets.empty? ? [] : photosets.map do |set|
         Set.new(set[:id], set[:photos], (set/:title).inner_text, (set/:description).inner_text)
       end
     end

data/lib/myflickr/version.rb

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

data/spec/photo_spec.rb

@@ -63,4 +63,10 @@ describe "Searching" do
     photo = Photo.find "252091410"
     photo.should be_an_instance_of(Photo)
   end
+  
+  it "should be able to find photos by tags only" do
+    search = Photo.search_tags(["street"])
+    search.should be_an_instance_of(Array)
+    search.first.should be_an_instance_of(Photo)
+  end
 end

data/spec/set_spec.rb

@@ -45,9 +45,21 @@ describe Set, "class" do
     tags.first.should be_an_instance_of(String)
   end
   
+  it "should collect machine_tags for the photos in the set" do
+    myset = Set.find "72157603414539843"
+    tags = myset.machine_tags
+    tags.should be_an_instance_of(Array)
+    tags.first.should be_an_instance_of(MachineTag)
+  end
+  
   it "should collect unique tags" do
     myset = Set.find "72157603414539843"
     tags = myset.tags
     tags.uniq.should eql tags
   end
+  
+  it "should know of similar sets" do
+    myset = Set.find "72157603414539843"
+    myset.similar.should be_an_instance_of(Array)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: myflickr
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Ben Schwarz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-19 00:00:00 +11:00
+date: 2008-01-28 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency