cf-runtime 0.0.2 → 0.1.0

data/lib/cfruntime.rb

@@ -22,5 +22,9 @@ begin
   require 'cfruntime/redis'
 rescue LoadError
 end
+begin
+  require 'cfruntime/aws_s3'
+rescue LoadError
+end
 require 'cfruntime/properties'
 require 'cfruntime/version'

data/lib/cfruntime/amqp.rb

@@ -1,4 +1,5 @@
 require 'amqp'
+require 'cfruntime/properties'
 module CFRuntime
   class AMQPClient
 

data/lib/cfruntime/aws_s3.rb

@@ -0,0 +1,43 @@
+require 'aws/s3'
+require 'cfruntime/properties'
+module CFRuntime
+  class AWSS3Client
+
+    # Creates and returns an AWS-S3 +Client+ instance.
+    # Passes optional Hash of non-connection-related options to +AWS::S3::Base.establish_connection!+.
+    # Raises +ArgumentError+ If zero or multiple blob services are found.
+    def self.create(options={})
+      service_names = CloudApp.service_names_of_type('blob')
+      if service_names.length != 1
+        raise ArgumentError.new("Expected 1 service of blob type, " +
+          "but found #{service_names.length}.  " +
+          "Consider using create_from_svc(service_name) instead.")
+      end
+      create_from_svc(service_names[0],options)
+    end
+
+    # Creates and returns a AWS-S3 +Client+ instance connected to a blob service with the
+    # specified name.
+    # Passes optional Hash of non-connection-related options to +AWS::S3::Base.establish_connection!+.
+    # Raises +ArgumentError+ If specified blob service is not found.
+    def self.create_from_svc(service_name, options={})
+      AWS::S3::Base.establish_connection!(options_for_svc(service_name,options))
+    end
+
+    # Merges provided options with connection options for specified blob service.
+    # Returns merged Hash containing (:access_key_id, :secret_access_key, :server, :port).
+    # Raises +ArgumentError+ If specified blob service is not found.
+    def self.options_for_svc(service_name,options={})
+      service_props = CFRuntime::CloudApp.service_props(service_name)
+      if service_props.nil?
+        raise ArgumentError.new("Service with name #{service_name} not found")
+      end
+      cfoptions = options
+      cfoptions[:server] = service_props[:host]
+      cfoptions[:port] = service_props[:port]
+      cfoptions[:access_key_id ] = service_props[:username]
+      cfoptions[:secret_access_key] = service_props[:password]
+      cfoptions
+    end
+  end
+end

data/lib/cfruntime/okjson.rb

@@ -27,10 +27,10 @@ require 'stringio'
 # Some parts adapted from
 # http://golang.org/src/pkg/json/decode.go and
 # http://golang.org/src/pkg/utf8/utf8.go
-module CFRuntime::OkJson
+module CFRuntime
+  module OkJson
   extend self
 
-
   # Decodes a json document in string s and
   # returns the corresponding ruby value.
   # String s must be valid UTF-8. If you have
@@ -593,4 +593,5 @@ module CFRuntime::OkJson
 
   Spc = ' '[0]
   Unesc = {?b=>?\b, ?f=>?\f, ?n=>?\n, ?r=>?\r, ?t=>?\t}
+end
 end

data/lib/cfruntime/parser.rb

@@ -0,0 +1,7 @@
+require "cfruntime/parser/blob_parser"
+require "cfruntime/parser/default_parser"
+require "cfruntime/parser/mongodb_parser"
+require "cfruntime/parser/mysql_parser"
+require "cfruntime/parser/postgresql_parser"
+require "cfruntime/parser/rabbitmq_parser"
+require "cfruntime/parser/redis_parser"

data/lib/cfruntime/parser/blob_parser.rb

@@ -0,0 +1,15 @@
+module CFRuntime
+  class BlobParser
+    def self.parse(svc)
+      serviceopts = {}
+      { :username => :username,
+        :password => :password,
+        :hostname => :host,
+        :port => :port
+      }.each do |from, to|
+        serviceopts[to] = svc["credentials"][from.to_s]
+      end
+      serviceopts
+    end
+  end
+end

data/lib/cfruntime/parser/default_parser.rb

@@ -0,0 +1,21 @@
+module CFRuntime
+  class DefaultParser
+    # Default parsing behavior simply returns
+    # the passed-in map with all keys converted
+    # to symbols
+    def self.parse(svc)
+      symbolize_keys(svc)
+    end
+
+    private
+    def self.symbolize_keys(hash)
+      if hash.is_a? Hash
+        new_hash = {}
+        hash.each {|k, v| new_hash[k.to_sym] = symbolize_keys(v) }
+        new_hash
+      else
+        hash
+      end
+    end
+  end
+end

data/lib/cfruntime/parser/mongodb_parser.rb

@@ -0,0 +1,32 @@
+module CFRuntime
+  class MongodbParser
+    def self.parse(svc)
+      serviceopts = {}
+      cred = svc["credentials"]
+      if cred["url"]
+        uri=URI.parse(cred["url"])
+        user=URI.unescape(uri.user) if uri.user
+        passwd=URI.unescape(uri.password) if uri.password
+        host=uri.host
+        port=uri.port
+        if uri.path =~ %r{^/(.*)}
+          raise ArgumentError.new("multiple segments in path of mongo URI: #{uri}") if $1.index('/')
+          db = URI.unescape($1)
+        end
+        url = cred["url"]
+      else
+        # The old credentials format with no URL
+        user,passwd,host,port, db = %w(username password hostname port db).map {|key|
+          cred[key]}
+        url = "mongodb://#{user}:#{passwd}@#{host}:#{port}/#{db}"
+      end
+      serviceopts[:username] = user
+      serviceopts[:password] = passwd
+      serviceopts[:host] = host
+      serviceopts[:port] = port
+      serviceopts[:url] = url
+      serviceopts[:db] = db
+      serviceopts
+    end
+  end
+end

data/lib/cfruntime/parser/mysql_parser.rb

@@ -0,0 +1,19 @@
+module CFRuntime
+  class MysqlParser
+    def self.parse(svc)
+      serviceopts = {}
+      { :username => :username,
+        :password => :password,
+        :hostname => :host,
+        :port => :port,
+        :name => :database
+      }.each do |from, to|
+        serviceopts[to] = svc["credentials"][from.to_s]
+      end
+      serviceopts[:url] = svc["credentials"]["url"] ||
+        "mysql://#{serviceopts[:username]}:#{serviceopts[:password]}@" +
+        "#{serviceopts[:host]}:#{serviceopts[:port]}/#{serviceopts[:database]}"
+      serviceopts
+    end
+  end
+end

data/lib/cfruntime/parser/postgresql_parser.rb

@@ -0,0 +1,19 @@
+module CFRuntime
+  class PostgresqlParser
+    def self.parse(svc)
+      serviceopts = {}
+      { :username => :username,
+        :password => :password,
+        :hostname => :host,
+        :port => :port,
+        :name => :database
+      }.each do |from, to|
+        serviceopts[to] = svc["credentials"][from.to_s]
+      end
+      serviceopts[:url] = svc["credentials"]["url"] ||
+        "postgresql://#{serviceopts[:username]}:#{serviceopts[:password]}@" +
+        "#{serviceopts[:host]}:#{serviceopts[:port]}/#{serviceopts[:database]}"
+      serviceopts
+    end
+  end
+end

data/lib/cfruntime/parser/rabbitmq_parser.rb

@@ -0,0 +1,34 @@
+module CFRuntime
+  class RabbitmqParser
+    def self.parse(svc)
+      serviceopts = {}
+      cred = svc["credentials"]
+      vhost = cred["vhost"] || "/" #The RabbitMQ default vhost
+      if cred["url"]
+        # The new "srs" credentials format
+        uri=URI.parse(cred["url"])
+        user=URI.unescape(uri.user) if uri.user
+        passwd=URI.unescape(uri.password) if uri.password
+        host=uri.host
+        port=uri.port
+        if uri.path =~ %r{^/(.*)}
+          raise ArgumentError.new("multiple segments in path of amqp URI: #{uri}") if $1.index('/')
+          vhost = URI.unescape($1)
+        end
+        serviceopts[:url] = cred["url"]
+      else
+        # The "old" credentials format
+        user,passwd,host,port = %w(user pass hostname port).map {|key|
+          cred[key]}
+        serviceopts[:url]  = "amqp://#{user}:#{passwd}@#{host}:#{port}"
+        serviceopts[:url] = "#{serviceopts[:url]}/#{vhost}" if vhost != "/"
+      end
+      serviceopts[:username] = user
+      serviceopts[:password] = passwd
+      serviceopts[:host] = host
+      serviceopts[:port] = port
+      serviceopts[:vhost] = vhost
+      serviceopts
+    end
+  end
+end

data/lib/cfruntime/parser/redis_parser.rb

