logworm 0.7.2 → 0.7.3

data/CHANGELOG

@@ -1,4 +1,4 @@
-v0.7.2
+v0.7.3
     Cleaner way to compose the URL for the DB (now logworm://key:secret@host/token/token_secret/)
 
 v0.7.1

data/Rakefile

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

data/lib/base/db.rb

@@ -16,14 +16,10 @@ module Logworm
       match = DB.parse_url(url)
       raise ForbiddenAccessException.new("Incorrect URL Format #{url}") unless match and match.size == 6
       
-      keys = match[1..4]
-      raise ForbiddenAccessException.new("Incorrect Keys") unless keys.is_a? Array and keys.size == 4
-      @consumer_key, @consumer_secret, @token, @token_secret = keys
+      @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)
-      
-      @host       = "http://" + match[5]
     end
   
     def self.with_tokens(token, token_secret)
@@ -67,11 +63,11 @@ module Logworm
     end
     
     def tables()
-      res = db_call(:get, "#{@host}/")
+      res = db_call(:get, "#{host_with_protocol}/")
     end
   
     def query(table, cond)
-      res = db_call(:post, "#{@host}/queries", {:table => table, :query => cond})
+      res = db_call(:post, "#{host_with_protocol}/queries", {:table => table, :query => cond})
     end
   
     def results(uri)
@@ -82,7 +78,7 @@ module Logworm
     end
     
     def batch_log(entries)
-      db_call(:post, "#{@host}/log", {:entries => $lr_queue.to_json})
+      db_call(:post, "#{host_with_protocol}/log", {:entries => $lr_queue.to_json})
     end
 
   private
@@ -107,6 +103,9 @@ module Logworm
        url.match(URL_FORMAT)
     end
     
+    def host_with_protocol
+      "http://#{@host}"
+    end
   end
 
 end

data/logworm.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{logworm}
-  s.version = "0.7.2"
+  s.version = "0.7.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pomelo, LLC"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 2
-  version: 0.7.2
+  - 3
+  version: 0.7.3
 platform: ruby
 authors: 
 - Pomelo, LLC