logworm 0.7.4 → 0.7.5

data/CHANGELOG

@@ -1,3 +1,6 @@
+v0.7.5
+    :force_ts now default in QueryBuilder
+    
 v0.7.4
     Eliminated default host for database. Must be specified in the configuration environment.
 

data/Manifest

@@ -7,4 +7,6 @@ lib/base/db.rb
 lib/base/query_builder.rb
 lib/logworm.rb
 spec/base_spec.rb
+spec/spec.opts
+spec/spec_helper.rb
 tests/builder_test.rb

data/Rakefile

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

data/lib/base/db.rb

@@ -60,13 +60,14 @@ module Logworm
     def self.example_url
       self.make_url("db.logworm.com", "Ub5sOstT9w", "GZi0HciTVcoFHEoIZ7", "OzO71hEvWYDmncbf3C", "J7wq4X06MihhZgqDeB")
     end
+
     
     def tables()
-      res = db_call(:get, "#{host_with_protocol}/")
+      db_call(:get, "#{host_with_protocol}/") || []
     end
   
     def query(table, cond)
-      res = db_call(:post, "#{host_with_protocol}/queries", {:table => table, :query => cond})
+      db_call(:post, "#{host_with_protocol}/queries", {:table => table, :query => cond})
     end
   
     def results(uri)
@@ -87,10 +88,10 @@ module Logworm
       rescue SocketError
         raise DatabaseException
       end
-      raise DatabaseException if res.code.to_i == 404
+      raise InvalidQueryException.new("#{res.body}")              if res.code.to_i == 400
+      raise ForbiddenAccessException                              if res.code.to_i == 403
+      raise DatabaseException                                     if res.code.to_i == 404
       raise DatabaseException.new("Server returned: #{res.body}") if res.code.to_i == 500
-      raise ForbiddenAccessException if res.code.to_i == 403
-      raise InvalidQueryException.new("#{res.body}") if res.code.to_i == 400
       begin
         JSON.parse(res.body)
       rescue Exception => e

data/lib/base/query_builder.rb

@@ -21,6 +21,7 @@ module Logworm
     
     def initialize(options = {})
       @options = options
+      @options.merge(:force_ts => true) unless @options.include? :force_ts
       @query = build()
     end
   

data/logworm.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{logworm}
-  s.version = "0.7.4"
+  s.version = "0.7.5"
 
   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-06}
+  s.date = %q{2010-04-22}
   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", "spec/base_spec.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", "spec/spec.opts", "spec/spec_helper.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

@@ -1,3 +1,8 @@
+require 'rubygems'
+require 'webmock'
+
+require File.dirname(__FILE__) + '/spec_helper'
+
 $: << File.dirname(__FILE__) + '/../lib'
 require 'logworm.rb'
 
@@ -28,25 +33,64 @@ end
 
 describe Logworm::DB, " functioning" do
   
+  host = "http://localhost:9401"
+  
   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
+  it "should offer a call to get the list of tables --> /" do
+    @db.should_receive(:db_call).with(:get, "#{host}/")
+    @db.tables
   end
   
-  it "should support a call to start a query"
+  it "should just parse and return the results of the call to get tables" do
+    return_body =  [
+            {"tablename" => "table1", "url" => "/table1", "last_write" => "2010-03-20 18:10:22", "rows" => 50},
+            {"tablename" => "table2", "url" => "/table1", "last_write" => "2010-03-20 18:10:22", "rows" => 50}]
+    stub_request(:get, "#{host}/").to_return(:body => return_body.to_json)
+    @db.tables.should == return_body
+  end
   
-  it "should support a call to get the results of a query"
+  it "should support a call to start a query --> POST /queries" do
+    @db.should_receive(:db_call).with(:post, "#{host}/queries", {:table => "tbl1", :query => "a good query"})
+    @db.query("tbl1", "a good query")
+  end
   
-  it "should raise DFGD if 404"
+  it "should just parse and return the results of the call to query" do
+    return_body =  {"id" => 10, "query" => "q", "self_uri" => "/queries/10", "results_uri" => "/queries/10/results"}
+    stub_request(:post, "#{host}/queries").with(:body => "table=table1&query=q").to_return(:body => return_body.to_json)
+    @db.query("table1", "q").should == return_body
+  end
 
-  it "should raise DFGD if 403"
+  it "should support a call to retrieve the results of a query --> GET /queries/10/results" do
+    @db.should_receive(:db_call).with(:get, "#{host}/queries/10/results")
+    @db.results("#{host}/queries/10/results") rescue Exception # Returns an error when trying to parse results
+  end
+  
+  it "should just parse and return the results of the call to retrieve results, but also add results field" do
+    results     = [{"a" => 10, "b" => "2"}, {"a" => "x"}]
+    return_body = {"id" => 10, "execution_time" => "5", 
+                   "query_url" => "#{host}/queries/10", "results_url" => "#{host}/queries/10/results",
+                   "results"   => results.to_json}
+    stub_request(:get, "#{host}/queries/10/results").to_return(:body => return_body.to_json)
+    @db.results("#{host}/queries/10/results").should == return_body.merge("results" => results)
+  end
+  
+  it "should raise ForbiddenAccessException if 403" do
+    stub_request(:get, "#{host}/").to_return(:status => 403)
+    lambda {@db.tables}.should raise_exception(Logworm::ForbiddenAccessException)
+  end
 
-  it "should raise DFGD if 400"
+  it "should raise InvalidQueryException if query is not valid" do
+    stub_request(:post, "#{host}/queries").to_return(:status => 400, :body => "Query error")
+    lambda {@db.query("tbl1", "bad query")}.should raise_exception(Logworm::InvalidQueryException)
+  end
   
+  it "should raise DatabaseException if response from server is not JSON" do
+    stub_request(:get, "#{host}/").to_return(:body => "blah")
+    lambda {@db.tables}.should raise_exception(Logworm::DatabaseException)
+  end
+  
+
 end

data/spec/spec.opts

@@ -0,0 +1,4 @@
+--colour
+--format specdoc
+--loadby mtime
+--reverse

data/spec/spec_helper.rb

@@ -0,0 +1,8 @@
+require 'rubygems'
+require 'spec'
+require 'spec/autorun'
+require 'spec/interop/test'
+require 'webmock/rspec'
+
+include WebMock
+

metadata

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