dohutil 0.2.7 → 0.2.9

data/lib/doh/env.rb

@@ -1,16 +1,17 @@
 module Doh
-  DEFAULT_ENV_PREFIXES = %w(DOH RACK RAILS)
+extend self
+ENV_PREFIXES = %w(DOH RACK RAILS).freeze
 
-  def self.env
-    @env ||= (find_env || 'development')
-  end
+def env
+  @env ||= find_env
+end
 
-  def self.find_env(prefixes = nil)
-    retval = nil
-    (prefixes || DEFAULT_ENV_PREFIXES).each do |elem|
-      retval = ENV["#{elem}_ENV"]
-      break if retval
-    end
-    retval
+def find_env
+  ENV_PREFIXES.each do |prefix|
+    denval = ENV["#{prefix}_ENV"]
+    return denval if denval
   end
+  raise 'please set DOH_ENV, RACK_ENV or RAILS_ENV'
+end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dohutil
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.9
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-20 00:00:00.000000000 Z
+date: 2013-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dohroot
@@ -87,8 +87,6 @@ files:
 - lib/doh/core_ext/string.rb
 - lib/doh/current_date.rb
 - lib/doh/env.rb
-- lib/doh/http_helper.rb
-- lib/doh/log/stub.rb
 - lib/doh/password_helper.rb
 - lib/doh/to_display.rb
 - test/core_ext/bigdecimal.dt.rb
@@ -118,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: assorted tiny utilities
@@ -128,4 +126,3 @@ test_files:
 - test/core_ext/datewithtime.dt.rb
 - test/core_ext/force_deep_copy.dt.rb
 - test/core_ext/string.dt.rb
-has_rdoc: 

data/lib/doh/http_helper.rb

@@ -1,108 +0,0 @@
-require 'net/http'
-require 'net/https'
-require 'uri'
-
-module Doh
-
-class HttpHelper
-  attr_reader :headers
-
-  def initialize(url)
-    @url = url
-    @headers = {}
-    init_sender
-  end
-
-  def post(data, get_body_only = true)
-    dohlog.debug("posting to url #@url data: #{data.inspect}")
-    response = if data.is_a?(Hash)
-      post_hash(data)
-    else
-      post_string(data)
-    end
-    check_for_errors(response)
-    return response.body.to_s if get_body_only
-    response
-  end
-
-  def get(get_body_only = true, allow_redirect = false, num_redirects = 0)
-    getstr = @parsed_url.path
-    getstr += '?' + @parsed_url.query unless @parsed_url.query.to_s.empty?
-    request = Net::HTTP::Get.new(getstr)
-    request.initialize_http_header(@headers)
-    response = @sender.start { |http| http.request(request) }
-    if response.is_a?(Net::HTTPRedirection) && allow_redirect
-      raise "too many redirects" if num_redirects > 20
-      @url = response['location']
-      init_sender
-      return get(get_body_only, true, num_redirects + 1)
-    end
-    return response.body.to_s if get_body_only
-    response
-  end
-
-  def xml
-    @headers['Content-Type'] = 'text/xml'
-    self
-  end
-
-  def soap_action(action)
-    @headers['SOAPAction'] = action
-    self
-  end
-
-  def nossl
-    @sender.use_ssl = false
-    @nossl = true
-    self
-  end
-
-  def timeout(seconds)
-    @sender.read_timeout = seconds
-    self
-  end
-
-  def hdr(name, value)
-    @headers[name] = value
-    self
-  end
-
-  #shortcut method
-  def self.load(url, use_ssl = true, encode_url = false)
-    url = URI.escape(url) if encode_url
-    helper = HttpHelper.new(url)
-    helper.nossl if !use_ssl
-    helper.get
-  end
-private
-  def init_sender
-    @parsed_url = URI.parse(@url)
-    @sender = Net::HTTP.new(@parsed_url.host, @parsed_url.port)
-    @sender.use_ssl = true unless @nossl || (['127.0.0.1', 'localhost'].include?(@parsed_url.host) && @parsed_url.port != 443)
-    @sender.verify_mode = OpenSSL::SSL::VERIFY_NONE
-  end
-
-  def post_hash(data)
-    request = Net::HTTP::Post.new(@parsed_url.path)
-    request.set_form_data(data)
-    request.initialize_http_header(@headers)
-    @sender.start { |http| http.request(request) }
-  end
-
-  def post_string(data)
-    @sender.post(@parsed_url.path, data, @headers)
-  end
-
-  def check_for_errors(response)
-    # TODO: do something useful here
-#     case response
-#     when Net::HTTPSuccess
-#       puts "success"
-#       puts response.body.to_s
-#     else
-#       puts response.error!
-#     end
-  end
-end
-
-end

data/lib/doh/log/stub.rb

@@ -1,26 +0,0 @@
-module DohLog
-  class StubInterface
-    def self.debug(msg); end
-    def self.info(msg); end
-    def self.notify(msg); end
-    def self.warn(msg); end
-    def self.error(msg, exception = nil); end
-    def self.fatal(msg, exception = nil); end
-  end
-end
-
-class Module
-  unless method_defined?(:dohlog)
-    def dohlog
-      DohLog::StubInterface
-    end
-  end
-end
-
-class Object
-  unless method_defined?(:dohlog)
-    def dohlog
-      DohLog::StubInterface
-    end
-  end
-end