rmails 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 722089a297589f3b84c92117564200adf61dece2
-  data.tar.gz: ec16435e608b9048f3734515a211a05ede2ae13b
+  metadata.gz: f401f448f9d918ccaf166213e68aab5c2e960a68
+  data.tar.gz: b0005de980f5159a5095ab98c32ef7af3f6c7bfb
 SHA512:
-  metadata.gz: fd2906efb59ddb99d0a2ec8e2f19cc834d3b91b66a519bfe945a77e6a1982d6ea0f70ec33424494a0afa0e5781a29a6ea5c54755979e1dc310be2c1e1dcf480f
-  data.tar.gz: 8e0ac9b713f62e2c020fd508940c4bbf27c94db6e52974cf31538e2bcdfcef8b244dae5b641f932f24757cf181cb3e804c8ac08ee8e4dc83737347dd8168aff2
+  metadata.gz: 9d03c6d4acacde0f7c16a54d146f2b02585720e9bf30da126fd4221c5ef6c67d915ff66583be37e9f5ca8480f8bd07ca6d86f8e7600874645342c798b6bb0344
+  data.tar.gz: 1d53cfbc754550f2849e9235f1b1162bfbde10474bc7a40f4b0ea2657d5cc2ff91ba30ce8698e7b4bc204cc148e0b98869e963563c7724dc37ce3e95c304bd31

data/.gitignore

@@ -6,6 +6,7 @@ doc/*
 config/database.yml
 db/*.sqlite3
 db/schema.rb
+db/data.yml
 *~
 start
 *.swp

data/CHANGELOG.md

@@ -0,0 +1,15 @@
+Changelog
+=========
+
+v0.2.3 - 2013-06-xx
+--------------------
+
+
+### Features and improvements ###
+
+ - Domains management use routes to edit, delete and manage actions.
+
+### Bug fixes ###
+
+
+

data/Vagrantfile

@@ -21,7 +21,7 @@ Vagrant::Config.run do |config|
     c.vm.box = "debian32"
     c.vm.forward_port 80, 8091
     c.vm.forward_port 3000, 4001
-    c.vm.forward_port 25, 1125
+    c.vm.forward_port 25,  1125
     c.vm.forward_port 587, 11587
     c.vm.forward_port 110, 11110
     c.vm.forward_port 995, 11995

data/app/assets/javascripts/controls/domains.coffee.erb

@@ -1,3 +1,7 @@
+can.route( ':action/:id' )
+can.route( ':action' )
+
+
 window.Domains = can.Control({
 
   init: (el, opt) ->
@@ -5,6 +9,27 @@ window.Domains = can.Control({
     @model = Domain.models JSON.parse($('#domains_JSON').text())
     return
 
+  render_manage_area: (li, item) ->
+    li.addClass('open').find('.item').append( can.view( 'manage_area_EJS' ) )
+    users   = new Users(li.find('.item .users'), {
+      items: item["virtual_users"]
+      domain_id: item.id
+      domain_name: item.name
+    })
+    aliases = new Aliases(li.find('.item .aliases'), {
+      items: item["virtual_aliases"]
+      domain_id: item.id
+      domain_name: item.name
+    })
+
+  close_manage_area: (li) ->
+    li.find('.nomanage').hide()
+    li.find('.manage').show()
+    li.removeClass('open')
+    it = li.find('.item .item-content:last')
+    if it.hasClass('out')
+      it.remove()
+
   "form reset": (el, ev) ->
     li = el.parents('li')
     if li.hasClass('empty')
@@ -16,22 +41,12 @@ window.Domains = can.Control({
       li.find('.item').html(
         can.view( 'domain_item_EJS', { item: item } )
       )
-
-  ".add-domain click": (el, ev) ->
-    ev.preventDefault()
-    $('#domains .empty').remove()
-    $('#domains').prepend(can.view( 'domain_form_EJS', { item: new Domain } ))
-    $('.add-domain').toggle()
-
-  ".rm-domain click": (el, ev) ->
-    ev.preventDefault()
-    $('#domains .empty').remove()
-    $('.add-domain').toggle()
+    can.route.attr('action', '' )
 
   "#new_virtual_domain submit": (el, ev) ->
     ev.preventDefault()
-    self = this
     values = el.formParams()
+    self = this
     item = new Domain(values["virtual_domain"])
     if item.errors() # validation error
       item.alert()
@@ -45,71 +60,49 @@ window.Domains = can.Control({
         )
       else
         # post-creation hook
-        item.attr('id', json.id)
-        li.removeClass('empty').attr('id', 'domain_'+json.id)
-        # show links to edit and remove with right id
-        li.find('.item').html(
-          can.view( 'domain_item_EJS', { item: item } )
-        ).find('.btn-group a').attr('href', (i, v) ->
-          return unescape(v).replace(/{id}/g, json.id)
-        )
-        self.model.unshift(item)
-        $('.add-domain').toggle()
+        item.attr(json.domain)
+        li.removeClass('empty').attr('id', 'domain_'+item.attr('id'))
     )
+    # show links to edit and remove with right id
+    li.find('.item').html( can.view( 'domain_item_EJS', { item: item } ) )
+    @model.unshift(item)
+    $('.add-domain').toggle()
 
+  ":action route": (a) ->
+    # action NEW
+    if a["action"] == 'new'
+      $('#domains .empty').remove()
+      $('#domains').prepend(can.view( 'domain_form_EJS', { item: new Domain } ))
+      $('.add-domain').toggle()
 
-
-  ".edit click": (el, ev) ->
-    ev.preventDefault()
-    li = el.parents('li')
-    id = li.attr('id').replace('domain_','')
-    item = @model.with_id(parseInt(id))
-    li.find('.item').html(can.view( 'domain_edit_EJS', { item: item } ))
-    li.addClass('inedit')
-    return false
-
-  ".delete click": (el, ev) ->
-    ev.preventDefault()
-    if not confirm('Are You sure?')
-      return false
-    li = el.parents('li')
-    id = li.attr('id').replace('domain_','')
-    item = @model.with_id(parseInt(id))
-    @model.splice(@model.indexOf(item), 1)
-    item.destroy()
-    li.remove()
-    return false
-
-  ".manage click": (el, ev) ->
-    ev.preventDefault()
-    li = el.parents('li')
-    txt = el.text()
-    el.text(el.data('inverse'))
-    el.data('inverse', txt)
-    if el.hasClass('label-info')
-      el.removeClass('label-info')
-    else
-      el.addClass('label-info')
-      li.find('.item-content:last').remove()
-      return false
-
-    id = li.attr('id').replace('domain_','')
-    item = @model.with_id(parseInt(id))
-    if li.find('.item .item-content:last').hasClass('out')
-      return false
-    li.find('.item').append(
-      can.view( 'manage_area_EJS' )
-    )
-    users   = new Users(li.find('.item .users'), {
-      items: item["virtual_users"]
-      domain_id: id
-      domain_name: item.name
-    })
-    aliases = new Aliases(li.find('.item .aliases'), {
-      items: item["virtual_aliases"]
-      domain_id: id
-      domain_name: item.name
-    })
-    return false
+  ":action/:id route": (params) ->
+    li = $("#domain_" + params["id"])
+    item = @model.with_id(parseInt(params["id"]))
+    self = this
+    # action EDIT
+    if params["action"] == 'edit'
+      li.find('.item').html(can.view( 'domain_edit_EJS', { item: item } ))
+      li.addClass('inedit')
+    # action DELETE
+    else if params["action"] == 'delete'
+      if confirm(li.find('.rm').data('msg'))
+        Domain.destroy(item, (json) ->
+          if json["errors"]
+            alert(json["errors"])
+          else
+            # delete from local Model.list
+            self.model.splice(self.model.indexOf(item), 1)
+            li.remove()
+        )
+        can.route.attr({action:''})
+    # action SHOW
+    else if params["action"] == 'show'
+      li.find('.manage').hide()
+      li.find('.nomanage').show()
+      @close_manage_area($('.open'))
+      @render_manage_area(li, item)
+    # action HIDE
+    else if params["action"] == 'hide'
+      @close_manage_area(li)
 
 })

data/app/assets/javascripts/models/domain.coffee.erb

@@ -11,7 +11,9 @@ window.Domain = can.Model({
     url = unescape('<%= Rails.application.routes.url_helpers.domain_path('{id}') %>').replace('{id}', domain.id)
     return $.post(url, attrs, null, "json")
 
-  destroy : ('DELETE ' + unescape('<%= Rails.application.routes.url_helpers.domain_path('{id}') %>'))
+  destroy : (item, callback) ->
+    url = unescape('<%= Rails.application.routes.url_helpers.domain_path('{id}') %>').replace("{id}", item.id)
+    return $.post(url, {"_method":"DELETE"}, callback, "json")
 
 
   attributes: {
@@ -20,8 +22,7 @@ window.Domain = can.Model({
   },
 
   init: () ->
-    @validatePresenceOf ['name']
-    #@validateFormatOf   ['name'], /\A(?:[-a-z0-9]+\.)+[a-z]{2,}\Z/i
+    @validateFormatOf   ['name'], /^(?:[-a-z0-9]+\.)+[a-z]{2,}$/i
 
 }, {})
 

data/app/assets/stylesheets/application.sass

@@ -91,8 +91,7 @@ header
     display: inline-block
     background: transparent
     border: none
-    *
-      display: inline
+
   //.actions
     float: right
   //.inputs
@@ -103,15 +102,12 @@ header
 #rmails
   .list .table
     tr td
-      *
+      .aliases
         display: inline-block
       .help-block
         display: block !important
 
-  .label
-    display: inline !important
-
-.aliases, .users
+.aliases
   margin: 0
   label
     display: block !important
@@ -126,9 +122,6 @@ header
     width: 100%
   .control-group
     vertical-align: top
-
-.aliases
-  .control-group
     float: left
   input.string, textarea
     display: block !important
@@ -144,9 +137,8 @@ header
       padding: 3px
 
 .users
-  input.string, input.password
-    width: 254px !important
-    display: inline-block !important
+
+
 
 #system
   /*.control-label

data/app/assets/stylesheets/base.css.sass

@@ -188,13 +188,9 @@ body#comfy, body#rmails
           font-size: 15px
           font-weight: 700
         .label
-          display: none
           opacity: 0.7
           &:hover
             opacity: 1
-        &:hover
-          .label
-            display: inline
       .btn-group
         float: right
     li ul

data/app/controllers/domains_controller.rb

@@ -21,7 +21,7 @@ class DomainsController < ApplicationController
   def create # JSON only
     @domain = current_admin_user.build_domain(params[:virtual_domain])
     if @domain.save
-      render :json => {:id => @domain.id}
+      render :json => {:domain => @domain}
     else
       render :json => {:errors => @domain.errors}
     end

data/app/models/virtual_domain.rb

@@ -12,4 +12,10 @@ class VirtualDomain < ActiveRecord::Base
 
   default_scope order('id DESC').includes([:virtual_users, :virtual_aliases])
 
+  def as_json(opt={})
+    super opt.merge({
+            :include => [:virtual_users, :virtual_aliases]
+         })
+  end
+
 end

data/app/models/virtual_user.rb

@@ -1,12 +1,12 @@
 class VirtualUser < ActiveRecord::Base
 
   devise :database_authenticatable, :encryptable,
-         :recoverable, :rememberable, :trackable, :validatable,
+         :recoverable, :rememberable, :validatable,
          :encryptor => :dovecot_ssha512, :stretches => 1
 
   belongs_to :virtual_domain
 
-  attr_accessible :name, :email, :password, :password_confirmation
+  attr_accessible :name, :email, :password, :quota_kb, :quota_messages
 
   before_validation :repair_email_format
 

data/app/views/admin_users/first.html.haml

@@ -7,6 +7,5 @@
   = f.input :name, :label => t('.name')
   = f.input :email, :label => t('.email')
   = f.input :password, :label => t('.pass'), :required => true
-  = f.input :password_confirmation, :label => t('.passs')
 
   = f.button :button, t('.create'), :type => 'submit', :class => 'btn-primary'

data/app/views/aliases/_templates.html.haml

@@ -0,0 +1,29 @@
+%script#aliass_each_EJS{"type" => "text/ejs"}
+  :plain
+    <% list (items, function(item, index) { %>
+      <tr id="alias_<%= index %>">
+  %td.tar
+    :plain
+      <%= item.source %>
+  %td
+    %b
+      :plain
+        @<%= domain_name %>
+    %i.icon-hand-right
+  %td
+    :plain
+      <%= item.destination %>
+  %td.tar
+    = link_to t(".edit"), edit_domain_alias_path('{domain_id}', '{id}'), :class => 'label edit-alias'
+    = link_to "&times;".html_safe, domain_alias_path('{domain_id}', '{id}'), :class => 'rm-alias', :title => t(".delete")
+  :plain
+      </tr>
+    <% }) %>
+
+%script#aliass_tabr_EJS{"type" => "text/ejs"}
+  %tr.new
+
+%script#aliass_form_EJS{"type" => "text/ejs"}
+  %td{:colspan => "4"}
+    = render :partial => '/aliases/form', :locals => { :virtual_alias => alias_ejs_object }
+

data/app/views/domains/_templates.html.haml

@@ -0,0 +1,71 @@
+%script#domain_form_EJS{"type" => "text/ejs"}
+  %li.empty
+    .item
+      .iconat @
+      = render :partial => 'form', :locals => { :domain => domain_ejs_object }
+      .out
+
+%script#domain_edit_EJS{"type" => "text/ejs"}
+  .iconat @
+  = render :partial => 'form', :locals => { :domain => domain_ejs_object }
+  .out
+
+%script#domain_item_EJS{"type" => "text/ejs"}
+  .iconat @
+  .btn-group
+    :plain
+      <a href="#!edit/<%= item.attr('id') %>" class="label edit">
+    = t("domains.index.edit")
+    :plain
+      </a>
+    :plain
+      <a href="#!delete/<%= item.attr('id') %>" class="label label-warning rm" data-msg="#{t("domains.index.confirm")}">
+    = t("domains.index.delete")
+    :plain
+      </a>
+
+  .item-content
+    :plain
+      <a href="#!show/<%= item.attr('id') %>" class="item-label">
+        <%= item.attr('name') %>
+      </a>
+    :plain
+      <a href="#!show/<%= item.attr('id') %>" class="label label-info manage">
+    = t("domains.index.manage")
+    :plain
+      </a>
+
+    :plain
+      <a href="#!hide/<%= item.attr('id') %>" class="label dn nomanage">
+    = t("domains.index.nomanage")
+    :plain
+      </a>
+
+%script#errors_EJS{"type" => "text/ejs"}
+  .errors
+    %h6= t('domains.index.errors')
+    :plain
+      <% for (attr in errors) { %>
+        <% list (errors[attr], function(error) { %>
+          <p><%= error %></p>
+        <% }) %>
+      <% } %>
+
+%script#manage_area_EJS{"type" => "text/ejs"}
+  .item-content.out.row-fluid
+    .span5.users
+      %h4
+        %span.title=         t('users.index.title')
+        %span.dn.title_new=  t('users.index.title_new')
+        %span.dn.title_edit= t('users.index.title_edit')
+      .label-info.label.new-user=t 'users.form.create'
+      %table.table.table-condensed
+    .span5.aliases
+      %h4
+        %span.title=         t('aliases.index.title')
+        %span.dn.title_new=  t('aliases.index.title_new')
+        %span.dn.title_edit= t('aliases.index.title_edit')
+      .label-info.label.new-alias=t 'aliases.form.create'
+      %table.table.table-condensed
+
+