softlayer_api 1.0.7 → 1.0.8

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f7f6dacd2a3f7e2589109a815000ed208497963e
+  data.tar.gz: b8b38d3cdaa828b98508ba13e494d0b771257c70
+SHA512:
+  metadata.gz: b80012657f2387a7ef60bfb284a64e2fa65ff6f8095a8b074d6992504f461b4547215607c583943ce13d86e9790fb7eddf8e5a3af90ca89eabb24293a3c7d5bf
+  data.tar.gz: aa3cc1087a9449539d69c29277a73b4a436afe61ce5ec1b25a9235e0bb4aa7dbc5af747e1fe60dc3eff5de63f5a4d224490977832742b87f59f6b8c28569ec25

data/LICENSE.textile

@@ -1,9 +1,19 @@
-Copyright (c) 2010, "SoftLayer Technologies, Inc.":http://www.softlayer.com/ All rights reserved.
+Copyright (c) 2010-2014 "SoftLayer Technologies, Inc.":http://www.softlayer.com/ All rights reserved.
 
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
- * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * Neither SoftLayer Technologies, Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.textile

@@ -248,4 +248,4 @@ This software is written by the SoftLayer Development Team <"sldn@softlayer.com"
 
 h2. Copyright
 
-This software is Copyright (c) 2010 "SoftLayer Technologies, Inc":http://www.softlayer.com/. See the bundled LICENSE.textile file for more information.
+This software is Copyright (c) 2010-2014 "SoftLayer Technologies, Inc":http://www.softlayer.com/. See the bundled LICENSE.textile file for more information.

data/examples/accountInformation.rb

@@ -1,28 +1,24 @@
-# Copyright (c) 2010, SoftLayer Technologies, Inc. All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# Copyright (c) 2014 SoftLayer Technologies, Inc. All rights reserved.
 #
-#  * Redistributions of source code must retain the above copyright notice,
-#    this list of conditions and the following disclaimer.
-#  * Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-#  * Neither SoftLayer Technologies, Inc. nor the names of its contributors may
-#    be used to endorse or promote products derived from this software without
-#    specific prior written permission.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 #
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
 
 require 'rubygems'
 require 'softlayer_api'

data/examples/createTicket.rb

@@ -1,28 +1,24 @@
-# Copyright (c) 2010, SoftLayer Technologies, Inc. All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# Copyright (c) 2014 SoftLayer Technologies, Inc. All rights reserved.
 #
-#  * Redistributions of source code must retain the above copyright notice,
-#    this list of conditions and the following disclaimer.
-#  * Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-#  * Neither SoftLayer Technologies, Inc. nor the names of its contributors may
-#    be used to endorse or promote products derived from this software without
-#    specific prior written permission.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 #
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
 
 require 'rubygems'
 require 'softlayer_api'

data/examples/openTickets.rb

@@ -1,28 +1,24 @@
-# Copyright (c) 2010, SoftLayer Technologies, Inc. All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# Copyright (c) 2014 SoftLayer Technologies, Inc. All rights reserved.
 #
-#  * Redistributions of source code must retain the above copyright notice,
-#    this list of conditions and the following disclaimer.
-#  * Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-#  * Neither SoftLayer Technologies, Inc. nor the names of its contributors may
-#    be used to endorse or promote products derived from this software without
-#    specific prior written permission.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 #
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
 
 require 'rubygems'
 require 'softlayer_api'

data/examples/ticket_info.rb

@@ -1,28 +1,24 @@
-# Copyright (c) 2010, SoftLayer Technologies, Inc. All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# Copyright (c) 2014 SoftLayer Technologies, Inc. All rights reserved.
 #
-#  * Redistributions of source code must retain the above copyright notice,
-#    this list of conditions and the following disclaimer.
-#  * Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-#  * Neither SoftLayer Technologies, Inc. nor the names of its contributors may
-#    be used to endorse or promote products derived from this software without
-#    specific prior written permission.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 #
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
 
 require 'rubygems'
 require 'softlayer_api'

data/lib/softlayer/base.rb

