cfoundry-IronFoundry 0.3.39 → 0.3.40

data/lib/cfoundry/baseclient.rb

@@ -104,12 +104,19 @@ module CFoundry
       proxy_uri = URI.parse(req[:url]).find_proxy()
       RestClient.proxy = proxy_uri.to_s if proxy_uri
 
-      RestClient::Request.execute(req) do |response, request|
+      RestClient::Request.execute(req) do |response, request, result, &block|
         time = Time.now - before
 
-        print_trace(req, request, response, caller) if @trace
-        log_request(time, req, response)
-        handle_response(response, accept)
+        print_trace(request, response, caller) if @trace
+        log_request(time, request, response)
+
+        if [:get, :head].include?(method) && \
+            [301, 302, 307].include?(response.code) && \
+            accept != :headers
+          response.follow_redirection(request, result, &block)
+        else
+          handle_response(response, accept)
+        end
       end
     rescue SocketError, Errno::ECONNREFUSED => e
       raise TargetRefused, e.message
@@ -178,11 +185,14 @@ module CFoundry
 
     def log_data(time, request, response)
       { :time => time,
-        :request => request,
+        :request => {
+          :method => request.method,
+          :url => request.url,
+          :headers => request.headers
+        },
         :response => {
           :code => response.code,
-          :headers => response.headers,
-          :body => response
+          :headers => response.headers
         }
       }
     end
@@ -232,10 +242,10 @@ module CFoundry
       end
     end
 
-    def print_trace(req, request, response, locs)
+    def print_trace(request, response, locs)
       $stderr.puts ">>>"
       $stderr.puts "PROXY: #{RestClient.proxy}" if RestClient.proxy
-      $stderr.puts "REQUEST: #{req[:method]} #{req[:url]}"
+      $stderr.puts "REQUEST: #{request.method} #{request.url}"
       $stderr.puts "RESPONSE_HEADERS:"
       response.headers.each do |key, value|
         $stderr.puts "    #{key} : #{value}"
@@ -244,7 +254,7 @@ module CFoundry
       request.headers.each do |key, value|
         $stderr.puts "    #{key} : #{value}"
       end
-      $stderr.puts "REQUEST_BODY: #{req[:payload]}" if req[:payload]
+      $stderr.puts "REQUEST_BODY: #{request.payload}" if request.payload
       $stderr.puts "RESPONSE: [#{response.code}]"
       begin
         parsed_body = MultiJson.load(response.body)
@@ -277,7 +287,7 @@ module CFoundry
       json = accept == :json
 
       case response.code
-      when 200, 201, 204, 302
+      when 200, 201, 204, 301, 302, 307
         if accept == :headers
           return response.headers
         end

data/lib/cfoundry/chatty_hash.rb

@@ -30,5 +30,9 @@ module CFoundry
     def to_json(*args)
       @hash.to_json(*args)
     end
+
+    def to_hash
+      @hash
+    end
   end
 end

data/lib/cfoundry/v1/base.rb

@@ -156,7 +156,7 @@ module CFoundry::V1
       json = accept == :json
 
       case response.code
-      when 200, 204, 302
+      when 200, 201, 204, 301, 302, 307
         if accept == :headers
           return response.headers
         end

data/lib/cfoundry/v2/app.rb

@@ -64,7 +64,9 @@ module CFoundry::V2
         environment_json)
     end
 
-    alias :env= :environment_json=
+    def env=(x)
+      self.environment_json = x.to_hash
+    end
 
     def debug_mode # TODO v2
       nil
@@ -111,7 +113,9 @@ module CFoundry::V2
     alias :create_route :create_routes
 
     def uri
-      uris[0]
+      if route = routes.first
+        "#{route.host}.#{route.domain.name}"
+      end
     end
     alias :url :uri
 

data/lib/cfoundry/v2/base.rb

@@ -139,7 +139,7 @@ module CFoundry::V2
       json = accept == :json
 
       case response.code
-      when 200, 201, 204, 302
+      when 200, 201, 204, 301, 302, 307
         if accept == :headers
           return response.headers
         end

data/lib/cfoundry/v2/client.rb

@@ -173,11 +173,14 @@ module CFoundry::V2
       end
 
       if has_name
-        define_method(:"#{singular}_by_name") do |name|
+        define_method(:"#{singular}_by_name") do |name, *args|
+          depth, _ = args
+          depth ||= 1
+
           if has_space && current_space
-            current_space.send(plural, 1, :name => name).first
+            current_space.send(plural, depth, :name => name).first
           else
-            send(plural, 1, :name => name).first
+            send(plural, depth, :name => name).first
           end
         end
       end

data/lib/cfoundry/version.rb

@@ -1,4 +1,4 @@
 module CFoundry # :nodoc:
   # CFoundry library version number.
-  VERSION = "0.3.39"
+  VERSION = "0.3.40"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfoundry-IronFoundry
 version: !ruby/object:Gem::Version
-  version: 0.3.39
+  version: 0.3.40
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-04 00:00:00.000000000 Z
+date: 2012-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client