eshq 0.0.8 → 0.0.9

data/lib/eshq.rb

@@ -1,12 +1,18 @@
 require "eshq/version"
 require "eshq/client"
+require "eshq/configuration"
 
 module ESHQ
+  class << self
+    attr_accessor :configuration
+  end
+
   def self.client
-    @@client ||= Client.new(*settings)
+    @@client ||= Client.new
   end
 
   def self.reset_client
+    self.configuration = nil
     @@client = nil
   end
 
@@ -18,10 +24,8 @@ module ESHQ
     client.post("/event", options)
   end
 
-  private
-  def self.settings
-    ["ESHQ_URL", "ESHQ_KEY", "ESHQ_SECRET"].map { |v|
-      ENV[v] || raise("Missing environment variable #{v}")
-    }
+  def self.configure
+    self.configuration ||= Configuration.new
+    yield(configuration) if block_given?
   end
 end

data/lib/eshq/client.rb

@@ -5,12 +5,16 @@ require "multi_json"
 
 module ESHQ
   class Client
-    attr_reader :url, :key, :secret
+    def initialize
+      ESHQ.configure
+    end
+
+    def config
+      ESHQ.configuration
+    end
 
-    def initialize(url, api_key, api_secret)
-      @url        = url
-      @key    = api_key
-      @secret = api_secret
+    def url
+      config.url
     end
 
     def post(path, params)
@@ -33,11 +37,11 @@ module ESHQ
 
     def credentials
       time = Time.now.to_i.to_s
-      {:key => key, :timestamp => time, :token => token(time)}
+      {:key => config.key, :timestamp => time, :token => token(time)}
     end
 
     def token(time)
-      Digest::SHA1.hexdigest([key, secret, time].join(":"))
+      Digest::SHA1.hexdigest([config.key, config.secret, time].join(":"))
     end
 
     def url_for(path)

data/lib/eshq/configuration.rb

@@ -0,0 +1,11 @@
+module ESHQ
+  class Configuration
+    attr_accessor :url, :key, :secret
+
+    def initialize
+      @url = ENV["ESHQ_URL"] || 'https://app.eventsourcehq.com/'
+      @key = ENV["ESHQ_KEY"]
+      @secret = ENV["ESHQ_SECRET"]
+    end
+  end
+end

data/lib/eshq/version.rb

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

data/test/client_test.rb

@@ -4,13 +4,18 @@ require "timecop"
 require "digest/sha1"
 require "fakeweb"
 
-require "eshq/client"
+require "eshq"
 
 class TestClient < Test::Unit::TestCase
   attr_reader :client
 
   def setup
-    @client = ESHQ::Client.new("http://example.com", "key", "secret")
+    ESHQ.configure do |config|
+      config.url = 'http://example.com'
+      config.key = 'key'
+      config.secret = 'secret'
+    end
+    @client = ESHQ::Client.new
   end
 
   def test_post

data/test/configuration_test.rb

@@ -0,0 +1,53 @@
+require "test/unit"
+require "mocha"
+
+require "eshq"
+
+class TestConfiguration < Test::Unit::TestCase
+  attr_reader :client
+
+  def setup
+    @client = ESHQ.client
+  end
+
+  def teardown
+    ESHQ.reset_client
+  end
+
+  def test_defaults
+    assert_equal "https://app.eventsourcehq.com/", ESHQ.configuration.url
+  end
+
+  def test_configure_url
+    ESHQ.configure do |config|
+      config.url = "http://example.com"
+    end
+    assert_equal "http://example.com", ESHQ.configuration.url
+  end
+
+  def test_configure_key
+    ESHQ.configure do |config|
+      config.key = "key"
+    end
+    assert_equal "key", ESHQ.configuration.key
+  end
+
+  def test_configure_secret
+    ESHQ.configure do |config|
+      config.secret = "secret"
+    end
+    assert_equal "secret", ESHQ.configuration.secret
+  end
+
+  def test_initializes_with_env_variables_when_available
+    ENV["ESHQ_URL"] = "http://fallback.example.com"
+    ENV["ESHQ_KEY"] = "fallback-key"
+    ENV["ESHQ_SECRET"] = "fallback-secret"
+    ESHQ.reset_client
+    ESHQ.client
+    assert_equal "http://fallback.example.com", ESHQ.configuration.url
+    assert_equal "fallback-key", ESHQ.configuration.key
+    assert_equal "fallback-secret", ESHQ.configuration.secret
+  end
+end
+

data/test/eshq_test.rb

@@ -13,9 +13,9 @@ class TestESHQ < Test::Unit::TestCase
 
   def test_client_instantiation
     client = ESHQ.client
-    assert_equal "http://example.com", client.url
-    assert_equal "key", client.key
-    assert_equal "secret", client.secret
+    assert_equal "http://example.com", client.config.url
+    assert_equal "key", client.config.key
+    assert_equal "secret", client.config.secret
   end
 
   def test_caches_client
@@ -23,16 +23,6 @@ class TestESHQ < Test::Unit::TestCase
     2.times { ESHQ.client }
   end
 
-  def test_missing_settings
-    ENV["ESHQ_KEY"] = nil
-    begin
-      ESHQ.client
-      flunk "No exception raised"
-    rescue => e
-      assert_match /Missing environment variable/, e.to_s
-    end
-  end
-
   def test_open
     ESHQ.client.expects(:post).with("/socket", {:channel => "test"}).returns({"socket" => "12345"})
     assert_equal "12345", ESHQ.open(:channel => "test")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eshq
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-30 00:00:00.000000000 Z
+date: 2012-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
@@ -89,8 +89,10 @@ files:
 - eshq.gemspec
 - lib/eshq.rb
 - lib/eshq/client.rb
+- lib/eshq/configuration.rb
 - lib/eshq/version.rb
 - test/client_test.rb
+- test/configuration_test.rb
 - test/eshq_test.rb
 homepage: ''
 licenses: []
@@ -118,4 +120,5 @@ specification_version: 3
 summary: EventSource HQ API Client
 test_files:
 - test/client_test.rb
+- test/configuration_test.rb
 - test/eshq_test.rb