@@ -1,28 +1,24 @@
-# Copyright (c) 2010, SoftLayer Technologies, Inc. All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# Copyright (c) 2014 SoftLayer Technologies, Inc. All rights reserved.
 #
-#  * Redistributions of source code must retain the above copyright notice,
-#    this list of conditions and the following disclaimer.
-#  * Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-#  * Neither SoftLayer Technologies, Inc. nor the names of its contributors may
-#    be used to endorse or promote products derived from this software without
-#    specific prior written permission.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 #
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
 
 # The SoftLayer Module
 #
@@ -36,7 +32,7 @@
 #
 
 module SoftLayer
-  VERSION = "1.0.7"  # version history at the bottom of the file.
+  VERSION = "1.0.8"  # 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/'
@@ -60,27 +56,3 @@ module SoftLayer
   # The base URL used for the SoftLayer API's
   $SL_API_BASE_URL = SoftLayer::API_PUBLIC_ENDPOINT
 end # module SoftLayer
-
-#
-# History:
-#
-# 1.0 - 1.0.1 - Initial release.  There was some confusion over getting the gem
-# posted up to rubygems.org and the 1.0.1 release came about because of that
-# confusion.  There should be no real functionality differences there.
-#
-# 1.0.2 - We have some API routines that start with 'get' but expect arguments
-# anyway.  The code now uses HTTP POST to send requests for which the user
-# has provided arguments regardless of the name of the routine.
-#
-# 1.0.3 - Added a request filter to add result limits to request.  Submitted by
-# 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
-#
-# 1.0.6 - Make all API calls with either a GET or a POST as the HTTP verb.
-#
-# 1.0.7 - Calls to the "getObject" method of any service should not take parameters.  The gem now
-# warns if you make this type of call and ignores the parameters. This prevents
-# SoftLayer_Virtual_Guest::getObject from accidentally creating (billable) CCI instances.

data/lib/softlayer/object_mask_helpers.rb

@@ -1,28 +1,24 @@
-# Copyright (c) 2010, SoftLayer Technologies, Inc. All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# Copyright (c) 2014 SoftLayer Technologies, Inc. All rights reserved.
 #
-#  * Redistributions of source code must retain the above copyright notice,
-#    this list of conditions and the following disclaimer.
-#  * Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-#  * Neither SoftLayer Technologies, Inc. nor the names of its contributors may
-#    be used to endorse or promote products derived from this software without
-#    specific prior written permission.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 #
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
 
 class Hash
   def to_sl_object_mask(base = "")

data/lib/softlayer/service.rb

@@ -1,28 +1,24 @@
-# Copyright (c) 2010, SoftLayer Technologies, Inc. All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# Copyright (c) 2014 SoftLayer Technologies, Inc. All rights reserved.
 #
-#  * Redistributions of source code must retain the above copyright notice,
-#    this list of conditions and the following disclaimer.
-#  * Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-#  * Neither SoftLayer Technologies, Inc. nor the names of its contributors may
-#    be used to endorse or promote products derived from this software without
-#    specific prior written permission.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 #
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
 
 require 'rubygems'
 require 'net/https'
@@ -102,7 +98,6 @@ module SoftLayer
       self.parameters[:result_offset]
     end
 
-
     def method_missing(method_name, *args, &block)
       return @target.call_softlayer_api_with_params(method_name, self, args, &block)
     end
@@ -138,6 +133,9 @@ module SoftLayer
     # The base URL for requests that are passed to the server. Cannot be emtpy or nil.
     attr_accessor :endpoint_url
 
+    # The User-Agent header sent to SoftLayer API.
+    attr_accessor :user_agent
+
     # Initialize an instance of the Client class. You pass in the service name
     # and optionally hash arguments specifying how the client should access the
     # SoftLayer API.
@@ -167,11 +165,17 @@ module SoftLayer
       # public endpoint
       self.endpoint_url = options[:endpoint_url] || $SL_API_BASE_URL || API_PUBLIC_ENDPOINT
 
