aperture 0.3.1 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/aperture.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{aperture}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kyle Burckhard"]

data/lib/aperture/photo_set.rb

@@ -80,7 +80,12 @@ module Aperture
       return hash
     end
     
-    # def find_photos_by_keyword
+    # Returns a new PhotoSet where the photos match the passed keyword
+    def find_by_keyword(keyword)
+      versions = map {|p| p.versions }.flatten
+      matching = versions.select {|v| v.attributes['keywords'] && v.attributes['keywords'].include?(keyword) }
+      return PhotoSet.new(matching.map{|v| v.photo}.uniq)
+    end
     
     # def find_photos_by_rating
       

data/lib/aperture.rb

@@ -1,7 +1,7 @@
 # = Overview
 # To use this libray check the Aperture::Library documentation and Library#parse
 module Aperture
-  VERSION = "0.2.0"
+  VERSION = "0.3.2"
 end
 
 

data/test/helper.rb

@@ -1,5 +1,5 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
+# $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+# $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'rubygems'
 require 'test/unit'

data/test/test_photo_set.rb

@@ -29,24 +29,6 @@ class TestPhotoSet < Test::Unit::TestCase
     end
   end
   
-  # context "each" do
-  #   setup do
-  #     @photoset = PhotoSet.new()
-  #     @photo = Photo.new(SAMPLE_PHOTO_PATH)
-  #   end
-  # 
-  #   should "iterate over all the photos" do
-  #     versions = 0
-  #     @photoset.each {|p| versions += p.versions.size}
-  #     assert_equal versions, 12
-  #   end
-  #   
-  #   should "give us access to inject" do
-  #     versions = @photoset.map {|p| p.versions.size }
-  #     assert_equal versions, [2]*6
-  #   end
-  # end
-  
   context "photo_count" do
     setup do
       @library = SAMPLE_LIBRARY
@@ -89,4 +71,16 @@ class TestPhotoSet < Test::Unit::TestCase
     end
   end
   
+  context "find_by_keyword" do
+    setup do
+      @library = SAMPLE_LIBRARY
+    end
+
+    should "should find 9 'Racing' photos" do
+      assert_instance_of(Aperture::PhotoSet, @library.photos.find_by_keyword('Racing'))
+      assert_equal @library.photos.find_by_keyword('Racing').size, 9
+    end
+  end
+  
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aperture
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Kyle Burckhard