spicycode-micronaut-rails 0.2.3 → 0.2.4

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:minor: 2
-:patch: 3
+:patch: 4
 :major: 0
+:minor: 2

data/lib/micronaut/rails/controllers.rb

@@ -1,3 +1,6 @@
+require 'action_controller'
+require 'action_controller/test_process'
+
 module Micronaut
   module Rails
     module Controllers
@@ -14,11 +17,11 @@ module Micronaut
           ActionController::Routing::Routes.reload if ActionController::Routing::Routes.empty?
           ActionController::Routing::Routes.recognize_path(path, :method => method)
         end
-          
+
       end
 
       module RenderOverrides
-        
+
         def render_views!
           @render_views = true
         end
@@ -27,42 +30,36 @@ module Micronaut
           @render_views
         end
         
-        def render(options=nil, deprecated_status_or_extra_options=nil, &block)
-          if ::Rails::VERSION::STRING >= '2.0.0' && deprecated_status_or_extra_options.nil?
-            deprecated_status_or_extra_options = {}
-          end
-          Micronaut.configuration.trace { "In RenderOverrides#render with options => #{options.inspect}, deprecated_status_or_extra_options => #{deprecated_status_or_extra_options.inspect}, render_views? => #{render_views?.inspect}"}
+        def render(options=nil, &block)
           response.headers['Status'] = interpret_status((options.is_a?(Hash) && options[:status]) || ::ActionController::Base::DEFAULT_RENDER_STATUS_CODE)
-                    
-          unless block_given?
-            unless render_views?
-              if @template.respond_to?(:finder)
-                (class << @template.finder; self; end).class_eval do
-                  define_method :file_exists? do; true; end
-                end
-              else
-                (class << @template; self; end).class_eval do
-                  define_method :file_exists? do; true; end
-                end
+
+          unless block_given? || render_views?
+            if @template.respond_to?(:finder)
+              (class << @template.finder; self; end).class_eval do
+                define_method :file_exists? do; true; end
               end
+            else
               (class << @template; self; end).class_eval do
+                define_method :file_exists? do; true; end
+              end
+            end
+            (class << @template; self; end).class_eval do
 
-                define_method :render_file do |*args|
-                  @first_render ||= args[0] unless args[0] =~ /^layouts/
-                  @_first_render ||= args[0] unless args[0] =~ /^layouts/
-                end
-
-                define_method :_pick_template do |*args|
-                  @_first_render ||= args[0] unless args[0] =~ /^layouts/
-                  PickedTemplate.new
-                end
+              define_method :render_file do |*args|
+                @first_render ||= args[0] unless args[0] =~ /^layouts/
+                @_first_render ||= args[0] unless args[0] =~ /^layouts/
+              end
 
+              define_method :_pick_template do |*args|
+                @_first_render ||= args[0] unless args[0] =~ /^layouts/
+                PickedTemplate.new
               end
-              
+
             end
+
           end     
-          
-          super(options, deprecated_status_or_extra_options, &block)
+
+          super(options, &block)
         end
 
       end
@@ -75,28 +72,22 @@ module Micronaut
         def render_partial(*ignore_args);  end
       end
 
-      def self.extended(kls)
-        Micronaut.configuration.trace { "In #{self} extended callback for #{kls}"}
-        
-        kls.send(:include, ActionController::TestProcess)
-        kls.send(:include, InstanceMethods)
-        kls.send(:include, Micronaut::Rails::Matchers::Controllers)
+      def self.extended(extended_behaviour)
+        extended_behaviour.send :include, ::ActionController::TestProcess, InstanceMethods, ::Micronaut::Rails::Matchers::Controllers
+        extended_behaviour.describes.send :include, RenderOverrides, ::ActionController::TestCase::RaiseActionExceptions
 
-        kls.before do
+        extended_behaviour.before do
           @controller = self.class.describes.new
-          Micronaut.configuration.trace { "Enhancing #{@controller.inspect} with Rails controller extensions" }
-          @controller.class.send :include, RenderOverrides
-          @controller.class.send :include, ActionController::TestCase::RaiseActionExceptions
-          @request = ActionController::TestRequest.new
-          @controller.request = @request
-          @response = ActionController::TestResponse.new
-          @controller.params = {}
-          @controller.send(:initialize_current_url)
+          @controller.request = @request = ::ActionController::TestRequest.new
+          @response = ::ActionController::TestResponse.new
           @response.session = @request.session
+          
+          @controller.params = {}
+          @controller.send(:initialize_current_url)          
         end
 
       end
 
     end
   end
-end
+end

data/lib/micronaut/rails/extensions/active_record.rb

@@ -15,5 +15,5 @@ module Micronaut
 end
 
 if defined?(::ActiveRecord::Base)
-  ::ActiveRecord::Base.send(:include, Micronaut::Rails::Extensions::ActiveRecord)
+  ::ActiveRecord::Base.send(:include, ::Micronaut::Rails::Extensions::ActiveRecord)
 end

data/lib/micronaut/rails/matchers/controllers/render_template.rb

@@ -13,6 +13,8 @@ module Micronaut
           def matches?(response)
             if response.respond_to?(:rendered_file)
               @actual = response.rendered_file
+            elsif response.respond_to?(:captured_render)
+              @actual = @controller.captured_render
             else
               @actual = response.rendered_template.to_s
             end

data/lib/micronaut/rails/transactional_database_support.rb

@@ -5,25 +5,25 @@ module Micronaut
       module InstanceMethods
 
         def active_record_configured?
-          defined?(ActiveRecord) && !ActiveRecord::Base.configurations.blank?
+          defined?(::ActiveRecord) && !::ActiveRecord::Base.configurations.blank?
         end
 
         def transactional_protection_start
           return unless active_record_configured?
 
-          ActiveRecord::Base.connection.increment_open_transactions
-          ActiveRecord::Base.connection.begin_db_transaction
+          ::ActiveRecord::Base.connection.increment_open_transactions
+          ::ActiveRecord::Base.connection.begin_db_transaction
         end
 
         def transactional_protection_cleanup
           return unless active_record_configured?
 
-          if ActiveRecord::Base.connection.open_transactions != 0
-            ActiveRecord::Base.connection.rollback_db_transaction
-            ActiveRecord::Base.connection.decrement_open_transactions
+          if ::ActiveRecord::Base.connection.open_transactions != 0
+            ::ActiveRecord::Base.connection.rollback_db_transaction
+            ::ActiveRecord::Base.connection.decrement_open_transactions
           end
 
-          ActiveRecord::Base.clear_active_connections!
+          ::ActiveRecord::Base.clear_active_connections!
         end
 
       end

data/lib/micronaut-rails.rb

@@ -1,5 +1,3 @@
-require 'action_controller'
-require 'action_controller/test_process'
 require 'micronaut/rails/configuration'
 require 'micronaut/rails/matchers/controllers/redirect_to'
 require 'micronaut/rails/matchers/controllers/render_template'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spicycode-micronaut-rails
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Chad Humphries