appstats 0.9.0 → 0.9.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    appstats (0.9.0)
+    appstats (0.9.1)
       daemons
       net-scp
       rails (>= 2.3.0)

data/lib/appstats/parser.rb

@@ -2,7 +2,9 @@
 module Appstats
   class Parser
 
-    attr_reader :raw_rules, :rules, :repeating, :raw_tokenize, :tokenize, :tokenize_no_spaces, :tokenize_regex, :tokenize_regex_no_spaces, :results, :raw_results, :constants
+    attr_reader :raw_rules, :rules, :repeating, :raw_tokenize, :results, :raw_results,
+                :tokenize, :tokenize_no_spaces, :tokenize_regex, :tokenize_regex_no_spaces,  
+                :constants, :constants_no_spaces
 
     def initialize(data = {})
       @raw_rules = data[:rules]
@@ -25,6 +27,7 @@ module Appstats
       @previous_text_so_far = input.strip
       @text_so_far = @previous_text_so_far
       @remaining_constants = @constants.dup
+      @remaining_constants_no_spaces = @constants_no_spaces.dup
       
       while !@text_so_far.blank?
         process_constant_if_present
@@ -37,12 +40,13 @@ module Appstats
         if rule.kind_of?(Hash)
           if rule[:stop] == :constant
             was_found = false
-            @remaining_constants.each_with_index do |k,index|
+            @remaining_constants_no_spaces.each_with_index do |k,index|
               p = parse_word(@text_so_far,k,true)
               if p[0].nil?
                 unset_rules_until(k)
               else
                 (index-1).downto(0) do |i|
+                  @remaining_constants_no_spaces.delete_at(i)
                   @remaining_constants.delete_at(i)
                 end
                 add_results(rule[:rule],p[0])
@@ -79,11 +83,10 @@ module Appstats
       clean_parsed_word(answer)
     end
     
-    def self.merge_regex_filter(a,b)
-      return "" if a.blank? && b.blank?
-      return "(#{a})" if b.blank?
-      return "(#{b})" if a.blank?
-      "(#{a}|#{b})"
+    def self.merge_regex_filter(inputs = [])
+      inputs.collect! { |x| x unless x.blank? }.compact!
+      return "" if inputs.empty?
+      "(#{inputs.join('|')})"
     end
     
     def parse_word(current_text,stop_on,strict = false)
@@ -94,7 +97,7 @@ module Appstats
       current_text = remove_tokens_at_start(current_text)
 
       if stop_on == :end
-        filter = Parser.merge_regex_filter(nil,@tokenize_regex)
+        filter = Parser.merge_regex_filter([nil,@tokenize_regex])
         m = current_text.match(/^(.*?)(#{filter}.*)$/im)
         if m.nil? || m[1].blank?
           answer[0] = current_text
@@ -103,7 +106,7 @@ module Appstats
           answer[1] = m[2]
         end
       elsif stop_on == :space
-        filter = Parser.merge_regex_filter('\s',@tokenize_regex)
+        filter = Parser.merge_regex_filter(['\s',@tokenize_regex,remaining_constants_regex])
         m = current_text.match(/^(.*?)(#{filter}.*)$/im)
         if m.nil?
           answer[0] = current_text
@@ -112,7 +115,7 @@ module Appstats
           answer[1] = m[2]
         end
       else
-        filter = Parser.merge_regex_filter(stop_on,@tokenize_regex)
+        filter = Parser.merge_regex_filter([stop_on,@tokenize_regex,remaining_constants_regex])
         m = current_text.match(/^(.*?)(#{filter}.*)$/im)
         if strict
           answer[0] = m[1] unless m.nil?
@@ -138,7 +141,7 @@ module Appstats
       def process_constant_if_present
         while process_tokens_if_present; end
         to_delete = nil
-        @remaining_constants.each do |k|
+        @remaining_constants_no_spaces.each do |k|
           p = Parser.parse_constant(@text_so_far,k)
           next if p[0].nil?
           to_delete = k
@@ -147,6 +150,7 @@ module Appstats
           @text_so_far = p[1]
         end
         @remaining_constants.delete(to_delete) unless to_delete.nil?
+        @remaining_constants_no_spaces.delete(to_delete) unless to_delete.nil?
       end
       
       def process_tokens_if_present
@@ -191,15 +195,20 @@ module Appstats
       def update_rules
         @rules = []
         @constants = []
+        @constants_no_spaces = []
         current_rule = nil
         return if @raw_rules.blank?
         @raw_rules.split(" ").each do |rule|
+          current_rule_no_spaces = nil  
 
           if rule.starts_with?(":") && rule.size > 1
-            current_rule = { :rule => rule[1..-1].to_sym, :stop => :end }
+            current_rule_no_spaces = { :rule => rule[1..-1].to_sym, :stop => :end }
             previous_stop_on = :space
           else
             current_rule = rule.upcase
+            current_rule_no_spaces = current_rule
+            @constants_no_spaces<< current_rule_no_spaces
+            current_rule = "\\s+#{current_rule}" unless current_rule.match(/.*[a-z].*/i).nil?
             @constants<< current_rule
             previous_stop_on = :constant
           end
@@ -208,7 +217,7 @@ module Appstats
             @rules.last[:stop] = previous_stop_on   
           end
           
-          @rules<< current_rule
+          @rules<< current_rule_no_spaces
         end
       end
 
@@ -234,6 +243,11 @@ module Appstats
         end
         current_text
       end
-
+      
+      def remaining_constants_regex
+        return "" if @remaining_constants.nil?
+        @remaining_constants.join("|")
+      end
+      
   end
 end

data/lib/appstats/version.rb

@@ -1,3 +1,3 @@
 module Appstats
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/spec/entry_spec.rb

@@ -188,18 +188,18 @@ module Appstats
       end
       
       it "should understand an entry without contexts" do
-        entry = Entry.create_from_logger_string("0.9.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
+        entry = Entry.create_from_logger_string("0.9.1 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
         Entry.count.should == @before_count + 1
         entry.action.should == "address_search"
-        entry.raw_entry.should == "0.9.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
+        entry.raw_entry.should == "0.9.1 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
         entry.occurred_at.should == Time.parse("2010-09-21 23:15:20")
       end
       
       it "should understand contexts" do
-        entry = Entry.create_from_logger_string("0.9.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
+        entry = Entry.create_from_logger_string("0.9.1 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
         Entry.count.should == @before_count + 1
         entry.action.should == "address_filter"
-        entry.raw_entry.should == "0.9.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
+        entry.raw_entry.should == "0.9.1 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
         entry.occurred_at.should == Time.parse("2010-09-21 23:15:20")
         entry.contexts.size.should == 2
         entry.contexts[0].context_key = "app_name"

data/spec/logger_spec.rb

@@ -115,7 +115,7 @@ module Appstats
       
       it "should accept numbers" do
         Appstats::Logger.entry(5, :blah => 6)   
-        Appstats::Logger.raw_read.should == ["0.9.0 setup[:,=,-n] 2010-09-21 23:15:20 action=5 : blah=6"]
+        Appstats::Logger.raw_read.should == ["0.9.1 setup[:,=,-n] 2010-09-21 23:15:20 action=5 : blah=6"]
       end
 
     end
@@ -124,7 +124,7 @@ module Appstats
 
       it "should look similar to regular entry" do
         Appstats::Logger.exception_entry(RuntimeError.new("blah"),:on => "login")   
-        Appstats::Logger.raw_read.should == ["0.9.0 setup[:,=,-n] 2010-09-21 23:15:20 action=appstats-exception : error=blah : on=login"]
+        Appstats::Logger.raw_read.should == ["0.9.1 setup[:,=,-n] 2010-09-21 23:15:20 action=appstats-exception : error=blah : on=login"]
       end
       
     end
@@ -141,29 +141,29 @@ module Appstats
     
        it "should handle a statistics entry" do
          expected = { :action => "address_search", :timestamp => "2010-09-21 23:15:20" }
-         actual = Appstats::Logger.entry_to_hash("0.9.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
+         actual = Appstats::Logger.entry_to_hash("0.9.1 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search")
          actual.should == expected
        end
        
        it "should handle contexts" do
          expected = { :action => "address_filter", :timestamp => "2010-09-21 23:15:20", :server => "Live", :app_name => 'Market' }
-         actual = Appstats::Logger.entry_to_hash("0.9.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
+         actual = Appstats::Logger.entry_to_hash("0.9.1 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live")
          actual.should == expected
        end
     
        it "should handle actions with the delimiter (and change the delimiter)" do
          expected = { :action => "address:=search-n", :timestamp => "2010-09-21 23:15:20" }
-         actual = Appstats::Logger.entry_to_hash("0.9.0 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n")
+         actual = Appstats::Logger.entry_to_hash("0.9.1 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n")
          actual.should == expected
     
          expected = { :action => "address::search==--n", :timestamp => "2010-09-21 23:15:20" }
-         actual = Appstats::Logger.entry_to_hash("0.9.0 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n")
+         actual = Appstats::Logger.entry_to_hash("0.9.1 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n")
          actual.should == expected
        end
     
        it "should handle contexts with the delimiter (and change the delimiter)" do
          expected = { :action => "address", :timestamp => "2010-09-21 23:15:20", :server => "market:eval=-n" }
-         actual = Appstats::Logger.entry_to_hash("0.9.0 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n")
+         actual = Appstats::Logger.entry_to_hash("0.9.1 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n")
          actual.should == expected
        end
        
@@ -172,66 +172,66 @@ module Appstats
     describe "#entry_to_s" do
       
       it "should handle a statistics entry" do
-        expected = "0.9.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
+        expected = "0.9.1 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search"
         actual = Appstats::Logger.entry_to_s("address_search")
         actual.should == expected
       end
       
       it "should handle numbers" do
-        expected = "0.9.0 setup[:,=,-n] 2010-09-21 23:15:20 action=1 : note=2.2"
+        expected = "0.9.1 setup[:,=,-n] 2010-09-21 23:15:20 action=1 : note=2.2"
         actual = Appstats::Logger.entry_to_s(1,:note => 2.2)
         actual.should == expected
       end
       
       it "should handle default contexts" do
         Appstats::Logger.default_contexts[:app_name] = "market"
-        expected = "0.9.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : app_name=market"
+        expected = "0.9.1 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : app_name=market"
         actual = Appstats::Logger.entry_to_s("address_search")
         actual.should == expected
       end
       
       it "should handle contexts (and sort them by symbol)" do
-        expected = "0.9.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
+        expected = "0.9.1 setup[:,=,-n] 2010-09-21 23:15:20 action=address_filter : app_name=Market : server=Live"
         actual = Appstats::Logger.entry_to_s("address_filter", { :server => "Live", :app_name => 'Market' })
         actual.should == expected
       end
 
       it "should handle actions with the delimiter (and change the delimiter)" do
-        expected = "0.9.0 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n"
+        expected = "0.9.1 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=search-n"
         actual = Appstats::Logger.entry_to_s("address:=search-n")
         actual.should == expected
 
-        expected = "0.9.0 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n"
+        expected = "0.9.1 setup[:::,===,---n] 2010-09-21 23:15:20 action===address::search==--n"
         actual = Appstats::Logger.entry_to_s("address::search==--n")
         actual.should == expected
       end
 
       it "should handle contexts with the delimiter (and change the delimiter)" do
-        expected = "0.9.0 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n"
+        expected = "0.9.1 setup[::,==,--n] 2010-09-21 23:15:20 action==address :: server==market:eval=-n"
         actual = Appstats::Logger.entry_to_s("address", :server => 'market:eval=-n')
         actual.should == expected
       end
 
       it "should ignore spaces" do
-        expected = "0.9.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address search"
+        expected = "0.9.1 setup[:,=,-n] 2010-09-21 23:15:20 action=address search"
         actual = Appstats::Logger.entry_to_s("address search")
         actual.should == expected
       end
       
       it "should convert newlines in action" do
-        expected = "0.9.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_-nsearch"
+        expected = "0.9.1 setup[:,=,-n] 2010-09-21 23:15:20 action=address_-nsearch"
         actual = Appstats::Logger.entry_to_s("address_\nsearch")
         actual.should == expected
       end
 
       it "should convert newlines in context" do
-        expected = "0.9.0 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : blah=some-nlong-nstatement"
+        expected = "0.9.1 setup[:,=,-n] 2010-09-21 23:15:20 action=address_search : blah=some-nlong-nstatement"
         actual = Appstats::Logger.entry_to_s("address_search",:blah => "some\nlong\nstatement")
         actual.should == expected
       end
       
       it "should convert newlines based on the delimiter" do
-        expected = "0.9.0 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=--nsearch-n"
+        expected = "0.9.1 setup[::,==,--n] 2010-09-21 23:15:20 action==address:=--nsearch-n"
         actual = Appstats::Logger.entry_to_s("address:=\nsearch-n")
         actual.should == expected
       end

data/spec/parser_spec.rb

@@ -17,6 +17,7 @@ module Appstats
         @parser.rules.should == []
         @parser.tokenize.should == []
         @parser.constants.should == []
+        @parser.constants_no_spaces.should == []
       end
       
       it "should set rules from constructor" do
@@ -27,7 +28,8 @@ module Appstats
         parser.rules.should == [ { :rule => :name, :stop => :constant }, "OR", { :rule => :bust, :stop => :end} ]
         parser.tokenize.should == ["\\s+A","\\s+BB","\\s+C"]
         parser.tokenize_no_spaces.should == ["A","BB","C"]
-        parser.constants.should == ["OR"]
+        parser.constants.should == ["\\s+OR"]
+        parser.constants_no_spaces.should == ["OR"]
       end
     
       it "should espace tokens as required" do
@@ -85,14 +87,34 @@ module Appstats
       end
     
       it "should upper case constants" do
-        Parser.new(:rules => "blah").constants.should == ["BLAH"]
+        Parser.new(:rules => "blah").constants.should == ["\\s+BLAH"]
       end
     
       it "should deal with multiple constants" do
-        Parser.new(:rules => ":name = :blah and :moreblah").constants.should == ["=","AND"]
+        Parser.new(:rules => ":name = :blah and :moreblah").constants.should == ["=","\\s+AND"]
       end
     
     end
+    
+    describe "#constants_no_spaces" do
+      
+      it "should be empty if only variables" do
+        Parser.new(:rules => ":name :blah").constants_no_spaces.should == [ ]
+      end
+    
+      it "should track all constants" do
+        Parser.new(:rules => ":name : :date").constants_no_spaces.should == [ ":" ]
+      end
+    
+      it "should upper case constants" do
+        Parser.new(:rules => "blah").constants_no_spaces.should == ["BLAH"]
+      end
+    
+      it "should deal with multiple constants" do
+        Parser.new(:rules => ":name = :blah and :moreblah").constants_no_spaces.should == ["=","AND"]
+      end
+    
+    end    
      
     describe "#parse_constant" do
     
@@ -214,19 +236,24 @@ module Appstats
     describe "#merge_regex_filter" do
       
       it "should handle nil" do
-        Parser.merge_regex_filter(nil,nil).should == ""
-        Parser.merge_regex_filter('','').should == ""
+        Parser.merge_regex_filter([nil,nil]).should == ""
+        Parser.merge_regex_filter(['','']).should == ""
       end
     
       it "should handle nil on one side" do
-        Parser.merge_regex_filter('\s',nil).should == '(\s)'
-        Parser.merge_regex_filter(nil,'\s').should == '(\s)'
-        Parser.merge_regex_filter('\s','').should == '(\s)'
-        Parser.merge_regex_filter('','\s').should == '(\s)'
+        Parser.merge_regex_filter(['\s',nil]).should == '(\s)'
+        Parser.merge_regex_filter([nil,'\s']).should == '(\s)'
+        Parser.merge_regex_filter(['\s','']).should == '(\s)'
+        Parser.merge_regex_filter(['','\s']).should == '(\s)'
       end
     
       it "should handle both sides" do
-        Parser.merge_regex_filter('\s','a|b').should == '(\s|a|b)'
+        Parser.merge_regex_filter(['\s','a|b']).should == '(\s|a|b)'
+      end
+
+      it "should handle three inputs" do
+        Parser.merge_regex_filter(['\s','a|b','dd']).should == '(\s|a|b|dd)'
+        Parser.merge_regex_filter(['\s','',nil]).should == '(\s)'
       end
       
       
@@ -321,6 +348,14 @@ module Appstats
           parser.results.should == {:operation => "#", :action => "logins", :date => "between 2010-01-15 and 2010-01-31", :host => "your.localnet", :contexts => nil }
         end
         
+        it "should handle last week" do
+
+          parser = Appstats::Parser.new(:rules => ":operation :action :date on :host where :contexts")
+          parser.parse("# logins last week where service_provider = Cox Communications").should == true
+          parser.results.should == {:operation => "#", :action => "logins", :date => "last week", :host => nil, :contexts => "service_provider = Cox Communications" }
+
+        end
+        
       end
       
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: appstats
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: false
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - Andrew Forward