nephophobia 0.0.1 → 0.0.2

data/lib/aws.rb

@@ -1,17 +1,16 @@
 ##
 # Taken from geemus/fog
-#
-# TODO: document
 
 require "cgi"
 require "openssl"
 require "base64"
 
 class AWS
+  attr_writer :path
+
   def initialize options
     @host       = options[:host]
     @port       = options[:port]
-    @path       = options[:path]
     @access_key = options[:access_key]
     @secret_key = options[:secret_key]
     @project    = options[:project]

data/lib/nephophobia/client.rb

@@ -10,7 +10,6 @@ module Nephophobia
 
     def initialize options
       @port = options[:port] || 8773
-      @path = options[:path] || "/services/Cloud"
 
       @connection = Hugs::Client.new(
         :host     => options[:host],
@@ -24,7 +23,6 @@ module Nephophobia
       @aws = AWS.new(
         :host       => options[:host],
         :port       => @port,
-        :path       => @path,
         :access_key => options[:access_key],
         :secret_key => options[:secret_key],
         :project    => options[:project]
@@ -40,6 +38,7 @@ module Nephophobia
     # +params+: A Hash containing the
 
     def raw method, params
+      @aws.path     = @path
       response      = @connection.send method, @path, :query => @aws.signed_params(method, params)
       response.body = Hashify.convert response.body.root
 
@@ -60,6 +59,7 @@ module Nephophobia
     # Provide a simple interface to the EC2 Compute resources.
 
     def compute
+      @path      = "/services/Cloud"
       @compute ||= Nephophobia::Compute.new self
     end
 
@@ -67,7 +67,24 @@ module Nephophobia
     # Provide a simple interface to the EC2 Image resources.
 
     def image
+      @path    = "/services/Cloud"
       @image ||= Nephophobia::Image.new self
     end
+
+    ##
+    # Provide a simple interface to the OpenStack Project resources.
+
+    def project
+      @path      = "/services/Admin/"
+      @project ||= Nephophobia::Project.new self
+    end
+
+    ##
+    # Provide a simple interface to the OpenStack User resources.
+
+    def user
+      @path   = "/services/Admin/"
+      @user ||= Nephophobia::User.new self
+    end
   end
 end

data/lib/nephophobia/version.rb

@@ -1,3 +1,3 @@
 module Nephophobia
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/test/lib/aws_test.rb

@@ -6,7 +6,6 @@ describe AWS do
       @aws = AWS.new(
         :host       => "example.com",
         :port       => 8773,
-        :path       => "/services/Cloud",
         :access_key => "9c01b833-3047-4f2e-bb2a-5c8dc7c8ae9c",
         :secret_key => "3ae9d9f0-2723-480a-99eb-776f05950506",
         :project    => "production"
@@ -14,6 +13,7 @@ describe AWS do
     end
 
     it "returns signed query params" do
+      @aws.path = "/services/Cloud"
       result = @aws.signed_params "get", "Action" => "DescribeInstances"
 
       result.must_equal "AWSAccessKeyId=9c01b833-3047-4f2e-bb2a-5c8dc7c8ae9c%3Aproduction&Action=DescribeInstances&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=1999-12-31T19%3A59%3A59Z&Version=2010-11-15&Signature=x0wJmpbCeXpNcwVuTmB7E59zmlyTRkjDxjlO%2BCQi4z4%3D"

data/test/lib/nephophobia/compute_test.rb

@@ -1,13 +1,7 @@
 require "test_helper"
 
 describe Nephophobia::Compute do
-  before { @compute = Nephophobia::Compute.new USER_CLIENT }
-
-  describe "#compute" do
-    it "has compute decorator" do
-      USER_CLIENT.must_respond_to :compute
-    end
-  end
+  before { @compute = USER_CLIENT.compute }
 
   describe "#all" do
     it "returns all instances" do
@@ -57,7 +51,7 @@ describe Nephophobia::Compute do
 
       VCR.use_cassette "compute_create_with_optional_params" do
         response = @compute.create @image_id, params
-        
+
         response.name.must_equal "testserver1"
         response.description.must_equal "test description"
       end

data/test/lib/nephophobia/image_test.rb

@@ -1,15 +1,7 @@
 require "test_helper"
 
 describe Nephophobia::Image do
-  before do
-    @image = Nephophobia::Image.new USER_CLIENT
-  end
-
-  describe "#image" do
-    it "has image decorator" do
-      USER_CLIENT.must_respond_to :image
-    end
-  end
+  before { @image = USER_CLIENT.image }
 
   describe "#all" do
     it "returns all images" do

data/test/lib/nephophobia/project_test.rb

@@ -2,8 +2,8 @@ require "test_helper"
 
 describe Nephophobia::Project do
   before do
-    @project      = Nephophobia::Project.new ADMIN_CLIENT
-    @user         = Nephophobia::User.new ADMIN_CLIENT
+    @project      = ADMIN_CLIENT.project
+    @user         = ADMIN_CLIENT.user
     @user_name    = "foobar_user"
     @project_name = "foobar_project"
   end

data/test/lib/nephophobia/user_test.rb

@@ -2,7 +2,7 @@ require "test_helper"
 
 describe Nephophobia::User do
   before do
-    @user         = Nephophobia::User.new ADMIN_CLIENT
+    @user         = ADMIN_CLIENT.user
     @user_name    = "foobar_user"
     @project_name = "foobar_project"
   end

data/test/test_helper.rb

@@ -19,8 +19,7 @@ class MiniTest::Unit::TestCase
     :host       => "10.1.170.32",
     :access_key => "1d7a687b-0065-44d6-9611-5bf6c6c72424",
     :secret_key => "fd3053fd-25c2-48f8-b893-9f22661ec63c",
-    :project    => "production",
-    :path       => "/services/Admin/"
+    :project    => "production"
   )
 
   def cassette_for cassette
@@ -44,4 +43,5 @@ class Time
     end
   end
 end
+
 MiniTest::Unit.autorun

metadata

@@ -2,7 +2,7 @@
 name: nephophobia
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - John Dewey
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-04 00:00:00 -08:00
+date: 2011-03-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency