email_template 0.6.0 → 0.6.2

data/lib/email-template/version.rb

@@ -1,3 +1,3 @@
 module EmailTemplate
-  VERSION = "0.6.0"
+  VERSION = "0.6.2"
 end

data/lib/email_template.rb

@@ -2,8 +2,8 @@ require "email_template/j_models"
 require "email_template/j_mailers"
 require "email_template/j_helpers"
 
-include JModels
-include JMailers
+include EmailTemplate::JModels
+include EmailTemplate::JMailers
 include EmailTemplate::Mailers::Helpers
 
 module EmailTemplate

data/lib/email_template/j_mailers.rb

@@ -1,7 +1,9 @@
-module JMailers
-  class TemplateSendMailer < ActionMailer::Base
-    def send_mail(template_name, mail_params = {}, template_params = {})
-      mailing(check_template(template_name), mail_params, template_params)
+module EmailTemplate
+  module JMailers
+    class TemplateSendMailer < ActionMailer::Base
+      def send_mail(template_name, mail_params = {}, template_params = {})
+        mailing(check_template(template_name), mail_params, template_params)
+      end
     end
   end
 end

data/lib/email_template/j_models.rb

@@ -1,112 +1,114 @@
-module JModels
-  class MailTemplate < ActiveRecord::Base
-    include EmailTemplate
-    include ActionView::Helpers::SanitizeHelper
-
-    self.table_name = 'email_templates'
-
-    attr_accessor :prepared
+module EmailTemplate
+  module JModels
+    class MailTemplate < ActiveRecord::Base
+      include ::EmailTemplate
+      include ActionView::Helpers::SanitizeHelper
+
+      self.table_name = 'email_templates'
+
+      attr_accessor :prepared
+
+      attr_accessible :name, :body, :subject, :classes
+      serialize :classes, Array
+
+      validates :name, :uniqueness => true
+
+      def prepare(attrs={})
+        @prepared ||= lambda{ |attrs|
+          attrs.stringify_keys!
+          body.gsub(/\#{.*?}/) do |match|
+            elem, action = match[2..-2].split('.')
+            if (action)
+              attrs[elem].try(action.to_sym) rescue match.to_s
+            else
+              attrs[elem] || match.to_s
+            end
+          end
+        }.call(attrs)
+      end
 
-    attr_accessible :name, :body, :subject, :classes
-    serialize :classes, Array
+      def as_html(attrs={})
+        prepare(attrs)
+      end
 
-    validates :name, :uniqueness => true
+      def as_text(attrs={})
+        strip_tags(prepare(attrs))
+        #sanitize(prepare(attrs), :tags => %w(a), :attributes => %w(href))
+      end
 
-    def prepare(attrs={})
-      @prepared ||= lambda{ |attrs|
-        attrs.stringify_keys!
-        body.gsub(/\#{.*?}/) do |match|
-          elem, action = match[2..-2].split('.')
-          if (action)
-            attrs[elem].try(action.to_sym) rescue match.to_s
+      def prepare_fields
+        possible_attrs = []
+        self.classes.each do |resource_class|
+          current_class = resource_class.downcase.match(/\w*/mix).to_a.first
+          if (current_class[0] == '_')
+            possible_attrs << obj(current_class.from(1))
           else
-            attrs[elem] || match.to_s
+            const_obj = current_class.camelize.constantize
+            [:find_attributes, :find_columns, :find_methods].each do |method|
+              possible_attrs += self.send(method, current_class, const_obj)
+            end
           end
         end
-      }.call(attrs)
-    end
-
-    def as_html(attrs={})
-      prepare(attrs)
-    end
-
-    def as_text(attrs={})
-      strip_tags(prepare(attrs))
-      #sanitize(prepare(attrs), :tags => %w(a), :attributes => %w(href))
-    end
+        possible_attrs.uniq
+      end
 
-    def prepare_fields
-      possible_attrs = []
-      self.classes.each do |resource_class|
-        current_class = resource_class.downcase.match(/\w*/mix).to_a.first
-        if (current_class[0] == '_')
-          possible_attrs << obj(current_class.from(1))
-        else
-          const_obj = current_class.camelize.constantize
-          [:find_attributes, :find_columns, :find_methods].each do |method|
-            possible_attrs += self.send(method, current_class, const_obj)
-          end
+      protected
+      def finder(classname, items, val, current_pattern)
+        items.each_with_object([]) do |attr, ret|
+          (ret << obj(classname, attr.send(val))) if ((attr.send(val) =~ /#{current_pattern}/).nil? || current_pattern.nil?)
         end
       end
-      possible_attrs.uniq
-    end
 
-    protected
-    def finder(classname, items, val, current_pattern)
-      items.each_with_object([]) do |attr, ret|
-        (ret << obj(classname, attr.send(val))) if ((attr.send(val) =~ /#{current_pattern}/).nil? || current_pattern.nil?)
+      def find_attributes(classname, object)
+        if object.respond_to?(:attributes)
+          finder(classname, object.attributes, :first, attr_pattern(classname))
+        end || []
       end
-    end
-
-    def find_attributes(classname, object)
-      if object.respond_to?(:attributes)
-        finder(classname, object.attributes, :first, attr_pattern(classname))
-      end || []
-    end
 
-    def find_columns(classname, object)
-      if object.respond_to?(:columns)
-        finder(classname, object.columns, :name, column_pattern(classname))
-      end || []
-    end
+      def find_columns(classname, object)
+        if object.respond_to?(:columns)
+          finder(classname, object.columns, :name, column_pattern(classname))
+        end || []
+      end
 
-    def find_methods(classname, object)
-      object.public_instance_methods.each_with_object([]) do |m_alias, ret|
-        (ret << obj(classname, m_alias.to_s.from(methods_header.length))) if m_alias.to_s.start_with?(methods_header)
+      def find_methods(classname, object)
+        object.public_instance_methods.each_with_object([]) do |m_alias, ret|
+          (ret << obj(classname, m_alias.to_s.from(methods_header.length))) if m_alias.to_s.start_with?(methods_header)
+        end
       end
-    end
 
-    def find_devise_methods(object)
-      res = []
-      res << obj("confirmation_token")    if object.respond_to? :confirmation_token
-      res << obj("reset_password_token")  if object.respond_to? :reset_password_token
-      res << obj("unlock_token")          if object.respond_to? :unlock_token
-      res
-    end
+      def find_devise_methods(object)
+        res = []
+        res << obj("confirmation_token")    if object.respond_to? :confirmation_token
+        res << obj("reset_password_token")  if object.respond_to? :reset_password_token
+        res << obj("unlock_token")          if object.respond_to? :unlock_token
+        res
+      end
 
-    private
-    def regex_from_list(list)
-      list.blank? ? nil : "(" + list.join(")|(") + ")"
-    end
+      private
+      def regex_from_list(list)
+        list.blank? ? nil : "(" + list.join(")|(") + ")"
+      end
 
-    def regex_from_hash(hash, object)
-      regex_from_list(hash[object] || hash['*'] || [])
-    end
+      def regex_from_hash(hash, object)
+        regex_from_list(hash[object] || hash['*'] || [])
+      end
 
-    def pattern(elems, object)
-      elems.is_a?(Array) ? regex_from_list(elems) : regex_from_hash(elems, object)
-    end
+      def pattern(elems, object)
+        elems.is_a?(Array) ? regex_from_list(elems) : regex_from_hash(elems, object)
+      end
 
-    def column_pattern(object)
-      pattern(columns_black_list, object)
-    end
+      def column_pattern(object)
+        pattern(columns_black_list, object)
+      end
 
-    def attr_pattern(object)
-      pattern(attributes_black_list, object)
-    end
+      def attr_pattern(object)
+        pattern(attributes_black_list, object)
+      end
 
-    def obj(clas, name = nil)
-      "\#{#{[clas, name].compact.join('.')}}"
+      def obj(clas, name = nil)
+        "\#{#{[clas, name].compact.join('.')}}"
+      end
     end
   end
 end

data/lib/email_template/linkable/devise.rb

@@ -1,35 +1,37 @@
-module Linkable
-  module DeviseMailer
-    class DeviseTemplateSendMailer < Devise::Mailer
-      require "email_template/linkable/devise_helper"
-      include Linkable::DeviseMailerHelper
-      include ActionView::Helpers::UrlHelper
-      include Devise::Mailers::Helpers
+module EmailTemplate
+  module Linkable
+    module DeviseMailer
+      class DeviseTemplateSendMailer < Devise::Mailer
+        require "email_template/linkable/devise_helper"
+        include EmailTemplate::Linkable::DeviseMailerHelper
+        include ActionView::Helpers::UrlHelper
+        include Devise::Mailers::Helpers
 
-      def send_mail(record, action, template_name, mail_params = {}, template_params = {})
-        initialize_from_record(record)
-        opts = template_params[:*] || {}
+        def send_mail(record, action, template_name, mail_params = {}, template_params = {})
+          initialize_from_record(record)
+          opts = template_params[:*] || {}
 
-        template_params.reverse_merge!(
-          :confirm_link => link_to(opts[:confirm_name] || 'Confirm my account',
-            "#{link_head(record)}/confirmation?confirmation_token=#{@resource.confirmation_token}")
-        ) if @resource.respond_to? :confirmation_token
+          template_params.reverse_merge!(
+            :confirm_link => link_to(opts[:confirm_name] || 'Confirm my account',
+              "#{link_head(record)}/confirmation?confirmation_token=#{@resource.confirmation_token}")
+          ) if @resource.respond_to? :confirmation_token
 
-        template_params.reverse_merge!(
-          :edit_password_link => link_to(opts[:change_name] || 'Change my password',
-            "#{link_head(record)}/password/edit?reset_password_token=#{@resource.reset_password_token}")
-        ) if @resource.respond_to? :reset_password_token
+          template_params.reverse_merge!(
+            :edit_password_link => link_to(opts[:change_name] || 'Change my password',
+              "#{link_head(record)}/password/edit?reset_password_token=#{@resource.reset_password_token}")
+          ) if @resource.respond_to? :reset_password_token
 
-        template_params.reverse_merge!(
-          :unlock_link => link_to(opts[:unlock_name] || 'Unlock my account',
-            "#{link_head(record)}/unlock?unlock_token => #{@resource.unlock_token}")
-        ) if @resource.respond_to? :unlock_token
+          template_params.reverse_merge!(
+            :unlock_link => link_to(opts[:unlock_name] || 'Unlock my account',
+              "#{link_head(record)}/unlock?unlock_token => #{@resource.unlock_token}")
+          ) if @resource.respond_to? :unlock_token
 
-        mailing(
-            check_template(template_name),
-            headers_for(action, mail_params).except(:subject, :template_path, :template_name),
-            template_params.except(:*)
-        )
+          mailing(
+              check_template(template_name),
+              headers_for(action, mail_params).except(:subject, :template_path, :template_name),
+              template_params.except(:*)
+          )
+        end
       end
     end
   end

data/lib/email_template/linkable/devise_helper.rb

@@ -1,12 +1,14 @@
-module Linkable
-  module DeviseMailerHelper
-    def link_head(record)
-      "#{ActionMailer::Base.default_url_options[:host]}/#{record.class.name.tableize.singularize}"
-    end
+module EmailTemplate
+  module Linkable
+    module DeviseMailerHelper
+      def link_head(record)
+        "#{ActionMailer::Base.default_url_options[:host]}/#{record.class.name.tableize.singularize}"
+      end
 
-    def sending(record, action, template_name, email_opts = {}, template_opts = {})
-      send_mail(record, action, template_name, email_opts,
-                template_opts.merge(obj_class_name(record).to_sym => record))
+      def sending(record, action, template_name, email_opts = {}, template_opts = {})
+        send_mail(record, action, template_name, email_opts,
+                  template_opts.merge(obj_class_name(record).to_sym => record))
+      end
     end
   end
 end

data/lib/generators/active_record/migration.rb

@@ -11,6 +11,6 @@ class AddMailsTemplate < ActiveRecord::Migration
   end
 
   def self.down
-    drop_table :mail_templates
+    drop_table :email_templates
   end
 end

data/lib/generators/templates/devise/custom_devise_mailer.rb

@@ -1,5 +1,5 @@
 require "email_template/linkable/devise"
-include Linkable::DeviseMailer
+include EmailTemplate::Linkable::DeviseMailer
 
 class CustomDeviseMailer < DeviseTemplateSendMailer
   def confirmation_instructions(record, opts={})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: email_template
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-19 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -71,12 +71,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -656039679
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -656039679
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24