@@ -0,0 +1,19 @@
+module CFRuntime
+  class RedisParser
+    def self.parse(svc)
+      serviceopts = {}
+      { :username => :username,
+        :password => :password,
+        :hostname => :host,
+        :port => :port,
+        :name => :database
+      }.each do |from, to|
+        serviceopts[to] = svc["credentials"][from.to_s]
+      end
+      serviceopts[:url] = svc["credentials"]["url"] ||
+        "redis://#{serviceopts[:username]}:#{serviceopts[:password]}@" +
+        "#{serviceopts[:host]}:#{serviceopts[:port]}/#{serviceopts[:database]}"
+      serviceopts
+    end
+  end
+end

data/lib/cfruntime/properties.rb

@@ -1,10 +1,9 @@
-module CFRuntime
-
-  require 'uri'
-  require File.join(File.dirname(__FILE__), 'okjson')
+require "uri"
+require "cfruntime/okjson"
+require "cfruntime/parser"
 
+module CFRuntime
   class CloudApp
-
     class << self
       # Returns true if this code is running on Cloud Foundry
       def running_in_cloud?()
@@ -29,54 +28,21 @@ module CFRuntime
       # of a specified type are found.
       def service_props(service_name)
         registered_svcs = {}
-        if ENV['VCAP_SERVICES']
-          svcs = CFRuntime::OkJson.decode(ENV['VCAP_SERVICES'])
-        else
-          svcs = {}
-        end
+        svcs = ENV['VCAP_SERVICES'] ? CFRuntime::OkJson.decode(ENV['VCAP_SERVICES']) : {}
         svcs.each do |key,list|
           label, version = key.split('-')
+          begin
+            parser = Object.const_get("CFRuntime").const_get("#{label.capitalize}Parser")
+          rescue NameError
+            parser = Object.const_get("CFRuntime").const_get("DefaultParser")
+          end
           list.each do |svc|
             name = svc["name"]
             serviceopts = {}
             serviceopts[:label] = label
             serviceopts[:version] = version
             serviceopts[:name] = name
-            cred = svc["credentials"]
-            if label =~ /rabbitmq/
-              if cred['url']
-                #The RabbitMQ default vhost
-                vhost = '/'
-                # The new "srs" credentials format
-                uri=URI.parse(cred['url'])
-                user=URI.unescape(uri.user) if uri.user
-                passwd=URI.unescape(uri.password) if uri.password
-                host=uri.host
-                port=uri.port
-                if uri.path =~ %r{^/(.*)}
-                  raise ArgumentError.new("multiple segments in path of amqp URI: #{uri}") if $1.index('/')
-                  vhost = URI.unescape($1)
-                end
-                serviceopts[:url] = cred['url']
-              else
-                # The "old" credentials format
-                user,passwd,host,port,vhost = %w(user pass hostname port vhost).map {|key|
-                  cred[key]}
-              end
-              serviceopts[:vhost] = vhost
-            else
-              user,passwd,host,port,dbname,db = %w(username password hostname port name db).map {|key|
-                cred[key]}
-              if label == "mongodb"
-                serviceopts[:db] = db
-              else
-                serviceopts[:database] = dbname
-              end
-            end
-            serviceopts[:username] = user
-            serviceopts[:password] = passwd
-            serviceopts[:host] = host
-            serviceopts[:port] = port
+            serviceopts.merge!(parser.parse(svc))
             registered_svcs[name] = serviceopts
             if list.count == 1
               registered_svcs[label] = serviceopts
@@ -118,7 +84,5 @@ module CFRuntime
         service_names
       end
     end
-
   end
-
-end
+end

data/lib/cfruntime/version.rb

@@ -1,3 +1,3 @@
 module CFRuntime
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf-runtime
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-31 00:00:00.000000000 Z
+date: 2012-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -107,6 +107,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.7
+- !ruby/object:Gem::Dependency
+  name: aws-s3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -214,10 +230,19 @@ files:
 - LICENSE
 - README.md
 - lib/cfruntime/amqp.rb
+- lib/cfruntime/aws_s3.rb
 - lib/cfruntime/carrot.rb
 - lib/cfruntime/mongodb.rb
 - lib/cfruntime/mysql.rb
 - lib/cfruntime/okjson.rb
+- lib/cfruntime/parser/blob_parser.rb
+- lib/cfruntime/parser/default_parser.rb
+- lib/cfruntime/parser/mongodb_parser.rb
+- lib/cfruntime/parser/mysql_parser.rb
+- lib/cfruntime/parser/postgresql_parser.rb
+- lib/cfruntime/parser/rabbitmq_parser.rb
+- lib/cfruntime/parser/redis_parser.rb
+- lib/cfruntime/parser.rb
 - lib/cfruntime/postgres.rb
 - lib/cfruntime/properties.rb
 - lib/cfruntime/redis.rb