cfoundry 0.3.7 → 0.3.8

data/lib/cfoundry/baseclient.rb

@@ -65,7 +65,8 @@ module CFoundry
       headers.merge!(options[:headers]) if options[:headers]
 
       if params
-        path += "?" + encode_params(params)
+        uri = URI.parse(path)
+        path += (uri.query ? "&" : "?") + encode_params(params)
       end
 
       req = options.dup

data/lib/cfoundry/v2/base.rb

@@ -74,17 +74,22 @@ module CFoundry::V2
       end
 
       define_method(plural) do |*args|
-        depth, query = args
-        depth ||= 1
+        get("v2", plural, nil => :json, :params => params_from(args))
+      end
+    end
 
-        params = { :"inline-relations-depth" => depth }
 
-        if query
-          params[:q] = "#{query.keys.first}:#{query.values.first}"
-        end
+    def params_from(args)
+      depth, query = args
+      depth ||= 1
+
+      params = { :"inline-relations-depth" => depth }
 
-        get("v2", plural, nil => :json, :params => params)
+      if query
+        params[:q] = "#{query.keys.first}:#{query.values.first}"
       end
+
+      params
     end
 
     private

data/lib/cfoundry/v2/client.rb

@@ -115,29 +115,23 @@ module CFoundry::V2
     end
 
 
-    # TODO: allow direct filtering
-    def app_by_name(name)
-      current_space.apps.find do |a|
-        a.name == name
-      end
-    end
-
-
     [ :app, :organization, :space, :user, :runtime, :framework,
       :service, :service_plan, :service_binding, :service_instance
     ].each do |singular|
-      klass = singular.to_s.capitalize.gsub(/(.)_(.)/) do
+      plural = :"#{singular}s"
+
+      classname = singular.to_s.capitalize.gsub(/(.)_(.)/) do
         $1 + $2.upcase
       end
 
-      plural = :"#{singular}s"
+      klass = CFoundry::V2.const_get(classname)
 
-      has_space =
-        CFoundry::V2.const_get(klass).method_defined? :space
+      has_space = klass.method_defined? :space
+      has_name = klass.method_defined? :name
 
       define_method(singular) do |*args|
         guid, _ = args
-        CFoundry::V2.const_get(klass).new(guid, self)
+        klass.new(guid, self)
       end
 
       define_method(plural) do |*args|
@@ -154,48 +148,38 @@ module CFoundry::V2
         end
       end
 
-      define_method(:"#{singular}_from") do |path, *args|
-        depth, _ = args
-        depth ||= 1
-
-        uri = URI.parse(path)
-
-        if uri.query
-          uri.query += "&inline-relations-depth=#{depth}"
-        else
-          uri.query = "inline-relations-depth=#{depth}"
+      if has_name
+        define_method(:"#{singular}_by_name") do |name|
+          if has_space && current_space
+            current_space.send(plural, 1, :name => name).first
+          else
+            send(plural, 1, :name => name).first
+          end
         end
+      end
 
+      define_method(:"#{singular}_from") do |path, *args|
         send(
           :"make_#{singular}",
           @base.request_path(
             :get,
-            uri.to_s,
-            nil => :json))
+            path,
+            nil => :json,
+            :params => @base.params_from(args)))
       end
 
       define_method(:"#{plural}_from") do |path, *args|
-        depth, _ = args
-        depth ||= 1
-
-        uri = URI.parse(path)
-
-        if uri.query
-          uri.query += "&inline-relations-depth=#{depth}"
-        else
-          uri.query = "inline-relations-depth=#{depth}"
-        end
-
         @base.request_path(
             :get,
-            uri.to_s,
-            nil => :json)[:resources].collect do |json|
+            path,
+            nil => :json,
+            :params => @base.params_from(args))[:resources].collect do |json|
           send(:"make_#{singular}", json)
         end
       end
 
       define_method(:"make_#{singular}") do |json|
-        CFoundry::V2.const_get(klass).new(
+        klass.new(
           json[:metadata][:guid],
           self,
           json)

data/lib/cfoundry/v2/model.rb

@@ -53,16 +53,27 @@ module CFoundry::V2
         object = opts[:as] || singular
         plural_object = :"#{object}s"
 
-        define_method(plural) {
-          if manifest[:entity].key? plural
-            manifest[:entity][plural].collect do |json|
+        define_method(plural) { |*args|
+          depth, query = args
+
+          if manifest[:entity].key?(plural)
+            objs = manifest[:entity][plural]
+
+            if query
+              find_by = query.keys.first
+              find_val = query.values.first
+              objs = objs.select { |o| o[:entity][find_by] == find_val }
+            end
+
+            objs.collect do |json|
               @client.send(:"make_#{object}", json)
             end
           else
             @client.send(
               :"#{plural_object}_from",
               send("#{plural}_url"),
-              opts[:depth] || 1)
+              depth || opts[:depth],
+              query)
           end
         }
 

data/lib/cfoundry/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cfoundry
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 3
-  - 7
-  version: 0.3.7
+  - 8
+  version: 0.3.8
 platform: ruby
 authors: 
 - Alex Suraci