motorhead 0.3.9 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4781c996444d1a9ca337aa5d1bf6fb69d94cd08e
-  data.tar.gz: faa1a2f4e4c4a7f7b9f24f26e177b135a3a82ee4
+  metadata.gz: 5da96ff9de01b6bd45257a2b9a42777a925f3acb
+  data.tar.gz: 3f2377fb39dba6442dae76751d4c2ed39363e61f
 SHA512:
-  metadata.gz: 2ee77af9cd14c25d10e17dce2f4071c3417cb88bca51b660c5b65bfe0cbc69cb7ecaf48d2feb01ae718e31235a35b01fa8ca9d912f2868fe0706a4d5d7b6736e
-  data.tar.gz: 4497e16918b8c31a7ccbead08d188955a0330aee71f6883bfc7c6565ad7151e5df5e404ad66c354f5463efc8538190fbee7306850797b75c189409c5988c9598
+  metadata.gz: 60516910dc8605c810355189928dacf857faf8998f0a51b69fa10ac90de1483e346dd3b3cd55f3cec9aa389b94d0e038695acbe390013b6ec802636c616b3b90
+  data.tar.gz: 180cf4a084f3c9106e01428c21f64ad95610b3bcd8087c3b802a91e6290388d83ba2087f47f493c89b96c07ed1703b60dc89850ed7abffd81642766a6760ba46

data/.travis.yml

@@ -1,4 +1,11 @@
 language: ruby
+sudo: false
+
 rvm:
   - 2.3.0
-before_install: gem install bundler -v 1.10.6
+
+before_install: gem install bundler -v 1.11.2
+
+gemfile:
+  - gemfiles/Gemfile-rails.4.2.x
+  - gemfiles/Gemfile-rails.5.0.x

data/README.md

@@ -16,7 +16,7 @@ Bundle into your Rails app.
 ### Isolated Engine
 
 Motorhead helps you mounting specially creafted Isolated Engines onto the main Rails app.
-An engine can contain whole MVC conponents, which means that you can encapsulate everything that are needed for your new feature under one single directory.
+An engine can contain whole MVC components, which means that you can encapsulate everything that are needed for your new feature under one single directory.
 This helps your team creating multiple new features simultaneously without causing code conflict.
 
 ### Conditional Execution

data/Rakefile

@@ -4,6 +4,8 @@ require "rake/testtask"
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
   t.libs << "lib"
+  t.warning = true
+  t.verbose = true
   t.test_files = FileList['test/**/*_test.rb']
 end
 

data/gemfiles/Gemfile-rails.5.0.x

@@ -0,0 +1,14 @@
+source 'https://rubygems.org'
+
+gemspec :path => '../'
+
+gem 'rails', '~> 5.0.0'
+gem 'controller_extension', path: '../test/dummy_app/app/engines/controller_extension'
+gem 'controller_fallback', path: '../test/dummy_app/app/engines/controller_fallback'
+gem 'view_render_fallback', path: '../test/dummy_app/app/engines/view_render_fallback'
+gem 'routes_fallback', path: '../test/dummy_app/app/engines/routes_fallback'
+gem 'italian', path: '../test/dummy_app/app/engines/italian'
+gem 'spanish', path: '../test/dummy_app/app/engines/spanish'
+gem 'simple_controller', path: '../test/dummy_app/app/engines/simple_controller'
+gem 'mount_at_capricorn', path: '../test/dummy_app/app/engines/mount_at_capricorn'
+gem 'redirector', path: '../test/dummy_app/app/engines/redirector'

data/lib/motorhead/abstract_controller.rb

@@ -27,13 +27,13 @@ module Motorhead
         begin
           super
           @_motorhead_action_successfully_finished = true
-          env['motorhead_view_assigns'] = view_assigns
+          request.env['motorhead_view_assigns'] = view_assigns
         rescue => e
           (self.class.parent::Engine.on_error || Motorhead.config.on_error).call(e)
         end
       when ::ActionController::Base
-        if env.key? 'motorhead_render_result'
-          self.response = env.delete 'motorhead_render_result'
+        if request.env.key? 'motorhead_render_result'
+          self.response = request.env.delete 'motorhead_render_result'
           headers.delete 'X-Cascade'
           self.response_body = response.body
         else
@@ -58,8 +58,8 @@ module Motorhead
     end
 
     def view_assigns
-      if env.key? 'motorhead_view_assigns'
-        super.merge env['motorhead_view_assigns']
+      if request.env.key? 'motorhead_view_assigns'
+        super.merge request.env['motorhead_view_assigns']
       else
         super
       end
@@ -68,13 +68,13 @@ module Motorhead
     def render_to_body(options = {})
       return if (headers['X-Cascade'] == 'pass') && !defined?(@_motorhead_action_successfully_finished)
       ret = super
-      env['motorhead_render_result'] = response
+      request.env['motorhead_render_result'] = response
       ret
     end
 
     def redirect_to(options = {}, response_status = {}) #:doc:
       ret = super
-      env['motorhead_render_result'] = response
+      request.env['motorhead_render_result'] = response
       ret
     end
   end

data/lib/motorhead/action_view.rb

@@ -13,7 +13,8 @@ ActionView::Base.class_eval do
     end
   end
 
-  alias_method_chain :render, :motorhead
+  alias_method :render_without_motorhead, :render
+  alias_method :render, :render_with_motorhead
 end
 
 module Motorhead

data/lib/motorhead/engine.rb

@@ -6,7 +6,6 @@ module Motorhead
 
     module ClassMethods
       attr_accessor :on_error
-      attr_reader :mount_at
 
       def active_if(&block)
         @active_if = block
@@ -17,7 +16,11 @@ module Motorhead
       end
 
       def mount_at(path = nil)
-        path ? @mount_at = path : @mount_at
+        if path
+          @mount_at = path
+        else
+          defined?(@mount_at) && @mount_at
+        end
       end
     end
 

data/lib/motorhead/road_crew/road_crew.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.rdoc"]
 
-  s.add_dependency "rails", "~> 4.2.4"
+  s.add_dependency 'rails'
 
   s.add_development_dependency "sqlite3"
 end

data/lib/motorhead/version.rb

@@ -1,3 +1,3 @@
 module Motorhead
-  VERSION = '0.3.9'.freeze
+  VERSION = '0.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motorhead
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.4.0
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-06 00:00:00.000000000 Z
+date: 2016-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -123,6 +123,7 @@ files:
 - README.md
 - Rakefile
 - gemfiles/Gemfile-rails.4.2.x
+- gemfiles/Gemfile-rails.5.0.x
 - lib/generators/motorhead/controller_generator.rb
 - lib/generators/motorhead/templates/controller.rb
 - lib/generators/motorhead/templates/lib/%name%/engine.rb
@@ -165,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A safe and rapid prototyping framework for Rails