carpentry 2.0.0 → 2.1.1

data/README.md

@@ -9,7 +9,7 @@ Installation
 
 Add Carpentry to Gemfile:
 
-    gem "carpentry"
+    gem "carpentry", "~> 2.1.1"
 
 Run the generator to create the prototypes folder (and inject the Carpentry route):
 
@@ -39,7 +39,7 @@ to `app/views/layouts/carpentry/prototypes.html.[format]`.
 You can customize the prototype URI prefix (`/p`) by editing the engine mount in your `roures.rb` file, for example:
 
 ```
-  mount Carpentry::Engine => "/prototype"
+  mount_carpentry_at "/prototype"
 ```
 
 Hooks

data/lib/carpentry.rb

@@ -1,8 +1,9 @@
 # require "carpentry/no_robots_middleware"
 require "carpentry/engine"
+require "carpentry/rails/routes"
+require "carpentry/no_robots_middleware"
 
 module Carpentry
   class Engine < ::Rails::Engine
-    # config.app_middleware.use NoRobotsMiddleware
   end
 end

data/lib/carpentry/engine.rb

@@ -1,9 +1,5 @@
-require File.expand_path("../no_robots_middleware", __FILE__)
-
 module Carpentry
   class Engine < ::Rails::Engine
-    isolate_namespace Carpentry
-
     initializer "carpentry.add_middleware" do |app|
       app.middleware.use Carpentry::NoRobotsMiddleware
     end

data/lib/carpentry/rails/routes.rb

@@ -0,0 +1,10 @@
+module ActionDispatch::Routing
+  class Mapper
+    def mount_carpentry_at(mount_location)
+      scope mount_location do
+        root to: "carpentry/prototypes#serve", file_path: "index", as: "carpentry_root"
+        match "/*file_path" => "carpentry/prototypes#serve", via: :get
+      end
+    end
+  end
+end

data/lib/carpentry/version.rb

@@ -1,3 +1,3 @@
 module Carpentry
-  VERSION = "2.0.0"
+  VERSION = "2.1.1"
 end

data/lib/generators/carpentry/install/install_generator.rb

@@ -7,7 +7,7 @@ module Carpentry
       end
 
       def add_carpentry_routes
-        route 'mount Carpentry::Engine => "/p"'
+        route 'mount_carpentry_at "/p"'
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carpentry
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-25 00:00:00.000000000 Z
+date: 2013-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -126,11 +126,11 @@ files:
 - app/controllers/carpentry/prototypes_controller.rb
 - lib/carpentry/engine.rb
 - lib/carpentry/no_robots_middleware.rb
+- lib/carpentry/rails/routes.rb
 - lib/carpentry/version.rb
 - lib/carpentry.rb
 - lib/generators/carpentry/install/install_generator.rb
 - lib/tasks/carpentry_tasks.rake
-- config/routes.rb
 - Rakefile
 - Gemfile
 - README.md
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -507400125341853681
+      hash: -2787984229922370110
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25

data/config/routes.rb

@@ -1,4 +0,0 @@
-Carpentry::Engine.routes.draw do
-  root to: "prototypes#serve", file_path: "index"
-  match "/*file_path" => "prototypes#serve", via: :get
-end