korekuto 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/korekuto.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{korekuto}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["retr0h"]
-  s.date = %q{2009-10-10}
+  s.date = %q{2009-10-13}
   s.description = %q{Data collector}
   s.email = %q{john@dewey.ws}
   s.extra_rdoc_files = [

data/lib/korekuto.rb

@@ -6,7 +6,7 @@ require 'httparty'
 class Collector
   include HTTParty
 
-  base_uri 'setsuju.heroku.com'
+  base_uri ENV['base_uri'] || 'setsuju.heroku.com'
   headers  'Content-Type' => 'application/json'
 end
 
@@ -30,11 +30,10 @@ private
   # Collect information about the dyno.
   def collect
     {
-      Mac.addr => {
-        :public_ip  => PublicIp.get('/automation/n09230945.asp', :timeout => 2),
-        :local_ip   => ENV['LOCAL_IP'],
-        :url        => ENV['URL'],
-      }
+      :mac => Mac.addr,
+      :public_ip  => PublicIp.get('/automation/n09230945.asp', :timeout => 2),
+      :local_ip   => ENV['LOCAL_IP'],
+      :url        => ENV['URL'],
     }
   end
 end

data/spec/korekuto_spec.rb

@@ -1,25 +1,46 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-{ 'collector' => 'setsuju.heroku.com', 'public_ip' => 'www.whatismyip.com' }.each do |k,v|
-  clazz = Kernel.const_get(k.split('_').map {|w| w.capitalize}.join)
-
-  describe clazz do
-    subject { clazz }
+describe Collector do
+  describe :with_defaults do
+    subject { Collector }
 
     it "has included modules" do
       subject.include?(HTTParty).should be_true
     end
 
     it "has a base_uri" do
-      subject.base_uri.should == "http://#{v}"
+      subject.base_uri.should == "http://setsuju.heroku.com"
+    end
+
+    it "sets headers" do
+      subject.headers.should == {'Content-Type' => 'application/json'}
     end
+  end
 
-    case clazz
-    when Collector
-      it "sets headers" do
-        subject.headers.should == {'Content-Type' => 'application/json'}
-      end
+  describe :without_defaults do
+    before(:each) do
+      ENV['base_uri'] = 'example.com'
+
+      Object.send(:remove_const, 'Collector')
+      load 'korekuto.rb'
     end
+
+    it "has a different base_uri when specified" do
+
+      Collector.base_uri.should == "http://example.com"
+    end
+  end
+end
+
+describe PublicIp do
+  subject { PublicIp }
+
+  it "has included modules" do
+    subject.include?(HTTParty).should be_true
+  end
+
+  it "has a base_uri" do
+    subject.base_uri.should == "http://www.whatismyip.com"
   end
 end
 
@@ -53,8 +74,9 @@ describe Korekuto do
       PublicIp.should_receive(:get).with('/automation/n09230945.asp', :timeout => 2).and_return('192.0.2.0')
       Mac.should_receive(:addr).and_return(:mac_address)
 
-      hash = Korekuto.send(:collect)[:mac_address]
+      hash = Korekuto.send(:collect)
 
+      hash[:mac].should       == :mac_address
       hash[:public_ip].should == '192.0.2.0'
       hash[:local_ip].should  == '192.0.2.1'
       hash[:url].should       == 'test.example.com'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: korekuto
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - retr0h
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-10 00:00:00 -07:00
+date: 2009-10-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency