swivel 0.0.160 → 0.0.175

data/lib/swivel.rb

@@ -207,7 +207,7 @@ module Swivel
       elsif @hash_doc[list_name].is_a? Hash and
           @hash_doc[list_name]['@type'] == 'array'
         member_name = (@hash_doc[list_name].keys.find{|k| !/^@/.match(k) } || list_name.singularize)
-        list = (@hash_doc[list_name][member_name] rescue [])
+        list = (@hash_doc[list_name][member_name] || [] rescue [])
         list = [list] unless list.is_a?(Array)
         # hack to get the gem to parse all array types correctly
         hack_list = list.map{|i| {member_name => i}}
@@ -483,9 +483,6 @@ module Swivel
     def self.resource
       'user'
     end
-    def to_param
-      name
-    end
   end
   
   class Group < Response
@@ -624,7 +621,10 @@ module Swivel
       'error'
     end
     def raise
-      super ApiError, message, backtrace ? backtrace.split("\n") : ''
+      trace = caller
+      trace = backtrace.split("\n") + trace  if backtrace
+
+      super ApiError, message, trace
     end
   end
 
@@ -669,7 +669,7 @@ module Swivel
         FileUtils::mkdir_p dir unless File.exist? dir
         @config =
           unless File.exist? @filename
-            DEFAULT_CONFIG
+            DEFAULT_CONFIG.clone
           else
             YAML::load_file @filename
           end
@@ -691,7 +691,7 @@ module Swivel
     # set in ~/.swivelrc.
 
     def initialize options = Hash.new
-      @config = Config::DEFAULT_CONFIG
+      @config = Config::DEFAULT_CONFIG.clone
       @config.merge! options
       @headers = options[:headers] || Hash.new
       @headers.merge! 'Accept' => 'application/xml'

data/lib/swivel2.rb

@@ -2,7 +2,9 @@ require 'rubygems'
 require 'active_support'
 require File.dirname(__FILE__) + '/../vendor/activesupport-2.0.2-/lib/active_support/core_ext/module/attr_accessor_with_default'
 require File.dirname(__FILE__) + '/../vendor/activesupport-2.0.2-/lib/active_support/core_ext/object/misc'
-require File.dirname(__FILE__) + '/../vendor/activeresource-2.0.2-/lib/active_resource'
+$: << File.dirname(__FILE__) + '/../vendor/activesupport-2.0.2-/lib/active_support/vendor/xml-simple-1.0.11'
+require File.dirname(__FILE__) + '/../vendor/activesupport-2.0.2-/lib/active_support/core_ext/hash/conversions'
+require File.dirname(__FILE__) + '/../vendor/activeresource/lib/active_resource'
 
 require File.dirname(__FILE__) + '/swivel2/config'
 require File.dirname(__FILE__) + '/swivel2/connection'

data/lib/swivel2/connection.rb

@@ -1,11 +1,25 @@
 module Swivel2
+  class Resource < ActiveResource::Connection
+    attr_accessor :read_timeout
+    private
+      def http
+        if read_timeout
+          returning super do |h|
+            h.read_timeout = read_timeout
+          end
+        else
+          super
+        end
+      end
+  end
 
   class Connection
     attr_reader :config, :resource, :format
 
     def initialize config = Config.default
       @config = config.is_a?(Hash) ? Config.new(config) : config
-      @resource = ActiveResource::Connection.new @config.site
+      @resource = Resource.new @config.site
+      @resource.read_timeout = @config.timeout_read  if @config.timeout_read
       @format = Swivel2::Formats::XmlFormat
     end
 

data/lib/swivel2/swivelrc.default

@@ -1,4 +1,3 @@
 --- !ruby/struct:Swivel2::Config 
 site: https://api.swivel.com
-timeout_read: 500
-timeout_write: 1_000
+timeout_read: 600

data/vendor/{activeresource-2.0.2- → activeresource}/CHANGELOG

@@ -1,3 +1,20 @@
+*SVN*
+
+* Use HEAD instead of GET in exists? [bscofield]
+
+* Fix small documentation typo.  Closes #10670 [l.guidi]
+
+* find_or_create_resource_for handles module nesting.  #10646 [xavier]
+
+* Allow setting ActiveResource::Base#format before #site.  [rick]
+
+* Support agnostic formats when calling custom methods.  Closes #10635 [joerichsen]
+
+* Document custom methods.  #10589 [Cheah Chu Yeow]
+
+* Ruby 1.9 compatibility.  [Jeremy Kemper]
+
+
 *2.0.2* (December 16th, 2007)
 
 * Added more specific exceptions for 400, 401, and 403 (all descending from ClientError so existing rescues will work) #10326 [trek]

data/vendor/activeresource/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2006 David Heinemeier Hansson
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/vendor/{activeresource-2.0.2- → activeresource}/Rakefile

@@ -4,7 +4,6 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 require 'rake/packagetask'
 require 'rake/gempackagetask'
