rails_current 1.8.2 → 1.9.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDFiMGFhZTZmYTMzYWJlMzI3MDgwNGU0NTAyZGI3ZDU4N2U3YWE5NA==
+    OTEyNzAzZTc0MGYzOWZhMzc0MjY5ZTY1N2MyOWQ1ZGRkOGFhZDE2NQ==
   data.tar.gz: !binary |-
-    NDUyNDJiYWExM2QwMjE5M2JjN2RhNzNlZWQ1N2FlZGFiYjA0Y2Q1OA==
+    MmE2NzM3YjYxMjIzMTcxM2QzYWZlMTRjYmEyOGM0M2MwNjczMTM5ZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YzlhZTY2OTg3YWYzNjQzYTA3ZmFkZGUwODE1YjcxOWQwMTQ4ZjgzNjliM2Ey
-    ZTc3YzhlZTNiNWNkN2VkMmJmNWExYWMyYjU1ZDZmOWM2NWE0MzE5YWYyYmI2
-    ZTE3YmU2MzNlMDI3ZDkyMzhlMWU0ZTA5MGIxNTJlZGMzYTdkNDI=
+    ZDZlZjA1ZmY4MzIzZTJjMWIxMTg1YmNkZjllYWY0ZGQ4YjdkMjk3NjE3YmFl
+    NDAyMWJmMDA4ZjhhNjExZDFlNDYwNDFmZTcxMTk5MjZjOThhZDk0NzVlZGIy
+    OTkyNGNlOGYwMmRhYWRkNDE0YjQzMDJjMWY5NGUwNDYwNWM5OGM=
   data.tar.gz: !binary |-
-    YzljNDQ4NDhkZmM2ZjE1Y2E2Mjg1OTJhMmFhNzIzMTI0YjFkNjk3ZGI3YmY0
-    ZGM0OWM1OTg0ZWIxNzNhMGQ5MzhhYWFlNzVhYWY2ZDc2YmYyODlkYTk0MGY4
-    Yzg0MTYyNmQwZjMxOTQ1Zjk2MGM0YWM3OTkyYjY2YjJmNjU5MzA=
+    NWM4ODVlMTIzNWU0OTgzMzUzNGQ4NjI0YjkyZDlhZGZjODEzZmIxYzVhNGY5
+    NjE2ZjNiMzMyMTdiY2NkZDA5YWQ1ZGJiYTZlNjRiZjdkN2U3Mzc0NjUyNDdl
+    NWQwYzcyNmM5ZjU3YThiYzY3MWU2NzNhYmNkNjRhNzI5YmQyZTU=

data/lib/rails_current.rb

@@ -2,7 +2,7 @@
 
 module Current
   def Current.version
-    '1.8.2'
+    '1.9.0'
   end
 
   def Current.dependencies
@@ -161,40 +161,53 @@ module Current
   end
 
   def Current.mock_controller(options = {})
-    require 'rails'
-    require 'action_controller'
-    require 'action_dispatch/testing/test_request.rb' 
-    require 'action_dispatch/testing/test_response.rb' 
+    ensure_rails_application do
+      require 'action_controller'
+      require 'action_dispatch/testing/test_request.rb'
+      require 'action_dispatch/testing/test_response.rb'
 
-    default_url_options =
-      begin
-        require 'rails_default_url_options'
-        DefaultUrlOptions
-      rescue LoadError
-        options[:default_url_options] || {}
+      store = ActiveSupport::Cache::MemoryStore.new
+
+      controller = mock_controller_class.new
+      controller.perform_caching = true
+      controller.cache_store = store
+
+      request = ActionDispatch::TestRequest.new
+      response = ActionDispatch::TestResponse.new
+
+      controller.request = request
+      controller.response = response
+
+      singleton_class =
+        class << controller
+          self
+        end
+
+      singleton_class.module_eval do
+        define_method(:default_url_options) do
+          @default_url_options ||= (
+            defined?(DefaultUrlOptions) ? DefaultUrlOptions.dup : {}
+          )
+        end
       end
 
-    ensure_rails_application do
-      store = ActiveSupport::Cache::MemoryStore.new 
-      controller =  
-        begin 
-          ApplicationController.new 
-        rescue NameError 
-          ActionController::Base.new 
-        end 
-      controller.perform_caching = true 
-      controller.cache_store = store 
-      request = ActionDispatch::TestRequest.new 
-      response = ActionDispatch::TestResponse.new 
-      controller.request = request 
-      controller.response = response 
-      #controller.send(:initialize_template_class, response) 
-      #controller.send(:assign_shortcuts, request, response) 
-      controller.send(:default_url_options).merge!(default_url_options)
       Current.proxy_for(controller)
     end
   end 
 
+  def Current.mock_controller_class
+    unless const_defined?(:Controller)
+      controller_class =
+        if defined?(::ApplicationController)
+          Class.new(::ApplicationController)
+        else
+          Class.new(::ActionController::Base)
+        end
+      const_set(:Controller, controller_class)
+    end
+    return const_get(:Controller)
+  end
+
   def Current.ensure_rails_application(&block)
     require 'rails' unless defined?(Rails)
     if Rails.application.nil?

data/rails_current.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification::new do |spec|
   spec.name = "rails_current"
-  spec.version = "1.8.2"
+  spec.version = "1.9.0"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "rails_current"
   spec.description = "track 'current_user' et all in a tidy, global, and thread-safe fashion for your rails apps"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_current
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.9.0
 platform: ruby
 authors:
 - Ara T. Howard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-22 00:00:00.000000000 Z
+date: 2014-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: map