sasha 0.0.3 → 0.1.0

data/README.md

@@ -9,12 +9,29 @@ git? rails?
 
 ## Usage
 
-### Rails 3 or Rails 2 with Bundler
+### Rails 3
 
 Add it to your Gemfile, you are using bundler, right?
 
     gem 'sasha'
 
+### Rails 2
+
+Install the gem:
+
+    gem install sasha
+
+Add to bottom of environment.rb:
+
+    require 'sasha'
+
+### Sinatra
+
+Require it on *config.ru* after sinatra/base
+
+    require 'sinatra/base'
+    require 'sasha'
+
 ## Test it
 
     $ curl -I http://www.example.net | grep X-Git-SHA

data/lib/sasha/git.rb

@@ -0,0 +1,7 @@
+module Sasha
+  class Git
+    def self.current_sha
+      @current_sha ||= `git rev-parse HEAD`.chomp
+    end
+  end
+end

data/lib/sasha/rails.rb

@@ -0,0 +1,10 @@
+module ActionController
+  class Base
+    before_filter :set_git_sha_header
+
+    def set_git_sha_header
+      warn "No git found for current project" unless Sasha::Git.current_sha
+      headers['X-Git-SHA'] = Sasha::Git.current_sha
+    end
+  end
+end

data/lib/sasha/sinatra.rb

@@ -0,0 +1,7 @@
+module Sinatra
+  class Base
+    before do
+      headers "X-Git-SHA" => Sasha::Git.current_sha
+    end
+  end
+end

data/lib/sasha/version.rb

@@ -1,3 +1,3 @@
 module Sasha
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/lib/sasha.rb

@@ -1,17 +1,6 @@
-require 'action_controller'
-
 module Sasha
-  class Git
-    def self.current_sha
-      @current_sha ||= `git rev-parse HEAD`.chomp
-    end
-  end
+  autoload :Git, 'sasha/git'
 end
 
-class ActionController::Base
-  before_filter :set_git_sha_header
-
-  def set_git_sha_header
-    headers['X-Git-SHA'] = Sasha::Git.current_sha
-  end
-end
+require 'sasha/rails' if defined?(ActionController)
+require 'sasha/sinatra' if defined?(Sinatra)

data/test/unit/test_controller.rb

@@ -6,8 +6,15 @@ class TestController < ActionController::TestCase
   end
 
   def test_header_included_in_request
-    Sasha::Git.expects(:current_sha).returns('ABC123ABC123')
+    Sasha::Git.expects(:current_sha).twice.returns('ABC123ABC123')
     get 'index'
     assert_equal 'ABC123ABC123', response.headers['X-Git-SHA']
   end
+
+  def test_warning
+    Sasha::Git.expects(:current_sha).twice.returns(nil)
+    @controller.expects(:warn).once.with(instance_of(String))
+    get 'index'
+    assert_equal nil, response.headers['X-Git-SHA']
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sasha
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 3
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - David Padilla
@@ -75,6 +75,9 @@ files:
 - README.md
 - Rakefile
 - lib/sasha.rb
+- lib/sasha/git.rb
+- lib/sasha/rails.rb
+- lib/sasha/sinatra.rb
 - lib/sasha/version.rb
 - sasha.gemspec
 - test/test_helper.rb