-require 'rake/contrib/rubyforgepublisher'
 require File.join(File.dirname(__FILE__), 'lib', 'active_resource', 'version')
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
@@ -52,6 +51,7 @@ Rake::RDocTask.new { |rdoc|
 dist_dirs = [ "lib", "test", "examples", "dev-utils" ]
 
 spec = Gem::Specification.new do |s|
+  s.platform = Gem::Platform::RUBY
   s.name = PKG_NAME
   s.version = PKG_VERSION
   s.summary = "Think Active Record for web resources."

data/vendor/{activeresource-2.0.2- → activeresource}/lib/active_resource.rb

@@ -27,7 +27,7 @@ $:.unshift(File.dirname(__FILE__)) unless
 unless defined?(ActiveSupport)
   begin
     $:.unshift(File.dirname(__FILE__) + "/../../activesupport/lib")  
-    require 'active_support'  
+    require 'active_support'
   rescue LoadError
     require 'rubygems'
     gem 'activesupport'

data/vendor/{activeresource-2.0.2- → activeresource}/lib/active_resource/base.rb

@@ -5,7 +5,7 @@ require 'set'
 module ActiveResource
   # ActiveResource::Base is the main class for mapping RESTful resources as models in a Rails application.
   #
-  # For an outline of what Active Resource is capable of, see link:files/README.html.
+  # For an outline of what Active Resource is capable of, see link:files/vendor/rails/activeresource/README.html.
   #
   # == Automated mapping
   #
@@ -33,7 +33,7 @@ module ActiveResource
   #   ryan.exists?  #=> true
   # 
   #   ryan = Person.find(1)
-  #   # => Resource holding our newly create Person object
+  #   # => Resource holding our newly created Person object
   # 
   #   ryan.first = 'Rizzle'
   #   ryan.save  #=> true
@@ -46,15 +46,26 @@ module ActiveResource
   # === Custom REST methods
   #
   # Since simple CRUD/lifecycle methods can't accomplish every task, Active Resource also supports
-  # defining your own custom REST methods.
-  # 
-  #   Person.new(:name => 'Ryan).post(:register)
+  # defining your own custom REST methods. To invoke them, Active Resource provides the <tt>get</tt>,
+  # <tt>post</tt>, <tt>put</tt> and <tt>delete</tt> methods where you can specify a custom REST method
+  # name to invoke.
+  #
+  #   # POST to the custom 'register' REST method, i.e. POST /people/new/register.xml.
+  #   Person.new(:name => 'Ryan').post(:register)
   #   # => { :id => 1, :name => 'Ryan', :position => 'Clerk' }
   #
+  #   # PUT an update by invoking the 'promote' REST method, i.e. PUT /people/1/promote.xml?position=Manager.
   #   Person.find(1).put(:promote, :position => 'Manager')
   #   # => { :id => 1, :name => 'Ryan', :position => 'Manager' }
+  #
+  #   # GET all the positions available, i.e. GET /people/positions.xml.
+  #   Person.get(:positions)
+  #   # => [{:name => 'Manager'}, {:name => 'Clerk'}]
+  #
+  #   # DELETE to 'fire' a person, i.e. DELETE /people/1/fire.xml.
+  #   Person.find(1).delete(:fire)
   # 
-  # For more information on creating and using custom REST methods, see the 
+  # For more information on using custom REST methods, see the
   # ActiveResource::CustomMethods documentation.
   #
   # == Validations
@@ -87,12 +98,12 @@ module ActiveResource
   # == Errors & Validation
   #
   # Error handling and validation is handled in much the same manner as you're used to seeing in
-  # Active Record.  Both the response code in the Http response and the body of the response are used to
+  # Active Record.  Both the response code in the HTTP response and the body of the response are used to
   # indicate that an error occurred.
   # 
   # === Resource errors
   # 
-  # When a get is requested for a resource that does not exist, the HTTP +404+ (Resource Not Found)
+  # When a GET is requested for a resource that does not exist, the HTTP <tt>404</tt> (Resource Not Found)
   # response code will be returned from the server which will raise an ActiveResource::ResourceNotFound
   # exception.
   # 
@@ -100,7 +111,7 @@ module ActiveResource
   #   ryan = Person.find(999) # => Raises ActiveResource::ResourceNotFound
   #   # => Response = 404
   # 
-  # +404+ is just one of the HTTP error response codes that ActiveResource will handle with its own exception. The 
+  # <tt>404</tt> is just one of the HTTP error response codes that ActiveResource will handle with its own exception. The
   # following HTTP response codes will also result in these exceptions:
   # 
   # 200 - 399:: Valid response, no exception
@@ -125,8 +136,8 @@ module ActiveResource
   # 
   # Active Resource supports validations on resources and will return errors if any these validations fail
   # (e.g., "First name can not be blank" and so on).  These types of errors are denoted in the response by 
-  # a response code of +422+ and an XML representation of the validation errors.  The save operation will 
-  # then fail (with a +false+ return value) and the validation errors can be accessed on the resource in question.
+  # a response code of <tt>422</tt> and an XML representation of the validation errors.  The save operation will
+  # then fail (with a <tt>false</tt> return value) and the validation errors can be accessed on the resource in question.
   # 
   #   ryan = Person.find(1)
   #   ryan.first #=> ''
@@ -181,7 +192,7 @@ module ActiveResource
           ActiveResource::Formats[mime_type_reference_or_format] : mime_type_reference_or_format
 
         write_inheritable_attribute("format", format)
-        connection.format = format
+        connection.format = format if site
       end
       
       # Returns the current format, default is ActiveResource::Formats::XmlFormat
@@ -191,7 +202,7 @@ module ActiveResource
 
       # An instance of ActiveResource::Connection that is the base connection to the remote service.
       # The +refresh+ parameter toggles whether or not the connection is refreshed at every request
-      # or not (defaults to +false+).
+      # or not (defaults to <tt>false</tt>).
       def connection(refresh = false)
         if defined?(@connection) || superclass == Object
           @connection = Connection.new(site, format) if refresh || @connection.nil?
@@ -372,6 +383,9 @@ module ActiveResource
       #   Person.find(:one, :from => :leader)                    
       #   # => GET /people/leader.xml
       #
+      #   Person.find(:all, :from => :developers, :params => { :language => 'ruby' })
+      #   # => GET /people/developers.xml?language=ruby
+      #
       #   Person.find(:one, :from => "/companies/1/manager.xml") 
       #   # => GET /companies/1/manager.xml
       #
@@ -422,7 +436,13 @@ module ActiveResource
       #   Note.exists(1349)
       #   # => false
       def exists?(id, options = {})
-        id && !find_single(id, options).nil?
+        if id
+          prefix_options, query_options = split_options(options[:params])
+          path = element_path(id, prefix_options, query_options)
+          response = connection.head(path, headers)
+          response.code == 200
+        end
+        # id && !find_single(id, options).nil?
       rescue ActiveResource::ResourceNotFound
         false
       end
@@ -687,9 +707,9 @@ module ActiveResource
     #
     # indent:: Set the indent level for the XML output (default is +2+).
     # dasherize:: Boolean option to determine whether or not element names should
-    #             replace underscores with dashes (default is +false+).
+    #             replace underscores with dashes (default is <tt>false</tt>).
     # skip_instruct::  Toggle skipping the +instruct!+ call on the XML builder 
-    #                  that generates the XML declaration (default is +false+).
+    #                  that generates the XML declaration (default is <tt>false</tt>).
     #
     # ==== Examples
     #   my_group = SubsidiaryGroup.find(:first)
@@ -769,8 +789,8 @@ module ActiveResource
     alias_method :respond_to_without_attributes?, :respond_to?
 
     # A method to determine if an object responds to a message (e.g., a method call). In Active Resource, a +Person+ object with a
-    # +name+ attribute can answer +true+ to +my_person.respond_to?("name")+, +my_person.respond_to?("name=")+, and
-    # +my_person.respond_to?("name?")+.
+    # +name+ attribute can answer <tt>true</tt> to <tt>my_person.respond_to?("name")</tt>, <tt>my_person.respond_to?("name=")</tt>, and
+    # <tt>my_person.respond_to?("name?")</tt>.
     def respond_to?(method, include_priv = false)
       method_name = method.to_s
       if attributes.nil?
@@ -831,17 +851,26 @@ module ActiveResource
         find_or_create_resource_for(name.to_s.singularize)
       end
       
+      # Tries to find a resource in a non empty list of nested modules
+      # Raises a NameError if it was not found in any of the given nested modules
+      def find_resource_in_modules(resource_name, module_names)
+        receiver = Object
+        namespaces = module_names.map do |module_name|
+          receiver = receiver.const_get(module_name)
+        end
+        if namespace = namespaces.reverse.detect { |ns| ns.const_defined?(resource_name) }
+          return namespace.const_get(resource_name)
+        else
+          raise NameError
+        end
+      end
+
       # Tries to find a resource for a given name; if it fails, then the resource is created
       def find_or_create_resource_for(name)
         resource_name = name.to_s.camelize
-
-        # FIXME: Make it generic enough to support any depth of module nesting
-        if (ancestors = self.class.name.split("::")).size > 1
-          begin
-            ancestors.first.constantize.const_get(resource_name)
-          rescue NameError
-            self.class.const_get(resource_name)
-          end
+        ancestors = self.class.name.split("::")
+        if ancestors.size > 1
+          find_resource_in_modules(resource_name, ancestors)
         else
           self.class.const_get(resource_name)
         end

data/vendor/{activeresource-2.0.2- → activeresource}/lib/active_resource/connection.rb

@@ -101,6 +101,12 @@ module ActiveResource
       request(:post, path, body.to_s, build_request_headers(headers))
     end
 
+    # Execute a HEAD request.
+    # Used to ...
+    def head(path, headers= {})
+      request(:head, path, build_request_headers(headers))
+    end
+
 
     private
       # Makes request to remote service.
@@ -108,7 +114,7 @@ module ActiveResource
         logger.info "#{method.to_s.upcase} #{site.scheme}://#{site.host}:#{site.port}#{path}" if logger
         result = nil
         time = Benchmark.realtime { result = http.send(method, path, *arguments) }
-        logger.info "--> #{result.code} #{result.message} (#{result.body ? result.body : 0}b %.2fs)" % time if logger
+        logger.info "--> #{result.code} #{result.message} (#{result.body ? result.body : 0}b " + ("%.2fs)" % time) if logger
         handle_response(result)
       end
 

data/vendor/activeresource/lib/active_resource/custom_methods.rb

@@ -0,0 +1,119 @@
+module ActiveResource
+  # A module to support custom REST methods and sub-resources, allowing you to break out
+  # of the "default" REST methods with your own custom resource requests.  For example,
+  # say you use Rails to expose a REST service and configure your routes with:
+  #
+  #    map.resources :people, :new => { :register => :post },
+  #                           :member => { :promote => :put, :deactivate => :delete }
+  #                           :collection => { :active => :get }
+  #
+  #  This route set creates routes for the following http requests:
+  #
+  #    POST    /people/new/register.xml #=> PeopleController.register
+  #    PUT     /people/1/promote.xml    #=> PeopleController.promote with :id => 1
+  #    DELETE  /people/1/deactivate.xml #=> PeopleController.deactivate with :id => 1
+  #    GET     /people/active.xml       #=> PeopleController.active
+  #
+  # Using this module, Active Resource can use these custom REST methods just like the
+  # standard methods.
+  #
+  #   class Person < ActiveResource::Base
+  #     self.site = "http://37s.sunrise.i:3000"
+  #   end
+  #
+  #   Person.new(:name => 'Ryan).post(:register)  # POST /people/new/register.xml
+  #   # => { :id => 1, :name => 'Ryan' }
+  #
+  #   Person.find(1).put(:promote, :position => 'Manager') # PUT /people/1/promote.xml
+  #   Person.find(1).delete(:deactivate) # DELETE /people/1/deactivate.xml
+  #
+  #   Person.get(:active)  # GET /people/active.xml
+  #   # => [{:id => 1, :name => 'Ryan'}, {:id => 2, :name => 'Joe'}]
+  #
+  module CustomMethods 
+    def self.included(base)
+      base.class_eval do
+        extend ActiveResource::CustomMethods::ClassMethods
+        include ActiveResource::CustomMethods::InstanceMethods
+
+        class << self
+          alias :orig_delete :delete
+
+          # Invokes a GET to a given custom REST method. For example:
+          #
+          #   Person.get(:active)  # GET /people/active.xml
+          #   # => [{:id => 1, :name => 'Ryan'}, {:id => 2, :name => 'Joe'}]
+          #
+          #   Person.get(:active, :awesome => true)  # GET /people/active.xml?awesome=true
+          #   # => [{:id => 1, :name => 'Ryan'}]
+          #
+          # Note: the objects returned from this method are not automatically converted
+          # into ActiveResource instances - they are ordinary Hashes. If you are expecting
+          # ActiveResource instances, use the <tt>find</tt> class method with the
+          # <tt>:from</tt> option. For example:
+          #
+          #   Person.find(:all, :from => :active)
+          def get(custom_method_name, options = {})
+            connection.get(custom_method_collection_url(custom_method_name, options), headers)
+          end
+
+          def post(custom_method_name, options = {}, body = '')
+            connection.post(custom_method_collection_url(custom_method_name, options), body, headers)
+          end
+
+          def put(custom_method_name, options = {}, body = '')
+            connection.put(custom_method_collection_url(custom_method_name, options), body, headers)
+          end
+
+          def delete(custom_method_name, options = {})
+            # Need to jump through some hoops to retain the original class 'delete' method
+            if custom_method_name.is_a?(Symbol)
+              connection.delete(custom_method_collection_url(custom_method_name, options), headers)
+            else
+              orig_delete(custom_method_name, options)
+            end
+          end
+        end
+      end
+    end
+
+    module ClassMethods
+      def custom_method_collection_url(method_name, options = {})
+        prefix_options, query_options = split_options(options)
+        "#{prefix(prefix_options)}#{collection_name}/#{method_name}.#{format.extension}#{query_string(query_options)}"
+      end
+    end
+    
+    module InstanceMethods
+      def get(method_name, options = {})
+        connection.get(custom_method_element_url(method_name, options), self.class.headers)
+      end
+      
+      def post(method_name, options = {}, body = '')
+        if new?
+          connection.post(custom_method_new_element_url(method_name, options), (body.nil? ? to_xml : body), self.class.headers)
+        else
+          connection.post(custom_method_element_url(method_name, options), body, self.class.headers)
+        end
+      end
+      
+      def put(method_name, options = {}, body = '')
+        connection.put(custom_method_element_url(method_name, options), body, self.class.headers)
+      end
+      
+      def delete(method_name, options = {})
+        connection.delete(custom_method_element_url(method_name, options), self.class.headers)
+      end
+
+
+      private
+        def custom_method_element_url(method_name, options = {})
+          "#{self.class.prefix(prefix_options)}#{self.class.collection_name}/#{id}/#{method_name}.#{self.class.format.extension}#{self.class.send!(:query_string, options)}"
+        end
+      
+        def custom_method_new_element_url(method_name, options = {})
+          "#{self.class.prefix(prefix_options)}#{self.class.collection_name}/new/#{method_name}.#{self.class.format.extension}#{self.class.send!(:query_string, options)}"
+        end
+    end
+  end
+end

data/vendor/{activeresource-2.0.2- → activeresource}/lib/active_resource/http_mock.rb

@@ -9,8 +9,8 @@ module ActiveResource
         @responses = responses
       end
 
-      for method in [ :post, :put, :get, :delete ]
-        module_eval <<-EOE
+      for method in [ :post, :put, :get, :delete, :head ]
+        module_eval <<-EOE, __FILE__, __LINE__
           def #{method}(path, request_headers = {}, body = nil, status = 200, response_headers = {})
             @responses[Request.new(:#{method}, path, nil, request_headers)] = Response.new(body || "", status, response_headers)
           end
@@ -47,21 +47,21 @@ module ActiveResource
     end
 
     for method in [ :post, :put ]
-      module_eval <<-EOE
+      module_eval <<-EOE, __FILE__, __LINE__
         def #{method}(path, body, headers)
           request = ActiveResource::Request.new(:#{method}, path, body, headers)
           self.class.requests << request
-          self.class.responses[request] || raise(InvalidRequestError.new("No response recorded for: \#{request.inspect}"))
+          self.class.responses[request] || raise(InvalidRequestError.new("No response recorded for \#{request}"))
         end
       EOE
     end
 
-    for method in [ :get, :delete ]
-      module_eval <<-EOE
+    for method in [ :get, :delete, :head ]
+      module_eval <<-EOE, __FILE__, __LINE__
         def #{method}(path, headers)
           request = ActiveResource::Request.new(:#{method}, path, nil, headers)
           self.class.requests << request
-          self.class.responses[request] || raise(InvalidRequestError.new("No response recorded for: \#{request.inspect}"))
+          self.class.responses[request] || raise(InvalidRequestError.new("No response recorded for \#{request}"))
         end
       EOE
     end
@@ -75,8 +75,7 @@ module ActiveResource
     attr_accessor :path, :method, :body, :headers
 
     def initialize(method, path, body = nil, headers = {})
-      @method, @path, @body, @headers = method, path, body, headers.dup
-      @headers.update('Content-Type' => 'application/xml')
+      @method, @path, @body, @headers = method, path, body, headers.reverse_merge('Content-Type' => 'application/xml')
     end
 
     def ==(other_request)

data/vendor/{activeresource-2.0.2- → activeresource}/test/authorization_test.rb

@@ -1,5 +1,4 @@
-require "#{File.dirname(__FILE__)}/abstract_unit"
-require 'base64'
+require 'abstract_unit'
 
 class AuthorizationTest < Test::Unit::TestCase
   Response = Struct.new(:code)
@@ -25,7 +24,7 @@ class AuthorizationTest < Test::Unit::TestCase
     authorization = authorization_header["Authorization"].to_s.split
     
     assert_equal "Basic", authorization[0]
-    assert_equal ["david", "test123"], Base64.decode64(authorization[1]).split(":")[0..1]
+    assert_equal ["david", "test123"], ActiveSupport::Base64.decode64(authorization[1]).split(":")[0..1]
   end
   
   def test_authorization_header_with_username_but_no_password
@@ -34,7 +33,7 @@ class AuthorizationTest < Test::Unit::TestCase
     authorization = authorization_header["Authorization"].to_s.split
     
     assert_equal "Basic", authorization[0]
-    assert_equal ["david"], Base64.decode64(authorization[1]).split(":")[0..1]
+    assert_equal ["david"], ActiveSupport::Base64.decode64(authorization[1]).split(":")[0..1]
   end
   
   def test_authorization_header_with_password_but_no_username
@@ -43,7 +42,7 @@ class AuthorizationTest < Test::Unit::TestCase
     authorization = authorization_header["Authorization"].to_s.split
     
     assert_equal "Basic", authorization[0]
-    assert_equal ["", "test123"], Base64.decode64(authorization[1]).split(":")[0..1]
+    assert_equal ["", "test123"], ActiveSupport::Base64.decode64(authorization[1]).split(":")[0..1]
   end
   
   def test_get

data/vendor/{activeresource-2.0.2- → activeresource}/test/base/custom_methods_test.rb

@@ -1,6 +1,6 @@
-require "#{File.dirname(__FILE__)}/../abstract_unit"
-require "#{File.dirname(__FILE__)}/../fixtures/person"
-require "#{File.dirname(__FILE__)}/../fixtures/street_address"
+require 'abstract_unit'
+require 'fixtures/person'
+require 'fixtures/street_address'
 
 class CustomMethodsTest < Test::Unit::TestCase
   def setup

data/vendor/{activeresource-2.0.2- → activeresource}/test/base/equality_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../abstract_unit"
+require 'abstract_unit'
 require "fixtures/person"
 require "fixtures/street_address"
 

data/vendor/{activeresource-2.0.2- → activeresource}/test/base/load_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../abstract_unit"
+require 'abstract_unit'
 require "fixtures/person"
 require "fixtures/street_address"
 
@@ -10,6 +10,29 @@ module Highrise
   class Comment < ActiveResource::Base
     self.site = "http://37s.sunrise.i:3000"
   end
+
+  module Deeply
+    module Nested
+
+      class Note < ActiveResource::Base
+        self.site = "http://37s.sunrise.i:3000"
+      end
+
+       class Comment < ActiveResource::Base
+         self.site = "http://37s.sunrise.i:3000"
+       end
+
+       module TestDifferentLevels
+
+         class Note < ActiveResource::Base
+           self.site = "http://37s.sunrise.i:3000"
+         end
+
+       end
+
+    end
+  end
+
 end
 
 
@@ -108,4 +131,16 @@ class BaseLoadTest < Test::Unit::TestCase
     n = Highrise::Note.new(:comments => [{ :name => "1" }])
     assert_kind_of Highrise::Comment, n.comments.first
   end
+
+  def test_nested_collections_within_deeply_nested_namespace
+    n = Highrise::Deeply::Nested::Note.new(:comments => [{ :name => "1" }])
+    assert_kind_of Highrise::Deeply::Nested::Comment, n.comments.first
+  end
+
+  def test_nested_collections_in_different_levels_of_namespaces
+    n = Highrise::Deeply::Nested::TestDifferentLevels::Note.new(:comments => [{ :name => "1" }])
+    assert_kind_of Highrise::Deeply::Nested::Comment, n.comments.first
+  end
+
+
 end

data/vendor/{activeresource-2.0.2- → activeresource}/test/base_errors_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/abstract_unit"
+require 'abstract_unit'
 require "fixtures/person"
 
 class BaseErrorsTest < Test::Unit::TestCase

data/vendor/{activeresource-2.0.2- → activeresource}/test/base_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/abstract_unit"
+require 'abstract_unit'
 require "fixtures/person"
 require "fixtures/street_address"
 require "fixtures/beast"
@@ -36,6 +36,11 @@ class BaseTest < Test::Unit::TestCase
       mock.put    "/people//addresses/1.xml",  {}, nil, 404
       mock.delete "/people//addresses/1.xml",  {}, nil, 404
       mock.post   "/people//addresses.xml",    {}, nil, 404
+      mock.head   "/people/1.xml",             {}, nil, 200
+      mock.head   "/people/99.xml",            {}, nil, 404
+      mock.head   "/people/1/addresses/1.xml", {}, nil, 200
+      mock.head   "/people/1/addresses/2.xml", {}, nil, 404
+      mock.head   "/people/2/addresses/1.xml", {}, nil, 404
     end
   end
 

data/vendor/{activeresource-2.0.2- → activeresource}/test/connection_test.rb

@@ -1,5 +1,4 @@
-require "#{File.dirname(__FILE__)}/abstract_unit"
-require 'base64'
+require 'abstract_unit'
 
 class ConnectionTest < Test::Unit::TestCase
   ResponseCodeStub = Struct.new(:code)
@@ -8,11 +7,13 @@ class ConnectionTest < Test::Unit::TestCase
     @conn = ActiveResource::Connection.new('http://localhost')
     @matz  = { :id => 1, :name => 'Matz' }
     @david = { :id => 2, :name => 'David' }
+    @percent = { :name => '%a' }
     @people = [ @matz, @david ].to_xml(:root => 'people')
     @people_single = [ @matz ].to_xml(:root => 'people-single-elements')
     @people_empty = [ ].to_xml(:root => 'people-empty-elements')
     @matz = @matz.to_xml(:root => 'person')
     @david = @david.to_xml(:root => 'person')
+    @percent = @percent.to_xml(:root => 'person')
     @header = {'key' => 'value'}.freeze
 
     @default_request_headers = { 'Content-Type' => 'application/xml' }
@@ -22,12 +23,14 @@ class ConnectionTest < Test::Unit::TestCase
       mock.get    "/people_single_elements.xml", {}, @people_single
       mock.get    "/people_empty_elements.xml", {}, @people_empty
       mock.get    "/people/1.xml", {}, @matz
+      mock.get    "/percent.xml", {}, @percent
       mock.put    "/people/1.xml", {}, nil, 204
       mock.put    "/people/2.xml", {}, @header, 204
       mock.delete "/people/1.xml", {}, nil, 200
       mock.delete "/people/2.xml", @header, nil, 200
       mock.post   "/people.xml",   {}, nil, 201, 'Location' => '/people/5.xml'
       mock.post   "/members.xml",  {}, @header, 201, 'Location' => '/people/6.xml'
+      mock.head   "/people/1.xml", {}, nil, 200
     end
   end
 
@@ -106,6 +109,12 @@ class ConnectionTest < Test::Unit::TestCase
     assert_equal "Matz", matz["name"]
   end
 
+  def test_head
+    response = @conn.head("/people/1.xml")
+    assert response.body.blank?
+    assert_equal 200, response.code
+  end
+
   def test_get_with_header
     david = @conn.get("/people/2.xml", @header)
     assert_equal "David", david["name"]
@@ -127,6 +136,11 @@ class ConnectionTest < Test::Unit::TestCase
     assert_equal [], people
   end
 
+  def test_get_percent_character
+    percent = @conn.get("/percent.xml")
+    assert_equal "%a", percent["name"]
+  end
+
   def test_post
     response = @conn.post("/people.xml")
     assert_equal "/people/5.xml", response["Location"]

data/vendor/activeresource/test/format_test.rb

@@ -0,0 +1,83 @@
+require 'abstract_unit'
+require "fixtures/person"
+
+class FormatTest < Test::Unit::TestCase
+  def setup
+    @matz  = { :id => 1, :name => 'Matz' }
+    @david = { :id => 2, :name => 'David' }
+    
+    @programmers = [ @matz, @david ]
+  end
+  
+  def test_formats_on_single_element
+    for format in [ :json, :xml ]
+      using_format(Person, format) do
+        ActiveResource::HttpMock.respond_to.get "/people/1.#{format}", {}, ActiveResource::Formats[format].encode(@david)
+        assert_equal @david[:name], Person.find(1).name
+      end
+    end
+  end
+
+  def test_formats_on_collection
+    for format in [ :json, :xml ]
+      using_format(Person, format) do
+        ActiveResource::HttpMock.respond_to.get "/people.#{format}", {}, ActiveResource::Formats[format].encode(@programmers)
+        remote_programmers = Person.find(:all)
+        assert_equal 2, remote_programmers.size
+        assert remote_programmers.select { |p| p.name == 'David' }
+      end
+    end
+  end
+
+  def test_formats_on_custom_collection_method
+    for format in [ :json, :xml ]
+      using_format(Person, format) do
+        ActiveResource::HttpMock.respond_to.get "/people/retrieve.#{format}?name=David", {}, ActiveResource::Formats[format].encode([@david])
+        remote_programmers = Person.get(:retrieve, :name => 'David')
+        assert_equal 1, remote_programmers.size
+        assert_equal @david[:id], remote_programmers[0]['id']
+        assert_equal @david[:name], remote_programmers[0]['name']
+      end
+    end
+  end
+  
+  def test_formats_on_custom_element_method
+    for format in [ :json, :xml ]
+      using_format(Person, format) do
+        ActiveResource::HttpMock.respond_to do |mock|
+          mock.get "/people/2.#{format}", {}, ActiveResource::Formats[format].encode(@david)
+          mock.get "/people/2/shallow.#{format}", {}, ActiveResource::Formats[format].encode(@david)
+        end
+        remote_programmer = Person.find(2).get(:shallow)
+        assert_equal @david[:id], remote_programmer['id']
+        assert_equal @david[:name], remote_programmer['name']
+      end
+    end
+
+    for format in [ :json, :xml ]
+      ryan = ActiveResource::Formats[format].encode({ :name => 'Ryan' })
+      using_format(Person, format) do
+        ActiveResource::HttpMock.respond_to.post "/people/new/register.#{format}", {}, ryan, 201, 'Location' => "/people/5.#{format}"
+        remote_ryan = Person.new(:name => 'Ryan')
+        assert_equal ActiveResource::Response.new(ryan, 201, {'Location' => "/people/5.#{format}"}), remote_ryan.post(:register)
+      end
+    end
+  end
+  
+  def test_setting_format_before_site
+    resource = Class.new(ActiveResource::Base)
+    resource.format = :json
+    resource.site   = 'http://37s.sunrise.i:3000'
+    assert_equal ActiveResource::Formats[:json], resource.connection.format
+  end
+  
+  private
+    def using_format(klass, mime_type_reference)
+      previous_format = klass.format
+      klass.format = mime_type_reference
+
+      yield
+    ensure
+      klass.format = previous_format
+    end
+end

data/vendor/{activeresource-2.0.2- → activeresource}/test/setter_trap.rb

@@ -1,4 +1,4 @@
-class SetterTrap < BasicObject
+class SetterTrap < ActiveSupport::BasicObject
   class << self
     def rollback_sets(obj)
       returning yield(setter_trap = new(obj)) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: swivel
 version: !ruby/object:Gem::Version 
-  version: 0.0.160
+  version: 0.0.175
 platform: ruby
 authors: 
 - huned
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-23 00:00:00 -08:00
+date: 2008-02-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -67,40 +67,41 @@ files:
 - lib/swivel2.rb
 - bin/mysql2swivel
 - bin/swivel
-- vendor/activeresource-2.0.2-
-- vendor/activeresource-2.0.2-/CHANGELOG
-- vendor/activeresource-2.0.2-/lib
-- vendor/activeresource-2.0.2-/lib/active_resource
-- vendor/activeresource-2.0.2-/lib/active_resource/base.rb
-- vendor/activeresource-2.0.2-/lib/active_resource/connection.rb
-- vendor/activeresource-2.0.2-/lib/active_resource/custom_methods.rb
-- vendor/activeresource-2.0.2-/lib/active_resource/formats
-- vendor/activeresource-2.0.2-/lib/active_resource/formats/json_format.rb
-- vendor/activeresource-2.0.2-/lib/active_resource/formats/xml_format.rb
-- vendor/activeresource-2.0.2-/lib/active_resource/formats.rb
-- vendor/activeresource-2.0.2-/lib/active_resource/http_mock.rb
-- vendor/activeresource-2.0.2-/lib/active_resource/validations.rb
-- vendor/activeresource-2.0.2-/lib/active_resource/version.rb
-- vendor/activeresource-2.0.2-/lib/active_resource.rb
-- vendor/activeresource-2.0.2-/lib/activeresource.rb
-- vendor/activeresource-2.0.2-/Rakefile
-- vendor/activeresource-2.0.2-/README
-- vendor/activeresource-2.0.2-/test
-- vendor/activeresource-2.0.2-/test/abstract_unit.rb
-- vendor/activeresource-2.0.2-/test/authorization_test.rb
-- vendor/activeresource-2.0.2-/test/base
-- vendor/activeresource-2.0.2-/test/base/custom_methods_test.rb
-- vendor/activeresource-2.0.2-/test/base/equality_test.rb
-- vendor/activeresource-2.0.2-/test/base/load_test.rb
-- vendor/activeresource-2.0.2-/test/base_errors_test.rb
-- vendor/activeresource-2.0.2-/test/base_test.rb
-- vendor/activeresource-2.0.2-/test/connection_test.rb
-- vendor/activeresource-2.0.2-/test/fixtures
-- vendor/activeresource-2.0.2-/test/fixtures/beast.rb
-- vendor/activeresource-2.0.2-/test/fixtures/person.rb
-- vendor/activeresource-2.0.2-/test/fixtures/street_address.rb
-- vendor/activeresource-2.0.2-/test/format_test.rb
-- vendor/activeresource-2.0.2-/test/setter_trap.rb
+- vendor/activeresource
+- vendor/activeresource/CHANGELOG
+- vendor/activeresource/lib
+- vendor/activeresource/lib/active_resource
+- vendor/activeresource/lib/active_resource/base.rb
+- vendor/activeresource/lib/active_resource/connection.rb
+- vendor/activeresource/lib/active_resource/custom_methods.rb
+- vendor/activeresource/lib/active_resource/formats
+- vendor/activeresource/lib/active_resource/formats/json_format.rb
+- vendor/activeresource/lib/active_resource/formats/xml_format.rb
+- vendor/activeresource/lib/active_resource/formats.rb
+- vendor/activeresource/lib/active_resource/http_mock.rb
+- vendor/activeresource/lib/active_resource/validations.rb
+- vendor/activeresource/lib/active_resource/version.rb
+- vendor/activeresource/lib/active_resource.rb
+- vendor/activeresource/lib/activeresource.rb
+- vendor/activeresource/MIT-LICENSE
+- vendor/activeresource/Rakefile
+- vendor/activeresource/README
+- vendor/activeresource/test
+- vendor/activeresource/test/abstract_unit.rb
+- vendor/activeresource/test/authorization_test.rb
+- vendor/activeresource/test/base
+- vendor/activeresource/test/base/custom_methods_test.rb
+- vendor/activeresource/test/base/equality_test.rb
+- vendor/activeresource/test/base/load_test.rb
+- vendor/activeresource/test/base_errors_test.rb
+- vendor/activeresource/test/base_test.rb
+- vendor/activeresource/test/connection_test.rb
+- vendor/activeresource/test/fixtures
+- vendor/activeresource/test/fixtures/beast.rb
+- vendor/activeresource/test/fixtures/person.rb
+- vendor/activeresource/test/fixtures/street_address.rb
+- vendor/activeresource/test/format_test.rb
+- vendor/activeresource/test/setter_trap.rb
 - vendor/activesupport-2.0.2-
 - vendor/activesupport-2.0.2-/CHANGELOG
 - vendor/activesupport-2.0.2-/lib

data/vendor/activeresource-2.0.2-/lib/active_resource/custom_methods.rb

@@ -1,105 +0,0 @@
-# A module to support custom REST methods and sub-resources, allowing you to break out
-# of the "default" REST methods with your own custom resource requests.  For example, 
-# say you use Rails to expose a REST service and configure your routes with:
-#
-#    map.resources :people, :new => { :register => :post },
-#                           :element => { :promote => :put, :deactivate => :delete }
-#                           :collection => { :active => :get }
-#
-#  This route set creates routes for the following http requests:
-#
-#    POST    /people/new/register.xml #=> PeopleController.register
-#    PUT     /people/1/promote.xml    #=> PeopleController.promote with :id => 1
-#    DELETE  /people/1/deactivate.xml #=> PeopleController.deactivate with :id => 1
-#    GET     /people/active.xml       #=> PeopleController.active
-#
-# Using this module, Active Resource can use these custom REST methods just like the
-# standard methods.
-#
-#   class Person < ActiveResource::Base
-#     self.site = "http://37s.sunrise.i:3000"
-#   end
-#
-#   Person.new(:name => 'Ryan).post(:register)  # POST /people/new/register.xml
-#   # => { :id => 1, :name => 'Ryan' }
-#
-#   Person.find(1).put(:promote, :position => 'Manager') # PUT /people/1/promote.xml
-#   Person.find(1).delete(:deactivate) # DELETE /people/1/deactivate.xml
-#
-#   Person.get(:active)  # GET /people/active.xml 
-#   # => [{:id => 1, :name => 'Ryan'}, {:id => 2, :name => 'Joe'}]
-#
-module ActiveResource
-  module CustomMethods 
-    def self.included(within)
-      within.class_eval do
-        extend ActiveResource::CustomMethods::ClassMethods
-        include ActiveResource::CustomMethods::InstanceMethods
-
-        class << self
-          alias :orig_delete :delete
-
-          def get(method_name, options = {})
-            connection.get(custom_method_collection_url(method_name, options), headers)
-          end
-
-          def post(method_name, options = {}, body = '')
-            connection.post(custom_method_collection_url(method_name, options), body, headers)
-          end
-
-          def put(method_name, options = {}, body = '')
-            connection.put(custom_method_collection_url(method_name, options), body, headers)
-          end
-
-          # Need to jump through some hoops to retain the original class 'delete' method
-          def delete(custom_method_name, options = {})
-            if (custom_method_name.is_a?(Symbol))
-              connection.delete(custom_method_collection_url(custom_method_name, options), headers)
-            else
-              orig_delete(custom_method_name, options)
-            end
-          end
-        end
-      end
-    end
-
-    module ClassMethods
-      def custom_method_collection_url(method_name, options = {})
-        prefix_options, query_options = split_options(options)
-        "#{prefix(prefix_options)}#{collection_name}/#{method_name}.xml#{query_string(query_options)}"
-      end
-    end
-    
-    module InstanceMethods
-      def get(method_name, options = {})
-        connection.get(custom_method_element_url(method_name, options), self.class.headers)
-      end
-      
-      def post(method_name, options = {}, body = '')
-        if new?
-          connection.post(custom_method_new_element_url(method_name, options), (body.nil? ? to_xml : body), self.class.headers)
-        else
-          connection.post(custom_method_element_url(method_name, options), body, self.class.headers)
-        end
-      end
-      
-      def put(method_name, options = {}, body = '')
-        connection.put(custom_method_element_url(method_name, options), body, self.class.headers)
-      end
-      
-      def delete(method_name, options = {})
-        connection.delete(custom_method_element_url(method_name, options), self.class.headers)
-      end
-
-
-      private
-        def custom_method_element_url(method_name, options = {})
-          "#{self.class.prefix(prefix_options)}#{self.class.collection_name}/#{id}/#{method_name}.xml#{self.class.send!(:query_string, options)}"
-        end
-      
-        def custom_method_new_element_url(method_name, options = {})
-          "#{self.class.prefix(prefix_options)}#{self.class.collection_name}/new/#{method_name}.xml#{self.class.send!(:query_string, options)}"
-        end
-    end
-  end
-end

data/vendor/activeresource-2.0.2-/test/format_test.rb

@@ -1,42 +0,0 @@
-require "#{File.dirname(__FILE__)}/abstract_unit"
-require "fixtures/person"
-
-class FormatTest < Test::Unit::TestCase
-  def setup
-    @matz  = { :id => 1, :name => 'Matz' }
-    @david = { :id => 2, :name => 'David' }
-    
-    @programmers = [ @matz, @david ]
-  end
-  
-  def test_formats_on_single_element
-    for format in [ :json, :xml ]
-      using_format(Person, format) do
-        ActiveResource::HttpMock.respond_to.get "/people/1.#{format}", {}, ActiveResource::Formats[format].encode(@david)
-        assert_equal @david[:name], Person.find(1).name
-      end
-    end
-  end
-
-  def test_formats_on_collection
-    for format in [ :json, :xml ]
-      using_format(Person, format) do
-        ActiveResource::HttpMock.respond_to.get "/people.#{format}", {}, ActiveResource::Formats[format].encode(@programmers)
-        remote_programmers = Person.find(:all)
-        assert_equal 2, remote_programmers.size
-        assert remote_programmers.select { |p| p.name == 'David' }
-      end
-    end
-  end
-
-  
-  private
-    def using_format(klass, mime_type_reference)
-      previous_format = klass.format
-      klass.format = mime_type_reference
-
-      yield
-    ensure
-      klass.format = previous_format
-    end
-end