+      @user_agent = {"User-Agent" => options[:user_agent] || "SoftLayer API Ruby Client #{SoftLayer::VERSION}"}
+
       if($DEBUG)
         @method_missing_call_depth = 0
       end
     end #initalize
 
+    # Use this to set the user agent string for this API client.
+    def user_agent=(set)
+      self.user_agent['User-Agent'] = set
+    end
 
     # Use this as part of a method call chain to identify a particular
     # object as the target of the request. The parameter is the SoftLayer
@@ -331,9 +335,9 @@ module SoftLayer
       end
 
       if request_body && !request_body.empty?
-            url_request = Net::HTTP::Post.new(method_url.request_uri(), content_type_header)
+            url_request = Net::HTTP::Post.new(method_url.request_uri(), content_type_header.merge(self.user_agent))
       else
-          	url_request = Net::HTTP::Get.new(method_url.request_uri())
+          	url_request = Net::HTTP::Get.new(method_url.request_uri(), self.user_agent)
       end
 
       # This warning should be obsolete as we should be using POST if the user
@@ -459,4 +463,5 @@ module SoftLayer
       @endpoint_url = new_url.strip
     end
   end # class Service
-end # module SoftLayer
+end # module SoftLayer
+

data/lib/softlayer_api.rb

@@ -1,28 +1,24 @@
-# Copyright (c) 2010, SoftLayer Technologies, Inc. All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# Copyright (c) 2014 SoftLayer Technologies, Inc. All rights reserved.
 #
-#  * Redistributions of source code must retain the above copyright notice,
-#    this list of conditions and the following disclaimer.
-#  * Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-#  * Neither SoftLayer Technologies, Inc. nor the names of its contributors may
-#    be used to endorse or promote products derived from this software without
-#    specific prior written permission.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 #
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
 
 require 'softlayer/base'
 require 'softlayer/object_mask_helpers'

metadata

@@ -1,30 +1,47 @@
 --- !ruby/object:Gem::Specification
 name: softlayer_api
 version: !ruby/object:Gem::Version
-  version: 1.0.7
-  prerelease: 
+  version: 1.0.8
 platform: ruby
 authors:
 - SoftLayer Development Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
+date: 2014-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.1
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: The softlayer_api gem offers a convenient mechanism for invoking the
@@ -34,41 +51,39 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- README.textile
 - LICENSE.textile
-- lib/softlayer/base.rb
-- lib/softlayer/object_mask_helpers.rb
-- lib/softlayer/service.rb
-- lib/softlayer_api.rb
-- test/SoftLayer_APIParameterFilter.rb
-- test/SoftLayer_Service.rb
-- test/SoftLayer_ToObjectMask.rb
+- README.textile
 - examples/accountInformation.rb
 - examples/createTicket.rb
 - examples/openTickets.rb
 - examples/ticket_info.rb
+- lib/softlayer/base.rb
+- lib/softlayer/object_mask_helpers.rb
+- lib/softlayer/service.rb
+- lib/softlayer_api.rb
 homepage: http://sldn.softlayer.com/
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 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.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Library for accessing the SoftLayer portal API
 test_files: []
+has_rdoc: true

data/test/SoftLayer_APIParameterFilter.rb

