magic_lamp 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59341749511aa8a67d1add3ab349b34efdf2ed38
-  data.tar.gz: 281fb70cc9c9bfacee96a46840aca2e8d619988a
+  metadata.gz: 1957d591851320510b8daeb8bef2a3278aef0deb
+  data.tar.gz: 9bee7c895782c080098b23698e7f662843a77661
 SHA512:
-  metadata.gz: 531159bceb7d43fa85994b61834cbb3e503b1eae418e70102b5fa50d27835273b2ad2b0b40c972308e3555c41a6ef3557dbb8faccf80fa2fea641f45286c9737
-  data.tar.gz: 31a71c1c45690d3a65a2260f4b39301477d536f3496ff159a9f4a0d8e3fe694d06db45072eae1bad1ae186383788cdde327f2bf0bf53c6f45c793198f7dbc7e7
+  metadata.gz: d8592fc96c3eba5598b0b27cfc9f2ee5035aca267a2f689ea2e81955df8e5fb4cc1082a1106ec845a545c17ffdaa5355b73b6f826585a15aa5b205197a694020
+  data.tar.gz: 0be0404f6eb9ee5e2e657e5daeea5cf9db4a0240be215c992cbc4c3409a01a2d6644184459c5662100df851037c218fe6ac7cca2cc89d08317697f28a8180d26

data/README.md

@@ -299,7 +299,15 @@ Ruby API
 ### fixture
 (also aliased to `register_fixture` and `register`)
 
-It requires a block that is invoked in the context of a controller. If render is called, it renders the specified template or partial the way the controller normally would. If `render` is not called in the block then MagicLamp will render the `to_json` representation of the return value of the block unless the return value is already a string. In that case, the string is rendered as is. 
+It requires a block that is invoked in the context of a controller. If `render` is called, it renders the specified template or partial the way the controller normally would minus the layout. If you'd like a particular layout to be rendered simply specify it when you call `render`:
+
+```ruby
+render :index, layout: "admin"
+```
+
+**Note:** Rendering the layout could be useful under some circumstances, but it is important to be aware that things will get weird if you use MagicLamp to load and entire HTML document. Especially if it contains `script` tags to your JavaScript.
+
+If `render` is not called in the block then MagicLamp will render the `to_json` representation of the return value of the block unless the return value is already a string. In that case, the string is rendered as is.
 
 It also takes an optional hash of arguments. The arguments hash recognizes:
 * `:controller`

data/app/controllers/magic_lamp/fixtures_controller.rb

@@ -9,15 +9,17 @@ module MagicLamp
       MagicLamp::DoubleRenderError
     ].map(&:name)
 
+    RENDER_TYPE = Rails::VERSION::MAJOR == 5 ? :plain : :text
+
     rescue_from(*ERRORS) do |exception, message = exception.message|
       error_message_with_bactrace = parse_error(exception, message)
       logger.error(error_message_with_bactrace)
-      render text: message, status: 400
+      render RENDER_TYPE => message, status: 400
     end
 
     def show
       MagicLamp.load_lamp_files
-      render text: MagicLamp.generate_fixture(params[:name])
+      render RENDER_TYPE => MagicLamp.generate_fixture(params[:name])
     end
 
     def index

data/lib/magic_lamp/fixture_creator.rb

@@ -22,7 +22,8 @@ module MagicLamp
       controller = controller_class.new
       redefine_view_context(controller, extensions)
       extensions.each { |extension| controller.extend(extension) }
-      controller.request = ActionDispatch::TestRequest.new
+      test_request_class = ActionDispatch::TestRequest
+      controller.request = test_request_class.respond_to?(:create) ? test_request_class.create : test_request_class.new
       redefine_redirect_to(controller)
       redefine_render(controller)
       controller

data/lib/magic_lamp/version.rb

@@ -1,3 +1,3 @@
 module MagicLamp
-  VERSION = "1.7.0"
+  VERSION = "1.8.0"
 end

data/spec/dummy/config/initializers/assets.rb

@@ -6,3 +6,21 @@ Rails.application.config.assets.version = '1.0'
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
 # Rails.application.config.assets.precompile += %w( search.js )
+Rails.application.config.assets.precompile += %w(
+  support/bind-poly.self.js
+  magic_lamp/magic_lamp.self.js
+  magic_lamp/genie.self.js
+  magic_lamp/boot.self.js
+  magic_lamp/application.self.js
+  support/underscore-1.6.self.js
+  support/chai.self.js
+  support/chai-fuzzy.self.js
+  support/sinon-chai.self.js
+  support/sinon.self.js
+  spec_helper.self.js
+  genie_spec.self.js
+  magic_lamp_spec.self.js
+  teaspoon.css
+  mocha/1.17.1.js
+  teaspoon-mocha.js
+)

data/spec/dummy/test/test_lamp.rb

@@ -1,3 +1,3 @@
 MagicLamp.fixture(name: "from_test_directory") do
-  render text: "something something"
+  render MagicLamp::FixturesController::RENDER_TYPE => "something something"
 end

data/spec/rails_helper.rb

@@ -42,4 +42,10 @@ RSpec.configure do |config|
   # The different available types are documented in the features, such as in
   # https://relishapp.com/rspec/rspec-rails/docs
   config.infer_spec_type_from_file_location!
+
+  if Rails::VERSION::MAJOR == 5
+    config.include Rails::Controller::Testing::TestProcess
+    config.include Rails::Controller::Testing::TemplateAssertions
+    config.include Rails::Controller::Testing::Integration
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magic_lamp
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Michael Crismali
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-03 00:00:00.000000000 Z
+date: 2016-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -371,7 +371,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Makes sure your JavaScript tests break when if your templates change.