reagent-fleakr 0.2.0 → 0.2.1

data/Rakefile

@@ -19,6 +19,7 @@ spec = Gem::Specification.new do |s|
   # s.executables    = ['fleakr']
   
   s.add_dependency('hpricot', '~> 0.6.0')
+  s.add_dependency('activesupport', '~> 2.2.0')
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|

data/lib/fleakr/group.rb

@@ -6,10 +6,7 @@ module Fleakr
     flickr_attribute :id, :attribute => 'nsid'
     flickr_attribute :name, :attribute => 'name'
     
-    def self.find_all_by_user_id(user_id)
-      response = Request.with_response!('people.getPublicGroups', :user_id => user_id)
-      (response.body/'rsp/groups/group').map {|g| Group.new(g) }
-    end
+    find_all :by_user_id, :call => 'people.getPublicGroups', :path => 'groups/group'
     
   end
 end

data/lib/fleakr/object.rb

@@ -12,6 +12,43 @@ module Fleakr
         class_eval "attr_reader :#{name}"
       end
       
+      def has_many(*attributes)
+        options = attributes.extract_options!
+        class_name = self.name
+
+        attributes.each do |attribute|
+          target = attribute.to_s.classify
+          finder_attribute = options[:using].nil? ? "#{class_name.demodulize.underscore}_id": options[:using]
+          class_eval <<-CODE
+            def #{attribute}
+              @#{attribute} ||= #{target}.send("find_all_by_#{finder_attribute}".to_sym, self.id)
+            end
+          CODE
+        end
+      end
+      
+      def find_all(condition, options)
+        attribute = options[:using].nil? ? condition.to_s.sub(/^by_/, '') : options[:using]
+        
+        class_eval <<-CODE
+          def self.find_all_#{condition}(value)
+            response = Request.with_response!('#{options[:call]}', :#{attribute} => value)
+            (response.body/'rsp/#{options[:path]}').map {|e| #{self.name}.new(e) }
+          end
+        CODE
+      end
+      
+      def find_one(condition, options)
+        attribute = options[:using].nil? ? condition.to_s.sub(/^by_/, '') : options[:using]
+        
+        class_eval <<-CODE
+          def self.find_#{condition}(value)
+            response = Request.with_response!('#{options[:call]}', :#{attribute} => value)
+            #{self.name}.new(response.body)
+          end
+        CODE
+      end
+      
     end
     
     module InstanceMethods

data/lib/fleakr/photo.rb

@@ -9,15 +9,8 @@ module Fleakr
     flickr_attribute :server_id, :attribute => 'server'
     flickr_attribute :secret, :attribute => 'secret'
     
-    def self.find_all_by_photoset_id(photoset_id)
-      response = Request.with_response!('photosets.getPhotos', :photoset_id => photoset_id)
-      (response.body/'rsp/photoset/photo').map {|p| Photo.new(p) }
-    end
-    
-    def self.find_all_by_user_id(user_id)
-      response = Request.with_response!('people.getPublicPhotos', :user_id => user_id)
-      (response.body/'rsp/photos/photo').map {|p| Photo.new(p) }
-    end
+    find_all :by_photoset_id, :call => 'photosets.getPhotos', :path => 'photoset/photo'
+    find_all :by_user_id, :call => 'people.getPublicPhotos', :path => 'photos/photo'
     
     def base_url
       "http://farm#{self.farm_id}.static.flickr.com/#{self.server_id}/#{self.id}_#{self.secret}"

data/lib/fleakr/search.rb

@@ -1,8 +1,6 @@
 module Fleakr
   class Search
 
-    attr_reader :tags
-
     def initialize(text = nil, search_options = {})
       @text = text
       @search_options = search_options

data/lib/fleakr/set.rb

@@ -2,19 +2,14 @@ module Fleakr
   class Set
 
     include Fleakr::Object
+
+    has_many :photos, :using => :photoset_id
     
     flickr_attribute :id, :attribute => 'id'
     flickr_attribute :title
     flickr_attribute :description
     
-    def self.find_all_by_user_id(user_id)
-      response = Request.with_response!('photosets.getList', :user_id => user_id)
-      (response.body/'rsp/photosets/photoset').map {|s| Set.new(s) }
-    end
-    
-    def photos
-      @photos ||= Photo.find_all_by_photoset_id(self.id)
-    end
+    find_all :by_user_id, :call => 'photosets.getList', :path => 'photosets/photoset'
     
     def save_to(path, size)
       target = "#{path}/#{self.title}"

data/lib/fleakr/user.rb

@@ -10,21 +10,11 @@ module Fleakr
     flickr_attribute :photos_count, :xpath => 'rsp/person/photos/count'
     flickr_attribute :icon_server, :xpath => 'rsp/person', :attribute => 'iconserver'
     flickr_attribute :icon_farm, :xpath => 'rsp/person', :attribute => 'iconfarm'
-
-    def icon_farm_with_load
-      retrieve_additional_information
-      icon_farm_without_load
-    end
-
-    def self.find_by_username(username)
-      response = Request.with_response!('people.findByUsername', :username => username)
-      User.new(response.body)
-    end
-
-    def self.find_by_email(email)
-      response = Request.with_response!('people.findByEmail', :find_email => email)
-      User.new(response.body)
-    end
+    
+    has_many :sets, :groups, :photos
+    
+    find_one :by_username, :call => 'people.findByUsername'
+    find_one :by_email, :using => :find_email, :call => 'people.findByEmail'
 
     def load_info
       response = Request.with_response!('people.getInfo', :user_id => self.id)
@@ -39,17 +29,5 @@ module Fleakr
       end
     end
 
-    def sets
-      @set ||= Set.find_all_by_user_id(self.id)
-    end
-
-    def groups
-      @groups ||= Group.find_all_by_user_id(self.id)
-    end
-    
-    def photos
-      @photos ||= Photo.find_all_by_user_id(self.id)
-    end
-
   end
 end

data/lib/fleakr/version.rb

@@ -3,7 +3,7 @@ module Fleakr
     
     MAJOR = 0
     MINOR = 2
-    TINY  = 0
+    TINY  = 1
     
     def self.to_s
       [MAJOR, MINOR, TINY].join('.')

data/lib/fleakr.rb

@@ -4,6 +4,7 @@ require 'uri'
 require 'cgi'
 require 'net/http'
 require 'hpricot'
+require 'activesupport'
 
 require 'fleakr/object'
 require 'fleakr/attribute'

data/test/fleakr/set_test.rb

@@ -3,6 +3,8 @@ require File.dirname(__FILE__) + '/../test_helper'
 module Fleakr
   class SetTest < Test::Unit::TestCase
 
+    should_have_many :photos, :using => 'photoset_id'
+
     describe "The Set class" do
       
       should_find_all :sets, :by => :user_id, :call => 'photosets.getList', :path => 'rsp/photosets/photoset'
@@ -22,26 +24,6 @@ module Fleakr
         
       end
       
-      context "when accessing its list of photos" do
-        before do
-          @set = Set.new
-          @set.stubs(:id).with().returns('1')          
-        end
-
-        it "should retrieve a list of photos" do
-          photos = [stub()]
-
-          Photo.expects(:find_all_by_photoset_id).with('1').returns(photos)
-
-          @set.photos.should == photos
-        end
-        
-        it "should memoize the list of photos retrieved" do
-          Photo.expects(:find_all_by_photoset_id).once.returns([])
-          2.times { @set.photos }
-        end
-      end
-      
       context "when saving the set" do
         before do
           @tmp_dir = create_temp_directory

data/test/fleakr/user_test.rb

@@ -3,6 +3,8 @@ require File.dirname(__FILE__) + '/../test_helper'
 module Fleakr
   class UserTest < Test::Unit::TestCase
 
+    should_have_many :photos, :groups, :sets
+
     describe "The User class" do
 
       should_find_one :user, :by => :username, :call => 'people.findByUsername', :path => 'rsp/user'
@@ -28,50 +30,7 @@ module Fleakr
 
       context "in general" do
 
-        before do
-          @user = User.new
-        end
-
-        it "should be able to retrieve the user's associated sets" do
-          sets = [stub()]
-          @user.stubs(:id).with().returns('1')
-
-          Set.expects(:find_all_by_user_id).with('1').returns(sets)
-
-          @user.sets.should == sets
-        end
-
-        it "should memoize the results returned for this user's sets" do
-          Set.expects(:find_all_by_user_id).once.returns([])
-          2.times { @user.sets }
-        end
-
-        it "should be able to retrieve the user's associated groups" do
-          groups = [stub()]
-          @user.stubs(:id).with().returns('1')
-
-          Group.expects(:find_all_by_user_id).with('1').returns(groups)
-
-          @user.groups.should == groups
-        end
-
-        it "should memoize the results returned for this user's group" do
-          Group.expects(:find_all_by_user_id).once.returns([])
-          2.times { @user.groups }
-        end
-
-        it "should be able to retrieve the user's photos" do
-          photos = [stub()]
-          @user.stubs(:id).with().returns('1')
-
-          Photo.expects(:find_all_by_user_id).with('1').returns(photos)
-          @user.photos.should == photos
-        end
-
-        it "should memoize the results returned for this user's photos" do
-          Photo.expects(:find_all_by_user_id).once.returns([])
-          2.times { @user.photos }
-        end
+        before { @user = User.new }
 
         it "should be able to retrieve additional information about the current user" do
           response = mock_request_cycle :for => 'people.getInfo', :with => {:user_id => @user.id}

data/test/test_helper.rb

@@ -4,7 +4,6 @@ require 'rubygems'
 require 'matchy'
 require 'context'
 require 'mocha'
-require 'activesupport'
 
 require File.dirname(__FILE__) + '/../lib/fleakr'
 
@@ -16,6 +15,35 @@ class Test::Unit::TestCase
     end
   end
 
+  def self.should_have_many(*attributes)
+    class_name = self.name.demodulize.sub(/Test$/, '')
+    this_klass = "Fleakr::#{class_name}".constantize
+
+    options = attributes.extract_options!
+    finder_attribute = options[:using].nil? ? "#{class_name.downcase}_id" : options[:using]
+    
+    attributes.each do |attribute|
+      target_klass = "Fleakr::#{attribute.to_s.singularize.classify}".constantize
+    
+      it "should be able to retrieve the #{class_name.downcase}'s #{attribute}" do
+        results = [stub()]
+        object = this_klass.new
+        object.stubs(:id).with().returns('1')
+
+        target_klass.expects("find_all_by_#{finder_attribute}".to_sym).with('1').returns(results)
+        object.send(attribute).should == results
+      end
+      
+      it "should memoize the results for the #{class_name.downcase}'s #{attribute}" do
+        object = this_klass.new
+        
+        target_klass.expects("find_all_by_#{finder_attribute}".to_sym).once.returns([])
+        2.times { object.send(attribute) }
+      end
+      
+    end
+  end
+
   def self.should_find_one(thing, options)
     class_name  = thing.to_s.singularize.camelcase
     klass       = "Fleakr::#{class_name}".constantize

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: reagent-fleakr
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Patrick Reagan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-03 00:00:00 -08:00
+date: 2008-12-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +21,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.6.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.2.0
+    version: 
 description: 
 email: reaganpr@gmail.com
 executables: []