rapuncel 0.0.3 → 0.0.4

data/lib/rapuncel/connection.rb

@@ -18,11 +18,10 @@ module Rapuncel
 
     def initialize configuration = {}
 
-      @host     = configuration[:host]    || 'localhost'
-      @port     = configuration[:port]    || '8080'
-      @path     = configuration[:path]    || '/'
-      @headers  = configuration[:headers] || {}
-
+      self.host     = configuration[:host]    || 'localhost'
+      self.port     = configuration[:port]    || '8080'
+      self.path     = configuration[:path]    || '/'
+      self.headers  = configuration[:headers] || {}
 
       if ssl = configuration[:ssl]
         @ssl = true
@@ -33,6 +32,18 @@ module Rapuncel
     def url
       "http://#{host}:#{port}#{path}"
     end
+    
+    def host= value
+      @host = value.to_s.sub /^http\:\/\//, ''
+    end
+    
+    def path= value
+      unless value =~ /^\//
+        value = "/" + value
+      end
+      
+      @path = value
+    end
 
     def headers
       @headers.merge  :Accept => 'text/xml', :'content-type' => 'text/xml'

data/lib/rapuncel/proxy.rb

@@ -2,7 +2,7 @@ require 'rapuncel/request'
 
 module Rapuncel
   class Proxy
-    PROXY_METHODS  = %w(tap inspect clone freeze dup class initialize).freeze
+    PROXY_METHODS  = %w(tap inspect clone freeze dup class initialize to_s).freeze
     LOCKED_METHODS = %w(method_missing).freeze
     LOCKED_PATTERN = /(\A__|\?\Z|!\Z)/.freeze
 
@@ -40,6 +40,8 @@ module Rapuncel
     PROXY_METHODS.each do |name|
       alias_method "__#{name}__", name
     end
+    
+    alias_method "__inspect__", "__to_s__"
 
     instance_methods.each do |name|
       unless LOCKED_METHODS.include?(name) || LOCKED_PATTERN.match(name)

data/rapuncel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "rapuncel"
-  s.version     = "0.0.3"
+  s.version     = "0.0.4"
   s.date        = Time.now.strftime("%Y-%m-%d")
   s.authors     = ["Michael Eickenberg", "Marian Theisen"]
   s.email       = 'marian@cice-online.net'

data/test/unit/array_test.rb

@@ -9,18 +9,19 @@ class ArrayTest < ActiveSupport::TestCase
     assert_select xml, '/array/data/value', 10
   end
 
-  def test_array arr
-    xml = arr.to_xml_rpc
 
-    xml_node = Nokogiri::XML(xml).children.first
 
-    reparsed = Array.from_xml_rpc xml_node
+  test "An array, converted to xml and parsed back should be itself" do
+    def test_array_conversion arr
+      xml = arr.to_xml_rpc
 
-    reparsed
-  end
+      xml_node = Nokogiri::XML(xml).children.first
 
+      reparsed = Array.from_xml_rpc xml_node
 
-  test "An array, converted to xml and parsed back should be itself" do
+      reparsed
+    end
+    
     arr1 = (1..10).to_a
     arr2 = arr1.map &:to_s
 
@@ -28,10 +29,10 @@ class ArrayTest < ActiveSupport::TestCase
 
     arr4 = ["hello", arr3]
 
-    reparsed1 = test_array arr1
-    reparsed2 = test_array arr2
-    reparsed3 = test_array arr3
-    reparsed4 = test_array arr4
+    reparsed1 = test_array_conversion arr1
+    reparsed2 = test_array_conversion arr2
+    reparsed3 = test_array_conversion arr3
+    reparsed4 = test_array_conversion arr4
 
     [reparsed1, reparsed2, reparsed3, reparsed4].zip([arr1, arr2, arr3, arr4]).each do |b|
       assert_equal *b

data/test/unit/connection_test.rb

@@ -6,6 +6,18 @@ class ConnectionTest < ActiveSupport::TestCase
     assert_kind_of Rapuncel::AuthConnection, Rapuncel::Connection.build(:user => '')
     assert_kind_of Rapuncel::AuthConnection, Rapuncel::Connection.build(:password => '')
   end
+  
+  test "Connection should not choke on extra 'http://' in @host" do
+    connection = Rapuncel::Connection.build :host => "http://example.org"
+    
+    assert_equal "example.org", connection.host
+  end
+  
+  test "Connection should accept path beginning with or without /" do
+    connection = Rapuncel::Connection.build :host => "http://example.org", :path => "abcd"
+
+    assert_equal "/abcd", connection.path
+  end
 
   test "Connection.new should return an ApiKeyAuthConnection if api_key is set" do
     assert_kind_of Rapuncel::ApiKeyAuthConnection, Rapuncel::Connection.build(:api_key => 'xyz')

data/test/unit/proxy_test.rb

@@ -47,6 +47,6 @@ class ProxyTest < ActiveSupport::TestCase
 
     p.foobar
 
-    assert Rapuncel::Proxy.instance_methods.include?('foobar')
+    assert (Rapuncel::Proxy.instance_methods.include?('foobar') || Rapuncel::Proxy.instance_methods.include?(:foobar))
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rapuncel
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Michael Eickenberg
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-29 00:00:00 +02:00
+date: 2011-05-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -93,6 +93,7 @@ files:
 - lib/rapuncel.rb
 - MIT-LICENSE
 - Rakefile
+- rapuncel-0.0.3.gem
 - rapuncel.gemspec
 - README.md
 - test/functional/client_test.rb