no_notifier_needed 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/no_notifier_needed/config.rb

@@ -0,0 +1,23 @@
+module NoNotifierNeeded
+  module Config
+
+    VALID_OPTIONS_KEYS = [
+      :from,
+      :bcc,
+      :reply_to,
+      :host,
+      :controller,
+      :action
+    ].freeze
+
+    # @private
+    attr_accessor *VALID_OPTIONS_KEYS
+
+    # Create a hash of options and their values
+    def options
+      VALID_OPTIONS_KEYS.inject({}) do |option, key|
+        option.merge!(key => send(key))
+      end
+    end
+  end
+end

data/lib/no_notifier_needed/railtie.rb

@@ -3,10 +3,13 @@ module NoNotifierNeeded
     initializer "Include code in controller" do
       ActiveSupport.on_load(:action_controller) do
 
+        #TODO
+        #Pass defaults to allow for this to work
         #::ActionMailer::Base.send(:include, ActionView::Helpers::)
-        ::ActionMailer::Base.send(:include, Rails.application.routes.url_helpers) # brings ActionDispatch::Routing::UrlFor
-        ::ActionMailer::Base.send(:include, ActionView::Helpers::UrlHelper)
-        ::ActionMailer::Base.send(:include, ActionView::Helpers::TextHelper)
+
+        NoNotifierNeeded::Sender.send(:include, Rails.application.routes.url_helpers) # brings ActionDispatch::Routing::UrlFor
+        NoNotifierNeeded::Sender.send(:include, ActionView::Helpers::UrlHelper)
+        NoNotifierNeeded::Sender.send(:include, ActionView::Helpers::TextHelper)
       end
     end
   end

data/lib/no_notifier_needed/send.rb

@@ -15,19 +15,5 @@ module NoNotifierNeeded
       time_from_now = what_time.is_a?(Time) ? what_time : Chronic.parse(what_time)
       Resque.enqueue_at(time_from_now, EmailProcessor, email_hash)
     end
-
-    def mcp(email_name, args)
-      @template = EmailTemplate.find_by_name(email_name)
-      raise "Email Template name not found" if @template.nil?
-
-      args_to_instance_vars(args)
-
-
-      mail_is = ActionMailer::Base.mail(get_send_hash) do|format|
-        format.html { render :inline => render_template_body_type(@template) }
-      end
-
-      return mail_is
-    end
   end
 end

data/lib/no_notifier_needed/sender.rb

@@ -0,0 +1,16 @@
+module NoNotifierNeeded
+  module Sender
+    def mcp(email_name, args)
+      template = EmailTemplate.find_by_name(email_name)
+      raise "Email Template name not found" if template.nil?
+
+      args_to_instance_vars(args)
+
+      mail_is = mail(get_send_hash) do|format|
+        format.html { render :inline => render_template_body_type(template) }
+      end
+
+      return mail_is
+    end
+  end
+end

data/lib/no_notifier_needed/translate.rb

@@ -21,10 +21,7 @@ module NoNotifierNeeded
     end
 
     def get_send_hash
-      mailers = ActiveSupport::DescendantsTracker.descendants(ActionMailer::Base)
-      send_hash = {}
-
-      send_hash.merge!(mailers.first.default)
+      send_hash = base_send_hash
       send_hash[:subject] = render_template_subject_type(@template)
       send_hash[:to] = @to.nil? ? @user.email : @to
       send_hash[:from] = @from unless @from.nil?
@@ -32,10 +29,16 @@ module NoNotifierNeeded
       send_hash
     end
 
+    def base_send_hash
+      base = {}
+      NoNotifierNeeded::Config::VALID_OPTIONS_KEYS.each do |k|
+        base[k] = NoNotifierNeeded.send(k)
+      end
+      base
+    end
+
     def args_to_instance_vars(args)
       #take each key, if a model, make it an @#{model} = model.find(value)
-      known_models = ActiveRecord::Base.send( :subclasses )
-
       #else make it a @#{name}=#{value}
       args.each do |k,v|
         if Object.const_defined?(k.classify) && known_models.include?(k.classify.constantize)
@@ -50,9 +53,11 @@ module NoNotifierNeeded
       end
     end
 
-    def translate_to_hash(which_email, args)
-      known_models = ActiveRecord::Base.send( :subclasses )
+    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
 

data/lib/no_notifier_needed.rb

@@ -1,14 +1,34 @@
 require 'no_notifier_needed/send'
 require 'no_notifier_needed/translate'
 require 'no_notifier_needed/render'
-
+require 'no_notifier_needed/config'
+require 'no_notifier_needed/sender'
 
 module NoNotifierNeeded
-  include NoNotifierNeeded::Send
-  include NoNotifierNeeded::Translate
-  include NoNotifierNeeded::Render
+  extend Config
+  extend Send
+#  include Render
+#  include Translate
+#  include Sender
+
+  def self.sender(options={})
+    NoNotifierNeeded::Sender.new(options)
+  end
+
+  def self.configure
+    yield self
+  end
+
+  def self.method_missing(method, *args, &block)
+    return super unless sender.respond_to?(method)
+    sender.send(method, *args, &block)
+  end
 
+  # Delegate to Instagram::Client
+  def self.respond_to?(method)
+    return sender.respond_to?(method) || super
+  end
 end
 
 require 'no_notifier_needed/railtie.rb' if defined?(Rails)
-::ActionMailer::Base.extend NoNotifierNeeded
+#::ActionMailer::Base.extend NoNotifierNeeded

data/no_notifier_needed.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "no_notifier_needed"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Robert R. Meyer"]
-  s.date = "2013-01-09"
+  s.date = "2013-01-11"
   s.description = "A work in progress"
   s.email = "Blue.Dog.Archolite@gmail.com"
   s.extra_rdoc_files = [
@@ -28,9 +28,11 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "lib/no_notifier_needed.rb",
+    "lib/no_notifier_needed/config.rb",
     "lib/no_notifier_needed/railtie.rb",
     "lib/no_notifier_needed/render.rb",
     "lib/no_notifier_needed/send.rb",
+    "lib/no_notifier_needed/sender.rb",
     "lib/no_notifier_needed/translate.rb",
     "no_notifier_needed.gemspec",
     "test/helper.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: no_notifier_needed
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-09 00:00:00.000000000 Z
+date: 2013-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -142,9 +142,11 @@ files:
 - Rakefile
 - VERSION
 - lib/no_notifier_needed.rb
+- lib/no_notifier_needed/config.rb
 - lib/no_notifier_needed/railtie.rb
 - lib/no_notifier_needed/render.rb
 - lib/no_notifier_needed/send.rb
+- lib/no_notifier_needed/sender.rb
 - lib/no_notifier_needed/translate.rb
 - no_notifier_needed.gemspec
 - test/helper.rb
@@ -164,7 +166,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -121523023849342970
+      hash: 2782706298375828992
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: