logworm 0.7.5 → 0.7.6

data/CHANGELOG

@@ -1,3 +1,6 @@
+v0.7.6
+    QueryBuilder now allows Time objects as arguments for timeframe
+
 v0.7.5
     :force_ts now default in QueryBuilder
     

data/Manifest

@@ -7,6 +7,8 @@ lib/base/db.rb
 lib/base/query_builder.rb
 lib/logworm.rb
 spec/base_spec.rb
+spec/builder_spec.rb
+spec/config_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.5') do |p|
+Echoe.new('logworm', '0.7.6') do |p|
   p.description = "logworm logging tool"
   p.url = "http://www.logworm.com"
   p.author = "Pomelo, LLC"

data/lib/base/config.rb

@@ -7,19 +7,24 @@ module Logworm
     
     include ::Singleton
       
-    FILENAME = "./.logworm"
+    FILENAME = ".logworm"
     
     def initialize
+      read
+    end
+
+    def read
       @file_found = false
       @url = nil
       begin
-        f = File.new(FILENAME, 'r')
+        f = File.new("./" + FILENAME, 'r')
         @url = f.readline.strip
         @file_found = true
       rescue Errno::ENOENT => e
       end
+      self
     end
-    
+
     def url
       @url
     end
@@ -29,10 +34,10 @@ module Logworm
     end
     
     def save(url)
-      File.open(FILENAME, 'w') do |f|
+      File.open("./" + FILENAME, 'w') do |f|
         f.puts url
       end rescue Exception
-      %x[echo '.logworm' >> .gitignore]
+      %x[echo #{FILENAME} >> .gitignore]
     end
     
   end

data/lib/base/query_builder.rb

@@ -70,7 +70,9 @@ module Logworm
       ###
       @tf = {}
       @tf[:start] = unquote(@options[:start]).to_s if is_set?(@options[:start]) or is_set?(@options[:start], Integer, 0)
-      @tf[:end] = unquote(@options[:end]).to_s if is_set?(@options[:end]) or is_set?(@options[:end], Integer, 0)
+      @tf[:start] = unquote(@options[:start].strftime("%Y-%m-%dT%H:%M:%SZ")).to_s if is_set?(@options[:start], Time)
+      @tf[:end]   = unquote(@options[:end]).to_s if is_set?(@options[:end]) or is_set?(@options[:end], Integer, 0)
+      @tf[:end]   = unquote(@options[:end].strftime("%Y-%m-%dT%H:%M:%SZ")).to_s if is_set?(@options[:end], Time)
       query_opts << '"timeframe":' + @tf.to_json if @tf.keys.size > 0
 
       ###

data/logworm.gemspec

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

@@ -0,0 +1,26 @@
+require 'rubygems'
+
+require File.dirname(__FILE__) + '/spec_helper'
+
+$: << File.dirname(__FILE__) + '/../lib'
+require 'logworm.rb'
+
+describe Logworm::QueryBuilder, " timeframes" do
+  
+  it " should accept Strings as time" do
+    Logworm::QueryBuilder.new(:start => "2010-01-01").to_json.should == '{"timeframe":{"start":"2010-01-01"}}'
+    Logworm::QueryBuilder.new(:end => "2010-01-01").to_json.should == '{"timeframe":{"end":"2010-01-01"}}'
+  end
+  
+  it "should accept an Integer as time, to mean the year" do
+    Logworm::QueryBuilder.new(:start => 2010).to_json.should == '{"timeframe":{"start":"2010"}}'
+    Logworm::QueryBuilder.new(:end => 2010).to_json.should == '{"timeframe":{"end":"2010"}}'
+  end
+
+  it "should accept a Time object" do
+    ts = Time.now
+    Logworm::QueryBuilder.new(:start => ts).to_json.should == '{"timeframe":{"start":"' + ts.strftime("%Y-%m-%dT%H:%M:%SZ") + '"}}'
+    Logworm::QueryBuilder.new(:end => ts).to_json.should   == '{"timeframe":{"end":"' + ts.strftime("%Y-%m-%dT%H:%M:%SZ") + '"}}'
+  end
+
+end

data/spec/config_spec.rb

@@ -0,0 +1,36 @@
+require 'rubygems'
+require 'webmock'
+
+require File.dirname(__FILE__) + '/spec_helper'
+
+$: << File.dirname(__FILE__) + '/../lib'
+require 'logworm.rb'
+
+describe Logworm::Config, " initialization" do
+  
+  before do
+    %x[rm .logworm]
+    %x[mv .gitignore .gitignore_old]
+  end
+  
+  after do
+    %x[mv .gitignore_old .gitignore]
+  end
+
+  it "should create a new .logworm file on save" do
+    url = "xxx"
+    File.should_not exist(".logworm")
+    Logworm::Config.instance.save(url)
+    File.should exist(".logworm")
+    Logworm::Config.instance.read.should be_file_found
+    Logworm::Config.instance.url.should == url
+  end
+
+  it "should add .logworm to .gitignore" do
+    File.should_not exist(".gitignore")
+    Logworm::Config.instance.save("xxx")
+    File.should exist(".gitignore")
+    File.open('.gitignore').readline.strip.should == ".logworm"
+  end
+
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 5
-  version: 0.7.5
+  - 6
+  version: 0.7.6
 platform: ruby
 authors: 
 - Pomelo, LLC
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-22 00:00:00 -04:00
+date: 2010-04-26 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/builder_spec.rb
+- spec/config_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - tests/builder_test.rb