softlayer_api 1.0.3 → 1.0.4

data/lib/softlayer/base.rb

@@ -36,7 +36,7 @@
 #
 
 module SoftLayer
-  VERSION = "1.0.3"  # version history at the bottom of the file.
+  VERSION = "1.0.4"  # 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/'
@@ -75,3 +75,5 @@ end # module SoftLayer
 # 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. 
+#

data/lib/softlayer/service.rb

@@ -93,7 +93,6 @@ module SoftLayer
       self.parameters[:result_limit]
     end
     
-    
     def result_offset(offset)
       self.parameters[:result_offset] = offset
       self
@@ -210,7 +209,13 @@ module SoftLayer
     def result_limit(limit)
       proxy = APIParameterFilter.new
       proxy.target = self
-      return proxy.result_limit=limit
+      return proxy.result_limit(limit)
+    end
+    
+    def result_offset(offset)
+      proxy = APIParameterFilter.new
+      proxy.target = self
+      return proxy.result_offset(offset)
     end
 
     # This is the primary mechanism by which requests are made. If you call
@@ -308,18 +313,18 @@ module SoftLayer
     # and create a Net::HTTP request of that type. This is intended
     # to be used in the internal processing of method_missing and
     # need not be called directly.
-    def http_request_for_method(method_name, method_url, request_body)
+    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
+        # 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/
@@ -327,16 +332,16 @@ module SoftLayer
       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
+        # 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
       end
 
-      # This warning should be obsolete as we should be using POST if the user
+    # 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?

data/test/SoftLayer_Service.rb

@@ -245,13 +245,6 @@ describe SoftLayer::Service, "#call_softlayer_api_with_params" do
     service.call_softlayer_api_with_params(:getObject, SoftLayer::APIParameterFilter.new.object_mask("cow  ", "  duck", "chicken", "bull dog"), []);
   end
 
-  it "should warn about calling a get method with arguments" do
-    service = SoftLayer::Service.new("SoftLayer_Account", :username => "sample_username", :api_key => "blah")
-    service.should_receive(:issue_http_request).with(any_args())
-    $stderr.should_receive(:puts).with("Warning - The HTTP request for getObject does not allow arguments to be passed to the server")
-    service.getObject("Hello", "Bindigo")
-  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}')
@@ -288,6 +281,28 @@ describe SoftLayer::Service, "#object_mask" do
   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, "#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")

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: softlayer_api
 version: !ruby/object:Gem::Version 
-  hash: 17
   prerelease: false
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - SoftLayer Development Team
@@ -15,18 +14,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-31 00:00:00 -06:00
+date: 2011-09-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -64,27 +61,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Library for accessing the SoftLayer portal API