reagent-fleakr 0.3.0 → 0.4.0

data/test/unit/fleakr_test.rb

@@ -4,11 +4,13 @@ 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
+    [:api_key, :shared_secret, :mini_token, :auth_token].each do |attribute|
+      it "should be able to set a value for :#{attribute}" do
+        value = 'value'
+        
+        Fleakr.send("#{attribute}=".to_sym, value)
+        Fleakr.send(attribute).should == value
+      end
     end
     
     it "should provide a means to find a user by his username" do
@@ -21,7 +23,7 @@ class FleakrTest < Test::Unit::TestCase
       user = stub()
       email = 'user@host.com'
       
-      Fleakr::Objects::User.stubs(:find_by_username).with(email).raises(Fleakr::Api::Request::ApiError)
+      Fleakr::Objects::User.stubs(:find_by_username).with(email).raises(Fleakr::ApiError)
       Fleakr::Objects::User.expects(:find_by_email).with(email).returns(user)
       
       Fleakr.user(email).should == user
@@ -38,6 +40,63 @@ class FleakrTest < Test::Unit::TestCase
       Fleakr::Objects::Search.expects(:new).with(:tags => %w(one two)).returns(stub(:results => []))
       Fleakr.search(:tags => %w(one two))
     end
+   
+    it "should be able to upload a collection of images" do
+      glob      = '*.jpg'
+      filenames = %w(one.jpg two.jpg)
+      
+      Dir.expects(:[]).with(glob).returns(filenames)
+      
+      Fleakr::Objects::Photo.expects(:upload).with('one.jpg')
+      Fleakr::Objects::Photo.expects(:upload).with('two.jpg')
+      
+      Fleakr.upload(glob)
+    end
+    
+    context "when generating an AuthenticationToken from an auth_token string" do
+
+      before do
+        @token = stub()
+        
+        Fleakr.expects(:auth_token).with().at_least_once.returns('abc123')
+        Fleakr::Objects::AuthenticationToken.expects(:from_auth_token).with('abc123').returns(@token)
+      end
+
+      # Make sure to clear the cache
+      after { Fleakr.instance_variable_set(:@token, nil) }
+      
+      it "should return the token" do
+        Fleakr.token.should == @token
+      end
+      
+      it "should cache the result" do
+        2.times { Fleakr.token }
+      end
+
+    end
+    
+    context "when generating an AuthenticationToken from a mini_token string" do
+      
+      before do
+        @token = stub()
+
+        Fleakr.expects(:auth_token).with().at_least_once.returns(nil)
+        Fleakr.expects(:mini_token).with().at_least_once.returns('123-123-123')
+        Fleakr::Objects::AuthenticationToken.expects(:from_mini_token).with('123-123-123').returns(@token)          
+      end
+      
+      # Make sure to clear the cache
+      after { Fleakr.instance_variable_set(:@token, nil) }
+      
+      it "should return the token" do
+        Fleakr.token.should == @token
+      end
+      
+      it "should cache the result" do
+        2.times { Fleakr.token }
+      end
+      
+    end
     
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: reagent-fleakr
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Patrick Reagan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-12 00:00:00 -08:00
+date: 2009-01-02 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,9 +43,19 @@ files:
 - Rakefile
 - lib/fleakr
 - lib/fleakr/api
-- lib/fleakr/api/request.rb
+- lib/fleakr/api/file_parameter.rb
+- lib/fleakr/api/method_request.rb
+- lib/fleakr/api/parameter.rb
+- lib/fleakr/api/parameter_list.rb
 - lib/fleakr/api/response.rb
+- lib/fleakr/api/upload_request.rb
+- lib/fleakr/api/value_parameter.rb
+- lib/fleakr/api.rb
+- lib/fleakr/core_ext
+- lib/fleakr/core_ext/hash.rb
+- lib/fleakr/core_ext.rb
 - lib/fleakr/objects
+- lib/fleakr/objects/authentication_token.rb
 - lib/fleakr/objects/contact.rb
 - lib/fleakr/objects/error.rb
 - lib/fleakr/objects/group.rb
@@ -54,12 +64,16 @@ files:
 - lib/fleakr/objects/search.rb
 - lib/fleakr/objects/set.rb
 - lib/fleakr/objects/user.rb
+- lib/fleakr/objects.rb
 - lib/fleakr/support
 - lib/fleakr/support/attribute.rb
 - lib/fleakr/support/object.rb
+- lib/fleakr/support.rb
 - lib/fleakr/version.rb
 - lib/fleakr.rb
 - test/fixtures
+- test/fixtures/auth.checkToken.xml
+- test/fixtures/auth.getFullToken.xml
 - test/fixtures/contacts.getPublicList.xml
 - test/fixtures/groups.pools.getPhotos.xml
 - test/fixtures/people.findByEmail.xml
@@ -67,6 +81,7 @@ files:
 - test/fixtures/people.getInfo.xml
 - test/fixtures/people.getPublicGroups.xml
 - test/fixtures/people.getPublicPhotos.xml
+- test/fixtures/photos.getInfo.xml
 - test/fixtures/photos.getSizes.xml
 - test/fixtures/photos.search.xml
 - test/fixtures/photosets.getList.xml
@@ -75,9 +90,17 @@ files:
 - test/unit
 - test/unit/fleakr
 - test/unit/fleakr/api
-- test/unit/fleakr/api/request_test.rb
+- test/unit/fleakr/api/file_parameter_test.rb
+- test/unit/fleakr/api/method_request_test.rb
+- test/unit/fleakr/api/parameter_list_test.rb
+- test/unit/fleakr/api/parameter_test.rb
 - test/unit/fleakr/api/response_test.rb
