cfoundry 0.3.20 → 0.3.21

data/lib/cfoundry/baseclient.rb

@@ -1,5 +1,5 @@
 require "restclient"
-require "json"
+require "multi_json"
 
 module CFoundry
   class BaseClient # :nodoc:
@@ -30,7 +30,7 @@ module CFoundry
     private
 
     def parse_json(x)
-      JSON.parse(x, :symbolize_names => true)
+      MultiJson.load(x, :symbolize_keys => true)
     end
 
     def request(method, path, options = {})
@@ -54,7 +54,7 @@ module CFoundry
       unless payload.is_a?(String)
         case type
         when :json
-          payload = payload.to_json
+          payload = MultiJson.dump(payload)
         when :form
           payload = encode_params(payload)
         end
@@ -93,7 +93,8 @@ module CFoundry
           $stderr.puts "REQUEST_BODY: #{req[:payload]}" if req[:payload]
           $stderr.puts "RESPONSE: [#{response.code}]"
           begin
-            $stderr.puts JSON.pretty_generate(JSON.parse(response.body))
+            parsed_body = MultiJson.load(response.body)
+            $stderr.puts MultiJson.dump(parsed_body, :pretty => true)
           rescue
             $stderr.puts "#{response.body}"
           end
@@ -127,7 +128,7 @@ module CFoundry
     def encode_params(hash, escape = true)
       hash.keys.map do |k|
         v = hash[k]
-        v = v.to_json if v.is_a?(Hash)
+        v = MultiJson.dump(v) if v.is_a?(Hash)
         v = URI.escape(v.to_s, /[^#{URI::PATTERN::UNRESERVED}]/) if escape
         "#{k}=#{v}"
       end.join("&")

data/lib/cfoundry/uaaclient.rb

@@ -74,7 +74,7 @@ module CFoundry
       when 411, 500, 504
         begin
           raise_error(parse_json(response))
-        rescue JSON::ParserError
+        rescue MultiJson::DecodeError
           raise BadResponse.new(response.code, response)
         end
 

data/lib/cfoundry/v1/app.rb

@@ -70,6 +70,12 @@ module CFoundry::V1
       "#<App '#@name'>"
     end
 
+    # Basic equality test by name.
+    def eql?(other)
+      other.is_a?(self.class) && other.name == @name
+    end
+    alias :== :eql?
+
     # Delete the application from the target.
     #
     # Keeps the metadata, but clears target-specific state from it.
@@ -300,7 +306,7 @@ module CFoundry::V1
     end
 
     def binds?(instance)
-      services.any? { |s| s == instance.name }
+      services.include? instance
     end
 
     # Retrieve file listing under path for the first instance of the application.

data/lib/cfoundry/v1/base.rb

@@ -1,4 +1,4 @@
-require "json"
+require "multi_json"
 
 require "cfoundry/baseclient"
 require "cfoundry/uaaclient"
@@ -105,7 +105,6 @@ module CFoundry::V1
     end
 
     def delete_app(name)
-      # TODO: no JSON response?
       delete("apps", name)
       true
     end
@@ -121,7 +120,7 @@ module CFoundry::V1
     def upload_app(name, zipfile, resources = [])
       payload = {
         :_method => "put",
-        :resources => resources.to_json,
+        :resources => MultiJson.dump(resources),
         :multipart => true,
         :application =>
           if zipfile.is_a? File
@@ -185,7 +184,7 @@ module CFoundry::V1
       when 411, 500, 504
         begin
           raise_error(parse_json(response))
-        rescue JSON::ParserError
+        rescue MultiJson::DecodeError
           raise CFoundry::BadResponse.new(response.code, response)
         end
 

data/lib/cfoundry/v1/framework.rb

@@ -9,6 +9,11 @@ module CFoundry::V1
       @detection = detection
     end
 
+    def eql?(other)
+      other.is_a?(self.class) && other.name == @name
+    end
+    alias :== :eql?
+
     def apps
       [] # not supported by v1
     end

data/lib/cfoundry/v1/runtime.rb

@@ -8,6 +8,11 @@ module CFoundry::V1
       @debug_modes = debug_modes
     end
 
+    def eql?(other)
+      other.is_a?(self.class) && other.name == @name
+    end
+    alias :== :eql?
+
     def apps
       [] # not supported by v1
     end

data/lib/cfoundry/v1/service.rb

@@ -9,6 +9,11 @@ module CFoundry::V1
       @type = nil
     end
 
+    def eql?(other)
+      other.is_a?(self.class) && other.label == @label
+    end
+    alias :== :eql?
+
     def provider
       "core"
     end

data/lib/cfoundry/v1/service_instance.rb

@@ -41,6 +41,12 @@ module CFoundry::V1
       "#<ServiceInstance '#@name'>"
     end
 
+    # Basic equality test by name.
+    def eql?(other)
+      other.is_a?(self.class) && other.name == @name
+    end
+    alias :== :eql?
+
     # Delete the service from the target.
     def delete!
       @client.base.delete_service(@name)

data/lib/cfoundry/v1/user.rb

@@ -23,6 +23,12 @@ module CFoundry::V1
       "#<User '#@email'>"
     end
 
+    # Basic equality test by email.
+    def eql?(other)
+      other.is_a?(self.class) && other.email == @email
+    end
+    alias :== :eql?
+
     # Delete the user from the target.
     def delete!
       @client.base.delete_user(@email)

data/lib/cfoundry/v2/app.rb

@@ -1,5 +1,5 @@
 require "tmpdir"
-require "json"
+require "multi_json"
 
 require "cfoundry/zip"
 require "cfoundry/upload_helpers"
@@ -42,7 +42,7 @@ module CFoundry::V2
     def env
       @env ||= CFoundry::ChattyHash.new(
         method(:env=),
-        JSON.parse(environment_json))
+        MultiJson.load(environment_json))
     end
 
     def env=(hash)

data/lib/cfoundry/v2/base.rb

@@ -1,4 +1,4 @@
-require "json"
+require "multi_json"
 require "base64"
 
 require "cfoundry/baseclient"
@@ -84,7 +84,7 @@ module CFoundry::V2
 
     def upload_app(guid, zipfile, resources = [])
       payload = {
-        :resources => resources.to_json,
+        :resources => MultiJson.dump(resources),
         :multipart => true,
         :application =>
           if zipfile.is_a? File
@@ -149,7 +149,7 @@ module CFoundry::V2
         begin
           info = parse_json(response)
           raise CFoundry::APIError.new(info[:code], info[:description])
-        rescue JSON::ParserError
+        rescue MultiJson::DecodeError
           raise CFoundry::BadResponse.new(response.code, response)
         end
 

data/lib/cfoundry/v2/client.rb

@@ -1,3 +1,4 @@
+require "multi_json"
 require "base64"
 
 require "cfoundry/v2/base"
@@ -61,6 +62,7 @@ module CFoundry::V2
     # printed out.
     def trace=(bool)
       @base.trace = bool
+      @base.uaa.trace = bool if @base.uaa
     end
 
     # The currently authenticated user.
@@ -199,7 +201,7 @@ module CFoundry::V2
     def token_data
       tok = Base64.decode64(@base.token.sub(/^bearer\s+/, ""))
       tok.sub!(/\{.+?\}/, "") # clear algo
-      JSON.parse(tok[/\{.+?\}/], :symbolize_names => true)
+      MultiJson.load(tok[/\{.+?\}/], :symbolize_keys => true)
 
     # normally i don't catch'em all, but can't expect all tokens to be the
     # proper format, so just silently fail as this is not critical

data/lib/cfoundry/v2/model.rb

@@ -1,3 +1,5 @@
+require "multi_json"
+
 module CFoundry::V2
   class Model
     class << self
@@ -155,7 +157,7 @@ module CFoundry::V2
             end
           end
         elsif k.to_s.end_with?("_json") && v.is_a?(String)
-          payload[k] = JSON.parse(v)
+          payload[k] = MultiJson.load(v)
         elsif k.to_s.end_with?("_url")
         else
           payload[k] = v
@@ -189,6 +191,8 @@ module CFoundry::V2
       if @manifest
         @manifest.delete :metadata
       end
+
+      true
     end
 
     def exists?

data/lib/cfoundry/v2/service_binding.rb

@@ -2,9 +2,6 @@ require "cfoundry/v2/model"
 
 module CFoundry::V2
   class ServiceBinding < Model
-    attribute :credentials
-    attribute :binding_options, :default => {}
-    attribute :gateway_data, :default => {}
     to_one    :app
     to_one    :service_instance
   end

data/lib/cfoundry/v2/service_instance.rb

@@ -6,7 +6,5 @@ module CFoundry::V2
     to_one    :space
     to_one    :service_plan
     to_many   :service_bindings
-    attribute :credentials
-    attribute :gateway_data, :default => {}
   end
 end

data/lib/cfoundry/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cfoundry
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: 
   segments: 
   - 0
   - 3
-  - 20
-  version: 0.3.20
+  - 21
+  version: 0.3.21
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-15 00:00:00 Z
+date: 2012-08-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client
@@ -34,19 +34,19 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: json_pure
+  name: multi_json
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 23
         segments: 
         - 1
+        - 3
         - 6
-        - 5
-        version: 1.6.5
+        version: 1.3.6
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency