visitors 0.0.8 → 0.1.0

data/config.yml

@@ -6,11 +6,9 @@ fields:
   - similar
 
 development:
-  redis_namespace: visitors_development
-  redis_config:
-    host: localhost
+  :redis_namespace: visitors_development
+  :redis_config:
+    :host: localhost
 
-uat:
-  redis_namespace: visitors_development
-  redis_config:
-    host: qa.touchlocal.com
+production:
+  :disabled: true

data/lib/visitors.rb

@@ -1,5 +1,7 @@
 $:.push File.expand_path('..', __FILE__)
+require 'bundler/setup'
 require 'visitors/helpers'
+require 'visitors/core_ext/hash'
 
 module Visitors
   extend self
@@ -7,15 +9,21 @@ module Visitors
   autoload :Config,   'visitors/config'
   autoload :Resource, 'visitors/resource'
 
+  def env
+    ENV['RAILS_ENV'] || ENV['VISITORS_ENV'] || 'development'
+  end
+
   def config
     @config ||= Config.load
   end
 
   def find(id)
+    return if Visitors.config.disabled
     Resource.find(id)
   end
 
   def increment(id, field)
+    return if Visitors.config.disabled
     Resource.new(id).increment(field)
   end
 end

data/lib/visitors/config.rb

@@ -3,6 +3,12 @@ require 'yaml'
 class Visitors::Config
   class MissingEnvironmentError < StandardError; end
 
+  DEFAULTS = {
+    :redis_namespace => "visitors_#{Visitors.env}",
+    :redis_connection => {:host => '127.0.0.1'},
+    :disabled => false
+  }
+
   def self.load
     new.tap { |instance| instance.send(:define_methods_from_yaml) }
   end
@@ -12,8 +18,8 @@ class Visitors::Config
   end
 
   def all
-    return yaml[env] if yaml[env]
-    raise MissingEnvironmentError, "#{env.inspect} environment not configured"
+    return yaml[Visitors.env] if yaml[Visitors.env]
+    raise MissingEnvironmentError, "#{Visitors.env.inspect} environment not configured"
   end
 
   def inspect
@@ -32,12 +38,8 @@ class Visitors::Config
     end
   end
 
-  def env
-    ENV['RAILS_ENV'] || ENV['VISITORS_ENV'] || 'development'
-  end
-
   def define_methods_from_yaml
-    all.each do |key, value|
+    DEFAULTS.deep_merge(all).each do |key, value|
       self.class.send(:define_method, key) { value }
     end
   end

data/lib/visitors/core_ext/hash.rb

@@ -0,0 +1,21 @@
+class Hash
+  if instance_methods.include?(:deep_merge)
+    warn 'Hash#deep_merge already defined!'
+  else
+    def deep_merge(other_hash)
+      dup.deep_merge!(other_hash)
+    end
+  end
+
+  if instance_methods.include?(:deep_merge!)
+    warn 'Hash#deep_merge! already defined!'
+  else
+    def deep_merge!(other_hash)
+      other_hash.each_pair do |k,v|
+        tv = self[k]
+        self[k] = tv.is_a?(Hash) && v.is_a?(Hash) ? tv.deep_merge(v) : v
+      end
+      self
+    end
+  end
+end

data/lib/visitors/version.rb

@@ -1,3 +1,3 @@
 module Visitors
-  VERSION = '0.0.8'
+  VERSION = '0.1.0'
 end

data/spec/visitors/config_spec.rb

@@ -3,15 +3,17 @@ require 'spec_helper'
 describe Visitors::Config do
   describe '#all' do
     it 'uses the config.yml file to return a hash of configuration information' do
+      Visitors.stub!(:env => 'development')
       File.stub!(:expand_path => '/path/to/config.yml')
+
       YAML.should_receive(:load_file).with('/path/to/config.yml').and_return('development' => {})
       Visitors::Config.load.all
     end
 
     it 'raises when an environment is not defined' do
       expect {
-	YAML.stub!(:load_file => {})
-	Visitors::Config.load.all
+        YAML.stub!(:load_file => {})
+        Visitors::Config.load.all
       }.to raise_error(Visitors::Config::MissingEnvironmentError)
     end
   end

data/spec/visitors_spec.rb

@@ -1,4 +1,23 @@
 require 'spec_helper'
 
 describe Visitors do
+  describe '#find' do
+    context 'with a disabled environment' do
+      it 'returns immediately' do
+        Visitors.config.stub!(:disabled => true)
+        Visitors::Resource.should_not_receive(:find)
+        Visitors.find(1).should be_nil
+      end
+    end
+  end
+
+  describe '#increment' do
+    context 'with a disabled environment' do
+      it 'returns immediately' do
+        Visitors.config.stub!(:disabled => true)
+        Visitors::Resource.should_not_receive(:new)
+        Visitors.increment(1, :show).should be_nil
+      end
+    end
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: visitors
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors: 
 - James Conroy-Finn
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-09 00:00:00 +00:00
+date: 2011-03-15 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -144,6 +144,7 @@ files:
 - config.yml
 - lib/visitors.rb
 - lib/visitors/config.rb
+- lib/visitors/core_ext/hash.rb
 - lib/visitors/helpers.rb
 - lib/visitors/resource.rb
 - lib/visitors/version.rb
@@ -155,6 +156,7 @@ files:
 - server.rb
 - spec/spec_helper.rb
 - spec/visitors/config_spec.rb
+- spec/visitors/helpers_spec.rb
 - spec/visitors/resource_spec.rb
 - spec/visitors_spec.rb
 - views/_form.haml
@@ -194,5 +196,6 @@ summary: All-in-one fast logging system for your Rails application
 test_files: 
 - spec/spec_helper.rb
 - spec/visitors/config_spec.rb
+- spec/visitors/helpers_spec.rb
 - spec/visitors/resource_spec.rb
 - spec/visitors_spec.rb