+- test/unit/fleakr/api/upload_request_test.rb
+- test/unit/fleakr/api/value_parameter_test.rb
+- test/unit/fleakr/core_ext
+- test/unit/fleakr/core_ext/hash_test.rb
 - test/unit/fleakr/objects
+- test/unit/fleakr/objects/authentication_token_test.rb
 - test/unit/fleakr/objects/contact_test.rb
 - test/unit/fleakr/objects/error_test.rb
 - test/unit/fleakr/objects/group_test.rb

data/lib/fleakr/api/request.rb

@@ -1,58 +0,0 @@
-module Fleakr
-  module Api # :nodoc:
-    
-    # = Request
-    #
-    # Performs requests against the Flickr API and returns response objects (Flickr::Api::Response)
-    # that contain Hpricot documents for further parsing and inspection.  This class is used internally
-    # in all the defined model objects.
-    #
-    class Request
-
-      # Generic catch-all exception for any API errors
-      class ApiError < StandardError; end
-
-      # Makes a request to the Flickr API and returns a valid Response object.  If
-      # there are errors on the response it will rais an ApiError exception
-      def self.with_response!(method, additional_parameters = {})
-        request = Request.new(method, additional_parameters)
-        response = request.send
-
-        raise(ApiError, "Code: #{response.error.code} - #{response.error.message}") if response.error?
-
-        response
-      end
-
-      # Create a new request for the specified API method and pass along any additional
-      # parameters.  The Flickr API uses namespacing for its methods - this is optional
-      # when calling this method.
-      #
-      # This must be called after initializing the library with the required API key
-      # see (#Fleakr.api_key=)
-      def initialize(method, additional_parameters = {})
-        method = method.sub(/^(flickr\.)?/, 'flickr.')
-
-        default_parameters = {:api_key => Fleakr.api_key, :method => method}
-        @parameters = default_parameters.merge(additional_parameters)
-      end
-
-      def send # :nodoc:
-        Response.new(Net::HTTP.get(endpoint_uri))
-      end
-
-      private
-      def endpoint_uri
-        uri = URI.parse('http://api.flickr.com/services/rest/')
-        uri.query = query_parameters
-        uri
-      end
-
-      def query_parameters
-        @parameters.map {|key,value| "#{key}=#{CGI.escape(value)}" }.join('&')
-      end
-
-
-
-    end
-  end
-end

data/test/unit/fleakr/api/request_test.rb

@@ -1,93 +0,0 @@
-require File.dirname(__FILE__) + '/../../../test_helper'
-
-module Fleakr::Api
-    class RequestTest < Test::Unit::TestCase
-
-      describe "A Request instance" do
-
-        context "with an API key" do
-
-          before do
-            @api_key = 'f00b4r'
-            Fleakr.stubs(:api_key).with().returns(@api_key)
-          end
-
-          it "should know the full query parameters" do
-            request = Request.new('flickr.people.findByUsername', :username => 'foobar')
-
-            expected = [
-              "api_key=#{@api_key}",
-              "method=flickr.people.findByUsername",
-              "username=foobar"
-            ]
-
-            request.query_parameters.split('&').sort.should == expected
-          end
-
-          it "should escape the keys and values in the parameter list" do
-            request = Request.new('flickr.people.findByUsername', :username => 'the decapitator')
-            request.query_parameters.split('&').include?("username=#{CGI.escape('the decapitator')}").should be(true)
-          end
-
-          it "should translate a shorthand API call" do
-            request = Request.new('people.findByUsername')
-            request.query_parameters.split('&').include?('method=flickr.people.findByUsername').should be(true)
-          end
-
-          it "should know the endpoint with full parameters" do
-            query_parameters = 'foo=bar'
-
-            request = Request.new('people.getInfo')
-            request.stubs(:query_parameters).with().returns(query_parameters)
-
-            uri_mock = mock() {|m| m.expects(:query=).with(query_parameters)}
-
-            URI.expects(:parse).with("http://api.flickr.com/services/rest/").returns(uri_mock)
-
-            request.endpoint_uri.should == uri_mock
-          end
-
-          it "should be able to make a request" do
-            endpoint_uri = stub()
-
-            request = Request.new('flickr.people.findByUsername')
-
-            request.stubs(:endpoint_uri).with().returns(endpoint_uri)
-            Net::HTTP.expects(:get).with(endpoint_uri).returns('<xml>')
-
-            request.send
-          end
-
-          it "should create a response from the request" do
-            response_xml  = '<xml>'
-            response_stub = stub()
-
-            request = Request.new('flickr.people.findByUsername')
-
-            Net::HTTP.stubs(:get).returns(response_xml)
-            Response.expects(:new).with(response_xml).returns(response_stub)
-
-            request.send.should == response_stub
-          end
-
-          it "should be able to make a full request and response cycle" do
-            response = stub(:error? => false)
-            Response.expects(:new).with(kind_of(String)).returns(response)
-
-            Request.with_response!('flickr.people.findByUsername', :username => 'foobar').should == response
-          end
-
-          it "should raise an exception when the full request / response cycle has errors" do
-            response = stub(:error? => true, :error => stub(:code => '1', :message => 'User not found'))
-            Response.stubs(:new).with(kind_of(String)).returns(response)
-
-            lambda do
-              Request.with_response!('flickr.people.findByUsername', :username => 'foobar')
-            end.should raise_error(Fleakr::Api::Request::ApiError)
-          end
-
-        end
-
-      end
-    end
-  end