all_seeing_eye 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/all_seeing_eye.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{all_seeing_eye}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Josh Symonds"]

data/lib/all_seeing_eye/model.rb

@@ -18,7 +18,7 @@ class AllSeeingEye::Model
   end
   
   def self.field_names
-    (self.field_keys + ['created_at', 'time_spent']).flatten
+    (self.field_keys + ['created_at']).flatten
   end
   
   def self.new(fields = {})

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

@@ -2,7 +2,7 @@
   <% if @id %>
     <div id='left'>
       <ul>
-        <li class=<%= current_page.split(CGI.escape(@id))[1] ? '' : 'current' %>><a href="/fields/<%= @field %>/<%= CGI.escape(@id) %>">Total</a></li>
+        <li class=<%= current_page.split(CGI.escape(@id))[1] ? '' : 'current' %>><a href="<%= u "/fields/#{@field}/#{CGI.escape(@id)} " %>">Total</a></li>
         <% (tabs - [@field]).each do |t| %>
           <%= tab t, "fields/#{@field}/#{CGI.escape(@id)}" %>
         <% end %>

data/lib/all_seeing_eye/server.rb

@@ -23,9 +23,13 @@ class AllSeeingEye
       end
 
       def url_path(*path_parts)
-        [ path_parts ].join("/").squeeze('/')
+        [ path_prefix, path_parts ].join("/").squeeze('/')
       end
       alias_method :u, :url_path
+      
+      def path_prefix
+        ENV['PATH_PREFIX']
+      end
 
       def class_if_current(path = '')
         'class="current"' if current_page.split('/').any?{|p| p == path}

data/lib/all_seeing_eye.rb

@@ -9,29 +9,31 @@ class AllSeeingEye
     @@configuration
   end
   
-  def self.redis
-    @host, @port = nil
+  def self.redis(options = {})
+    @host, @port = options[:host], options[:port]
     
-    begin
-      resque_config = if defined?(Rails)
-        YAML::load_file("#{Rails.root}/#{location}/resque.yml")
-      else
-        YAML::load_file("./#{location}/resque.yml")
+    unless @host && @port
+      begin
+        resque_config = if defined?(Rails)
+          YAML::load_file("#{Rails.root}/#{location}/resque.yml")
+        else
+          YAML::load_file("./#{location}/resque.yml")
+        end
+        @host = resque_config[ENV['RAILS_ENV']].split(':').first
+        @port = resque_config[ENV['RAILS_ENV']].split(':').first
+      rescue
       end
-    rescue
-      @host = resque_config[ENV['RAILS_ENV']].split(':').first
-      @port = resque_config[ENV['RAILS_ENV']].split(':').first
-    end
     
-    begin
-      redis_config = if defined?(Rails)
-        YAML::load_file("#{Rails.root}/#{location}/resque.yml")
-      else
-        YAML::load_file("./#{location}/resque.yml")
+      begin
+        redis_config = if defined?(Rails)
+          YAML::load_file("#{Rails.root}/#{location}/resque.yml")
+        else
+          YAML::load_file("./#{location}/resque.yml")
+        end
+        @host = resque_config[ENV['RAILS_ENV']].split(':').first
+        @port = resque_config[ENV['RAILS_ENV']].split(':').first
+      rescue
       end
-    rescue
-      @host = resque_config[ENV['RAILS_ENV']].split(':').first
-      @port = resque_config[ENV['RAILS_ENV']].split(':').first
     end
     
     @host, @port = 'localhost', 6379 unless @host && @port

data/test/model_test.rb

@@ -20,7 +20,7 @@ context 'class methods without setup' do
   end
   
   test 'models should get field names' do
-    assert_equal ["uri", "action", "ip", "controller", "browser", "status", "created_at", "time_spent"],
+    assert_equal ["uri", "action", "ip", "controller", "browser", "status", "time_spent", "created_at"],
       AllSeeingEye::Model.field_names
   end
   
@@ -229,7 +229,7 @@ context 'many objects' do
     @time = Time.now
     
     2000.times do |n|
-      instance_variable_set("@obj#{n}".to_sym, AllSeeingEye::Model.create(:uri => '/', :ip => '127.0.0.1', :created_at => @time - (n * (1999 - n)).minutes))
+      instance_variable_set("@obj#{n}".to_sym, AllSeeingEye::Model.create(:uri => '/', :ip => '127.0.0.1', :created_at => @time - (n * (1999 - n)) * 60))
     end
   end
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: all_seeing_eye
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Josh Symonds