logworm 0.7.1 → 0.7.2

data/CHANGELOG

@@ -1,3 +1,6 @@
+v0.7.2
+    Cleaner way to compose the URL for the DB (now logworm://key:secret@host/token/token_secret/)
+
 v0.7.1
     Added DB.from_config_or_die, to throw exception if DB cannot be initialized
 

data/Rakefile

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

data/lib/base/db.rb

@@ -9,9 +9,8 @@ module Logworm
   class DB
     
     DEFAULT_HOST  = "db.logworm.com"
-    URL_FORMAT    = /lw:\/\/([^:]+):([^!]+)!([^:]+):([^@]+)@([^\/]+)\//
-    # URI: lw://<consumer_key>:<consumer_secret>!<access_token>:<access_token_secret>@db.logworm.com/
-
+    URL_FORMAT    = /logworm:\/\/([^:]+):([^@]+)@([^\/]+)\/([^\/]+)\/([^\/]+)\//
+    # URI: logworm://<consumer_key>:<consumer_secret>@db.logworm.com/<access_token>/<access_token_secret>/
 
     def initialize(url)
       match = DB.parse_url(url)
@@ -30,7 +29,7 @@ module Logworm
     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("lw://#{consumer_key}:#{consumer_secret}!#{token}:#{token_secret}@#{DEFAULT_HOST}/")
+      DB.new(DB.url(consumer_key, consumer_secret, token, token_secret))
     end
     
     def self.from_config
@@ -54,7 +53,19 @@ module Logworm
       raise "The application is not properly configured. Either use 'heroku addon:add' to add logworm to your app, or save your project's credentials into the .logworm file" unless db
       db
     end
-      
+
+    def self.url(consumer_key, consumer_secret, token, token_secret, host = DEFAULT_HOST)
+      "logworm://#{consumer_key}:#{consumer_secret}@#{host}/#{token}/#{token_secret}/"
+    end
+
+    def url()
+      DB.url(@consumer_key, @consumer_secret, @token, @token_secret, @host)
+    end
+    
+    def self.example_url
+      self.url("Ub5sOstT9w", "GZi0HciTVcoFHEoIZ7", "OzO71hEvWYDmncbf3C", "J7wq4X06MihhZgqDeB")
+    end
+    
     def tables()
       res = db_call(:get, "#{@host}/")
     end

data/logworm.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{logworm}
-  s.version = "0.7.1"
+  s.version = "0.7.2"
 
   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
-  - 1
-  version: 0.7.1
+  - 2
+  version: 0.7.2
 platform: ruby
 authors: 
 - Pomelo, LLC