rails_pages 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c868c2add079ac10f1a6fa9d245f81e0bc93c12c
-  data.tar.gz: 3ad0ed3082e87e83d189fbcda2e6b681128e5f09
+  metadata.gz: d8ab66cbd0caae12d860e511c514c9818d494f63
+  data.tar.gz: 2ac04cc6496aa1e8bf583355a85a7a9b2d5a5f8c
 SHA512:
-  metadata.gz: 1eb32c9da657d0f486456e04af0f36898fa9d3032a25aa4596d9f02d8aaa3a57cb6ce62610bb5547577b8338168d01e3254b06ec5b1b670dc0b64ce15d5e12cc
-  data.tar.gz: 775a55ac815fad89fed233cf15b9f43e00beb11a7f604916d4731857395c7132134fe4049ab7956f7c808314d66885ccf85a9517ccff4461e8455b2292f31b60
+  metadata.gz: a988284e2bce192a5a68776889d243aab51e732c09fb6223470e268deb183b8f2c06c66a34feef68e138e83ec8940346d3f04a6e1edeaa8953d50ed394cf0e5e
+  data.tar.gz: d2e1602f8142b9bfebe79d04ad75b4eaa1addaf41e25a35ebe7a3f01989dd642eb9614d8f163ca9f0cf7512b4ec42f583d32f44b5ae3bc3b7a1f1dae31778956

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rails_pages (0.0.3)
+    rails_pages (0.0.4)
       rails (~> 4.0.0)
 
 GEM
@@ -31,17 +31,17 @@ GEM
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    arel (4.0.0)
+    arel (4.0.1)
     atomic (1.1.14)
     builder (3.1.4)
-    diff-lcs (1.2.4)
+    diff-lcs (1.2.5)
     erubis (2.7.0)
     hike (1.2.3)
     i18n (0.6.5)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.25)
+    mime-types (1.25.1)
     minitest (4.7.5)
     multi_json (1.8.1)
     polyglot (0.3.3)
@@ -61,24 +61,25 @@ GEM
       activesupport (= 4.0.0)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.1.0)
-    rspec-core (2.14.5)
-    rspec-expectations (2.14.3)
+    rake (10.1.1)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.3)
-    rspec-rails (2.14.0)
+    rspec-mocks (2.14.4)
+    rspec-rails (2.14.1)
       actionpack (>= 3.0)
