rhcp 0.2.19 → 0.2.20

data/lib/rhcp.rb

@@ -23,7 +23,7 @@ module RHCP #:nodoc:
     
     MAJOR = 0
     MINOR = 2
-    TINY  = 19
+    TINY  = 20
 
     def Version.to_s
       [ MAJOR, MINOR, TINY ].join(".")

data/lib/rhcp/client/http_broker.rb

@@ -14,7 +14,7 @@ module RHCP
       # clients can use it exactly as if they were talking to the broker itself.
       class HttpBroker < Broker
 
-        def initialize(url)
+        def initialize(url, user = nil, password = nil)
           # TODO should this really be an URL? or just a host name?
           @url = url
           @logger = RHCP::ModuleHelper.instance.logger
@@ -32,13 +32,11 @@ module RHCP
 #          @op.log_to_jabber_detail("message" => "HTTP_START #{uri} : #{req}")
 #          response = http.request(req)
           
-          res = Net::HTTP.new(@url.host, @url.port).start { |http|
-            if @url.user != nil then
-              @logger.debug "using basic auth data: #{@url.user} / #{@url.password}"
-              http.basic_auth @url.user, @url.password
-            end
-            http.get("/rhcp/") 
-          }
+          http = Net::HTTP.new(@url.host, @url.port)
+          request = Net::HTTP::Get.new('/rhcp/')
+          request.basic_auth user, password if user and password
+          res = http.request request
+          
           if (res.code == "200")
             @logger.info "connected to '#{@url}' successfully."
           else

data/lib/rhcp/command.rb

@@ -178,7 +178,9 @@ module RHCP
         end
       rescue Exception => ex
         if (/undefined\sparameter/.match(ex.message))
-          raise RHCP::RhcpException.new(ex.message) unless @accepts_extra_params or @ignores_extra_params 
+          raise RHCP::RhcpException.new(ex.message) unless @accepts_extra_params or @ignores_extra_params
+        else
+          raise ex 
         end
       end
 

data/lib/rhcp/command_param.rb

@@ -26,7 +26,7 @@ module RHCP
     # the key to a context value that is used for filling this parameter
     attr_reader :autofill_context_key
     
-    attr_reader :allows_extra_values
+    attr_accessor :allows_extra_values
     
     attr_accessor :default_value
 
@@ -99,8 +99,7 @@ module RHCP
       # check against lookup values
       if @has_lookup_values
         possible_value.each do |value|
-          if ! get_lookup_values(request).include?(value) and
-             ! @allows_extra_values
+          if (not get_lookup_values(request).include?(value)) and (not @allows_extra_values)
             raise RHCP::RhcpException.new("invalid value '#{value}' for parameter '#{@name}'")
           end
         end
@@ -119,7 +118,8 @@ module RHCP
         'has_lookup_values' => @has_lookup_values,
         'is_default_param' => @is_default_param,
         'mandatory' => @mandatory,
-        'autofill_context_key' => @autofill_context_key
+        'autofill_context_key' => @autofill_context_key,
+        'allows_extra_values' => @allows_extra_values
       }.to_json(*args)
     end        
 

data/lib/rhcp/request.rb

@@ -44,6 +44,15 @@ module RHCP
             param_values[param.name] = param.default_value
           end
         end
+        
+        # autobox if necessary
+        # if param.allows_multiple_values
+          # k = param.name
+          # v = param_values[k]
+          # unless v.instance_of? Array
+            # param_values[k] = [ v ]
+          # end
+        # end
       end
 
       # autobox the parameters if necessary
@@ -74,6 +83,14 @@ module RHCP
         @param_values[param_name][0]
       end
     end
+    
+    def values
+      result = {}
+      @param_values.keys.each do |k|
+        result[k] = get_param_value(k)
+      end
+      result
+    end
 
     def has_param_value(param_name)
       @param_values.has_key?(param_name)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhcp
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 63
   prerelease: 
   segments: 
   - 0
   - 2
-  - 19
-  version: 0.2.19
+  - 20
+  version: 0.2.20
 platform: ruby
 authors: 
 - Philipp T.
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-06 00:00:00 Z
+date: 2013-02-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -34,7 +34,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 description: RHCP is a protocol designed for building up a command-metadata-based communication infrastructure making it easier for application developers to export commands in applications to generic clients.
-email: philipp@virtualop.org
+email: philipp at virtualop dot org
 executables: 
 - rhcp_test_server
 extensions: []
@@ -43,38 +43,38 @@ extra_rdoc_files: []
 
 files: 
 - bin/rhcp_test_server
-- lib/rhcp/response.rb
-- lib/rhcp/logging_broker.rb
-- lib/rhcp/command_param.rb
+- lib/rhcp.rb
+- lib/rhcp/http_exporter.rb
+- lib/rhcp/request.rb
 - lib/rhcp/rhcp_exception.rb
+- lib/rhcp/logging_broker.rb
+- lib/rhcp/dispatching_broker.rb
+- lib/rhcp/command.rb
+- lib/rhcp/response.rb
+- lib/rhcp/client/http_broker.rb
 - lib/rhcp/client/context_aware_broker.rb
-- lib/rhcp/client/command_param_stub.rb
 - lib/rhcp/client/command_stub.rb
-- lib/rhcp/client/http_broker.rb
-- lib/rhcp/command.rb
-- lib/rhcp/context.rb
-- lib/rhcp/request.rb
-- lib/rhcp/http_exporter.rb
-- lib/rhcp/dispatching_broker.rb
+- lib/rhcp/client/command_param_stub.rb
 - lib/rhcp/broker.rb
-- lib/rhcp.rb
+- lib/rhcp/command_param.rb
+- lib/rhcp/context.rb
+- test/rhcp/http_broker_test.rb
+- test/rhcp/request_test.rb
+- test/rhcp/broker_test.rb
+- test/rhcp/tests_for_writable_brokers.rb
 - test/rhcp/context_test.rb
-- test/rhcp/http_exporter_test.rb
+- test/rhcp/http_test_server.rb
+- test/rhcp/dispatching_broker_test.rb
+- test/rhcp/command_param_test.rb
+- test/rhcp/command_test.rb
 - test/rhcp/tests_for_brokers.rb
 - test/rhcp/logging_broker_test.rb
-- test/rhcp/command_test.rb
 - test/rhcp/response_test.rb
 - test/rhcp/context_aware_broker_test.rb
 - test/rhcp/test_base.rb
-- test/rhcp/broker_test.rb
-- test/rhcp/tests_for_writable_brokers.rb
-- test/rhcp/client/command_param_stub_test.rb
 - test/rhcp/client/command_stub_test.rb
-- test/rhcp/dispatching_broker_test.rb
-- test/rhcp/http_test_server.rb
-- test/rhcp/command_param_test.rb
-- test/rhcp/request_test.rb
-- test/rhcp/http_broker_test.rb
+- test/rhcp/client/command_param_stub_test.rb
+- test/rhcp/http_exporter_test.rb
 homepage: http://rubyforge.org/projects/rhcp
 licenses: []