reagent-fleakr 0.2.1 → 0.3.0

data/test/{fleakr → unit/fleakr/objects}/set_test.rb

@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require File.dirname(__FILE__) + '/../../../test_helper'
 
-module Fleakr
+module Fleakr::Objects
   class SetTest < Test::Unit::TestCase
 
     should_have_many :photos, :using => 'photoset_id'
@@ -27,6 +27,10 @@ module Fleakr
       context "when saving the set" do
         before do
           @tmp_dir = create_temp_directory
+          @set_title = 'set'
+          
+          @set = Set.new
+          @set.stubs(:title).with().returns(@set_title)
         end
         
         after { FileUtils.rm_rf(@tmp_dir) }
@@ -36,26 +40,27 @@ module Fleakr
           image.expects(:save_to).with("#{@tmp_dir}/set")
           
           photo = stub(:small => image)
-          
-          set = Set.new
-          set.stubs(:title).with().returns('set')
-          set.stubs(:photos).with().returns([photo])
+
+          @set.stubs(:photos).with().returns([photo])
           
           FileUtils.expects(:mkdir).with("#{@tmp_dir}/set")
           
-          set.save_to(@tmp_dir, :small)
+          @set.save_to(@tmp_dir, :small)
         end
         
         it "should not create the directory if it already exists" do
           FileUtils.mkdir("#{@tmp_dir}/set")
-          
-          set = Set.new
-          set.stubs(:title).with().returns('set')
-          set.stubs(:photos).with().returns([])
+
+          @set.stubs(:photos).with().returns([])
           
           FileUtils.expects(:mkdir).with("#{@tmp_dir}/set").never
           
-          set.save_to(@tmp_dir, :small)
+          @set.save_to(@tmp_dir, :small)
+        end
+        
+        it "should not raise errors when saving an image size that doesn't exist" do
+          @set.stubs(:photos).with().returns([stub(:large => nil)])
+          lambda { @set.save_to(@tmp_dir, :large) }.should_not raise_error
         end
         
       end

data/test/{fleakr → unit/fleakr/objects}/user_test.rb

@@ -1,9 +1,25 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require File.dirname(__FILE__) + '/../../../test_helper'
 
-module Fleakr
+module Fleakr::Objects
   class UserTest < Test::Unit::TestCase
 
-    should_have_many :photos, :groups, :sets
+    def self.should_autoload_when_accessing(*attributes)
+      options = attributes.extract_options!
+      attributes.each do |accessor_name|
+        it "should load the additional user information when accessing the :#{accessor_name} attribute" do
+          user = User.new
+          user.expects(options[:with]).with()
+          user.send(accessor_name)
+        end
+      end
+    end
+    
+    should_search_by :user_id
+
+    should_have_many :photos, :groups, :sets, :contacts
+    
+    should_autoload_when_accessing :name, :photos_url, :profile_url, :photos_count, :with => :load_info
+    should_autoload_when_accessing :icon_server, :icon_farm, :pro, :admin, :icon_url, :with => :load_info
 
     describe "The User class" do
 
@@ -21,11 +37,15 @@ module Fleakr
 
         should_have_a_value_for :id           => '31066442@N69'
         should_have_a_value_for :username     => 'frootpantz'
+        should_have_a_value_for :name         => 'Sir Froot Pantz'
         should_have_a_value_for :photos_url   => 'http://www.flickr.com/photos/frootpantz/'
         should_have_a_value_for :profile_url  => 'http://www.flickr.com/people/frootpantz/'
         should_have_a_value_for :photos_count => '3907'
         should_have_a_value_for :icon_server  => '30'
         should_have_a_value_for :icon_farm    => '1'
+        should_have_a_value_for :pro          => '1'
+        should_have_a_value_for :admin        => '0'
+        
       end
 
       context "in general" do
@@ -56,6 +76,27 @@ module Fleakr
           @user.stubs(:icon_server).with().returns(nil)
           @user.icon_url.should == 'http://www.flickr.com/images/buddyicon.jpg'
         end
+        
+        it "should return a boolean value for :pro?" do
+          @user.stubs(:pro).with().returns('0')
+          @user.pro?.should be(false)
+          
+          @user.stubs(:pro).with().returns('1')
+          @user.pro?.should be(true)
+        end
+        
+        it "should return a boolean value for :admin?" do
+          @user.stubs(:admin).with().returns('0')
+          @user.admin?.should be(false)
+          
+          @user.stubs(:admin).with().returns('1')
+          @user.admin?.should be(true)
+        end
+        
+        
+        
+
+        
       end
     end
 

data/test/{fleakr → unit/fleakr/support}/attribute_test.rb

@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require File.dirname(__FILE__) + '/../../../test_helper'
 
-module Fleakr
+module Fleakr::Support
   class AttributeTest < Test::Unit::TestCase
     describe "An instance of the Attribute class" do
 

data/test/{fleakr → unit/fleakr/support}/object_test.rb

@@ -1,12 +1,12 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require File.dirname(__FILE__) + '/../../../test_helper'
 
 class EmptyObject
-  include Fleakr::Object
+  include Fleakr::Support::Object
 end
 
 class FlickrObject
   
-  include Fleakr::Object
+  include Fleakr::Support::Object
   
   flickr_attribute :name
   flickr_attribute :description, :xpath => 'desc'

data/test/unit/fleakr_test.rb

@@ -0,0 +1,44 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class FleakrTest < Test::Unit::TestCase
+  
+  describe "The Fleakr module" do
+    
+    it "should be able to set an API key" do
+      key = 'f00b4r'
+      Fleakr.api_key = key
+      
+      Fleakr.api_key.should == key
+    end
+    
+    it "should provide a means to find a user by his username" do
+      user = stub()
+      Fleakr::Objects::User.expects(:find_by_username).with('username').returns(user)
+      Fleakr.user('username').should == user
+    end
+    
+    it "should fall back to finding a user by email if finding by username fails" do
+      user = stub()
+      email = 'user@host.com'
+      
+      Fleakr::Objects::User.stubs(:find_by_username).with(email).raises(Fleakr::Api::Request::ApiError)
+      Fleakr::Objects::User.expects(:find_by_email).with(email).returns(user)
+      
+      Fleakr.user(email).should == user
+    end
+    
+    it "should be able to perform text searches" do
+      photos = [stub()]
+      
+      Fleakr::Objects::Search.expects(:new).with(:text => 'foo').returns(stub(:results => photos))
+      Fleakr.search('foo').should == photos
+    end
+    
+    it "should be able to perform searches based on tags" do
+      Fleakr::Objects::Search.expects(:new).with(:tags => %w(one two)).returns(stub(:results => []))
+      Fleakr.search(:tags => %w(one two))
+    end
+    
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: reagent-fleakr
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors: 
 - Patrick Reagan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-04 00:00:00 -08:00
+date: 2008-12-12 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,51 +37,65 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.markdown
+- README.rdoc
 files: 
-- README.markdown
+- README.rdoc
 - Rakefile
 - lib/fleakr
-- lib/fleakr/attribute.rb
-- lib/fleakr/error.rb
-- lib/fleakr/group.rb
-- lib/fleakr/image.rb
-- lib/fleakr/object.rb
-- lib/fleakr/photo.rb
-- lib/fleakr/request.rb
-- lib/fleakr/response.rb
-- lib/fleakr/search.rb
-- lib/fleakr/set.rb
-- lib/fleakr/user.rb
+- lib/fleakr/api
+- lib/fleakr/api/request.rb
+- lib/fleakr/api/response.rb
+- lib/fleakr/objects
+- lib/fleakr/objects/contact.rb
+- lib/fleakr/objects/error.rb
+- lib/fleakr/objects/group.rb
+- lib/fleakr/objects/image.rb
+- lib/fleakr/objects/photo.rb
+- lib/fleakr/objects/search.rb
+- lib/fleakr/objects/set.rb
+- lib/fleakr/objects/user.rb
+- lib/fleakr/support
+- lib/fleakr/support/attribute.rb
+- lib/fleakr/support/object.rb
 - lib/fleakr/version.rb
 - lib/fleakr.rb
 - test/fixtures
+- test/fixtures/contacts.getPublicList.xml
+- test/fixtures/groups.pools.getPhotos.xml
 - test/fixtures/people.findByEmail.xml
 - test/fixtures/people.findByUsername.xml
 - test/fixtures/people.getInfo.xml
 - test/fixtures/people.getPublicGroups.xml
 - test/fixtures/people.getPublicPhotos.xml
+- test/fixtures/photos.getSizes.xml
 - test/fixtures/photos.search.xml
 - test/fixtures/photosets.getList.xml
 - test/fixtures/photosets.getPhotos.xml
-- test/fleakr
-- test/fleakr/attribute_test.rb
-- test/fleakr/error_test.rb
-- test/fleakr/group_test.rb
-- test/fleakr/image_test.rb
-- test/fleakr/object_test.rb
-- test/fleakr/photo_test.rb
-- test/fleakr/request_test.rb
-- test/fleakr/response_test.rb
-- test/fleakr/search_test.rb
-- test/fleakr/set_test.rb
-- test/fleakr/user_test.rb
 - test/test_helper.rb
+- test/unit
+- test/unit/fleakr
+- test/unit/fleakr/api
+- test/unit/fleakr/api/request_test.rb
+- test/unit/fleakr/api/response_test.rb
+- test/unit/fleakr/objects
+- test/unit/fleakr/objects/contact_test.rb
+- test/unit/fleakr/objects/error_test.rb
+- test/unit/fleakr/objects/group_test.rb
+- test/unit/fleakr/objects/image_test.rb
+- test/unit/fleakr/objects/photo_test.rb
+- test/unit/fleakr/objects/search_test.rb
+- test/unit/fleakr/objects/set_test.rb
+- test/unit/fleakr/objects/user_test.rb
+- test/unit/fleakr/support
+- test/unit/fleakr/support/attribute_test.rb
+- test/unit/fleakr/support/object_test.rb
+- test/unit/fleakr_test.rb
 has_rdoc: true
 homepage: http://sneaq.net
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --main
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/lib/fleakr/attribute.rb

@@ -1,26 +0,0 @@
-module Fleakr
-  class Attribute
-
-    attr_reader :name, :xpath, :attribute
-
-    def initialize(name, options = {})
-      @name = name.to_sym
-      @attribute = options[:attribute]
-      
-      @xpath = options[:xpath]
-      @xpath ||= @name.to_s unless @attribute
-    end
-
-    def value_from(document)
-      node = document
-      
-      begin 
-        node = document.at(self.xpath) if self.xpath
-        self.attribute.nil? ? node.inner_text : node[self.attribute]
-      rescue NoMethodError
-        nil
-      end
-    end
-
-  end
-end

data/lib/fleakr/error.rb

@@ -1,10 +0,0 @@
-module Fleakr
-  class Error
-    
-    include Fleakr::Object
-    
-    flickr_attribute :code, :xpath => 'rsp/err', :attribute => 'code'
-    flickr_attribute :message, :xpath => 'rsp/err', :attribute => 'msg'
-    
-  end
-end

data/lib/fleakr/group.rb

@@ -1,12 +0,0 @@
-module Fleakr
-  class Group
-    
-    include Fleakr::Object
-    
-    flickr_attribute :id, :attribute => 'nsid'
-    flickr_attribute :name, :attribute => 'name'
-    
-    find_all :by_user_id, :call => 'people.getPublicGroups', :path => 'groups/group'
-    
-  end
-end

data/lib/fleakr/image.rb

@@ -1,35 +0,0 @@
-module Fleakr
-  class Image
-    
-    SUFFIXES = {
-      :square    => '_s.jpg',
-      :thumbnail => '_t.jpg',
-      :small     => '_m.jpg',
-      :medium    => '.jpg',
-      :large     => '_b.jpg',
-    }.freeze
-    
-    def self.suffix_for(size)
-      self::SUFFIXES[size]
-    end
-    
-    def initialize(base_url, size)
-      @base_url = base_url
-      @size = size
-    end
-    
-    def url
-      "#{@base_url}#{Image.suffix_for(@size)}"
-    end
-    
-    def filename
-      self.url.match(/([^\/]+)$/)[1]
-    end
-    
-    def save_to(target)
-      destination = File.directory?(target) ? "#{target}/#{self.filename}" : "#{target}"
-      File.open(destination, 'w') {|f| f << Net::HTTP.get(URI.parse(self.url)) }
-    end
-    
-  end
-end

data/lib/fleakr/object.rb

@@ -1,75 +0,0 @@
-module Fleakr
-  module Object
-    
-    module ClassMethods
-      
-      def attributes
-        @attributes ||= []
-      end
-      
-      def flickr_attribute(name, options = {})
-        self.attributes << Attribute.new(name, options)
-        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
-      
-      def initialize(document = nil)
-        self.populate_from(document) unless document.nil?
-      end
-      
-      def populate_from(document)
-        self.class.attributes.each do |attribute|
-          value = attribute.value_from(document)
-          instance_variable_set("@#{attribute.name}".to_sym, value) unless value.nil?
-        end
-      end
-      
-    end
-
-    def self.included(other)
-      other.send(:extend, Fleakr::Object::ClassMethods)
-      other.send(:include, Fleakr::Object::InstanceMethods)
-    end    
-  end
-  
-end