softlayer_api 1.0.4 → 1.0.5

data/lib/softlayer/base.rb

@@ -36,7 +36,7 @@
 #
 
 module SoftLayer
-  VERSION = "1.0.4"  # version history at the bottom of the file.
+  VERSION = "1.0.5"  # version history at the bottom of the file.
 
   # The base URL of the SoftLayer API's REST-like endpoints available to the public internet.
   API_PUBLIC_ENDPOINT = 'https://api.softlayer.com/rest/v3/'
@@ -76,4 +76,6 @@ end # module SoftLayer
 # JN.  Thanks!
 #
 # 1.0.4 - Fixed a bug where the result_limit and result_offset object filters were just not working. 
+#
+# 1.0.5 - Fixed a bug where empty hashes and empty arrays would not generate meaningful object masks
 #

data/lib/softlayer/object_mask_helpers.rb

@@ -26,6 +26,8 @@
 
 class Hash
   def to_sl_object_mask(base = "")
+    return base if(self.empty?)
+    
     # ask the children to convert themselves with the key as the base
     masked_children = self.map { |key, value| result = value.to_sl_object_mask(key); }.flatten
 
@@ -36,6 +38,7 @@ end
 
 class Array
   def to_sl_object_mask(base = "")
+    return base if self.empty?
     self.map { |item| item.to_sl_object_mask(base) }.flatten
   end
 end

data/test/SoftLayer_APIParameterFilter.rb

@@ -28,7 +28,7 @@ $: << File.expand_path(File.join(File.dirname(__FILE__), "../lib"))
 
 require 'rubygems'
 require 'softlayer_api'
-require 'spec'
+require 'rspec'
 
 describe SoftLayer::APIParameterFilter, "#object_with_id" do
   it "should intitialize with empty parameter values" do

data/test/SoftLayer_Service.rb

@@ -28,8 +28,8 @@ $: << File.expand_path(File.join(File.dirname(__FILE__), "../lib"))
 
 require 'rubygems'
 require 'softlayer_api'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
+require 'rspec/autorun'
 
 describe SoftLayer::Service, "#new" do
   before(:each) do

data/test/SoftLayer_ToObjectMask.rb

@@ -28,8 +28,8 @@ $: << File.expand_path(File.join(File.dirname(__FILE__), "../lib"))
 
 require 'rubygems'
 require 'softlayer_api'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
+require 'rspec/autorun'
 
 describe String, "#to_sl_object_mask" do
   it "should echo back a string with no base" do
@@ -50,8 +50,8 @@ describe String, "#to_sl_object_mask" do
 end
 
 describe Array,"#to_sl_object_mask" do
-  it "should return the empty array if run on an empty array" do
-    [].to_sl_object_mask.should eql([])
+  it "should return and empty string if run on an empty array" do
+    [].to_sl_object_mask.should eql("")
   end
 
   it "should call to_sl_object_mask passing the base to all its elements" do
@@ -70,6 +70,10 @@ describe Array,"#to_sl_object_mask" do
 end
 
 describe Hash, "#to_sl_object_mask" do
+  it "should return an empty string if run on an empty hash" do
+	  {}.to_sl_object_mask.should eql("")
+  end
+
   it "should call to_sl_object_mask on values with the key as the base" do
     proxy = "value"
     proxy.should_receive(:to_sl_object_mask).with("key").and_return("key.value")
@@ -80,4 +84,9 @@ describe Hash, "#to_sl_object_mask" do
   it "should resolve the mapped values with the base provided" do
     {"top" => [ "middle1", {"middle2" => "end"}]}.to_sl_object_mask.should eql(["top.middle1", "top.middle2.end"])
   end
+  
+  it "should handle a complex hash object mask with an inner empty hash" do
+    { "ipAddress" => { "ipAddress" => {}}}.to_sl_object_mask.should eql(["ipAddress.ipAddress"])
+  end
+  
 end

metadata

@@ -1,43 +1,34 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: softlayer_api
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 4
-  version: 1.0.4
+version: !ruby/object:Gem::Version
+  version: 1.0.5
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - SoftLayer Development Team
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-20 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-08-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  requirement: &70161596543420 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-description: The softlayer_api gem offers a convenient mechanism for invoking the services of the SoftLayer API from Ruby.
+  prerelease: false
+  version_requirements: *70161596543420
+description: The softlayer_api gem offers a convenient mechanism for invoking the
+  services of the SoftLayer API from Ruby.
 email: sldn@softlayer.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README.textile
 - LICENSE.textile
 - lib/softlayer/base.rb
@@ -51,35 +42,28 @@ files:
 - examples/createTicket.rb
 - examples/openTickets.rb
 - examples/ticket_info.rb
-has_rdoc: true
 homepage: http://sldn.softlayer.com/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Library for accessing the SoftLayer portal API
 test_files: []
-