activesupport-decorators 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab36f5e952455f62d9a6ba3297a3b9ccf0a4a882
-  data.tar.gz: ec8df96f59cc48cefd330897491137a4b50fbbce
+  metadata.gz: 1eb929b86d8d93c87ea6b1b82fc674d71085d530
+  data.tar.gz: 06bdf75917b92a6a5f14932d6cff4085b57dc92a
 SHA512:
-  metadata.gz: ea6ccf8428d1eceb951baf6df41f69b9de6ae94410b108d5e475ef0b5a69b2d4be7e2edbb51a678c00f7c9cac5f08b41861a14e43239a03233396972e590b223
-  data.tar.gz: 64f9957ace96a5ac3186c06e66319d90b0e9190d564cc794c1279f38bb71c7bd72be0f45822643a8ac226f02ba1608a3acd886571c551f917c0e7abba23bd9cf
+  metadata.gz: 29989390b460c1be447c186f801c58a15258af962f950fe0eb02a20f0536d0b6f38f78136b4597f78b58d68b505a0dde925a3a3a0171fa0be6be055d36467a52
+  data.tar.gz: ea865922feebb36e0c4c1dc5729382bcbe371e307fea2cbc9873d6c4e94ad3c187c77d83e72ca33ad65f60fcc16a5445438585e40a2814c97dcc5dfca7b08ae1

data/README.md

@@ -22,16 +22,16 @@ gem 'activesupport-decorators', '~> 2.0'
 
 #### Example 1 - Application extends engine (or any other) class.
 
-Your Rails engine defines a model called Pet (in my_engine/app/models/pet.rb):
+Your engine defines a model called Pet (in my_engine/app/models/pet.rb):
 
 ```Ruby
 class Pet < ActiveRecord::Base
 end
 ```
 
-Your Rails application now wants to adds the concept of pet owners.  You extend the Pet model in the main application
-with the following model decorator (in app/models/pet_decorator.rb).  Note that you could use 'Pet.class_eval do'
-instead of 'class Pet' if you want.
+Your application now wants to adds the concept of pet owners.  You extend the Pet model in the application with the
+following model decorator (in app/models/pet_decorator.rb).  Note that you could use 'Pet.class_eval do' instead
+of 'class Pet' if you want.
 
 ```Ruby
 class Pet
@@ -39,9 +39,9 @@ class Pet
 end
 ```
 
-Set your ActiveSupportDecorators paths similar to setting Rails autoload paths.  This will load a decorator file if it
-matches the original file's name/path and ends with '_decorator.rb'.  In other words when the engine's app/pet.rb is
-loaded, it will load the main applications app/pet_decorator.rb.
+Now tell ActiveSupportDecorators where to look for decorators, similar to setting Rails autoload paths.  This will load
+a decorator file if it matches the original file's name/path and ends with '_decorator.rb'.  In other words when the
+engine's app/pet.rb is loaded, it will load the main applications app/pet_decorator.rb.
 
 ```Ruby
 ActiveSupportDecorators.paths << File.join(Rails.application.root, 'app/**')

data/lib/active_support_decorators/active_support_decorators.rb

@@ -1,4 +1,5 @@
 module ActiveSupportDecorators
+
   def self.paths
     @paths ||= []
   end
@@ -23,34 +24,47 @@ module ActiveSupportDecorators
     @debug = debugging_enabled
   end
 
-  private
-  def self.all_autoload_paths
-    return [] unless defined?(Rails)
-    all_modules = [::Rails.application] + ::Rails::Engine.subclasses.map(&:instance)
-    all_modules.map { |mod| mod.send(:_all_autoload_paths) }.flatten
+  def self.log(message)
+    puts message if debug
+  end
+
+  def self.is_decorator?(file_name)
+    sanitize(file_name).ends_with?(pattern)
   end
 
-  def self.relative_search_path(file_name, const_path = nil)
-    file = file_name
+  def self.all(file_name, const_path = nil)
+    file = sanitize(file_name)
 
     if const_path
       file = const_path.underscore
     else
-      sanitized_file_name = file_name.sub(/\.rb$/, '')
-      first_load_path_match = all_autoload_paths.find { |p| file_name.include?(p) }
-      file = sanitized_file_name.sub(first_load_path_match, '') if first_load_path_match
+      first_autoload_match = all_autoload_paths.find { |p| file.include?(p) }
+      file.sub!(first_autoload_match, '') if first_autoload_match
     end
-    "#{file}#{pattern}.rb"
+
+    relative_target = "#{file}#{pattern}.rb"
+
+    expanded_paths.map { |path| File.join(path, relative_target) }.select { |candidate| File.file?(candidate) }
   end
 
-  def self.load_path_order(file_name, const_path = nil)
-    order = [file_name]
+  def self.original_const_name(file_name)
+    first_match = expanded_paths.find { |path| file_name.include?(path) }
 
-    expanded_paths.each do |path|
-      candidate_file = File.join(path, relative_search_path(file_name, const_path))
-      order << candidate_file if File.file?(candidate_file)
+    if first_match
+      sanitize(file_name).sub("#{first_match}/", '').sub(pattern, '').camelize
+    else
+      nil
     end
+  end
+
+  private
+  def self.all_autoload_paths
+    return [] unless defined?(Rails)
+    all_modules = [::Rails.application] + ::Rails::Engine.subclasses.map(&:instance)
+    all_modules.map { |mod| mod.send(:_all_autoload_paths) }.flatten
+  end
 
-    order
+  def self.sanitize(file_name)
+    file_name.sub(/\.rb$/, '')
   end
 end

data/lib/active_support_decorators/dependencies_patch.rb

@@ -2,17 +2,35 @@ require 'active_support/dependencies'
 
 module ActiveSupport
   module Dependencies
-    alias_method :require_or_load_without_multiple, :require_or_load
+    alias_method :require_or_load_single, :require_or_load
 
     def require_or_load(file_name, const_path = nil)
-      order = ActiveSupportDecorators.load_path_order(file_name, const_path)
+      if ActiveSupportDecorators.is_decorator?(file_name)
+        # If an attempt is made to load the decorator file (such as eager loading), we
+        # need to load the original file and then the decorators.
+        original_const_name = ActiveSupportDecorators.original_const_name(file_name)
 
-      if ActiveSupportDecorators.debug && order.size > 1
-        Rails.try(:logger).try(:debug, "ActiveSupportDecorators: Loading files in order #{order.join(', ')}.")
-      end
+        if original_const_name
+          ActiveSupportDecorators.log "Decorators: Expecting #{file_name} to decorate #{original_const_name}."
+          original_const_name.constantize
+
+          ActiveSupportDecorators.all(file_name, const_path).each do |d|
+            ActiveSupportDecorators.log "Decorators: Loading #{d} for #{file_name}."
+            require_or_load_single(d)
+          end
+
+        else
+          ActiveSupportDecorators.log "Decorators: Nothing found to load before: #{file_name}."
+          require_or_load_single(file_name)
+        end
+
+      else
+        require_or_load_single(file_name, const_path)
 
-      order.each do |path|
-        require_or_load_without_multiple(path, const_path)
+        ActiveSupportDecorators.all(file_name, const_path).each do |d|
+          ActiveSupportDecorators.log "Decorators: Loading #{d} for #{file_name}."
+          require_or_load_single(d)
+        end
       end
     end
   end

data/lib/active_support_decorators/version.rb

@@ -1,3 +1,3 @@
 module ActiveSupportDecorators
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

data/spec/lib/active_support_decorators/active_support_decorator_spec.rb

@@ -19,19 +19,26 @@ describe ActiveSupportDecorators do
       ActiveSupportDecorators.paths << File.join(File.dirname(__FILE__), 'support', 'decorators')
     end
 
-    it 'it loads the decorator file after loading the original without const_path' do
+    it 'it loads the decorator file when you load the original without const_path' do
       path = File.join(File.dirname(__FILE__), 'support', 'originals', 'pet')
       ActiveSupport::Dependencies.require_or_load(path)
 
       Pet.new.owner.should eq('Mr. Robinson')
     end
 
-    it 'it loads the decorator file after loading the original with const_path' do
+    it 'it loads the decorator file when you load the original with const_path' do
       path = File.join(File.dirname(__FILE__), 'support', 'originals', 'pet')
       ActiveSupport::Dependencies.require_or_load(path, 'Pet')
 
       Pet.new.owner.should eq('Mr. Robinson')
     end
+
+    #it 'it loads the original file when you load the decorator file' do
+    #  path = File.join(File.dirname(__FILE__), 'support', 'decorators', 'pet_decorator')
+    #  ActiveSupport::Dependencies.require_or_load(path)
+
+    #  Pet.new.owner.should eq('Mr. Robinson')
+    #end
   end
 
   describe 'when not using activesupport-decorators' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activesupport-decorators
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Pierre Pretorius
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2014-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties