bushido 0.0.34 → 0.0.35

data/lib/bushido/middleware.rb

@@ -15,6 +15,8 @@ module Bushido
     end
 
     def call(env)
+      @bushido_claimed        = (ENV['BUSHIDO_CLAIMED'].nil? or ENV['BUSHIDO_CLAIMED'].blank?) ? false : true
+
       status, headers, response = @app.call(env)
       
       unless @bushido_app_name.empty?

data/lib/bushido/version.rb

@@ -1,4 +1,4 @@
 module Bushido
   # Current version of the Bushido gem 
-  VERSION = "0.0.34"
+  VERSION = "0.0.35"
 end

data/lib/engine.rb

@@ -11,8 +11,6 @@ module Bushido
       unless ENV['BUSHIDO_APP'].nil?
         app.middleware.use Bushido::Middleware
       end
-      
     end
-    
   end
 end

data/test_app/Gemfile

@@ -4,3 +4,4 @@ gem 'rails', '3.0.9'
 gem 'rspec'
 gem 'rspec-rails'
 gem 'bushido', :path => '../'
+gem 'capybara'

data/test_app/app/controllers/static_controller.rb

@@ -0,0 +1,4 @@
+class StaticController < ApplicationController
+  def home
+  end
+end

data/test_app/app/helpers/static_helper.rb

@@ -0,0 +1,2 @@
+module StaticHelper
+end

data/test_app/app/views/static/home.html.erb

@@ -0,0 +1 @@
+Homepage

data/test_app/config/routes.rb

@@ -1,5 +1,8 @@
 TestApp::Application.routes.draw do
   bushido_routes
+
+  match '/home' => 'static#home'
+
   # The priority is based upon order of creation:
   # first created -> highest priority.
 

data/test_app/spec/helpers/static_helper_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+# Specs in this file have access to a helper object that includes
+# the StaticHelper. For example:
+#
+# describe StaticHelper do
+#   describe "string concat" do
+#     it "concats two strings with spaces" do
+#       helper.concat_strings("this","that").should == "this that"
+#     end
+#   end
+# end
+describe StaticHelper do
+end

data/test_app/spec/integration/app_claim_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe 'claiming an app' do
+  it "marks claimed = false in the markup" do
+    visit "/home"
+
+    page.body.include?("var _bushido_claimed = false;").should be_true
+  end
+
+  it "marks claimed = false in the markup" do
+    preserve_envs("BUSHIDO_CLAIMED") do
+      ENV["BUSHIDO_CLAIMED"] = "true"
+      visit "/home"
+
+      page.body.include?("var _bushido_claimed = true;").should be_true
+    end
+  end
+end

data/test_app/spec/spec_helper.rb

@@ -1,9 +1,19 @@
-require File.expand_path('../boot', __FILE__)
+#require File.expand_path('../boot', __FILE__)
+require File.expand_path("../../config/environment", __FILE__)
+require 'rspec/rails'
+
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
 
 require "action_controller/railtie"
 require "action_mailer/railtie"
 require "active_resource/railtie"
 
+# Add this to load Capybara integration:
+require 'capybara/rspec'
+require 'capybara/rails'
+
 # If you have a Gemfile, require the gems listed there, including any gems
 # you've limited to :test, :development, or :production.
 Bundler.require(:default, Rails.env) if defined?(Bundler)
@@ -42,3 +52,15 @@ module TestApp
     config.filter_parameters += [:password]
   end
 end
+
+
+def preserve_envs(*keys, &block)
+  cache = {}
+  keys.each { |key| cache[key] = ENV[key] }
+
+  begin
+    yield
+  ensure
+    keys.each { |key| ENV[key] = cache[key] }
+  end
+end

data/test_app/spec/support/integration_example_group.rb

@@ -0,0 +1,35 @@
+require 'action_dispatch'
+require 'capybara/rails'
+require 'capybara/dsl'
+
+module RSpec::Rails
+  module IntegrationExampleGroup
+    extend ActiveSupport::Concern
+
+    include ActionDispatch::Integration::Runner
+    include RSpec::Rails::TestUnitAssertionAdapter
+    include ActionDispatch::Assertions
+    include Capybara::DSL
+    include RSpec::Matchers
+
+    module InstanceMethods
+      def app
+        ::Rails.application
+      end
+
+      def last_response
+        page
+      end
+    end
+
+    included do
+      before do
+        @router = ::Rails.application.routes
+      end
+    end
+
+    RSpec.configure do |c|
+      c.include self, :example_group => { :file_path => /\bspec\/integration\// }
+    end
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: bushido
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.34
+  version: 0.0.35
 platform: ruby
 authors: 
 - Sean Grove
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-26 00:00:00 -07:00
+date: 2011-07-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -112,8 +112,11 @@ files:
 - test_app/README
 - test_app/Rakefile
 - test_app/app/controllers/application_controller.rb
+- test_app/app/controllers/static_controller.rb
 - test_app/app/helpers/application_helper.rb
+- test_app/app/helpers/static_helper.rb
 - test_app/app/views/layouts/application.html.erb
+- test_app/app/views/static/home.html.erb
 - test_app/config.ru
 - test_app/config/application.rb
 - test_app/config/boot.rb
@@ -149,7 +152,10 @@ files:
 - test_app/public/stylesheets/.gitkeep
 - test_app/script/rails
 - test_app/spec/controllers/envs_controller_spec.rb
+- test_app/spec/helpers/static_helper_spec.rb
+- test_app/spec/integration/app_claim_spec.rb
 - test_app/spec/spec_helper.rb
+- test_app/spec/support/integration_example_group.rb
 - test_app/test/performance/browsing_test.rb
 - test_app/test/test_helper.rb
 - test_app/vendor/plugins/.gitkeep
@@ -189,8 +195,11 @@ test_files:
 - test_app/README
 - test_app/Rakefile
 - test_app/app/controllers/application_controller.rb
+- test_app/app/controllers/static_controller.rb
 - test_app/app/helpers/application_helper.rb
+- test_app/app/helpers/static_helper.rb
 - test_app/app/views/layouts/application.html.erb
+- test_app/app/views/static/home.html.erb
 - test_app/config.ru
 - test_app/config/application.rb
 - test_app/config/boot.rb
@@ -226,7 +235,10 @@ test_files:
 - test_app/public/stylesheets/.gitkeep
 - test_app/script/rails
 - test_app/spec/controllers/envs_controller_spec.rb
+- test_app/spec/helpers/static_helper_spec.rb
+- test_app/spec/integration/app_claim_spec.rb
 - test_app/spec/spec_helper.rb
+- test_app/spec/support/integration_example_group.rb
 - test_app/test/performance/browsing_test.rb
 - test_app/test/test_helper.rb
 - test_app/vendor/plugins/.gitkeep