nisetegami 0.5.0 → 0.5.1

data/README.md

@@ -1,5 +1,5 @@
 ## Nisetegami
 
-
+Authors: Denis Lifanov, Dmitry Afanasyev
 
 This project rocks and uses MIT-LICENSE.

data/app/assets/stylesheets/nisetegami/templates.css.scss

@@ -17,3 +17,7 @@ table {
 form.filters table {
   text-align: left;
 }
+
+.red {
+  color: red;
+}

data/app/controllers/nisetegami/templates_controller.rb

@@ -11,7 +11,6 @@ module Nisetegami
       %w(name subject from reply_to cc bcc).each do |attr|
         @templates = @templates.where(["#{attr} LIKE ?", "%#{params[attr]}%"]) unless params[attr].blank?
       end
-      @templates = @templates.all
     end
 
     def actions

data/app/models/nisetegami/template.rb

@@ -24,11 +24,11 @@ class Nisetegami::Template < ActiveRecord::Base
 
   address_re   = "(?:[^<@]+\\s+<#{Nisetegami.email_re}>|#{Nisetegami.email_re})"
   addresses_re = /^#{address_re}(?:\s*,\s*#{address_re})*$/i
-  validates_format_of :from, :reply_to, :cc, :bcc, with: addresses_re, allow_blank: true
-  validate :name, :subject, :body_text, :layout_text, presence: true
-  validate :body_html, :layout_html, presence: true, unless: :only_text?
-  validate :check_template_syntax
-  validate :check_mailer
+  validates :from, :reply_to, :cc, :bcc, format: {with: addresses_re}, allow_blank: true
+  validates :name, :subject, :body_text, presence: true
+  validates :body_html, presence: true, unless: :only_text?
+  validate  :check_template_syntax
+  validate  :check_mailer
 
   ## callbacks
 

data/app/views/nisetegami/templates/_field.html.erb

@@ -1,6 +1,9 @@
 <div class="control-group">
   <%= f.label attr, class: 'control-label' %>
   <div class="controls">
+    <% if f.object.errors[attr] %>
+      <span class="red"><%= f.object.errors[attr].join(', ') %></span>
+    <% end %>
     <%= (input = yield).present? ? input : f.text_field(attr) %>
   </div>
 </div>

data/lib/generators/initializers/nisetegami.rb

@@ -0,0 +1,14 @@
+Nisetegami.configure do |config|
+  # Cast variables types
+  # config.cast do |klass|
+  #   begin
+  #     "#{klass}Decorator".constantize
+  #   rescue
+  #     klass.constantize
+  #   end
+  # end
+
+  # Mailers mapping
+  # config.register 'UserMailer', :signup, user, temporary_password, created_at: 'DateTime'
+  # config.register 'UserMailer', :notice, user, notice, additional_attributes: 'Hash'
+end

data/lib/generators/{nisetegami/templates/migrations → migrations}/001_create_nisetegami_templates.rb

@@ -5,7 +5,7 @@ class CreateNisetegamiTemplates < ActiveRecord::Migration
       ## mapping
       t.string :mailer # EG: "TestMailer"
       t.string :action # EG: "simple"
-      t.string :name   # results in "TestMailer#simple"
+      t.string :name
 
       ## headers
       t.string :from

data/lib/generators/{nisetegami/templates_generator.rb → nisetegami_generator.rb}

@@ -1,10 +1,10 @@
 require 'rails/generators'
 require 'rails/generators/migration'
 
-class Nisetegami::TemplatesGenerator < Rails::Generators::Base
+class NisetegamiGenerator < Rails::Generators::Base
   include Rails::Generators::Migration
 
-  source_root File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
+  source_root File.dirname(__FILE__)
 
   def self.next_migration_number(dirname)
     if ActiveRecord::Base.timestamped_migrations
@@ -14,6 +14,10 @@ class Nisetegami::TemplatesGenerator < Rails::Generators::Base
     end
   end
 
+  def create_config_file
+    template 'initializers/nisetegami.rb', 'config/initializers/nisetegami.rb'
+  end
+
   def create_migrations
     Dir[File.join(self.class.source_root, 'migrations/*.rb')].sort.each do |template|
       basename = File.basename(template).gsub(/^\d+_/, '')

data/lib/nisetegami.rb

@@ -19,7 +19,7 @@ module Nisetegami
   mattr_reader :mapping
   @@mapping = Nisetegami::Mapping.new
 
-  mattr_accessor :email_re
+  mattr_reader :email_re
   @@email_re = /[-a-z0-9_+\.]+@([-a-z0-9]+\.)+[a-z0-9]{2,}/
 
   def self.configure
@@ -29,7 +29,15 @@ module Nisetegami
   # optional block to cast a thing (String, Symbol)
   # into a class with liquid_methods
   def self.cast(&block)
-    @@cast ||= ->(thing){ defined?(thing) == 'constant' ? thing : thing.to_s.constantize }
+    @@cast ||= ->(thing) do
+      if defined?(thing) == 'constant'
+        thing
+      elsif const_defined?(thing.to_s)
+        thing.to_s.constantize
+      else
+        String
+      end
+    end
     block_given? ? @@cast = block : @@cast
   end
 

data/lib/nisetegami/version.rb

@@ -1,3 +1,3 @@
 module Nisetegami
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/lib/tasks/nisetegami_tasks.rake

@@ -1,7 +1,7 @@
 namespace :nisetegami do
   namespace :templates do
     desc "Populate nisetegami templates with sample data"
-    task :populate => :environment do
+    task populate: :environment do
       Nisetegami.populate!
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nisetegami
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-09 00:00:00.000000000 Z
+date: 2012-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -169,8 +169,9 @@ files:
 - config/locales/nisetegami.en.yml
 - config/locales/nisetegami.ru.yml
 - config/routes.rb
-- lib/generators/nisetegami/templates/migrations/001_create_nisetegami_templates.rb
-- lib/generators/nisetegami/templates_generator.rb
+- lib/generators/initializers/nisetegami.rb
+- lib/generators/migrations/001_create_nisetegami_templates.rb
+- lib/generators/nisetegami_generator.rb
 - lib/nisetegami/action_mailer_extensions.rb
 - lib/nisetegami/ar_template_resolver.rb
 - lib/nisetegami/asset_provider.rb