nitroapi 0.0.8 → 0.0.9

data/lib/nitro_api.rb

@@ -129,7 +129,11 @@ module NitroApi
     end
 
     def base_url
-      "#{self.protocol}://#{self.host}/nitro/#{self.accepts}"
+      "#{self.protocol}://#{self.host}#{base_url_path}"
+    end
+
+    def base_url_path
+      "/nitro/#{self.accepts}"
     end
 
     private
@@ -152,14 +156,35 @@ module NitroApi
     end
 
     def really_make_call params, method
-      if :get == method
-        request = "#{base_url}?#{to_query(params)}"
-        data = Net::HTTP.get(URI.parse(request))
-      elsif :post == method
-        data = Net::HTTP.post_form(URI.parse(base_url), params)
-        data = data.body
+      data = nil
+      if :http == protocol or 'http' == protocol
+        if :get == method
+          request = "#{base_url}?#{to_query(params)}"
+          data = Net::HTTP.get(URI.parse(request))
+        elsif :post == method
+          data = Net::HTTP.post_form(URI.parse(base_url), params)
+          data = data.body
+        end
+      elsif :https == protocol or 'https' == protocol
+        http = Net::HTTP.new(host, 443)
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+
+        if :get == method
+          request = "#{base_url_path}?#{to_query(params)}"
+          data = http.request(Net::HTTP::Get.new(request))
+          data = data.body
+        elsif :post == method
+          request = Net::HTTP::Post.new(base_url_path)
+          request.set_form_data(params)
+          data = http.request request
+          data = data.body
+        end
+      else
+        raise NitroError.new(1), "Unknown protocl: #{protocol.to_s}"
       end
 
+
       json = JSON.parse(data)
       response = json["Nitro"]
       error = response["Error"]

data/lib/nitro_api/version.rb

@@ -1,3 +1,3 @@
 module NitroApi
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/nitro_api_spec.rb

@@ -60,6 +60,15 @@ describe NitroApi do
     end
   end
 
+  describe "#base_url_path" do
+    it "correclty users the configured accepts value" do
+      @nitro.base_url_path.should == '/nitro/json'
+
+      @nitro.accepts = 'xml'
+      @nitro.base_url_path.should == '/nitro/xml'
+    end
+  end
+
   context "when authenticated" do
     before do
       @nitro.session = @session
@@ -467,8 +476,35 @@ describe NitroApi do
           expect {@nitro.action_history 'action1'}.to raise_error(NitroApi::NitroError)
         end
       end
+    end
+  end
+
+  context "https connections" do
+    it "makes a single call successfully via https" do
+      @nitro.protocol = 'https'
+      mock_json = {"Nitro" => {"Login" => {"sessionKey" => @session}}}
+      url = @nitro.base_url + "?.*method=user.login.*"
+      stub_http_request(:get, Regexp.new(url)).
+          to_return(:body => mock_json.to_json)
 
+      @nitro.login
+      @nitro.session.should == @session
+    end
+
+    it "makes a batch call successfully via https" do
+      @nitro.protocol = 'https'
+      mock_json = {'Nitro' => {'Login' => {'sessionKey' => @session}, 'method' => 'user.login', 'res' => 'ok'}}
+      url = @nitro.base_url #+ "?.*method=batch.run.*"
+      stub_http_request(:get, Regexp.new(url)).
+          to_return(:body => mock_json.to_json)
+
+      @nitro.start_batch!
+      @nitro.login
+      @nitro.run_batch
+
+      @nitro.session.should == @session
     end
   end
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nitroapi
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-06 00:00:00.000000000 Z
+date: 2012-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport