no_notifier_needed 2.0.4 → 2.0.8

data/Gemfile

@@ -5,6 +5,7 @@ source "http://rubygems.org"
 gem 'haml'
 gem 'rails', '>= 3.2.11'
 gem 'metric_fu'
+gem "facets", "~> 2.9.3"
 
 group :test do
   gem 'debugger'

data/Gemfile.lock

@@ -53,6 +53,7 @@ GEM
       debugger-ruby_core_source (>= 1.1.1)
     debugger-ruby_core_source (1.1.7)
     erubis (2.7.0)
+    facets (2.9.3)
     fattr (2.2.1)
     flay (1.2.1)
       hoe (>= 1.11.0)
@@ -192,6 +193,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (>= 1.2.3)
   debugger
+  facets (~> 2.9.3)
   haml
   jeweler (~> 1.8.4)
   metric_fu

data/VERSION

@@ -1 +1 @@
-2.0.4
+2.0.8

data/lib/no_notifier_needed/railtie.rb

@@ -1,10 +1,6 @@
 module NoNotifierNeeded
   class Railtie < Rails::Railtie
     initializer "Include code in controller" do
-      ActiveSupport.on_load(:active_record) do
-        require File.expand_path('../../../initializers/hotpatches/subclasses',  __FILE__)
-      end
-
       ActiveSupport.on_load(:action_controller) do
         require File.expand_path('../../../initializers/notifier',  __FILE__)
 

data/lib/no_notifier_needed/send.rb

@@ -17,10 +17,6 @@ module NoNotifierNeeded
     end
 
     private
-    def known_models
-      @known_models || @known_models = ActiveRecord::Base.send( :subclasses )
-    end
-
     def translate_to_hash(which_email, args)
       th = {}
       th[:which_email] = which_email
@@ -28,12 +24,12 @@ module NoNotifierNeeded
       args = args.flatten if args.respond_to?(:flatten)
       args.each do |a|
         next if a.blank?
-        if known_models.include?(a.class)
+        if known_models.include?(a.class.name)
           th[a.class.name.downcase.to_sym] = a.id
         elsif a.is_a?(Hash)
           a.each{|k,v| th[k.to_sym] = CGI.escapeHTML(v) }
         else
-          raise ArgumentError.new("Unknown values passed to email procesor. \n Object #{a} \n\n WhichEmail: #{which_email} \n Args #{pp args} \n\n Known Models #{known_models}")
+          raise ArgumentError.new("Unknown #{a.class} passed to email procesor. \n Object #{a.inspect} \n\n WhichEmail: #{which_email} \n Args #{pp args} \n\n Known Models #{known_models}")
         end
       end
       th

data/lib/no_notifier_needed/sender.rb

@@ -6,7 +6,6 @@ module NoNotifierNeeded
 
       args_to_instance_vars(args)
 
-      debugger
       mail_is = mail(get_send_hash) do|format|
         format.html { render :inline => render_template_body_type(@template) }
       end

data/lib/no_notifier_needed/translate.rb

@@ -3,9 +3,10 @@ module NoNotifierNeeded
     def get_send_hash(template)
       send_hash = base_send_hash(template)
       send_hash[:subject] = render_template_subject_type(@template)
-      send_hash[:to] = @to.nil? ? @user.email : @to
-      send_hash[:from] = @from unless @from.nil?
-      send_hash[:reply_to] = @reply_to unless @reply_to.nil?
+      send_hash[:to] = @to.blank? ? @user.email : @to
+      send_hash[:from] = @from unless @from.blank?
+      send_hash[:cc] = @cc.nil? ? nil : @cc
+      send_hash[:reply_to] = @reply_to unless @reply_to.blank?
       send_hash
     end
 
@@ -16,8 +17,8 @@ module NoNotifierNeeded
       end
 
       base[:from] = "#{base.delete(:from_name)} <#{base.delete(:from_email)}>"
-      base[:from] = "#{template.from_name} <#{template.from_email}>" if template.from_name && template.from_email
-      base[:reply_to] = "#{template.reply_to}" if template.reply_to
+      base[:from] = "#{template.from_name} <#{template.from_email}>" unless template.from_name.blank? || template.from_email.blank?
+      base[:reply_to] = "#{template.reply_to}" unless template.reply_to.blank?
       base
     end
 
