ispmail-on-rails 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01096e9085a7a63f8f1db334ca0ef2059bd388aa
-  data.tar.gz: 4ad07c63b1bc0ec6c995208dd71287f2ee5c2f24
+  metadata.gz: 26ebc3f4f1d1f46091e87b3643171928c9a9d8b7
+  data.tar.gz: 502c2f66c1e307e921a6d504e9e6b8ff3ac74ba2
 SHA512:
-  metadata.gz: 657df8f6e958a237069a090509e8671a5d46ac6bb75975607d41b086f09a3e2a23e65bb46cacb5c8669f68cbb7f567c235ca1f79876d98b58a37a9d3a8e1e31e
-  data.tar.gz: 763d87bf8613b9e82218b9ef5086d0ef30cbe4cb97fca32fbe47e97b54b54e472c7aecf74b0054e758210367a66ab937293015f5263c6b4556c25b46680c84a3
+  metadata.gz: 98008acba0c599aacd6d3099f8b0f2d9b409d231af1e7d32a4b1b23ff57732b2670c248e7e136567a0ec75fc5a555e70f958fa07fb54afd030876d988aa97723
+  data.tar.gz: 8d3ac999527c9bd1e2325400e240dff30ef6dfefd8eeb1829a9016072abc084368b16a2c4b37e3383f6b4665d56d6f722a17e2c4c9ba0cb8f04064c97e41e3df

data/app/models/virtual_alias.rb

@@ -1,6 +1,6 @@
 class VirtualAlias < ActiveRecord::Base
   validates :source, presence: true, domain_name: true, email: true
-  validates :destination, presence: true, email: true
+  validates :destination, presence: true, alias: true, uniqueness: true
   validates :domain_id, presence: true
 
   belongs_to :virtual_domain, foreign_key: :domain_id
@@ -8,9 +8,13 @@ class VirtualAlias < ActiveRecord::Base
   before_validation :complete_emails
 
   private
+
+  # Complete email addresses with the domain, if only user name is given
+  # Clean up destination list to pass the AliasValidator
   def complete_emails
     self.source += "@#{virtual_domain.name}" unless source =~ /@/
     self.destination += "@#{virtual_domain.name}" unless destination =~ /@/
+    self.destination = destination.split(/,| /).select {|ds| !ds.empty? }.map(&:strip).join(", ")
   end
 
 end

data/app/validators/alias_validator.rb

@@ -0,0 +1,11 @@
+# Validates that a string contains only valid email addresses, separated by comma
+class AliasValidator < EmailValidator
+  def validate_each(record, attribute, value)
+    destinations = value.split(",")
+    unless destinations.map {|destination|
+        self.class.valid? destination.strip
+      }.all?
+      record.errors[attribute] << (options[:message] || "is not a valid list of email addresses")
+    end
+  end
+end

data/app/validators/password_validator.rb

@@ -1,7 +1,7 @@
 # Validates the attribute's value is an acceptable password
 class PasswordValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    if record.password_changing? && value.to_s.size <= 10
+    if record.password_changing? && value.to_s.size < 10
       record.errors[attribute] << (options[:message] || "must be minimum 10 characters long")
     elsif record.password.blank? && !record.password_changing?
       record.errors[attribute] << (options[:message] || "must be set")

data/app/views/application/_heading.html.erb

@@ -1,7 +1,7 @@
   <!-- domain-heading from application/_heading.html.erb -->
   <div class="row domain-heading">
     <div class="small-6 columns">
-      <h1>Virtual users for <%= @domain.name %></h1>
+      <h1>Virtual <%= @virtual_user.nil? ? "aliases" : "users" %> for <%= @domain.name %></h1>
     </div>
     <div class="small-6 columns">
       <p>

data/db/migrate/20160321130230_create_virtual_domains.rb

@@ -6,7 +6,7 @@ class CreateVirtualDomains < ActiveRecord::Migration
 
         t.timestamps null: false
       end