@@ -1,81 +0,0 @@
-# Copyright (c) 2010, SoftLayer Technologies, Inc. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-#  * Redistributions of source code must retain the above copyright notice,
-#    this list of conditions and the following disclaimer.
-#  * Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-#  * Neither SoftLayer Technologies, Inc. nor the names of its contributors may
-#    be used to endorse or promote products derived from this software without
-#    specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-$: << File.expand_path(File.join(File.dirname(__FILE__), "../lib"))
-
-require 'rubygems'
-require 'softlayer_api'
-require 'rspec'
-
-describe SoftLayer::APIParameterFilter, "#object_with_id" do
-  it "should intitialize with empty parameter values" do
-    filter = SoftLayer::APIParameterFilter.new
-    filter.server_object_id.should be_nil
-    filter.server_object_mask.should be_nil
-  end
-
-  it "should store its value in server_object_id when called " do
-    filter = SoftLayer::APIParameterFilter.new
-    result = filter.object_with_id(12345)
-    result.server_object_id.should eql(12345)
-    result.parameters.should eql({:server_object_id => 12345})
-  end
-
-  it "should allow call chaining with object_mask " do
-    filter = SoftLayer::APIParameterFilter.new
-    result = filter.object_with_id(12345).object_mask("fish", "cow", "duck")
-    result.server_object_id.should == 12345
-    result.server_object_mask.should == ["fish", "cow", "duck"]
-  end
-end
-
-describe SoftLayer::APIParameterFilter, "#object_mask" do
-  it "should store its value in server_object_mask when called" do
-    filter = SoftLayer::APIParameterFilter.new
-    result = filter.object_mask("fish", "cow", "duck")
-    result.server_object_mask.should == ["fish", "cow", "duck"]
-  end
-
-  it "should allow call chaining with object_with_id" do
-    filter = SoftLayer::APIParameterFilter.new
-    result = filter.object_mask("fish", "cow", "duck").object_with_id(12345)
-    result.server_object_id.should == 12345
-    result.server_object_mask.should == ["fish", "cow", "duck"]
-  end
-end
-
-describe SoftLayer::APIParameterFilter, "#method_missing" do
-  it "should invoke call_softlayer_api_with_params(method_name, self, args, &block) on it's target with itself and the method_missing parameters" do
-    filter = SoftLayer::APIParameterFilter.new.object_mask("fish", "cow", "duck").object_with_id(12345)
-
-    target = mock("method_missing_target")
-    target.should_receive(:call_softlayer_api_with_params).with(:getObject, filter, ["marshmallow"])
-
-    filter.target = target
-
-    filter.getObject("marshmallow")
-  end
-end

data/test/SoftLayer_Service.rb

@@ -1,361 +0,0 @@
-# Copyright (c) 2010, SoftLayer Technologies, Inc. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-#  * Redistributions of source code must retain the above copyright notice,
-#    this list of conditions and the following disclaimer.
-#  * Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-#  * Neither SoftLayer Technologies, Inc. nor the names of its contributors may
-#    be used to endorse or promote products derived from this software without
-#    specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-$: << File.expand_path(File.join(File.dirname(__FILE__), "../lib"))
-
-require 'rubygems'
-require 'softlayer_api'
-require 'rspec'
-require 'rspec/autorun'
-
-describe SoftLayer::Service, "#new" do
-  before(:each) do
-    $SL_API_USERNAME = "some_default_username"
-    $SL_API_KEY = "some_default_api_key"
-    $SL_API_BASE_URL = SoftLayer::API_PUBLIC_ENDPOINT
-  end
-
-  after(:each) do
-    $SL_API_USERNAME = nil
-    $SL_API_KEY = nil
-    $SL_API_BASE_URL = SoftLayer::API_PUBLIC_ENDPOINT
-  end
-
-  it "should reject a nil or empty service name" do
-    lambda() {service = SoftLayer::Service.new(nil)}.should raise_error
-    lambda() {service = SoftLayer::Service.new("")}.should raise_error
-  end
-
-  it "should remember service name passed in" do
-    service = SoftLayer::Service.new("SoftLayer_Account")
-    service.service_name.should == "SoftLayer_Account"
-  end
-
-  it "should pickup default username" do
-    $SL_API_USERNAME = "sample"
-    service = SoftLayer::Service.new("SoftLayer_Account")
-    service.username.should == "sample"
-  end
-
-  it "should accept a username in options" do
-    $SL_API_USERNAME = "sample"
-    service = SoftLayer::Service.new("SoftLayer_Account", :username => 'fred')
-    service.username.should == "fred"
-  end
-
-  it "should pickup default api key" do
-    $SL_API_KEY = "sample"
-    service = SoftLayer::Service.new("SoftLayer_Account")
-    service.api_key.should == "sample"
-  end
-
-  it "should accept an api key in options" do
-    $SL_API_KEY = "sample"
-    service = SoftLayer::Service.new("SoftLayer_Account", :api_key => 'fred')
-    service.api_key.should == "fred"
-  end
-
-  it "should fail if username is empty" do
-    lambda() do
-      $SL_API_USERNAME = ""
-      $SL_API_KEY = "sample"
-
-      service = SoftLayer::Service.new("SoftLayer_Account")
-    end.should raise_error
-
-    lambda() do
-      $SL_API_USERNAME = "good_username"
-      $SL_API_KEY = "sample"
-
-      service = SoftLayer::Service.new("SoftLayer_Account", :username => "")
-    end.should raise_error
-  end
-
-  it "should fail if username is nil" do
-    lambda() do
-      $SL_API_USERNAME = nil
-      service = SoftLayer::Service.new("SoftLayer_Account", :api_key => "sample")
-    end.should raise_error
-
-    lambda() do
-      $SL_API_KEY = "sample"
-      service = SoftLayer::Service.new("SoftLayer_Account", :username => nil, :api_key => "sample")
-    end.should raise_error
-  end
-
-  it "should fail if api_key is empty" do
-    lambda() do
-      $SL_API_USERNAME = "good_username"
-      $SL_API_KEY = ""
-
-      service = SoftLayer::Service.new("SoftLayer_Account")
-    end.should raise_error
-
-    lambda() do
-      $SL_API_USERNAME = "good_username"
-      $SL_API_KEY = "good_api_key"
-
-      service = SoftLayer::Service.new("SoftLayer_Account", :username => "sample", :api_key => "")
-    end.should raise_error
-  end
-
-  it "should fail if api_key is nil" do
-    lambda() do
-      $SL_API_KEY = nil
-      service = SoftLayer::Service.new("SoftLayer_Account", :username => "sample")
-    end.should raise_error
-
-    lambda() do
-      $SL_API_KEY = nil
-      service = SoftLayer::Service.new("SoftLayer_Account", :username => "sample", :api_key => nil)
-    end.should raise_error
-  end
-
-  it "should pickup default base url" do
-    $SL_API_BASE_URL = nil
-    service = SoftLayer::Service.new("SoftLayer_Account")
-    service.endpoint_url.should == SoftLayer::API_PUBLIC_ENDPOINT
-  end
-
-  it "should get base URL from globals" do
-    $SL_API_BASE_URL = "http://someendpoint.softlayer.com/from/globals"
-    service = SoftLayer::Service.new("SoftLayer_Account")
-    service.endpoint_url.should == "http://someendpoint.softlayer.com/from/globals"
-  end
-
-  it "should accept a base url through options" do
-    service = SoftLayer::Service.new("SoftLayer_Account", :endpoint_url => "http://someendpoint.softlayer.com")
-    service.endpoint_url.should == "http://someendpoint.softlayer.com"
-  end
-end #describe SoftLayer#new
-
-describe SoftLayer::Service, "#username=" do
-  it "should not allow you to set a nil or empty username" do
-    service = SoftLayer::Service.new("SoftLayer_Account", :username => "sample", :api_key => "sample")
-    lambda() {service.username = ""}.should raise_error
-    lambda() {service.username = nil}.should raise_error
-  end
-
-  it "should strip whitespace" do
-    service = SoftLayer::Service.new("SoftLayer_Account", :username => "sample", :api_key => "sample")
-    service.username = "    whitespace   "
-    service.username.should == "whitespace"
-  end
-end  #describe SoftLayer#username=
-
-describe SoftLayer::Service, "#api_key=" do
-  it "should not allow you to set a nil or empty api_key" do
-    service = SoftLayer::Service.new("SoftLayer_Account", :username => "sample", :api_key => "sample")
-    lambda() {service.api_key = ""}.should raise_error
-    lambda() {service.api_key = nil}.should raise_error
-  end
-
-  it "should strip whitespace" do
-    service = SoftLayer::Service.new("SoftLayer_Account", :username => "sample", :api_key => "sample")
-    service.api_key = "    fred  "
-    service.api_key.should == "fred"
-  end
-end  #describe SoftLayer#api_key=
-
-describe SoftLayer::Service, "#endpoint_url=" do
-  it "should not allow you to set a nil or empty endpoint_url" do
-    service = SoftLayer::Service.new("SoftLayer_Account", :username => "sample", :api_key => "sample", :endpoint_url => "http://someendpoint.softlayer.com")
-    lambda() {service.endpoint_url = ""}.should raise_error
-    lambda() {service.endpoint_url = nil}.should raise_error
-  end
-
-  it "should strip whitespace" do
-    service = SoftLayer::Service.new("SoftLayer_Account", :username => "sample", :api_key => "sample", :endpoint_url => "http://someendpoint.softlayer.com")
-    service.endpoint_url = "    http://someendpoint.softlayer.com  "
-    service.endpoint_url.should == "http://someendpoint.softlayer.com"
-  end
-end  #describe SoftLayer#endpoint_url=
-
-describe SoftLayer::Service, "#url_to_call_method" do
-  it "should concatenate the method to the base url" do
-    service = SoftLayer::Service.new("SoftLayer_Account", :username => "sample_username", :api_key => "blah")
-
-    # make sure we've picked up the default API key (can be wrong if one of the other tests is misbehaving)
-    service.endpoint_url.should == SoftLayer::API_PUBLIC_ENDPOINT
-
-    call_url = service.url_to_call_method("getOpenTickets", nil);
-    call_url.scheme.should == "https"
-    call_url.host.should == "api.softlayer.com"
-    call_url.path.should == "/rest/v3/SoftLayer_Account/getOpenTickets.json"
-  end  #describe SoftLayer#url_to_call_method=
-end
-
-describe SoftLayer::Service, "#object_with_id" do
-  it "should add an object to the URL for a request " do
-      service = SoftLayer::Service.new("SoftLayer_Ticket", :username => "sample_username", :api_key => "blah")
-      service.should_receive(:issue_http_request).with(URI.parse("https://api.softlayer.com/rest/v3/SoftLayer_Ticket/12345/getObject.json"), an_instance_of(Net::HTTP::Get))
-      service.object_with_id(12345).getObject
-  end
-end
-
-describe SoftLayer::Service, "#missing_method" do
-  it "should translate unknown method into an api call" do
-    service = SoftLayer::Service.new("SoftLayer_Account", :username => "sample_username", :api_key => "blah")
-    service.should_receive(:call_softlayer_api_with_params).with(:getOpenTickets, nil, ["marshmallow"])
-    response = service.getOpenTickets("marshmallow")
-  end
-end
-
-describe SoftLayer::Service, "#http_request_for_method" do
-  it "should only use HTTP GET for requests to the getObject method even if paramters are provided" do
-    service = SoftLayer::Service.new("SoftLayer_Account", :username => "sample_username", :api_key => "blah")
-    request = service.http_request_for_method(:getObject, URI.parse("https://api.softlayer.com/rest/v3/SoftLayer_Ticket/12345/getObject.json"), '{"simple" : "object"}')
-    request.should be_a_kind_of(Net::HTTP::Get)
-    request.should_not be_a_kind_of(Net::HTTP::Post)
-  end
-end
-
-describe SoftLayer::Service, "#call_softlayer_api_with_params" do
-  it "should issue an HTTP request for the given method" do
-    service = SoftLayer::Service.new("SoftLayer_Account", :username => "sample_username", :api_key => "blah")
-    service.should_receive(:issue_http_request).with(any_args())
-    service.call_softlayer_api_with_params(:getObject, nil, []);
-  end
-
-  it "should include the object id in the url created" do
-    service = SoftLayer::Service.new("SoftLayer_Ticket", :username => "sample_username", :api_key => "blah")
-    service.should_receive(:issue_http_request).with(URI.parse("https://api.softlayer.com/rest/v3/SoftLayer_Ticket/12345/getObject.json"), an_instance_of(Net::HTTP::Get))
-    service.call_softlayer_api_with_params(:getObject, SoftLayer::APIParameterFilter.new.object_with_id(12345), []);
-  end
-
-  it "should include the object mask in the url created" do
-    expected_uri = "https://api.softlayer.com/rest/v3/SoftLayer_Account/getObject.json?objectMask=cow;duck;chicken;bull%20dog"
-
-    service = SoftLayer::Service.new("SoftLayer_Account", :username => "sample_username", :api_key => "blah")
-    service.should_receive(:issue_http_request).with(URI.parse(expected_uri), an_instance_of(Net::HTTP::Get))
-    service.call_softlayer_api_with_params(:getObject, SoftLayer::APIParameterFilter.new.object_mask("cow  ", "  duck", "chicken", "bull dog"), []);
-  end
-
-  it "should return the parsed JSON when completing successfully" do
-    service = SoftLayer::Service.new("SoftLayer_Account", :username => "sample_username", :api_key => "blah")
-    service.should_receive(:issue_http_request).with(any_args()).and_return('{"successful":"Yipeee!", "array":[1,2,3], "bool":true}')
-    result = service.getObject
-    result.should == {"array"=>[1, 2, 3], "successful"=>"Yipeee!", "bool"=>true}
-  end
-
-  it "should raise an exception when completing unsuccessfully" do
-    service = SoftLayer::Service.new("SoftLayer_Account", :username => "sample_username", :api_key => "blah")
-    service.should_receive(:issue_http_request).with(any_args()).and_return('{"error":"Function (\"getSnargled\") is not a valid method for this service"}')
-    lambda{ result = service.getSnargled }.should raise_error
-  end
-end
-
-describe SoftLayer::Service, "#object_with_id" do
-  it "should return an APIParameterFilter with itself as the target" do
-    service = SoftLayer::Service.new("SoftLayer_Account", :username => "sample_username", :api_key => "blah")
-    filter = service.object_with_id(12345)
-
-    filter.should_not be_nil
-    filter.target.should === service
-    filter.server_object_id.should == 12345
-  end
-end
-
-describe SoftLayer::Service, "#object_mask" do
-  it "should return an APIParameterFilter with itself as the target" do
-    service = SoftLayer::Service.new("SoftLayer_Account", :username => "sample_username", :api_key => "blah")
-    filter = service.object_mask("fish", "cow", "duck")
-
-    filter.should_not be_nil
-    filter.target.should === service
-    filter.server_object_mask.should == ["fish", "cow", "duck"]
-  end
-end
-
-describe SoftLayer::Service, "#result_limit" do
-  it "should return an APIParameterFilter with itself as the target" do
-    service = SoftLayer::Service.new("SoftLayer_Account", :username => "sample_username", :api_key => "blah")
-    filter = service.result_limit(10)
-
-    filter.should_not be_nil
-    filter.target.should === service
-    filter.server_result_limit.should == 10
-  end
-end
-
-describe SoftLayer::Service, "#result_offset" do
-  it "should return an APIParameterFilter with itself as the target" do
-    service = SoftLayer::Service.new("SoftLayer_Account", :username => "sample_username", :api_key => "blah")
-    filter = service.result_offset(5)
-
-    filter.should_not be_nil
-    filter.target.should === service
-    filter.server_result_offset.should == 5
-  end
-end
-
-describe SoftLayer::Service, "#marshall_arguments_for_call" do
-  service = SoftLayer::Service.new("SoftLayer_Account", :username => "sample_username", :api_key => "blah")
-  request_body = service.marshall_arguments_for_call(["first", 3, {"cow" => "chicken"}])
-  request_body.should == '{"parameters":["first",3,{"cow":"chicken"}]}'
-end
-
-describe SoftLayer::Service, " creating option proxies" do
-  it "should allow me to create a proxy object with just the object_with_id option" do
-    service = SoftLayer::Service.new("SoftLayer_Ticket", :username => "sample_username", :api_key => "blah")
-    ticket_proxy = service.object_with_id(123456)
-
-    ticket_proxy.server_object_id.should eql(123456)
-    service.should_receive(:call_softlayer_api_with_params).with(any_args())
-    ticket_proxy.getObject
-  end
-
-  it "should allow me to create a proxy object with just the object_mask option" do
-    service = SoftLayer::Service.new("SoftLayer_Ticket", :username => "sample_username", :api_key => "blah")
-    ticket_proxy = service.object_mask("fish", "cow", "duck")
-
-    ticket_proxy.server_object_mask.should eql(["fish", "cow", "duck"])
-    service.should_receive(:call_softlayer_api_with_params).with(any_args())
-    ticket_proxy.getObject
-  end
-
-  it "should not modify an object_with_id proxy even if that proxy is used with a mask" do
-    service = SoftLayer::Service.new("SoftLayer_Ticket", :username => "sample_username", :api_key => "blah")
-    ticket_proxy = service.object_with_id(123456)
-
-    service.should_receive(:issue_http_request).with(URI.parse("https://api.softlayer.com/rest/v3/SoftLayer_Ticket/123456/getObject.json?objectMask=fish;cow;duck"), an_instance_of(Net::HTTP::Get))
-    ticket_proxy.object_mask("fish", "cow", "duck").getObject
-
-    ticket_proxy.server_object_id.should eql(123456)
-    ticket_proxy.server_object_mask.should be_nil
-  end
-
-  it "should not modify an object_mask proxy even if it is used with an object ID" do
-    service = SoftLayer::Service.new("SoftLayer_Ticket", :username => "sample_username", :api_key => "blah")
-    masked_proxy = service.object_mask("fish", "cow", "duck")
-
-    service.should_receive(:issue_http_request).with(URI.parse("https://api.softlayer.com/rest/v3/SoftLayer_Ticket/123456/getObject.json?objectMask=fish;cow;duck"), an_instance_of(Net::HTTP::Get))
-    masked_proxy.object_with_id(123456).getObject
-
-    masked_proxy.server_object_id.should be_nil
-    masked_proxy.server_object_mask.should eql(["fish", "cow", "duck"])
-  end
-end

data/test/SoftLayer_ToObjectMask.rb

@@ -1,92 +0,0 @@
-# Copyright (c) 2010, SoftLayer Technologies, Inc. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-#  * Redistributions of source code must retain the above copyright notice,
-#    this list of conditions and the following disclaimer.
-#  * Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-#  * Neither SoftLayer Technologies, Inc. nor the names of its contributors may
-#    be used to endorse or promote products derived from this software without
-#    specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-$: << File.expand_path(File.join(File.dirname(__FILE__), "../lib"))
-
-require 'rubygems'
-require 'softlayer_api'
-require 'rspec'
-require 'rspec/autorun'
-
-describe String, "#to_sl_object_mask" do
-  it "should echo back a string with no base" do
-    "blah".to_sl_object_mask.should eql("blah")
-  end
-
-  it "should prepend the base with a dot if given" do
-    "blah".to_sl_object_mask("foo").should eql("foo.blah")
-  end
-
-  it "should return the empty string if given the empty string with no base" do
-    "".to_sl_object_mask.should eql("")
-  end
-
-  it "should return the base with no dot if applied to the empty string" do
-    "".to_sl_object_mask("foo").should eql("foo")
-  end
-end
-
-describe Array,"#to_sl_object_mask" do
-  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
-    proxy = "Hello"
-    proxy.should_receive(:to_sl_object_mask).with("")
-    [proxy].to_sl_object_mask
-
-    proxy = "Hello"
-    proxy.should_receive(:to_sl_object_mask).with("foo")
-    [proxy].to_sl_object_mask('foo')
-  end
-
-  it "should flatten any arrays inside of itself" do
-    ["foo", ["bar", "baz"]].to_sl_object_mask("buz").should eql(["buz.foo", "buz.bar", "buz.baz"])
-  end
-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")
-    mask_elements = {"key" => proxy}.to_sl_object_mask
-    mask_elements.should eql(["key.value"])
-  end
-
-  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