@@ -21,7 +21,8 @@ module Viking class << self attr_accessor :host, :port, :api_version, :standard_headers, :service_type end - + + attr_accessor :verify_options attr_accessor :proxy_port, :proxy_host attr_reader :last_response @@ -336,37 +337,26 @@ module Viking ) << '.yaml' end - protected + protected + def call_defensio(action, params={}) + params.update('owner-url' => options[:blog] || options[:owner_url]) + data = params.dasherize_keys.to_query + resp = http_instance.post url(action), data, self.class.standard_headers + log_request(url(action), data, resp) + process_response_body(resp.body) + end + + def http_instance + http = Net::HTTP.new self.class.host, self.class.port, options[:proxy_host], options[:proxy_port] + http.read_timeout = http.open_timeout = Viking.timeout_threshold + http + end - def call_defensio(action, params={}) - resp = defensio_http.post( - url(action), - data(params), - self.class.standard_headers - ) - log_request(url(action), data, resp) - process_response_body(resp.body) - end - - def defensio_http - http = Net::HTTP.new self.class.host, self.class.port, options[:proxy_host], options[:proxy_port] - http.read_timeout = http.open_timeout = Viking.timeout_threshold - http - end - - def data(params={}) - params.update('owner-url' => options[:blog] || options[:owner_url]) - params.dasherize_keys.to_query - end - - private - attr_accessor :verify_options - - def process_response_body(response_body) - data = YAML.load(response_body) - return data['defensio-result'].symbolize_keys - rescue - { :data => data, :status => 'fail' } - end + def process_response_body(response_body) + data = YAML.load(response_body) + return data['defensio-result'].symbolize_keys + rescue + { :data => data, :status => 'fail' } + end end end \ No newline at end of file lib/viking/defensio.rb @@ -12,11 +12,11 @@ require 'viking' # See http://blog.jayfields.com/2007/11/ruby-testing-private-methods.html class Class def publicize_methods(instance=nil) - saved_private_instance_methods = self.private_instance_methods - self.class_eval { public *saved_private_instance_methods } + saved_protected_instance_methods = self.protected_instance_methods + self.class_eval { public *saved_protected_instance_methods } yield(instance) ensure - self.class_eval { private *saved_private_instance_methods } + self.class_eval { protected *saved_protected_instance_methods } end end spec/spec_helper.rb a8744aafc960159bcfcd197dce4d1e98d769982a rick technoweenie@gmail.com http://github.com/technoweenie/viking/commit/2205e197e2205f30bc07eb901ae0050cb857a377 2205e197e2205f30bc07eb901ae0050cb857a377 2008-06-04T21:30:11-07:00 2008-06-04T21:30:11-07:00 ok now im just getting nit-picky d9f0c408e899eef60e038f7ecb2c742532e0b831 rick technoweenie@gmail.com