fms-admin-api 0.2 → 0.3

data/Gemfile.lock

@@ -1,21 +1,24 @@
 PATH
   remote: .
   specs:
-    fms-admin-api (0.1)
+    fms-admin-api (0.3)
       activesupport
       colorize
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.3)
+    activesupport (3.2.7)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     addressable (2.2.6)
     colorize (0.5.8)
     crack (0.3.1)
     i18n (0.6.0)
-    multi_json (1.3.5)
+    metaclass (0.0.1)
+    mocha (0.12.3)
+      metaclass (~> 0.0.1)
+    multi_json (1.3.6)
     rake (0.9.2.2)
     webmock (1.7.8)
       addressable (~> 2.2, > 2.2.5)
@@ -26,5 +29,6 @@ PLATFORMS
 
 DEPENDENCIES
   fms-admin-api!
+  mocha
   rake
   webmock

data/fms-admin-api.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "colorize"
   s.add_development_dependency "webmock"
   s.add_development_dependency "rake"
+  s.add_development_dependency "mocha"
 end

data/lib/fms/client.rb

@@ -16,6 +16,7 @@ module FMS
       @host = defaults[:host]
       @port = defaults[:port]
       @base_params = {:auser => defaults[:auser], :apswd => defaults[:apswd]}
+      @timeout = options[:timeout]
     end
 
     def method_missing(meth, *args)
@@ -31,15 +32,17 @@ module FMS
     private
 
     def do_get(action, params = {})
-      resp = Net::HTTP.get_response(build_url(action, params))
+      url = build_url action, params
+      http_client = HTTPClient.new @host, @port
+      resp = http_client.get url, @timeout
       raise NoMethodError, "#{action.inspect} is not a valid API method" unless resp.code == "200"
       resp.body
     end
 
     def build_url(method, extra_params = {})
-      url = URI("http://#{@host}:#{@port}/admin/#{method}")
-      url.query = URI.encode_www_form(@base_params.merge(extra_params))
-      url
+      params = URI.encode_www_form(@base_params.merge(extra_params))
+      uri = URI.parse "http://#{@host}:#{@port}/admin/#{method}?#{params}"
+      uri.request_uri
     end
 
     def camelize_params(params)
@@ -52,6 +55,24 @@ module FMS
 
   end
 
+  class HTTPClient
+
+    def initialize(host, port)
+      @host = host
+      @port = port
+    end
+
+    def get(url, timeout)
+      http = Net::HTTP.new @host, @port
+      unless timeout.nil?
+        http.read_timeout = timeout
+        http.open_timeout = timeout
+      end
+      http.request Net::HTTP::Get.new(url)
+    end
+
+  end
+
   class Response
 
     def initialize(content)

data/lib/fms/cmdline.rb

@@ -94,7 +94,7 @@ module FMS
         end
         
         def init_param?(param)
-          [:host, :port, :auser, :apswd].include? param
+          [:host, :port, :auser, :apswd, :timeout].include? param
         end
 
       end

data/lib/fms/version.rb

@@ -1,3 +1,3 @@
 module FMS
-  VERSION = "0.2"
+  VERSION = "0.3"
 end

data/tests/client_tests.rb

@@ -55,6 +55,22 @@ class ClientTests < BaseTestCase
     assert str_resp.include?('<name>cam1</name>')
   end
 
+  def test_should_use_timeout_param
+    c = FMS::Client.new(:host => 'fms.example.com', :timeout => 3)
+    c.get_apps
+    assert_requested(:get, "http://fms.example.com:1111/admin/getApps?apswd=fms&auser=fms")
+  end
+
+  def test_should_respect_timeout_param
+    httpclient_mock = mock()
+    response_stub = stub(:code => "200", :body => "")
+    FMS::HTTPClient.expects(:new).with('fms.example.com', 1111).returns(httpclient_mock)
+    httpclient_mock.expects(:get).with('/admin/getApps?auser=fms&apswd=fms', 123).returns(response_stub)
+
+    c = FMS::Client.new(:host => 'fms.example.com', :timeout => 123)
+    c.get_apps
+  end
+
 end
 
 # Stub responses

data/tests/cmdline_tests.rb

@@ -72,6 +72,11 @@ class CommandLineTests < BaseTestCase
     assert_command_stdout_contains GET_LIVE_STREAMS.strip
   end
 
+  def test_should_have_timeout_option
+    run_command ['get_apps', '--host=fms.example.com', '--timeout=3']
+    assert_requested(:get, "http://fms.example.com:1111/admin/getApps?apswd=fms&auser=fms")
+  end
+
 
   def run_command(argv)
     FMS::CmdLine.parse(argv)

data/tests/tests_helper.rb

@@ -1,5 +1,6 @@
 require 'minitest/autorun'
 require 'webmock'
+require 'mocha'
 
 require 'fms'
 

metadata

@@ -2,7 +2,7 @@
 name: fms-admin-api
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: "0.2"
+  version: "0.3"
 platform: ruby
 authors: 
 - Igor Sobreira
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-17 00:00:00 Z
+date: 2012-08-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -56,6 +56,17 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id005
 description: Ruby client and command line interface to Flash Media Server Administration API
 email: 
 - igor@igorsobreira.com
@@ -75,6 +86,7 @@ files:
 - bin/fmsapi
 - fms-admin-api.gemspec
 - gems/fms-admin-api-0.1.gem
+- gems/fms-admin-api-0.2.gem
 - lib/fms.rb
 - lib/fms/client.rb
 - lib/fms/cmdline.rb