-      add_index :domains, :name, unique: true
+      add_index :virtual_domains, :name, unique: true
     rescue
     end
   end

data/db/migrate/20160321130250_create_virtual_users.rb

@@ -9,7 +9,7 @@ class CreateVirtualUsers < ActiveRecord::Migration
         t.timestamps null: false
       end
       add_index :virtual_users, :email, unique: true
-      add_foreign_key :virtual_users, :domains, on_delete: :cascade
+      add_foreign_key :virtual_users, :virtual_domains, column: :domain_id, on_delete: :cascade
     rescue
     end
   end

data/db/migrate/20160321130353_create_virtual_aliases.rb

@@ -8,7 +8,8 @@ class CreateVirtualAliases < ActiveRecord::Migration
 
         t.timestamps null: false
       end
-      add_foreign_key :virtual_aliases, :domains, on_delete: :cascade
+      add_index :virtual_aliases, :destination, unique: true
+      add_foreign_key :virtual_aliases, :virtual_domains, column: :domain_id, on_delete: :cascade
     rescue
     end
   end

data/db/schema.rb

@@ -13,14 +13,6 @@
 
 ActiveRecord::Schema.define(version: 20160321133546) do
 
-  create_table "domains", force: :cascade do |t|
-    t.string   "name",       limit: 255, null: false
-    t.datetime "created_at",             null: false
-    t.datetime "updated_at",             null: false
-  end
-
-  add_index "domains", ["name"], name: "index_domains_on_name", unique: true, using: :btree
-
   create_table "users", force: :cascade do |t|
     t.datetime "created_at",                     null: false
     t.datetime "updated_at",                     null: false
@@ -43,6 +35,14 @@ ActiveRecord::Schema.define(version: 20160321133546) do
 
   add_index "virtual_aliases", ["domain_id"], name: "index_virtual_aliases_on_domain_id", using: :btree
 
+  create_table "virtual_domains", force: :cascade do |t|
+    t.string   "name",       limit: 255, null: false
+    t.datetime "created_at",             null: false
+    t.datetime "updated_at",             null: false
+  end
+
+  add_index "virtual_domains", ["name"], name: "index_virtual_domains_on_name", unique: true, using: :btree
+
   create_table "virtual_users", force: :cascade do |t|
     t.integer  "domain_id",  limit: 4,   null: false
     t.string   "password",   limit: 255, null: false
@@ -54,6 +54,6 @@ ActiveRecord::Schema.define(version: 20160321133546) do
   add_index "virtual_users", ["domain_id"], name: "index_virtual_users_on_domain_id", using: :btree
   add_index "virtual_users", ["email"], name: "index_virtual_users_on_email", unique: true, using: :btree
 
-  add_foreign_key "virtual_aliases", "domains", on_delete: :cascade
-  add_foreign_key "virtual_users", "domains", on_delete: :cascade
+  add_foreign_key "virtual_aliases", "virtual_domains", column: "domain_id", on_delete: :cascade
+  add_foreign_key "virtual_users", "virtual_domains", column: "domain_id", on_delete: :cascade
 end

data/lib/ispmail/on/rails/version.rb

@@ -1,7 +1,7 @@
 module Ispmail
   module On
     module Rails
-      VERSION = "0.2.3"
+      VERSION = "0.3.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ispmail-on-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Runar Ingebrigtsen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-28 00:00:00.000000000 Z
+date: 2016-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -99,6 +99,7 @@ files:
 - app/models/virtual_alias.rb
 - app/models/virtual_domain.rb
 - app/models/virtual_user.rb
+- app/validators/alias_validator.rb
 - app/validators/domain_name_validator.rb
 - app/validators/password_validator.rb
 - app/views/api/virtual_aliases/index.json.jbuilder
@@ -195,3 +196,4 @@ signing_key:
 specification_version: 4
 summary: Rails app to manage ISPMAIL
 test_files: []
+has_rdoc: