Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Remove engine #8

Merged
merged 3 commits into from

2 participants

Samuel Cochran Pavel Pravosud
Samuel Cochran

Nestive doesn't need an engine.

If you don't like the other changes feel free to cherry-pick.

sj26 added some commits
Samuel Cochran sj26 Fix specs with rails 4 ab50cef
Samuel Cochran sj26 No need for an Engine 22743cd
Samuel Cochran sj26 Fix bundler + gemspec configuration
Using bundler + gemspec means `git ls-files` can't be used when testing new files.

Additionally, the spec files don't *require* bundler to run, so instead we can just `bundle exec rspec` to lock down the gemset then run as normal. Bundler makes sure our gem is already in the load path.
affc5fe
Pavel Pravosud rwz merged commit 8c90dcb into from
Pavel Pravosud
Owner

Thanks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jul 16, 2013
  1. Samuel Cochran

    Fix specs with rails 4

    sj26 authored
  2. Samuel Cochran

    No need for an Engine

    sj26 authored
  3. Samuel Cochran

    Fix bundler + gemspec configuration

    sj26 authored
    Using bundler + gemspec means `git ls-files` can't be used when testing new files.
    
    Additionally, the spec files don't *require* bundler to run, so instead we can just `bundle exec rspec` to lock down the gemset then run as normal. Bundler makes sure our gem is already in the load path.
This page is out of date. Refresh to see the latest.
6 lib/nestive.rb
View
@@ -1,4 +1,6 @@
-require 'nestive/engine'
+require 'nestive/version'
+require 'nestive/layout_helper'
+require 'nestive/railtie'
module Nestive
-end
+end
6 lib/nestive/engine.rb
View
@@ -1,6 +0,0 @@
-if defined?(Rails) && Rails.version.to_i >= 3
- module Nestive
- class Engine < Rails::Engine
- end
- end
-end
0  app/helpers/nestive/layout_helper.rb → lib/nestive/layout_helper.rb
View
File renamed without changes
5 nestive.gemspec
View
@@ -13,9 +13,8 @@ Gem::Specification.new do |s|
s.description = 'A Rails plugin/gem for awesome nested templates and layouts'
s.licenses = ['MIT']
-
- s.files = `git ls-files`.split("\n")
- s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+ s.files = Dir["README.md", "MIT-LICENSE", "lib/**/*"]
+ s.test_files = Dir["spec/**/*"]
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
s.require_paths = ['lib']
2  spec/internal/config/routes.rb
View
@@ -1,3 +1,3 @@
Rails.application.routes.draw do
- match ':controller/:action'
+ get ':controller/:action'
end
5 spec/spec_helper.rb
View
@@ -1,9 +1,8 @@
-require 'bundler/setup'
require 'rails'
require 'combustion'
-require File.expand_path('../../lib/nestive', __FILE__)
+require 'nestive'
Combustion.initialize! :action_controller
-require 'rspec/rails'
+require 'rspec/rails'
Something went wrong with that request. Please try again.