rails_default_url_options 5.0.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3528ba9babc8f72d7dfc4157003784eb641171b551ab986cf7a786c0bcddc587
-  data.tar.gz: 470ec9f879a7e68faf00a6cf05c71e85007d3f946031d774072f5f5488c57b63
+  metadata.gz: d4cd442dd369102c6463931394c5ea8011676a361822b096b2d0d2d7222227ff
+  data.tar.gz: 3811e6226beac41b4c7a3aadfa18badf922fab5f298401699a9d39d437f64fa5
 SHA512:
-  metadata.gz: 66c83875a9548eb4379c5df3ca63c27b807e87b8cd6720e32aaa3078d76c926149dc7ca1631445901ba8500a0062c10ec7918463aa957ebb10f540fc2c5a3fac
-  data.tar.gz: f81ecdad6a24488fef3dd4d72d7e9ea22b1f781c3ca7fbaf5c035f1f2e3071f08f3a35bcbd3b87c20b6f205b06172afb3028626dfd49c0e132c6c6729287893d
+  metadata.gz: c0787e3f5993f7a0150e8011aa538b8a0ea5974311806d1763a41129326e95072f9e34f8784c310b0619347165849138caf87a68215d8aea7565955ffc3abe0d
+  data.tar.gz: 63735520cc91a62bdf254740dfe88c73403eeda5b05e625be77e29af79c5bab9ca05b5e4baf6b51b6accf84f8047ebcf319d2111954a02108c00c9bf0cc73fc8

data/lib/rails_default_url_options.rb

@@ -7,13 +7,13 @@
 #
 # 2) dynamically configure these defaults on the first request seen.
 #
-# all we require to do this is a smart hash and simple before_filter.  save
+# all we require to do this is a smart hash and simple before_action.  save
 # this file as 'config/intiializers/deafult_url_options.rb' and add this
 # before filter to your application_controller.rb
 #
 # class ApplicationController < ActionController::Base
 #
-#   before_filter :configure_default_url_options!
+#   before_action :configure_default_url_options!
 #
 #   protected
 #     def configure_default_url_options!
@@ -31,7 +31,7 @@ unless defined?(DefaultUrlOptions)
   DefaultUrlOptions = Hash.new
 
   def DefaultUrlOptions.version
-    '5.0.0'
+    '6.0.0'
   end
 
   def DefaultUrlOptions.dependencies
@@ -39,7 +39,7 @@ unless defined?(DefaultUrlOptions)
   end
 
 
-  def DefaultUrlOptions.configure(request = {})
+  def DefaultUrlOptions.configure(request = {}, &block)
     default_url_options = DefaultUrlOptions
 
     default_url_options.clear
@@ -60,19 +60,15 @@ unless defined?(DefaultUrlOptions)
 
     normalize!
 
-  # force action_mailer to not lick balls
+  # force action_mailer to not suck so bad 
   #
     Rails.configuration.action_mailer.default_url_options = default_url_options
+
     if ActionMailer::Base.respond_to?('default_url_options=')
       ActionMailer::Base.default_url_options = default_url_options
     end
 
     default_url_options
-  ensure
-    keys.each do |key|
-      next if key.is_a?(Symbol)
-      self[key.to_s.to_sym] = self.fetch(key)
-    end
   end
 
   def DefaultUrlOptions.configure!(request = {})
@@ -115,7 +111,18 @@ unless defined?(DefaultUrlOptions)
         delete(:port) if port.to_s == '80'
     end
 
-    keys.each{|key| delete(key) if self[key].nil?}
+    keys.each do |key|
+      if self[key].nil?
+        delete(key)
+        next
+      end
+
+      if key.is_a?(Symbol)
+        next
+      end
+
+      self[key.to_s.to_sym] = self.delete(key)
+    end
 
     self
   end
@@ -132,56 +139,88 @@ unless defined?(DefaultUrlOptions)
     DefaultUrlOptions[:port]
   end
 
+  def DefaultUrlOptions.domain
+    case host
+      when '0.0.0.0', '127.0.0.1'
+        'localhost'
+      when /\A[\d.]+\Z/iomx
+        host
+      else
+        host.split('.').last(2).join('.')
+    end
+  end
+
   def DefaultUrlOptions.to_yaml(*args, &block)
     Hash.new.update(self).to_yaml(*args, &block)
   end
 
+  def DefaultUrlOptions.callbacks
+    @callbacks ||= []
+  end
 end
 
 
 if defined?(Rails)
-##
-#
-  def DefaultUrlOptions.install_before_filter!
-    DefaultUrlOptions.configure(
-      :host => '127.0.0.1',
-      :port => 3000
-    ) unless DefaultUrlOptions.configured?
+  def DefaultUrlOptions.autoconfigure!(&block)
+    unless DefaultUrlOptions.configured?
+      DefaultUrlOptions.configure(
+        :host => 'localhost',
+        :port => 3000
+      )
+    end
+
+    if block
+      DefaultUrlOptions.callbacks.push(block)
+    end
+
+    DefaultUrlOptions.install_before_action!
+  end
+
+  def DefaultUrlOptions.autoconfigure(&block)
+    DefaultUrlOptions.autoconfigure!(&block)
+  end
 
+  def DefaultUrlOptions.install_before_action!
     if defined?(::ActionController::Base)
       ::ActionController::Base.module_eval do
-        install_method = respond_to?(:prepend_before_filter) ? :prepend_before_filter : :prepend_before_action
-
-        send(install_method) do |controller|
-          unless controller.respond_to?(:configure_default_url_options!)
-            unless DefaultUrlOptions.configured?
-              request = controller.send(:request)
-
-              if Rails.env.production?
-                DefaultUrlOptions.configure!(request)
-              else
-                DefaultUrlOptions.configure(request)
-              end
+        def configure_default_url_options!
+          unless DefaultUrlOptions.configured?
+            if Rails.env.production?
+              DefaultUrlOptions.configure!(request)
+            else
+              DefaultUrlOptions.configure(request)
+            end
+
+            DefaultUrlOptions.callbacks.each do |block|
+              block.call
             end
+
+            DefaultUrlOptions.callbacks.clear
           end
         end
+
+        prepend_before_action = respond_to?(:prepend_before_filter) ? :prepend_before_filter : :prepend_before_action
+
+        send(prepend_before_action, :configure_default_url_options!)
       end
     end
   end
 
-##
+=begin
 #
   if defined?(Rails::Engine)
     class Engine < Rails::Engine
       config.before_initialize do
         ActiveSupport.on_load(:action_controller) do
-          DefaultUrlOptions.install_before_filter!
+          DefaultUrlOptions.install_before_action!
         end
       end
     end
   else
-    DefaultUrlOptions.install_before_filter!
+    DefaultUrlOptions.install_before_action!
   end
+=end
+
 end
 
 ::Rails_default_url_options = ::DefaultUrlOptions

data/rails_default_url_options.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification::new do |spec|
   spec.name = "rails_default_url_options"
-  spec.version = "5.0.0"
+  spec.version = "6.0.0"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "rails_default_url_options"
   spec.description = "description: rails_default_url_options kicks the ass"
@@ -13,7 +13,6 @@ Gem::Specification::new do |spec|
 ["README.md",
  "Rakefile",
  "lib",
- "lib/rails_default_url_options",
  "lib/rails_default_url_options.rb",
  "rails_default_url_options.gemspec"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_default_url_options
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 6.0.0
 platform: ruby
 authors:
 - Ara T. Howard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-19 00:00:00.000000000 Z
+date: 2020-10-24 00:00:00.000000000 Z
 dependencies: []
 description: 'description: rails_default_url_options kicks the ass'
 email: ara.t.howard@gmail.com
@@ -39,8 +39,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: codeforpeople
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: rails_default_url_options