all_seeing_eye 0.0.6 → 0.0.7

data/Gemfile

@@ -3,6 +3,8 @@ source "http://rubygems.org"
 gem 'redis'
 gem 'chronic'
 gem 'rbtree'
+gem 'sinatra'
+gem 'vegas'
 
 group :development do
   gem "bundler", "~> 1.0.0"

data/Gemfile.lock

@@ -7,10 +7,17 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+    rack (1.2.3)
     rake (0.9.2)
     rbtree (0.3.0)
     rcov (0.9.10)
     redis (2.2.2)
+    sinatra (1.2.6)
+      rack (~> 1.1)
+      tilt (< 2.0, >= 1.2.2)
+    tilt (1.3.2)
+    vegas (0.1.8)
+      rack (>= 1.0.0)
 
 PLATFORMS
   ruby
@@ -22,3 +29,5 @@ DEPENDENCIES
   rbtree
   rcov
   redis
+  sinatra
+  vegas

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/all_seeing_eye.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{all_seeing_eye}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Josh Symonds"]
@@ -48,6 +48,7 @@ Gem::Specification.new do |s|
     "test/base_test.rb",
     "test/fixtures/all_seeing_eye.yml",
     "test/fixtures/redis-test.conf",
+    "test/fixtures/redis.yml",
     "test/model_test.rb",
     "test/test_helper.rb"
   ]
@@ -64,6 +65,8 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<redis>, [">= 0"])
       s.add_runtime_dependency(%q<chronic>, [">= 0"])
       s.add_runtime_dependency(%q<rbtree>, [">= 0"])
+      s.add_runtime_dependency(%q<sinatra>, [">= 0"])
+      s.add_runtime_dependency(%q<vegas>, [">= 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"])
@@ -71,6 +74,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<redis>, [">= 0"])
       s.add_dependency(%q<chronic>, [">= 0"])
       s.add_dependency(%q<rbtree>, [">= 0"])
+      s.add_dependency(%q<sinatra>, [">= 0"])
+      s.add_dependency(%q<vegas>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
@@ -79,6 +84,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<redis>, [">= 0"])
     s.add_dependency(%q<chronic>, [">= 0"])
     s.add_dependency(%q<rbtree>, [">= 0"])
+    s.add_dependency(%q<sinatra>, [">= 0"])
+    s.add_dependency(%q<vegas>, [">= 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.rb

@@ -1,43 +1,28 @@
-class AllSeeingEye  
-  def self.configuration(location = nil)
-    location ||= 'config'
-    @@configuration ||= if defined?(Rails)
-      YAML::load_file("#{Rails.root}/#{location}/all_seeing_eye.yml")
-    else
-      YAML::load_file("./#{location}/all_seeing_eye.yml")
-    end
-    @@configuration
+class AllSeeingEye 
+  def self.environment
+    ENV['RUBBER_ENV'] || ENV['RAILS_ENV'] || ENV['ALL_SEEING_EYE_ENV'] || 'development'
   end
-  
-  def self.redis(options = {})
-    @host, @port = options[:host], options[:port]
-    
-    unless @host && @port
+   
+  def self.configuration
+    location = ENV['ALL_SEEING_EYE_CONFIG'] || 'config'
+    @@configuration ||= Hash.new
+    @@configuration[:redis] ||=
       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
+        YAML::load_file("./#{location}/resque.yml")[AllSeeingEye.environment]
       rescue
-      end
-    
-      begin
-        redis_config = if defined?(Rails)
-          YAML::load_file("#{Rails.root}/#{location}/resque.yml")
-        else
-          YAML::load_file("./#{location}/resque.yml")
+        begin
+          YAML::load_file("./#{location}/redis.yml")[AllSeeingEye.environment]
+        rescue
+          'localhost:6379'
         end
-        @host = resque_config[ENV['RAILS_ENV']].split(':').first
-        @port = resque_config[ENV['RAILS_ENV']].split(':').first
-      rescue
       end
-    end
-    
-    @host, @port = 'localhost', 6379 unless @host && @port
-    @@redis ||= Redis.new(:host => @host, :port => @port)
+    @@configuration[:all_seeing_eye] ||= YAML::load_file("./#{location}/all_seeing_eye.yml")
+    @@configuration
+  end
+  
+  def self.redis
+    @@redis ||= Redis.new(:host => AllSeeingEye.configuration[:redis].split(':').first,
+                          :port => AllSeeingEye.configuration[:redis].split(':').last)
   end
 end
 

data/lib/all_seeing_eye/model.rb

@@ -10,7 +10,7 @@ class AllSeeingEye::Model
   end
   
   def self.fields
-    AllSeeingEye.configuration[self.model_name]
+    AllSeeingEye.configuration[:all_seeing_eye][self.model_name]
   end
   
   def self.field_keys

data/lib/all_seeing_eye/server.rb

@@ -23,7 +23,7 @@ class AllSeeingEye
       end
 
       def url_path(*path_parts)
-        [ path_prefix, path_parts ].join("/").squeeze('/')
+        [ path_prefix, path_parts ].compact.join("/").squeeze('/')
       end
       alias_method :u, :url_path
       

data/test/base_test.rb

@@ -1,8 +1,12 @@
 require 'test_helper'
 
 context 'with the base class' do
+  test 'get the environment' do
+    assert 'test', AllSeeingEye.environment
+  end
+  
   test 'load the configuration' do
-    assert AllSeeingEye.configuration['model']
+    assert AllSeeingEye.configuration[:all_seeing_eye]['model']
   end
   
   test 'connect to Redis' do

data/test/fixtures/redis.yml

@@ -0,0 +1 @@
+test: localhost:9736

data/test/test_helper.rb

@@ -5,6 +5,8 @@ $LOAD_PATH.unshift dir + '/../lib'
 require 'test/unit'
 require 'yaml'
 require 'all_seeing_eye'
+ENV['ALL_SEEING_EYE_ENV'] = 'test'
+ENV['ALL_SEEING_EYE_CONFIG'] = 'test/fixtures'
 
 if !system("which redis-server")
   puts '', "** can't find `redis-server` in your path"
@@ -30,9 +32,6 @@ end
 
 puts "Starting redis for testing at localhost:9736..."
 `redis-server #{dir}/fixtures/redis-test.conf`
-AllSeeingEye.redis(:host => 'localhost', :port => 9736)
-
-AllSeeingEye.configuration('test/fixtures')
 
 ##
 # test/spec/mini 3

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: all_seeing_eye
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Josh Symonds
@@ -61,8 +61,36 @@ dependencies:
   version_requirements: *id003
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :development
+  type: :runtime
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: sinatra
+  version_requirements: *id004
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: vegas
+  version_requirements: *id005
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -74,11 +102,11 @@ dependencies:
         - 0
         version: 1.0.0
   name: bundler
-  version_requirements: *id004
+  version_requirements: *id006
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -90,11 +118,11 @@ dependencies:
         - 4
         version: 1.6.4
   name: jeweler
-  version_requirements: *id005
+  version_requirements: *id007
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -104,7 +132,7 @@ dependencies:
         - 0
         version: "0"
   name: rcov
-  version_requirements: *id006
+  version_requirements: *id008
   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
@@ -145,6 +173,7 @@ files:
 - test/base_test.rb
 - test/fixtures/all_seeing_eye.yml
 - test/fixtures/redis-test.conf
+- test/fixtures/redis.yml
 - test/model_test.rb
 - test/test_helper.rb
 has_rdoc: true