+      activemodel (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    sprockets (2.10.0)
+    sprockets (2.10.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.0.0)
+    sprockets-rails (2.0.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
@@ -95,7 +96,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.3.5)
+  bundler (~> 1.5.1)
   rails_pages!
-  rake (~> 10.1.0)
-  rspec-rails (~> 2.14.0)
+  rake (~> 10.1.1)
+  rspec-rails (~> 2.14.1)

data/README.md

@@ -8,7 +8,7 @@ Static pages on Rails.
 
 ## Installation
 
-```
+```bash
 $ gem install rails_pages
 ```
 
@@ -21,9 +21,9 @@ gem 'rails_pages'
 
 Create static pages:
 
-```
-$ mkdir app/views/rails_pages
-$ touch app/views/rails_pages/page.html.erb
+```bash
+$ mkdir app/views/rails_pages/pages
+$ touch app/views/rails_pages/pages/page.html.erb
 ```
 
 Visit pages `http://localhost:3000/pages/page`.
@@ -32,11 +32,11 @@ Default behavior accepts nested page directory structures using `:constraints`.
 
 ### Generating resources
 
-```
+```bash
 $ rails generate rails_pages:scaffold products
 ```
 
-Would generate the following:
+Would create the following:
 
 ```ruby
 # app/controllers/products_controller.rb
@@ -60,7 +60,7 @@ resources :products,
 
 Create static pages:
 
-```
+```bash
 $ mkdir app/views/products
 $ touch app/views/products/product.html.erb
 ```
@@ -69,22 +69,22 @@ Visit pages `http://localhost:3000/products/product`.
 
 ## Routing
 
-Add root page:
+Create root page:
 
-```
-$ touch app/views/rails_pages/home.html.erb
+```bash
+$ touch app/views/rails_pages/pages/home.html.erb
 ```
 
 ```ruby
 # config/routes.rb
-root 'rails_pages#show', :id => 'home'
+root 'rails_pages/pages#show', :id => 'home'
 ```
 
 Use top-level routes:
 
 ```ruby
 # config/routes.rb
-get '/:id' => 'rails_pages#show',
+get '/:id' => 'rails_pages/pages#show',
   :as          => :page,
   :format      => false,
   :constraints => { :id => /.+?/ }

data/lib/generators/rails_pages/helper/helper_generator.rb

@@ -3,7 +3,7 @@ module RailsPages
     class HelperGenerator < Rails::Generators::NamedBase
       source_root File.expand_path('../templates', __FILE__)
 
-      def create_controller
+      def create_helper
         template 'helper.rb', File.join('app/helpers', "#{plural_name}_helper.rb")
       end
     end

data/lib/generators/rails_pages/resource_route/resource_route_generator.rb

@@ -3,7 +3,7 @@ module RailsPages
     class ResourceRouteGenerator < Rails::Generators::NamedBase
       source_root File.expand_path('../', __FILE__)
 
-      def insert_resource_route
+      def create_resource_route
         route "resources :#{plural_name}, :only => :show, :format => false, :constraints => { :id => /.+?/ }"
       end
     end

data/lib/rails_pages/engine.rb

@@ -1,5 +1,4 @@
 module RailsPages
   class Engine < ::Rails::Engine
-    isolate_namespace RailsPages
   end
 end

data/lib/rails_pages/version.rb

@@ -1,3 +1,3 @@
 module RailsPages
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/rails_pages.gemspec

@@ -16,9 +16,9 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- spec/*`.split("\n")
   s.require_paths = ['lib']
 
-  s.add_dependency 'rails', '~> 4.0.0'
+  s.add_runtime_dependency 'rails', '~> 4.0.0'
 
-  s.add_development_dependency 'bundler', '~> 1.3.5'
-  s.add_development_dependency 'rake', '~> 10.1.0'
-  s.add_development_dependency 'rspec-rails', '~> 2.14.0'
+  s.add_development_dependency 'bundler', '~> 1.5.1'
+  s.add_development_dependency 'rake', '~> 10.1.1'
+  s.add_development_dependency 'rspec-rails', '~> 2.14.1'
 end

data/spec/controllers/pages_controller_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe RailsPages::PagesController do
   describe 'GET /pages/page' do
-    before { get :show, :id => 'page' }
+    subject(:response) { get :show, :id => 'page' }
 
     it 'responds successfully with an HTTP 200 status code' do
       expect(response).to be_success
@@ -19,7 +19,7 @@ describe RailsPages::PagesController do
   end
 
   describe 'GET /pages/nested/page' do
-    before { get :show, :id => 'nested/page' }
+    subject(:response) { get :show, :id => 'nested/page' }
 
     it 'responds successfully with an HTTP 200 status code' do
       expect(response).to be_success
@@ -27,7 +27,7 @@ describe RailsPages::PagesController do
     end
 
     it 'renders requested template' do
-      expect(response).to render_template('page')
+      expect(response).to render_template('nested/page')
     end
 
     it 'inherits layout from ApplicationController' do

data/spec/dummy/bin/bundle

@@ -1,4 +1,3 @@
 #!/usr/bin/env ruby
-
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 load Gem.bin_path('bundler', 'bundle')

data/spec/dummy/bin/rails

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-
 APP_PATH = File.expand_path('../../config/application',  __FILE__)
 require_relative '../config/boot'
 require 'rails/commands'

data/spec/dummy/bin/rake

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-
 require_relative '../config/boot'
 require 'rake'
 Rake.application.run

data/spec/integration/controller_generator_spec.rb

@@ -9,7 +9,7 @@ describe RailsPages::Generators::ControllerGenerator do
       Dir.chdir(destination) { %x(rails generate rails_pages:controller test) }
     end
 
-    describe 'tests_controller.rb' do
+    describe 'controller' do
       it 'should exist' do
         expect(File.exist? "#{destination}/app/controllers/tests_controller.rb").to be_true
       end
@@ -21,7 +21,7 @@ describe RailsPages::Generators::ControllerGenerator do
       Dir.chdir(destination) { %x(rails destroy rails_pages:controller test) }
     end
 
-    describe 'tests_controller.rb' do
+    describe 'controller' do
       it 'should not exist' do
         expect(File.exist? "#{destination}/app/controllers/tests_controller.rb").to be_false
       end

data/spec/integration/helper_generator_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'generators/rails_pages/helper/helper_generator'
 
-describe RailsPages::Generators::ControllerGenerator do
+describe RailsPages::Generators::HelperGenerator do
   destination = File.expand_path('../../dummy', __FILE__)
 
   context 'generate' do
@@ -9,7 +9,7 @@ describe RailsPages::Generators::ControllerGenerator do
       Dir.chdir(destination) { %x(rails generate rails_pages:helper test) }
     end
 
-    describe 'tests_helper.rb' do
+    describe 'helper' do
       it 'should exist' do
         expect(File.exist? "#{destination}/app/helpers/tests_helper.rb").to be_true
       end
@@ -21,7 +21,7 @@ describe RailsPages::Generators::ControllerGenerator do
       Dir.chdir(destination) { %x(rails destroy rails_pages:helper test) }
     end
 
-    describe 'tests_helper.rb' do
+    describe 'helper' do
       it 'should not exist' do
         expect(File.exist? "#{destination}/app/helpers/tests_helper.rb").to be_false
       end

data/spec/integration/resource_route_generator_spec.rb

@@ -9,8 +9,8 @@ describe RailsPages::Generators::ResourceRouteGenerator do
       Dir.chdir(destination) { %x(rails generate rails_pages:resource_route test) }
     end
 
-    describe 'resources :tests' do
-      it 'should be defined' do
+    describe 'resource route' do
+      it 'should exist' do
         expect(File.read "#{destination}/config/routes.rb").to include(
           "resources :tests, :only => :show, :format => false, :constraints => { :id => /.+?/ }"
         )
@@ -23,8 +23,8 @@ describe RailsPages::Generators::ResourceRouteGenerator do
       Dir.chdir(destination) { %x(rails destroy rails_pages:resource_route test) }
     end
 
-    describe 'resources :tests' do
-      it 'should not be defined' do
+    describe 'resource route' do
+      it 'should not exist' do
         expect(File.read "#{destination}/config/routes.rb").to_not include(
           "resources :tests, :only => :show, :format => false, :constraints => { :id => /.+?/ }"
         )

data/spec/integration/scaffold_generator_spec.rb

@@ -9,21 +9,23 @@ describe RailsPages::Generators::ScaffoldGenerator do
       Dir.chdir(destination) { %x(rails generate rails_pages:scaffold test) }
     end
 
-    describe 'tests_controller.rb' do
+    describe 'controller' do
       it 'should exist' do
         expect(File.exist? "#{destination}/app/controllers/tests_controller.rb").to be_true
       end
     end
 
-    describe 'tests_helper.rb' do
+    describe 'helper' do
       it 'should exist' do
         expect(File.exist? "#{destination}/app/helpers/tests_helper.rb").to be_true
       end
     end
 
-    describe 'resources :tests' do
-      it 'should be defined' do
-        expect(File.read "#{destination}/config/routes.rb").to include('resources :tests')
+    describe 'resource route' do
+      it 'should exist' do
+        expect(File.read "#{destination}/config/routes.rb").to include(
+          "resources :tests, :only => :show, :format => false, :constraints => { :id => /.+?/ }"
+        )
       end
     end
   end
@@ -33,21 +35,23 @@ describe RailsPages::Generators::ScaffoldGenerator do
       Dir.chdir(destination) { %x(rails destroy rails_pages:scaffold test) }
     end
 
-    describe 'tests_controller.rb' do
+    describe 'controller' do
       it 'should not exist' do
         expect(File.exist? "#{destination}/app/controllers/tests_controller.rb").to be_false
       end
     end
 
-    describe 'tests_helper.rb' do
+    describe 'helper' do
       it 'should not exist' do
         expect(File.exist? "#{destination}/app/helpers/tests_helper.rb").to be_false
       end
     end
 
-    describe 'resources :tests' do
-      it 'should not be defined' do
-        expect(File.read "#{destination}/config/routes.rb").to_not include('resources :tests')
+    describe 'resource route' do
+      it 'should not exist' do
+        expect(File.read "#{destination}/config/routes.rb").to_not include(
+          "resources :tests, :only => :show, :format => false, :constraints => { :id => /.+?/ }"
+        )
       end
     end
   end

data/spec/rails_pages/configuration_spec.rb

@@ -1,21 +1,19 @@
 require 'spec_helper'
 
 describe RailsPages::Configuration do
-  describe 'default_routes' do
-    context 'enabled' do
-      it 'returns true' do
-        expect(RailsPages.configuration.default_routes).to be_true
-      end
+  describe 'default routes' do
+    it 'returns true' do
+      expect(RailsPages.configuration.default_routes).to be_true
     end
+  end
 
-    context 'disabled' do
-      before do
-        RailsPages.configure { |c| c.default_routes = false }
-      end
+  describe 'default routes disabled' do
+    before(:all) do
+      RailsPages.configure { |c| c.default_routes = false }
+    end
 
-      it 'returns false' do
-        expect(RailsPages.configuration.default_routes).to be_false
-      end
+    it 'returns false' do
+      expect(RailsPages.configuration.default_routes).to be_false
     end
   end
 end

data/spec/routing/routes_spec.rb

@@ -1,94 +1,82 @@
 require 'spec_helper'
 
 describe 'routing' do
-  context 'default' do
-    describe 'pages' do
-      it "routes '/pages/:id' to 'rails_pages/pages#show'" do
-        expect(:get => '/pages/page').to route_to(
-          :controller => 'rails_pages/pages',
-          :action     => 'show',
-          :id         => 'page'
-        )
-      end
+  describe 'default routes' do
+    before(:all) do
+      RailsPages.configure { |c| c.default_routes = true }
+      Rails.application.reload_routes!
+    end
 
-      it 'generates page_path helper' do
-        expect(page_path 'page').to eq('/pages/page')
-      end
+    after(:all) { Rails.application.reload_routes! }
+
+    it 'generates resource route' do
+      expect(page_path 'page').to eq('/pages/page')
     end
 
-    describe 'nested pages' do
-      it "routes '/pages/nested/:id' to 'rails_pages/pages#show'" do
-        expect(:get => '/pages/nested/page').to route_to(
-          :controller => 'rails_pages/pages',
-          :action     => 'show',
-          :id         => 'nested/page'
-        )
-      end
+    it 'generates nested resource route' do
+      expect(page_path 'nested/page').to eq('/pages/nested/page')
+    end
 
-      it 'generates page_path helper' do
-        expect(page_path 'nested/page').to eq('/pages/nested/page')
-      end
+    it 'recognizes route' do
+      expect(:get => '/pages/page').to be_routable
+    end
+
+    it 'recognizes nested route' do
+      expect(:get => '/pages/nested/page').to be_routable
     end
   end
 
-  context 'root' do
-    before do
-      Rails.application.routes.draw do
-        get '/:id' => 'rails_pages/pages#show',
-          :as          => :page,
-          :format      => false,
-          :constraints => { :id => /.+?/ }
-      end
+  describe 'default routes disabled' do
+    before(:all) do
+      RailsPages.configure { |c| c.default_routes = false }
+      Rails.application.reload_routes!
     end
 
-    describe 'pages' do
-      it "routes '/:id' to 'rails_pages/pages#show'" do
-        expect(:get => '/page').to route_to(
-          :controller => 'rails_pages/pages',
-          :action     => 'show',
-          :id         => 'page'
-        )
-      end
+    after(:all) { Rails.application.reload_routes! }
 
-      it 'generates page_path helper' do
-        expect(page_path 'page').to eq('/page')
-      end
+    it 'does not generate resource route' do
+      expect { page_path 'page' }.to raise_error(NameError)
     end
 
-    describe 'nested pages' do
-      it "routes '/nested/:id' to 'rails_pages/pages#show'" do
-        expect(:get => '/nested/page').to route_to(
-          :controller => 'rails_pages/pages',
-          :action     => 'show',
-          :id         => 'nested/page'
-        )
-      end
+    it 'does not generate nested resource route' do
+      expect { page_path 'pages/page' }.to raise_error(NameError)
+    end
 
-      it 'generates page_path helper' do
-        expect(page_path 'nested/page').to eq('/nested/page')
-      end
+    it 'does not recognize route' do
+      expect(:get => '/pages/page').not_to be_routable
     end
 
-    after do
-      Rails.application.reload_routes!
+    it 'does not recognize nested route' do
+      expect(:get => '/pages/nested/page').not_to be_routable
     end
   end
 
-  context 'disabled' do
-    before do
-      RailsPages.configure { |c| c.default_routes = false }
+  describe 'root routes' do
+    before(:all) do
+      Rails.application.routes.draw do
+        get '/:id' => 'rails_pages/pages#show',
+          :as          => :page,
+          :format      => false,
+          :constraints => { :id => /.+?/ }
+      end
     end
 
-    describe 'pages' do
-      it "does not route '/:id'" do
-        expect(:get => '/page').not_to be_routable
-      end
+    after(:all) { Rails.application.reload_routes! }
+
+    it 'generates resource route' do
+      expect(page_path 'page').to eq('/page')
     end
 
-    describe 'nested pages' do
-      it "does not route '/nested/:id'" do
-        expect(:get => '/nested/page').not_to be_routable
-      end
+    it 'generates nested resource route' do
+      expect(page_path 'nested/page').to eq('/nested/page')
+    end
+
+    it 'recognizes route' do
+      expect(:get => '/page').to be_routable
+    end
+
+    it 'recognizes nested route' do
+      expect(:get => '/nested/page').to be_routable
     end
   end
 end

data/spec/spec_helper.rb

@@ -3,10 +3,9 @@ ENV['RAILS_ENV'] = 'test'
 require File.expand_path('../dummy/config/environment',  __FILE__)
 require 'rails/generators'
 require 'rspec/rails'
-require 'rspec/autorun'
 
 Rails.backtrace_cleaner.remove_silencers!
 
-RSpec.configure do |config|
-  config.include Rails.application.routes.url_helpers
+RSpec.configure do |c|
+  c.include Rails.application.routes.url_helpers
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_pages
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Niclas Gelin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-22 00:00:00.000000000 Z
+date: 2014-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,42 +30,42 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: 1.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: 10.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: 10.1.1
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: 2.14.1
 description: Static pages on Rails.
 email:
 - github@niclasgelin.se
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: ''