cfoundry 0.3.56 → 0.3.57

data/lib/cfoundry/baseclient.rb

@@ -163,7 +163,7 @@ module CFoundry
         nil
       # return request headers (not really Accept)
       else
-        raise "unknown mimetype #{content.inspect}"
+        raise CFoundry::Error, "Unknown mimetype '#{content.inspect}'"
       end
     end
 
@@ -317,7 +317,9 @@ module CFoundry
       when Net::HTTPSuccess, Net::HTTPRedirection
         if accept == :json
           if response.is_a?(Net::HTTPNoContent)
-            raise "Expected JSON response, got 204 No Content"
+            raise CFoundry::BadResponse.new(
+              204,
+              "Expected JSON response, got 204 No Content")
           end
 
           parse_json(response.body)

data/lib/cfoundry/errors.rb

@@ -1,4 +1,20 @@
 module CFoundry
+  # Base class for CFoundry errors (not from the server).
+  class Error < RuntimeError; end
+
+  class Deprecated < Error; end
+
+  class Mismatch < Error
+    def initialize(expected, got)
+      @expected = expected
+      @got = got
+    end
+
+    def to_s
+      "Invalid value type; expected #{@expected.inspect}, got #{@got.inspect}"
+    end
+  end
+
   # Exception representing errors returned by the API.
   class APIError < RuntimeError
     class << self

data/lib/cfoundry/uaaclient.rb

@@ -64,7 +64,9 @@ module CFoundry
       when Net::HTTPSuccess, Net::HTTPRedirection
         if accept == :json
           if response.is_a?(Net::HTTPNoContent)
-            raise "Expected JSON response, got 204 No Content"
+            raise CFoundry::BadResponse.new(
+              204,
+              "Expected JSON response, got 204 No Content")
           end
 
           parse_json(response.body)

data/lib/cfoundry/upload_helpers.rb

@@ -88,7 +88,8 @@ module CFoundry
 
       unless unreachable.empty?
         root = Pathname.new(path).relative_path_from(pwd)
-        raise "Can't deploy application containing links '#{unreachable}' that reach outside its root '#{root}'"
+        raise CFoundry::Error,
+          "Path contains links '#{unreachable}' that point outside '#{root}'"
       end
     end
 

data/lib/cfoundry/v1/app.rb

@@ -360,7 +360,7 @@ module CFoundry::V1
     #   Only do this if you know what you're doing.
     def upload(path, check_resources = true)
       unless File.exist? path
-        raise "invalid application path '#{path}'"
+        raise CFoundry::Error, "Invalid application path '#{path}'"
       end
 
       zipfile = "#{Dir.tmpdir}/#{@name}.zip"

data/lib/cfoundry/v1/base.rb

@@ -159,7 +159,9 @@ module CFoundry::V1
       when Net::HTTPSuccess, Net::HTTPRedirection
         if accept == :json
           if response.is_a?(Net::HTTPNoContent)
-            raise "Expected JSON response, got 204 No Content"
+            raise CFoundry::BadResponse.new(
+              204,
+              "Expected JSON response, got 204 No Content")
           end
 
           parse_json(response.body)

data/lib/cfoundry/v2/app.rb

@@ -127,7 +127,8 @@ module CFoundry::V2
     alias :urls :uris
 
     def uris=(uris)
-      raise "App#uris= is invalid against V2 APIs. Use add/remove_route."
+      raise CFoundry::Deprecated,
+        "App#uris= is invalid against V2 APIs; use add/remove_route"
     end
     alias :urls= :uris=
 
@@ -140,7 +141,9 @@ module CFoundry::V2
             d.name == domain_name
           }
 
-        raise "Invalid domain '#{domain_name}'" unless domain
+        unless domain
+          raise CFoundry::Error, "Invalid domain '#{domain_name}'"
+        end
 
         route = @client.routes.find { |r|
           r.host == host && r.domain == domain
@@ -296,7 +299,7 @@ module CFoundry::V2
     #   Only do this if you know what you're doing.
     def upload(path, check_resources = true)
       unless File.exist? path
-        raise "invalid application path '#{path}'"
+        raise CFoundry::Error, "Invalid application path '#{path}'"
       end
 
       zipfile = "#{Dir.tmpdir}/#{@guid}.zip"

data/lib/cfoundry/v2/base.rb

@@ -149,7 +149,9 @@ module CFoundry::V2
 
         if accept == :json
           if response.is_a?(Net::HTTPNoContent)
-            raise "Expected JSON response, got 204 No Content"
+            raise CFoundry::BadResponse.new(
+              204,
+              "Expected JSON response, got 204 No Content")
           end
 
           parse_json(response.body)

data/lib/cfoundry/v2/model.rb

@@ -33,7 +33,7 @@ module CFoundry::V2
 
       def validate_type(val, type)
         unless value_matches?(val, type)
-          raise "invalid attribute; expected #{type.inspect} but got #{val.inspect}"
+          raise CFoundry::Mismatch.new(type, val)
         end
       end
 
@@ -62,13 +62,13 @@ module CFoundry::V2
           defaults[name] = default
         end
 
-        define_method(name) {
+        define_method(name) do
           return @cache[name] if @cache.key?(name)
 
           @cache[name] = manifest[:entity][name] || default
-        }
+        end
 
-        define_method(:"#{name}=") { |val|
+        define_method(:"#{name}=") do |val|
           unless has_default && val == default
             Model.validate_type(val, type)
           end
@@ -79,7 +79,7 @@ module CFoundry::V2
           @manifest[:entity] ||= {}
           @manifest[:entity][name] = val
           @diff[name] = val
-        }
+        end
       end
 
       def scoped_to_organization(relation = :organization)
@@ -104,7 +104,7 @@ module CFoundry::V2
           defaults[:"#{name}_guid"] = default
         end
 
-        define_method(name) {
+        define_method(name) do
           return @cache[name] if @cache.key?(name)
 
           @cache[name] =
@@ -115,13 +115,13 @@ module CFoundry::V2
             else
               default
             end
-        }
+        end
 
-        define_method(:"#{name}_url") {
+        define_method(:"#{name}_url") do
           manifest[:entity][:"#{name}_url"]
-        }
+        end
 
-        define_method(:"#{name}=") { |x|
+        define_method(:"#{name}=") do |x|
           unless has_default && x == default
             Model.validate_type(x, CFoundry::V2.const_get(kls))
           end
@@ -132,7 +132,7 @@ module CFoundry::V2
           @manifest[:entity] ||= {}
           @manifest[:entity][:"#{name}_guid"] =
             @diff[:"#{name}_guid"] = x && x.guid
-        }
+        end
       end
 
       def to_many(plural, opts = {})
@@ -147,7 +147,7 @@ module CFoundry::V2
           $1 + $2.upcase
         end
 
-        define_method(plural) { |*args|
+        define_method(plural) do |*args|
           depth, query = args
 
           if !depth && !query && cache = @cache[plural]
@@ -181,13 +181,13 @@ module CFoundry::V2
           end
 
           res
-        }
+        end
 
-        define_method(:"#{plural}_url") {
+        define_method(:"#{plural}_url") do
           manifest[:entity][:"#{plural}_url"]
-        }
+        end
 
-        define_method(:"add_#{singular}") { |x|
+        define_method(:"add_#{singular}") do |x|
           Model.validate_type(x, CFoundry::V2.const_get(kls))
 
           if cache = @cache[plural]
@@ -198,9 +198,9 @@ module CFoundry::V2
             Net::HTTP::Put,
             ["v2", "#{object_name}s", @guid, plural, x.guid],
             :accept => :json)
-        }
+        end
 
-        define_method(:"remove_#{singular}") { |x|
+        define_method(:"remove_#{singular}") do |x|
           Model.validate_type(x, CFoundry::V2.const_get(kls))
 
           if cache = @cache[plural]
@@ -211,9 +211,9 @@ module CFoundry::V2
             Net::HTTP::Delete,
             ["v2", "#{object_name}s", @guid, plural, x.guid],
             :accept => :json)
-        }
+        end
 
-        define_method(:"#{plural}=") { |xs|
+        define_method(:"#{plural}=") do |xs|
           Model.validate_type(xs, [CFoundry::V2.const_get(kls)])
 
           @cache[plural] = xs
@@ -222,7 +222,7 @@ module CFoundry::V2
           @manifest[:entity] ||= {}
           @manifest[:entity][:"#{singular}_guids"] =
             @diff[:"#{singular}_guids"] = xs.collect(&:guid)
-        }
+        end
       end
 
       def has_summary(actions = {})
@@ -248,11 +248,11 @@ module CFoundry::V2
             elsif self.class.to_many_relations[key]
               singular = key.to_s.sub(/s$/, "").to_sym
 
-              vals = val.collect { |sub|
+              vals = val.collect do |sub|
                 obj = @client.send(singular, sub[:guid], true)
                 obj.summarize! sub
                 obj
-              }
+              end
 
               self.send(:"#{key}=", vals)
 

data/lib/cfoundry/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cfoundry
 version: !ruby/object:Gem::Version 
-  hash: 99
+  hash: 97
   prerelease: 
   segments: 
   - 0
   - 3
-  - 56
-  version: 0.3.56
+  - 57
+  version: 0.3.57
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-10 00:00:00 -08:00
+date: 2012-11-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency