logworm 0.7.3 → 0.7.4

data/CHANGELOG

@@ -1,3 +1,6 @@
+v0.7.4
+    Eliminated default host for database. Must be specified in the configuration environment.
+
 v0.7.3
     Cleaner way to compose the URL for the DB (now logworm://key:secret@host/token/token_secret/)
 

data/Manifest

@@ -6,4 +6,5 @@ lib/base/config.rb
 lib/base/db.rb
 lib/base/query_builder.rb
 lib/logworm.rb
+spec/base_spec.rb
 tests/builder_test.rb

data/Rakefile

@@ -1,5 +1,5 @@
 require 'echoe'
-Echoe.new('logworm', '0.7.3') do |p|
+Echoe.new('logworm', '0.7.4') do |p|
   p.description = "logworm logging tool"
   p.url = "http://www.logworm.com"
   p.author = "Pomelo, LLC"

data/lib/base/db.rb

@@ -8,24 +8,23 @@ module Logworm
   
   class DB
     
-    DEFAULT_HOST  = "db.logworm.com"
     URL_FORMAT    = /logworm:\/\/([^:]+):([^@]+)@([^\/]+)\/([^\/]+)\/([^\/]+)\//
     # URI: logworm://<consumer_key>:<consumer_secret>@db.logworm.com/<access_token>/<access_token_secret>/
+    
+    attr_reader :host, :consumer_key, :consumer_secret, :token, :token_secret
 
     def initialize(url)
       match = DB.parse_url(url)
-      raise ForbiddenAccessException.new("Incorrect URL Format #{url}") unless match and match.size == 6
-      
+      raise ForbiddenAccessException.new("Incorrect URL Format #{url}") unless match and match.size == 6      
       @consumer_key, @consumer_secret, @host, @token, @token_secret = match[1..5]
-      raise ForbiddenAccessException.new("Missing consumer keys") if @consumer_key.nil? or @consumer_secret.nil? 
-      raise ForbiddenAccessException.new("Missing tokens") if @token.nil? or @token_secret.nil?
       @connection = OAuth::AccessToken.new(OAuth::Consumer.new(@consumer_key, @consumer_secret), @token, @token_secret)
     end
   
     def self.with_tokens(token, token_secret)
       consumer_key    = ENV["#{ENV['APP_ID']}_APPS_KEY"]
       consumer_secret = ENV["#{ENV['APP_ID']}_APPS_SECRET"]
-      DB.new(DB.url(consumer_key, consumer_secret, token, token_secret))
+      host            = ENV["#{ENV['APP_ID']}_DB_HOST"]
+      DB.new(DB.make_url(host, consumer_key, consumer_secret, token, token_secret))
     end
     
     def self.from_config
@@ -50,16 +49,16 @@ module Logworm
       db
     end
 
-    def self.url(consumer_key, consumer_secret, token, token_secret, host = DEFAULT_HOST)
+    def self.make_url(host, consumer_key, consumer_secret, token, token_secret)
       "logworm://#{consumer_key}:#{consumer_secret}@#{host}/#{token}/#{token_secret}/"
     end
 
     def url()
-      DB.url(@consumer_key, @consumer_secret, @token, @token_secret, @host)
+      DB.make_url(@host, @consumer_key, @consumer_secret, @token, @token_secret)
     end
     
     def self.example_url
-      self.url("Ub5sOstT9w", "GZi0HciTVcoFHEoIZ7", "OzO71hEvWYDmncbf3C", "J7wq4X06MihhZgqDeB")
+      self.make_url("db.logworm.com", "Ub5sOstT9w", "GZi0HciTVcoFHEoIZ7", "OzO71hEvWYDmncbf3C", "J7wq4X06MihhZgqDeB")
     end
     
     def tables()

data/logworm.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{logworm}
-  s.version = "0.7.3"
+  s.version = "0.7.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pomelo, LLC"]
-  s.date = %q{2010-04-01}
+  s.date = %q{2010-04-06}
   s.description = %q{logworm logging tool}
   s.email = %q{schapira@pomelollc.com}
   s.extra_rdoc_files = ["CHANGELOG", "README", "lib/base/config.rb", "lib/base/db.rb", "lib/base/query_builder.rb", "lib/logworm.rb"]
-  s.files = ["CHANGELOG", "Manifest", "README", "Rakefile", "lib/base/config.rb", "lib/base/db.rb", "lib/base/query_builder.rb", "lib/logworm.rb", "tests/builder_test.rb", "logworm.gemspec"]
+  s.files = ["CHANGELOG", "Manifest", "README", "Rakefile", "lib/base/config.rb", "lib/base/db.rb", "lib/base/query_builder.rb", "lib/logworm.rb", "spec/base_spec.rb", "tests/builder_test.rb", "logworm.gemspec"]
   s.homepage = %q{http://www.logworm.com}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Logworm", "--main", "README"]
   s.require_paths = ["lib"]

data/spec/base_spec.rb

@@ -0,0 +1,52 @@
+$: << File.dirname(__FILE__) + '/../lib'
+require 'logworm.rb'
+
+describe Logworm::DB, " initialization" do
+  it "should only accept proper URLs" do
+    lambda {Logworm::DB.new('')}.should raise_exception(Logworm::ForbiddenAccessException)
+    lambda {Logworm::DB.new('http://www.test.com')}.should   raise_exception(Logworm::ForbiddenAccessException)
+    lambda {Logworm::DB.new('logworm://a:b@xxx/c/d')}.should raise_exception(Logworm::ForbiddenAccessException)
+    lambda {Logworm::DB.new('logworm://a:b@/c/d/')}.should   raise_exception(Logworm::ForbiddenAccessException)
+    lambda {Logworm::DB.new('logworm://a:b@sda//d/')}.should raise_exception(Logworm::ForbiddenAccessException)
+    lambda {Logworm::DB.new('logworm://:b@sda//d/')}.should  raise_exception(Logworm::ForbiddenAccessException)
+    lambda {Logworm::DB.new('logworm://a:b@xxx/c/d/')}.should_not raise_exception(Logworm::ForbiddenAccessException)
+  end
+
+  it "should be able to parse a proper logworm URL" do
+    db = Logworm::DB.new('logworm://a:b@localhost:9401/c/d/')
+    db.host.should == "localhost:9401"
+    db.consumer_key.should == "a"
+    db.consumer_secret.should == "b"
+    db.token.should == "c"
+    db.token_secret.should == "d"
+  end
+
+  it "should be able to read its configuration from a file"
+  it "should be able to read its configuration from the current Heroku application"
+
+end
+
+describe Logworm::DB, " functioning" do
+  
+  before(:all) do
+    @db = Logworm::DB.new('logworm://a:b@localhost:9401/c/d/')
+  end
+  
+  it "should support a call to get the list of tables" do
+    @db.should have(0).tables
+    log_details = {:value => 10, :_ts => Time.now.utc.strftime("%Y-%m-%dT%H:%M:%SZ"), :_ts_utc =>  (Time.now.utc.to_f * 1000).to_i}
+    @db.batch_log([["log", log_details]])
+    @db.should have(1).tables
+  end
+  
+  it "should support a call to start a query"
+  
+  it "should support a call to get the results of a query"
+  
+  it "should raise DFGD if 404"
+
+  it "should raise DFGD if 403"
+
+  it "should raise DFGD if 400"
+  
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 3
-  version: 0.7.3
+  - 4
+  version: 0.7.4
 platform: ruby
 authors: 
 - Pomelo, LLC
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-01 00:00:00 -04:00
+date: 2010-04-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -135,6 +135,7 @@ files:
 - lib/base/db.rb
 - lib/base/query_builder.rb
 - lib/logworm.rb
+- spec/base_spec.rb
 - tests/builder_test.rb
 - logworm.gemspec
 has_rdoc: true