sir_tracks_alot 0.4.0 → 0.6.2

data/lib/sir_tracks_alot/event_helper.rb

@@ -1,6 +1,6 @@
 module SirTracksAlot
   module EventHelper
-    DATE_FORMATS = {:hourly => '%Y/%m/%d %H', :daily => '%Y/%m/%d'}
+    DATE_FORMATS = {:hourly => '%Y/%m/%d %H:00', :daily => '%Y/%m/%d'}
     
     def views(resolution = nil)
       return events.size if resolution.nil?

data/lib/sir_tracks_alot/filter_helper.rb

@@ -5,33 +5,43 @@ module SirTracksAlot
     # Regular Expression filters match against retrieved attribute values
     # 
     # filter(:actor => 'user1', :target => /\/targets\/\d+/, :action => ['view', 'create'], :category => ['/root', '/other_root'])
-    def filter(options_for_find, &block)      
+    def filter(filters, &block)      
       items = []
       all = []
       
-      strings, matchers, arrays = extract_filter_options(options_for_find)
+      filters = [filters] unless filters.kind_of?(Array)
       
-      unless arrays.empty?
-        (arrays.values.inject{|a, b| a.product b}).each do |combo|
-          terms = {}; combo.each{|c| terms[find_key_from_value(arrays, c)] = c}
-          all += find(terms.merge(strings)).to_a
-        end
-      else
-        all = find(strings)
-      end
+      filters.each do |options_for_find|
+        strings, matchers, arrays = extract_filter_options(options_for_find)
 
-      all.each do |item|
-        pass = true
-        
-        matchers.each do |key, matcher|
-          pass = false if !matcher.match(item.send(key))
+        unless arrays.empty?
+          (arrays.values.inject{|a, b| a.product b}).each do |combo|
+            combo = [combo] unless combo.kind_of?(Array)
+            terms = {}; combo.each{|c| terms[find_key_from_value(arrays, c)] = c}
+            if terms.values.detect{|t| t.kind_of?(Regexp)}
+              matchers.merge!(terms) 
+              next 
+            end
+            
+            all += find(terms.merge(strings)).to_a
+          end          
+        else 
+          all += find(strings).to_a
         end
 
-        next unless pass
+        all.each do |item|
+          pass = true
+          
+          matchers.each do |key, matcher|
+            pass = false if !matcher.match(item.send(key))
+          end
+
+          next unless pass
         
-        yield item if block_given?
+          # yield item if block_given?
         
-        items << item
+          items << item
+        end
       end
       
       items      

data/lib/sir_tracks_alot/persistable.rb

@@ -24,6 +24,10 @@ module SirTracksAlot
       self.id == comparee.id
     end
 
+    def to_hash
+      super
+    end
+
 
     protected
     

data/lib/sir_tracks_alot/queue/report_cache.rb

@@ -4,8 +4,10 @@ module SirTracksAlot
       attribute :created_at
       attribute :report
       attribute :owner
+      attribute :name
       attribute :html
     
+      index :name
       index :report
       index :owner
     end

data/lib/sir_tracks_alot/queue/report_config.rb

@@ -6,9 +6,11 @@ module SirTracksAlot
     
       attribute :created_at
       attribute :report
+      attribute :name
       attribute :owner
       attribute :options_store
 
+      index :name
       index :report
       index :owner
 
@@ -24,6 +26,7 @@ module SirTracksAlot
       def validate
         assert_present :report
         assert_present :owner      
+        assert_present :name
       end
     end
   end

data/lib/sir_tracks_alot/queue/report_queue.rb

@@ -8,9 +8,9 @@ module SirTracksAlot
       index :name
       list :queue # of ReportConfigs
 
-      def self.push(owner, report, options)
-        config = ReportConfig.find_or_create(:owner => owner.to_s, :report => report.to_s)
-        config.options = options.merge(:owner => owner.to_s) # reports require owner, should be sync'd with config owner        
+      def self.push(owner, report, name, options)
+        config = ReportConfig.find_or_create(:owner => owner.to_s, :report => report.to_s, :name => name.to_s)
+        config.options = options
         queue = self.find_or_create(:name => QUEUE_NAME)
         queue.queue << config.id
       end