@@ -39,9 +40,9 @@ module NoNotifierNeeded
 
     def known_models
       @known_models if @known_models
-      @known_models = ActiveRecord::Base.send( :subclasses )
-#      @known_models += @known_models.collect{|k| k.send(:subclasses) }.flatten.uniq
-#      @known_models.uniq!
+      @known_models = ActiveRecord::Base.send( :descendants ).flatten.uniq
+      @known_models += @known_models.collect{|k| k.send(:descendants) }.flatten.uniq
+      @known_models.uniq!
       @known_models
     end
   end

data/no_notifier_needed.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "no_notifier_needed"
-  s.version = "2.0.4"
+  s.version = "2.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Robert R. Meyer"]
-  s.date = "2013-01-29"
+  s.date = "2013-02-03"
   s.description = "A work in progress: Replace ActionMailer::Base class redundency. Temlating using haml or erb."
   s.email = "Blue.Dog.Archolite@gmail.com"
   s.extra_rdoc_files = [
@@ -25,7 +25,6 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
-    "initializers/hotpatches/subclasses.rb",
     "initializers/notifier.rb",
     "lib/generators/no_notifier_needed/install_generator.rb",
     "lib/generators/no_notifier_needed/templates/email_template.rb",
@@ -95,6 +94,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<haml>, [">= 0"])
       s.add_runtime_dependency(%q<rails>, [">= 3.2.11"])
       s.add_runtime_dependency(%q<metric_fu>, [">= 0"])
+      s.add_runtime_dependency(%q<facets>, ["~> 2.9.3"])
       s.add_development_dependency(%q<rails-pry>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
@@ -105,6 +105,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<haml>, [">= 0"])
       s.add_dependency(%q<rails>, [">= 3.2.11"])
       s.add_dependency(%q<metric_fu>, [">= 0"])
+      s.add_dependency(%q<facets>, ["~> 2.9.3"])
       s.add_dependency(%q<rails-pry>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
@@ -116,6 +117,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<haml>, [">= 0"])
     s.add_dependency(%q<rails>, [">= 3.2.11"])
     s.add_dependency(%q<metric_fu>, [">= 0"])
+    s.add_dependency(%q<facets>, ["~> 2.9.3"])
     s.add_dependency(%q<rails-pry>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])

metadata

@@ -2,7 +2,7 @@
 name: no_notifier_needed
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.0.4
+  version: 2.0.8
 platform: ruby
 authors: 
 - Robert R. Meyer
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-29 00:00:00 Z
+date: 2013-02-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: haml
@@ -46,8 +46,19 @@ dependencies:
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rails-pry
+  name: facets
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.9.3
+  type: :runtime
+  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rails-pry
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -55,10 +66,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: shoulda
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -66,10 +77,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rdoc
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -77,10 +88,10 @@ dependencies:
         version: "3.12"
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -88,10 +99,10 @@ dependencies:
         version: 1.2.3
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -99,10 +110,10 @@ dependencies:
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: simplecov
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -110,7 +121,7 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *id010
 description: "A work in progress: Replace ActionMailer::Base class redundency. Temlating using haml or erb."
 email: Blue.Dog.Archolite@gmail.com
 executables: []
@@ -129,7 +140,6 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- initializers/hotpatches/subclasses.rb
 - initializers/notifier.rb
 - lib/generators/no_notifier_needed/install_generator.rb
 - lib/generators/no_notifier_needed/templates/email_template.rb
@@ -198,7 +208,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4263578042653107453
+      hash: -1788069034561306138
       segments: 
       - 0
       version: "0"

data/initializers/hotpatches/subclasses.rb

@@ -1,17 +0,0 @@
-class Object
-  def self.subclasses(direct = false)
-    classes = []
-    if direct
-      ObjectSpace.each_object(Class) do |c|
-        next unless c.superclass == self
-        classes << c
-      end
-    else
-      ObjectSpace.each_object(Class) do |c|
-        next unless c.ancestors.include?(self) and (c != self)
-        classes << c
-      end
-    end
-    classes
-  end
-end