engine_of_war 1.3.0 → 1.4.0

data/engine_of_war.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "RedCloth"
   gem.add_dependency "rdiscount"
   gem.add_dependency "coffee-script"
+  gem.add_dependency "rack-google-analytics"
 
   gem.add_development_dependency "yard"
   gem.add_development_dependency "rake"

data/lib/engine_of_war/app.rb

@@ -8,18 +8,37 @@ class EngineOfWar::App < Sinatra::Base
   end
 
   disable :show_exceptions
-  set :haml,        format: :html5
-  set :scss,        Compass.sass_engine_options
-  set :github_info, nil
-  set :site_title,  nil
+  set :haml,                  format: :html5
+  set :scss,                  Compass.sass_engine_options
+  set :github_info,           nil
+  set :site_title,            nil
+  set :google_analytics_key,  nil
+
   set :config do
     File.expand_path(root + '/config/')
   end
 
+  def self.google_analytics_key=(key)
+    use Rack::GoogleAnalytics, :tracker => key
+  end
+
   def render_page_with_layout(page)
     render_page(page, layout: "layouts/#{page.layout}", layout_engine: :haml)
   end
 
+  helpers do
+    def render_page(page, opts = {})
+      opts[:locals] ||= {}
+      opts[:locals][:meta] = page.meta
+      opts[:locals][:page] = page
+      send(page.engine, page.source, opts)
+    end
+ 
+    def collection(dir)
+      EngineOfWar::PageCollection.new(dir)
+    end
+  end
+
   error(500) { haml :"500" }
   error(404) { haml :"404" }
 
@@ -62,17 +81,4 @@ class EngineOfWar::App < Sinatra::Base
     content_type ext
     render :"#{name}", :layout => false
   end
-
-  helpers do
-    def render_page(page, opts = {})
-      opts[:locals] ||= {}
-      opts[:locals][:meta] = page.meta
-      opts[:locals][:page] = page
-      send(page.engine, page.source, opts)
-    end
- 
-    def collection(dir)
-      EngineOfWar::PageCollection.new(dir)
-    end
-  end
 end

data/lib/engine_of_war/version.rb

@@ -1,3 +1,3 @@
 module EngineOfWar
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

data/lib/engine_of_war.rb

@@ -1,4 +1,5 @@
 require 'sinatra'
+require 'rack/google-analytics'
 require 'compass'
 require "builder"
 require 'haml'

data/spec/atom_spec.rb

@@ -4,7 +4,7 @@ require "spec_helper"
 
 describe "Given some blog posts" do
   before do
-    Capybara.app.settings.site_title = "The Great Bambino"
+    Capybara.app.site_title = "The Great Bambino"
     create_template("posts/a_post.html.haml", 
                     <<-EOF)
                       ---

data/spec/error_pages_spec.rb

@@ -1,8 +1,15 @@
 require "spec_helper"
 
 describe "when not raising errors" do
-  before { Capybara.app.disable :raise_errors }
-  after  { Capybara.app.enable :raise_errors }
+  before do
+    Capybara.app.disable :raise_errors
+    Capybara.app.disable :show_exceptions
+  end
+
+  after do
+    Capybara.app.enable :raise_errors 
+    Capybara.app.enable :show_exceptions
+  end
 
   describe "given a /public/500.html page" do
     before { create_template("500.haml", "Bam") }

data/spec/page_spec.rb

@@ -27,14 +27,14 @@ describe "Given a textile file without frontmatter, Page" do
   its(:engine) { should == :textile }
 
   context "when github is configured" do
-    before { EngineOfWar::App.set :github_info, "foo/bar" }
+    before { Capybara.app.github_info = "foo/bar" }
     its(:github_edit_url) do 
       should == "https://github.com/foo/bar/edit/master/views/file.html.textile" 
     end
   end
 
   context "when github is not configured" do
-    before { EngineOfWar::App.set :github_info, nil }
+    before { Capybara.app.github_info = nil }
     it ".github_edit_url should raise" do
       lambda { subject.github_edit_url }.should raise_error
     end
@@ -84,7 +84,7 @@ describe "Given a file with front matter" do
     its(:source) { should match("%h1 This is a post.") }
     its(:source) { should_not match("Title for this post") }
     context "when github is configured" do
-      before { EngineOfWar::App.set :github_info, "foo/bar" }
+      before { Capybara.app.github_info = "foo/bar" }
       its(:github_edit_url) do 
         should == "https://github.com/foo/bar/edit/master/views/file.html.haml" 
       end

data/spec/root_spec.rb

@@ -2,7 +2,14 @@ require "spec_helper"
 
 describe "given a layout" do
   before do
-    create_template("layouts/application.html.haml", "%h1 Layout\n= yield")
+    create_template("layouts/application.html.haml", <<-EOP)
+                    %html
+                      %head
+                      %body
+                        %h1 Layout
+                        = yield
+                    EOP
+
   end
 
   describe "and a haml template named index.html.haml" do
@@ -19,6 +26,19 @@ describe "given a layout" do
         page.should have_selector('h1:contains("Layout")')
       end
     end
+
+    context "with google analytics configured" do
+      before { Capybara.app.google_analytics_key = "UA-xxxxxx-x" }
+
+      context "on GET to /" do
+        before { visit "/" }
+
+        it "renders the google analytics JS" do
+          page.should have_selector('script[type="text/javascript"]:contains("google-analytics.com")')
+          page.should have_selector('script[type="text/javascript"]:contains("UA-xxxxxx-x")')
+        end
+      end
+    end
   end
 end
 

data/spec/spec_helper.rb

@@ -5,21 +5,18 @@ require 'capybara/rspec'
 require "engine_of_war.rb"
 
 Capybara.app = EngineOfWar::App
-
-EngineOfWar::App.set     :root,  "/tmp/engine-#{$$}"
-EngineOfWar::App.enable  :raise_errors
-EngineOfWar::App.disable :show_exceptions
+Capybara.app.set :root,  "/tmp/engine-#{$$}"
 
 def create_template(path, content)
-  create_file "#{EngineOfWar::App.settings.views}/#{path}", content.unindent
+  create_file "#{Capybara.app.settings.views}/#{path}", content.unindent
 end
 
 def create_asset(path, content)
-  create_file "#{EngineOfWar::App.settings.public_folder}/#{path}", content.unindent
+  create_file "#{Capybara.app.settings.public_folder}/#{path}", content.unindent
 end
 
 def create_config(path, content)
-  create_file "#{EngineOfWar::App.settings.config}/#{path}", content.unindent
+  create_file "#{Capybara.app.settings.config}/#{path}", content.unindent
 end
 
 def create_file(path, content)
@@ -30,19 +27,19 @@ def create_file(path, content)
 end
 
 def show_files
-  pp Dir[File.join(File.dirname(EngineOfWar::App.settings.views), "**", "*")]
+  pp Dir[File.join(File.dirname(Capybara.app.settings.views), "**", "*")]
 end
 
 def create_dirs
-  FileUtils.mkdir_p(EngineOfWar::App.settings.views)
-  FileUtils.mkdir_p(EngineOfWar::App.settings.public_folder)
-  FileUtils.mkdir_p(EngineOfWar::App.settings.config)
+  FileUtils.mkdir_p(Capybara.app.settings.views)
+  FileUtils.mkdir_p(Capybara.app.settings.public_folder)
+  FileUtils.mkdir_p(Capybara.app.settings.config)
 end
 
 def remove_dirs
-  FileUtils.rm_rf(EngineOfWar::App.settings.views)
-  FileUtils.rm_rf(EngineOfWar::App.settings.public_folder)
-  FileUtils.rm_rf(EngineOfWar::App.settings.config)
+  FileUtils.rm_rf(Capybara.app.settings.views)
+  FileUtils.rm_rf(Capybara.app.settings.public_folder)
+  FileUtils.rm_rf(Capybara.app.settings.config)
 end
 
 RSpec.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engine_of_war
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-23 00:00:00.000000000 Z
+date: 2012-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70287796203920 !ruby/object:Gem::Requirement
+  requirement: &70269693381840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70287796203920
+  version_requirements: *70269693381840
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &70287796203500 !ruby/object:Gem::Requirement
+  requirement: &70269693381420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70287796203500
+  version_requirements: *70269693381420
 - !ruby/object:Gem::Dependency
   name: padrino
-  requirement: &70287796203040 !ruby/object:Gem::Requirement
+  requirement: &70269693380960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70287796203040
+  version_requirements: *70269693380960
 - !ruby/object:Gem::Dependency
   name: active_support
-  requirement: &70287796202620 !ruby/object:Gem::Requirement
+  requirement: &70269693380540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70287796202620
+  version_requirements: *70269693380540
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70287796202200 !ruby/object:Gem::Requirement
+  requirement: &70269693380120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70287796202200
+  version_requirements: *70269693380120
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70287796201780 !ruby/object:Gem::Requirement
+  requirement: &70269693379700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70287796201780
+  version_requirements: *70269693379700
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70287796201280 !ruby/object:Gem::Requirement
+  requirement: &70269693379200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 3.1.7
   type: :runtime
   prerelease: false
-  version_requirements: *70287796201280
+  version_requirements: *70269693379200
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &70287796200860 !ruby/object:Gem::Requirement
+  requirement: &70269693378780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70287796200860
+  version_requirements: *70269693378780
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70287796200400 !ruby/object:Gem::Requirement
+  requirement: &70269693378320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70287796200400
+  version_requirements: *70269693378320
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &70287796199980 !ruby/object:Gem::Requirement
+  requirement: &70269693377900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70287796199980
+  version_requirements: *70269693377900
+- !ruby/object:Gem::Dependency
+  name: rack-google-analytics
+  requirement: &70269693377480 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70269693377480
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70287796199560 !ruby/object:Gem::Requirement
+  requirement: &70269693377060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70287796199560
+  version_requirements: *70269693377060
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70287796199120 !ruby/object:Gem::Requirement
+  requirement: &70269693376640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70287796199120
+  version_requirements: *70269693376640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70287796198700 !ruby/object:Gem::Requirement
+  requirement: &70269693376220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70287796198700
+  version_requirements: *70269693376220
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70287796198280 !ruby/object:Gem::Requirement
+  requirement: &70269693375800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70287796198280
+  version_requirements: *70269693375800
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70287796197860 !ruby/object:Gem::Requirement
+  requirement: &70269693375380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +186,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70287796197860
+  version_requirements: *70269693375380
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &70287796197440 !ruby/object:Gem::Requirement
+  requirement: &70269693374960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +197,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70287796197440
+  version_requirements: *70269693374960
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
-  requirement: &70287796197020 !ruby/object:Gem::Requirement
+  requirement: &70269693374540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,7 +208,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70287796197020
+  version_requirements: *70269693374540
 description: Semi-static site engine.
 email:
 - us@thunderboltlabs.com
@@ -252,7 +263,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1331396465721998580
+      hash: -3177996844443617288
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -261,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1331396465721998580
+      hash: -3177996844443617288
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11