@@ -23,13 +23,12 @@ module SirTracksAlot
           return false
         end
         
-        queue = queue.first
+        queue = queue.first        
+        config = ReportConfig[queue.queue.pop] # raw gets us just the id's, pop to remove the las one, it's a queue!      
         
-        config = ReportConfig[queue.queue.pop] # raw gets us just the id's, pop to remove the las one, it's a queue!
-      
         process(config)
       end
-    
+
       def self.process(config)
         return false if config.nil?
 
@@ -37,9 +36,8 @@ module SirTracksAlot
 
         begin
           report = QueueHelper.constantize(QueueHelper.camelize("SirTracksAlot::Reports::#{config.report.capitalize}"))
-          counts = Count.filter(config.options)
-          html = report.render_html(:counts => counts)
-          cache = ReportCache.find_or_create(:owner => config.owner, :report => config.report)
+          html = report.render_html(config.options)
+          cache = ReportCache.find_or_create(:owner => config.owner, :report => config.report, :name => config.name)
           cache.update(:html => html)
         rescue Exception => e
           SirTracksAlot.log.fatal("Error building report #{config.report} for #{config.owner}: #{e}")

data/lib/sir_tracks_alot/reports/actor_activity_report.rb

@@ -24,12 +24,12 @@ module SirTracksAlot
             t << [target, count[0], count[1]]
           end          
         end
-        
+
         table.sort_rows_by!('page views', :order => :descending)
-        
+
         self.data = table
       end  
-                  
+
       module Helpers
         include Report::Helpers        
       end

data/lib/sir_tracks_alot/reports/basic_report.rb

@@ -13,7 +13,7 @@ module SirTracksAlot
 
         self.data = grouping
       end  
-                  
+
       module Helpers
         include Report::Helpers
       end

data/lib/sir_tracks_alot/reports/filter_report.rb

@@ -8,17 +8,10 @@ module SirTracksAlot
       
       # Build up reports by filtering things. Filters are applied and assigned a row title.
       #
-      # SirTracksAlot::Reports::FilterReport.render_html(
-      #   :actions => ['view', 'search']
-      # 
       # :filters = {
       #   'Title' => {:category => 'category', :target => /\/categories/}
       # }
       #      
-      # :filters => {
-      #   :only => {Profile Pages' => {:target => /^\/user_profiles\/.+$/}}
-      #   :except => {Profile Index' => {:target => /^\/user_profiles$/}}
-      # })      
       def setup
         super
         
@@ -26,12 +19,13 @@ module SirTracksAlot
         options.filters ||= {}
         options.column_names ||= COLUMN_NAMES
         
-        
         options.filters.each do |title, options_for_find|
           Count.filter(options_for_find.merge(:owner => options.owner)).each do |count|
-            counts[title] ||= [0,0]
-            counts[title][0] += count.visits.to_i
-            counts[title][1] += count.views.to_i
+            count.summaries.each do |summary|
+              counts[title] ||= [0,0]
+              counts[title][0] += summary.visits.to_i
+              counts[title][1] += summary.views.to_i
+            end
           end
         end
       

data/lib/sir_tracks_alot/reports/report.rb

@@ -3,12 +3,26 @@ module SirTracksAlot
     class Report < Ruport::Controller
       attr_accessor :all
       
+      # Accepts either:
+      # options: {'title' => {:owner => 'xxx'}}
+      # options: [{:owner => 'xxx'}]
+      def self.build_rows(filters)
+        rows = []          
+        filters = {nil => filters} if filters.kind_of?(Array)
+
+        filters.each do |title, options_for_find|
+          rows += SirTracksAlot::Count.rows(options_for_find, title)
+        end
+
+        rows
+      end
+      
       def setup
         self.data = []        
         options.report_class ||= ''
         options.report_title ||= 'Report'
-      end
-      
+      end      
+
       module Helpers
         def self.handle(name, &block)
           @@handlers ||= {}

data/lib/sir_tracks_alot/reports/simple_report.rb

@@ -0,0 +1,43 @@
+module SirTracksAlot
+  module Reports
+    class SimpleReport < Report
+      COLUMN_NAMES = ['target', 'page views', 'visits']
+      
+      stage :simple
+      
+      def setup      
+        options.column_names ||= COLUMN_NAMES
+        
+        rows = Report.build_rows(options.filters)
+        
+        table = Table(options.column_names, :data => rows)
+        
+        if options.group
+          grouping = Grouping(table, :by => options.group, :order => options.group)
+          grouping.each{|n, g| g.sort_rows_by!('count', :order => :descending)}
+          self.data = grouping
+        else
+          table.sort_rows_by!('page views', :order => :descending)        
+          self.data = table
+        end
+
+      end
+
+      module Helpers
+        include Report::Helpers
+      end
+
+      class HTML < Ruport::Formatter::HTML
+        renders :html, :for => SimpleReport        
+
+        build :simple do
+          if options.group
+            output << erb((options.template || TRACKABLE_ROOT+"/views/reports/group.html.erb"), :binding => binding)
+          else
+            output << erb((options.template || TRACKABLE_ROOT+"/views/reports/table.html.erb"), :binding => binding)
+          end
+        end    
+      end                  
+    end
+  end
+end

data/lib/sir_tracks_alot/reports/target_report.rb

@@ -8,14 +8,9 @@ module SirTracksAlot
       def setup
         super
         column_names = options.column_names || COLUMN_NAMES
-        counts = options.counts || {}
-        
-        table = Table(column_names) do |t|
-          counts.each do |count|
-            t << [count.target, count.visits, count.views]
-          end
-        end
+        rows = options.rows || []
         
+        table = Table(column_names, :data => rows)
         table.sort_rows_by!('page views', :order => :descending)
         
         self.data = table

data/lib/sir_tracks_alot/summary.rb

@@ -0,0 +1,9 @@
+module SirTracksAlot
+  class Summary < Persistable
+    attribute :date # 234234234
+    attribute :views
+    attribute :visits
+    
+    index :date
+  end
+end

data/sir_tracks_alot.gemspec

@@ -0,0 +1,140 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{sir_tracks_alot}
+  s.version = "0.6.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Peter T. Brown"]
+  s.date = %q{2010-10-18}
+  s.description = %q{A high speed general purpose tracking and reporting tool which uses Redis.}
+  s.email = %q{peter@flippyhead.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    "Gemfile",
+     "Gemfile.lock",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "benchmarks/activity_benchmark.rb",
+     "benchmarks/benchmark_helper.rb",
+     "benchmarks/count_benchmark.rb",
+     "benchmarks/report_benchmark.rb",
+     "lib/sir_tracks_alot.rb",
+     "lib/sir_tracks_alot/activity.rb",
+     "lib/sir_tracks_alot/clock.rb",
+     "lib/sir_tracks_alot/count.rb",
+     "lib/sir_tracks_alot/event_helper.rb",
+     "lib/sir_tracks_alot/filter_helper.rb",
+     "lib/sir_tracks_alot/persistable.rb",
+     "lib/sir_tracks_alot/queue/queue_helper.rb",
+     "lib/sir_tracks_alot/queue/report_cache.rb",
+     "lib/sir_tracks_alot/queue/report_config.rb",
+     "lib/sir_tracks_alot/queue/report_queue.rb",
+     "lib/sir_tracks_alot/reports/activity_report.rb",
+     "lib/sir_tracks_alot/reports/actor_activity_report.rb",
+     "lib/sir_tracks_alot/reports/actor_report.rb",
+     "lib/sir_tracks_alot/reports/basic_report.rb",
+     "lib/sir_tracks_alot/reports/filter_report.rb",
+     "lib/sir_tracks_alot/reports/report.rb",
+     "lib/sir_tracks_alot/reports/root_stem_report.rb",
+     "lib/sir_tracks_alot/reports/simple_report.rb",
+     "lib/sir_tracks_alot/reports/target_report.rb",
+     "lib/sir_tracks_alot/reports/trackable_report.rb",
+     "lib/sir_tracks_alot/summary.rb",
+     "sir_tracks_alot.gemspec",
+     "spec/activity_spec.rb",
+     "spec/count_spec.rb",
+     "spec/queue/report_config_spec.rb",
+     "spec/queue/report_queue_spec.rb",
+     "spec/redis_spec_helper.rb",
+     "spec/reports/activity_report_spec.rb",
+     "spec/reports/actor_activity_report_spec.rb",
+     "spec/reports/actor_report_spec.rb",
+     "spec/reports/basic_report_spec.rb",
+     "spec/reports/filter_report_spec.rb",
+     "spec/reports/report_spec.rb",
+     "spec/reports/root_stem_report_spec.rb",
+     "spec/reports/shared_report_specs.rb",
+     "spec/reports/simple_report_spec.rb",
+     "spec/reports/target_report_spec.rb",
+     "spec/sir_tracks_alot_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb",
+     "test/helper.rb",
+     "test/test_sir_tracks_alot.rb",
+     "views/reports/group.html.erb",
+     "views/reports/table.html.erb"
+  ]
+  s.homepage = %q{http://github.com/flippyhead/sir_tracks_alot}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{A high speed general purpose tracking and reporting tool which uses Redis.}
+  s.test_files = [
+    "spec/activity_spec.rb",
+     "spec/count_spec.rb",
+     "spec/queue/report_config_spec.rb",
+     "spec/queue/report_queue_spec.rb",
+     "spec/redis_spec_helper.rb",
+     "spec/reports/activity_report_spec.rb",
+     "spec/reports/actor_activity_report_spec.rb",
+     "spec/reports/actor_report_spec.rb",
+     "spec/reports/basic_report_spec.rb",
+     "spec/reports/filter_report_spec.rb",
+     "spec/reports/report_spec.rb",
+     "spec/reports/root_stem_report_spec.rb",
+     "spec/reports/shared_report_specs.rb",
+     "spec/reports/simple_report_spec.rb",
+     "spec/reports/target_report_spec.rb",
+     "spec/sir_tracks_alot_spec.rb",
+     "spec/spec_helper.rb",
+     "test/helper.rb",
+     "test/test_sir_tracks_alot.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<logging>, [">= 0"])
+      s.add_runtime_dependency(%q<twitter>, [">= 0"])
+      s.add_runtime_dependency(%q<ruport>, [">= 0"])
+      s.add_runtime_dependency(%q<ohm>, ["= 0.0.38"])
+      s.add_runtime_dependency(%q<redis>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<color>, [">= 0"])
+      s.add_development_dependency(%q<rspec_hpricot_matchers>, [">= 0"])
+      s.add_development_dependency(%q<hpricot>, [">= 0"])
+    else
+      s.add_dependency(%q<logging>, [">= 0"])
+      s.add_dependency(%q<twitter>, [">= 0"])
+      s.add_dependency(%q<ruport>, [">= 0"])
+      s.add_dependency(%q<ohm>, ["= 0.0.38"])
+      s.add_dependency(%q<redis>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<color>, [">= 0"])
+      s.add_dependency(%q<rspec_hpricot_matchers>, [">= 0"])
+      s.add_dependency(%q<hpricot>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<logging>, [">= 0"])
+    s.add_dependency(%q<twitter>, [">= 0"])
+    s.add_dependency(%q<ruport>, [">= 0"])
+    s.add_dependency(%q<ohm>, ["= 0.0.38"])
+    s.add_dependency(%q<redis>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<color>, [">= 0"])
+    s.add_dependency(%q<rspec_hpricot_matchers>, [">= 0"])
+    s.add_dependency(%q<hpricot>, [">= 0"])
+  end
+end
+