softlayer_api 1.0.5 → 1.0.6

data/lib/softlayer/base.rb

@@ -36,7 +36,7 @@
 #
 
 module SoftLayer
-  VERSION = "1.0.5"  # version history at the bottom of the file.
+  VERSION = "1.0.6"  # 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/'
@@ -78,4 +78,5 @@ end # module SoftLayer
 # 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.

data/lib/softlayer/service.rb

@@ -316,34 +316,15 @@ module SoftLayer
     def http_request_for_method(method_name, method_url, request_body = nil)
       content_type_header = {"Content-Type" => "application/json"}
 
-      case method_name.to_s
-      when /^get/
-        # if the user has provided some arguments to the call, we 
-        # use a POST instead of a GET in spite of the method name.
-        if request_body && !request_body.empty?
-              url_request = Net::HTTP::Post.new(method_url.request_uri(), content_type_header)
-        else 
-            	url_request = Net::HTTP::Get.new(method_url.request_uri())
-        end
-      when /^edit/
-        url_request = Net::HTTP::Put.new(method_url.request_uri(), content_type_header)
-      when /^delete/
-        url_request = Net::HTTP::Delete.new(method_url.request_uri())
-      when /^create/, /^add/, /^remove/, /^findBy/
-        url_request = Net::HTTP::Post.new(method_url.request_uri(), content_type_header)
-      else
-        # The name doesn't match one of our expected patterns... Use GET if 
-        # there are no parameters, and POST if the user has given parameters.
-        if request_body && !request_body.empty?
-              url_request = Net::HTTP::Post.new(method_url.request_uri(), content_type_header)
-        else 
-            	url_request = Net::HTTP::Get.new(method_url.request_uri())
-        end
+      if request_body && !request_body.empty?
+            url_request = Net::HTTP::Post.new(method_url.request_uri(), content_type_header)
+      else 
+          	url_request = Net::HTTP::Get.new(method_url.request_uri())
       end
 
-    # This warning should be obsolete as we should be using POST if the user
- 	  # has provided parameters. I'm going to leave it in, however, on the off
-	  # chance that it catches a case we aren't expecting.
+      # This warning should be obsolete as we should be using POST if the user
+   	  # has provided parameters. I'm going to leave it in, however, on the off
+  	  # chance that it catches a case we aren't expecting.
       if request_body && !url_request.request_body_permitted?
         $stderr.puts("Warning - The HTTP request for #{method_name} does not allow arguments to be passed to the server")
       else
@@ -351,7 +332,7 @@ module SoftLayer
         url_request.body = request_body
       end
 
-	  url_request
+  	  url_request
     end
 
     # Connect to the network and request the content of the resource

data/test/SoftLayer_Service.rb

@@ -303,45 +303,6 @@ describe SoftLayer::Service, "#result_offset" do
   end
 end
 
-describe SoftLayer::Service, "#http_request_for_method" do
-  it "should generate a GET request for methods staring with get" do
-    service = SoftLayer::Service.new("SoftLayer_Account", :username => "sample_username", :api_key => "blah")
-    url_request = service.http_request_for_method(:getObject, URI.parse("http://bogus.com"))
-    url_request.should_not be_nil
-    url_request.should be_kind_of(Net::HTTP::Get)
-  end
-
-  it "should generate a POST request for methods starting with crate" do
-    service = SoftLayer::Service.new("SoftLayer_Account", :username => "sample_username", :api_key => "blah")
-    url_request = service.http_request_for_method(:createSomeTicket, URI.parse("http://bogus.com"))
-    url_request.should_not be_nil
-    url_request.should be_kind_of(Net::HTTP::Post)
-  end
-
-  it "should generate a PUT request for methods starting with edit" do
-    service = SoftLayer::Service.new("SoftLayer_Account", :username => "sample_username", :api_key => "blah")
-    url_request = service.http_request_for_method(:editFoo, URI.parse("http://bogus.com"))
-    url_request.should_not be_nil
-    url_request.should be_kind_of(Net::HTTP::Put)
-
-    # I know of at least one service (I think it's the ticket service) that uses "edit" as
-    # a method name. Make sure that the lack of additional characters doesn't throw off
-    # the service
-    service = SoftLayer::Service.new("SoftLayer_Account", :username => "sample_username", :api_key => "blah")
-    url_request = service.http_request_for_method(:edit, URI.parse("http://bogus.com"))
-    url_request.should_not be_nil
-    url_request.should be_kind_of(Net::HTTP::Put)
-  end
-
-  it "should generate a DELETE request for methods starting with delete" do
-    service = SoftLayer::Service.new("SoftLayer_Account", :username => "sample_username", :api_key => "blah")
-    url_request = service.http_request_for_method(:deleteObject, URI.parse("http://bogus.com"))
-
-    url_request.should_not be_nil
-    url_request.should be_kind_of(Net::HTTP::Delete)
-  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"}])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: softlayer_api
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-16 00:00:00.000000000 Z
+date: 2013-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70161596543420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70161596543420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: The softlayer_api gem offers a convenient mechanism for invoking the
   services of the SoftLayer API from Ruby.
 email: sldn@softlayer.com
@@ -62,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Library for accessing the SoftLayer portal API