all_seeing_eye 0.0.15 → 0.0.16

data/Gemfile

@@ -7,6 +7,7 @@ gem 'sinatra'
 gem 'vegas'
 gem 'activesupport', '>=2.3.12'
 gem 'i18n'
+gem 'thin'
 
 group :development do
   gem "bundler", "~> 1.0.0"

data/Gemfile.lock

@@ -3,6 +3,8 @@ GEM
   specs:
     activesupport (3.0.9)
     chronic (0.6.2)
+    daemons (1.1.4)
+    eventmachine (0.12.10)
     git (1.2.5)
     i18n (0.6.0)
     jeweler (1.6.4)
@@ -17,6 +19,10 @@ GEM
     sinatra (1.2.6)
       rack (~> 1.1)
       tilt (< 2.0, >= 1.2.2)
+    thin (1.2.11)
+      daemons (>= 1.0.9)
+      eventmachine (>= 0.12.6)
+      rack (>= 1.0.0)
     tilt (1.3.2)
     vegas (0.1.8)
       rack (>= 1.0.0)
@@ -34,4 +40,5 @@ DEPENDENCIES
   rcov
   redis
   sinatra
+  thin
   vegas

data/VERSION

@@ -1 +1 @@
-0.0.15
+0.0.16

data/all_seeing_eye.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{all_seeing_eye}
-  s.version = "0.0.15"
+  s.version = "0.0.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Josh Symonds"]
-  s.date = %q{2011-08-12}
+  s.date = %q{2011-08-15}
   s.default_executable = %q{all-seeing-eye}
   s.description = %q{AllSeeingEye observes all requests, with parameters that you specify, to Redis. Then it composes them into graphs for you to see.}
   s.email = %q{veraticus@gmail.com}
@@ -68,6 +68,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<vegas>, [">= 0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3.12"])
       s.add_runtime_dependency(%q<i18n>, [">= 0"])
+      s.add_runtime_dependency(%q<thin>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
@@ -79,6 +80,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<vegas>, [">= 0"])
       s.add_dependency(%q<activesupport>, [">= 2.3.12"])
       s.add_dependency(%q<i18n>, [">= 0"])
+      s.add_dependency(%q<thin>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
@@ -91,6 +93,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<vegas>, [">= 0"])
     s.add_dependency(%q<activesupport>, [">= 2.3.12"])
     s.add_dependency(%q<i18n>, [">= 0"])
+    s.add_dependency(%q<thin>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rcov>, [">= 0"])

data/lib/all_seeing_eye/server.rb

@@ -24,8 +24,9 @@ class AllSeeingEye
       end
 
       def url_path(*path_parts)
+        path_parts = path_parts.collect{|p| p.gsub(path_prefix, '')}
         path = [ path_prefix, path_parts ].compact.join("/")
-        ('/' + path).squeeze('/')
+        ('/' + path).squeeze('/').squeeze(path_prefix + '/')
       end
       alias_method :u, :url_path
       
@@ -75,18 +76,18 @@ class AllSeeingEye
     end
     
     get '/total' do
-      @counts = AllSeeingEye::Request.count_by_field('created_at', :start => (DateTime.now - 1.month).to_i, :stop => DateTime.now.to_i)
+      @counts = AllSeeingEye::Request.count_by_field('created_at', :start => (DateTime.now - 2.days).to_i, :stop => DateTime.now.to_i)
       show :total
     end
     
     get '/search' do
-      redirect url_path("/search/#{params[:query]}")
+      redirect url_path("/search/#{CGI::escape(params[:query])}")
     end
     
-    get '/search/:id' do
+    get %r{/search/(.*?)$} do
       @field = 'total'
-      @query = params[:id]
-      @requests = AllSeeingEye::Request.search(@query, :count => true)
+      @query = params[:captures].first
+      @counts = AllSeeingEye::Request.search(@query, :count => true)
       show :total
     end
     
@@ -101,9 +102,9 @@ class AllSeeingEye
         show :field
       end
       
-      get "/search/:id/#{field}" do
+      get %r{/search/(.*?)/#{field}$} do
         @field = field
-        @query = params[:id]
+        @query = params[:captures].first
         @requests = AllSeeingEye::Request.search(@query)
         counts = Hash.new(0)
         @requests.each {|r| next if r.send(@field.to_sym).nil?; counts[r.send(@field.to_sym)] += 1}

data/lib/all_seeing_eye/server/views/field.erb

@@ -6,7 +6,7 @@
   <% if @query %>
     <h1>Search &raquo; <%= humanize @query %> &raquo; <%= humanize @field %></h1>
   <% elsif @view %>
-    <h1><a href='/fields/<%= @field %>'><%= humanize @field %></a> &raquo; <%= humanize @id %> &raquo; <%= humanize @view %></h1>
+    <h1><a href='<%=u "/fields/<%= @field %>" %>'><%= humanize @field %></a> &raquo; <%= humanize @id %> &raquo; <%= humanize @view %></h1>
   <% else %>
     <h1><%= humanize @field %></h1>
   <% end %>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: all_seeing_eye
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 63
   prerelease: 
   segments: 
   - 0
   - 0
-  - 15
-  version: 0.0.15
+  - 16
+  version: 0.0.16
 platform: ruby
 authors: 
 - Josh Symonds
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-12 00:00:00 -05:00
+date: 2011-08-15 00:00:00 -05:00
 default_executable: all-seeing-eye
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -119,8 +119,22 @@ dependencies:
   version_requirements: *id007
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :development
+  type: :runtime
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: thin
+  version_requirements: *id008
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -132,11 +146,11 @@ dependencies:
         - 0
         version: 1.0.0
   name: bundler
-  version_requirements: *id008
+  version_requirements: *id009
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -148,11 +162,11 @@ dependencies:
         - 4
         version: 1.6.4
   name: jeweler
-  version_requirements: *id009
+  version_requirements: *id010
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -162,7 +176,7 @@ dependencies:
         - 0
         version: "0"
   name: rcov
-  version_requirements: *id010
+  version_requirements: *id011
   prerelease: false
 description: AllSeeingEye observes all requests, with parameters that you specify, to Redis. Then it composes them into graphs for you to see.
 email: veraticus@gmail.com