ogle 0.0.1 → 0.0.2

data/lib/ogle/resource.rb

@@ -24,27 +24,19 @@ module Ogle
     # +image_id+: A String representing an image_id.
 
     def find image_id
-      headers = @connection.head "/images/#{image_id}"
-
-      meta ={}
-
-      headers.each_header do |k, v|
-        if k.match('x-image-meta-')
-          meta["#{k}"] = v
+      response = @connection.head "/images/#{image_id}"
+
+      Hash.new.tap do |h|
+        properties = h['properties'] = Hash.new
+        response.each_header do |k, v|
+          case k.downcase.tr '-', '_'
+            when %r{^x_image_meta_property_([a-z_]+)$}
+              properties[$1] = v
+            when %r{^x_image_meta_([a-z_]+)$}
+              h[$1] = v
+          end
         end
       end
-
-      meta
-    end
-
-    ##
-    # Stores the disk provided disk image in glance
-    # Stores provided meta-data about the image in glance
-    #
-    # +image_location+: A string representing the location of the image to updload
-    
-    def add image_location
     end
-  
   end
 end

data/lib/ogle/version.rb

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

data/test/lib/ogle/resource_test.rb

@@ -4,34 +4,104 @@ CONNECTION = Ogle::Client.new(
   :host => "10.1.170.33"
 )
 
+def must_have_valid_keys response, keys
+  raise "The response passed in is empty." if response.keys.empty?
+  response.keys.delete_if { |k| keys.include? k }.must_be_empty
+end
+
 describe Ogle::Resource do
   describe "#all" do
-    it "returns a hash of images" do
+    before do
       VCR.use_cassette "resource_all" do
-        response = CONNECTION.resource.all
-
-        response.size.must_equal 6
+        @response = CONNECTION.resource.all
       end
     end
+
+    it "returns a hash of images" do
+      @response.size.must_be :>=, 1
+    end
+
+    it "returns metadata" do
+      must_have_valid_keys @response.first, %w(
+        name
+        container_format
+        disk_format
+        checksum
+        id
+        size
+      )
+    end
   end
 
   describe "#all true" do
-    it "returns a detailed hash of images (verbose = true)" do
+    before do
       VCR.use_cassette "resource_all_verbose" do
-        response = CONNECTION.resource.all true
-
-        response.size.must_equal 6
+        @response = CONNECTION.resource.all true
       end
     end
+
+    it "returns a detailed hash of images" do
+      @response.size.must_be :>=, 1
+    end
+
+    it "returns metadata" do
+      must_have_valid_keys @response.first, %w(
+        status
+        name
+        deleted
+        container_format
+        created_at
+        disk_format
+        updated_at
+        id
+        location
+        checksum
+        is_public
+        deleted_at
+        properties
+        size
+      )
+    end
   end
 
   describe "#find" do
-    it "returns X-Image-Meta-* headers as a hash" do
+    before do
       VCR.use_cassette "resource_find" do
-        response = CONNECTION.resource.find 6
-
-        response.size.must_equal 20
+        @response = CONNECTION.resource.find 6
       end
     end
+
+    ### TODO: May want to refactor these keys into a variable,
+    ### TODO: since Resource#find verbose shares them.
+    it "returns X-Image-Meta-* headers as a hash" do
+      must_have_valid_keys @response, %w(
+        status
+        name
+        deleted
+        container_format
+        created_at
+        disk_format
+        updated_at
+        id
+        location
+        checksum
+        is_public
+        deleted_at
+        properties
+        size
+      )
+    end
+
+    it "returns a nested properties hash" do
+      must_have_valid_keys @response['properties'], %w(
+        distro
+        arch
+        uploader
+        type
+        kernel_name
+        kernel_id
+        version
+      )
+    end
   end
 end

data/test/test_helper.rb

@@ -1,18 +1,14 @@
-%w(bundler minitest/spec ogle vcr webmock).each { |r| require r }
-
 Bundler.setup :default, :test
 
+%w(minitest/spec ogle vcr webmock).each { |r| require r }
+
 class MiniTest::Unit::TestCase
-  def cassette_for cassette
-    c = VCR::Cassette.new(cassette).send :recorded_interactions
-  end
 end
 
 VCR.config do |c|
   c.stub_with :webmock
-  c.cassette_library_dir      = "test/cassettes"
-  c.default_cassette_options  = { :record => :none }
+  c.cassette_library_dir     = "test/cassettes"
+  c.default_cassette_options = { :record => :none }
 end
 
-
 MiniTest::Unit.autorun

metadata

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