rmails 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08a72a2314c87bc4826cad68bd25ee09437ee948
-  data.tar.gz: 6cfd3a107228ee47b84ff16d9d31ff62f63fbddf
+  metadata.gz: 722089a297589f3b84c92117564200adf61dece2
+  data.tar.gz: ec16435e608b9048f3734515a211a05ede2ae13b
 SHA512:
-  metadata.gz: 6ff0f20c67f7f8f2a9c2f7d490dac3e482783b38ecd365d9c0ea26d34048dbe3ac75eb42d24c5c9c2bd4a3903360b45ba75eadb376e6a56b0986f7a938c83525
-  data.tar.gz: 722bb29634c60373c36ea78524803cf06cfd392a959ec1f76d24dae5beefac9de553c196cfd0b1775a31f4a5e1b7894e769611d9d0fcd326c67b96a2dc497ef4
+  metadata.gz: fd2906efb59ddb99d0a2ec8e2f19cc834d3b91b66a519bfe945a77e6a1982d6ea0f70ec33424494a0afa0e5781a29a6ea5c54755979e1dc310be2c1e1dcf480f
+  data.tar.gz: 8e0ac9b713f62e2c020fd508940c4bbf27c94db6e52974cf31538e2bcdfcef8b244dae5b641f932f24757cf181cb3e804c8ac08ee8e4dc83737347dd8168aff2

data/.gitignore

@@ -35,4 +35,10 @@ bin/sprockets
 bin/thor
 bin/tilt
 bin/tt
-vendor/gems/automateit
+bin/haml
+bin/sass
+bin/sass-convert
+bin/scss
+bin/thin
+Gemfile
+Gemfile.lock

data/Gemfile

@@ -4,5 +4,22 @@ gem 'hoe'
 gem 'open4'
 gem 'rails', '~> 3.2'
 gem 'devise'
+gem 'devise-encryptable'
+gem 'thin'
+gem 'pg'
 
 gem 'automate-it', :require => 'automateit'
+
+gem 'simple_form'
+gem 'paper_trail'
+
+['haml', 'jquery', 'chosen'].each do |g|
+  gem "#{g}-rails"
+end
+
+#group :assets do
+  gem 'sass-rails',   '~> 3.2.3'
+  gem 'coffee-rails', '~> 3.2.1'
+  gem 'therubyracer', :platforms => :ruby
+  gem 'uglifier', '>= 1.0.3'
+#end

data/Gemfile.lock

@@ -1,9 +1,3 @@
-GIT
-  remote: git://github.com/fanda/automateit.git
-  revision: 959e23be77c9054e712e670110632883d1a92c61
-  specs:
-    automateit (0.0.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -35,20 +29,51 @@ GEM
       i18n (= 0.6.1)
       multi_json (~> 1.0)
     arel (3.0.2)
+    automate-it (0.9.0)
+      hoe
+      open4
     bcrypt-ruby (3.0.1)
     builder (3.0.4)
+    chosen-rails (0.9.12)
+      coffee-rails (>= 3.2)
+      railties (>= 3.0)
+      sass-rails (>= 3.2)
+    coffee-rails (3.2.2)
+      coffee-script (>= 2.2.0)
+      railties (~> 3.2.0)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.6.1)
+    daemons (1.1.9)
     devise (2.2.4)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
       railties (~> 3.1)
       warden (~> 1.2.1)
+    devise-encryptable (0.1.2)
+      devise (>= 2.1.0)
     erubis (2.7.0)
+    eventmachine (1.0.3)
+    execjs (1.4.0)
+      multi_json (~> 1.0)
+    haml (4.0.0)
+      tilt
+    haml-rails (0.4)
+      actionpack (>= 3.1, < 4.1)
+      activesupport (>= 3.1, < 4.1)
+      haml (>= 3.1, < 4.1)
+      railties (>= 3.1, < 4.1)
     hike (1.2.2)
     hoe (3.6.1)
       rake (>= 0.8, < 11.0)
     i18n (0.6.1)
     journey (1.0.4)
+    jquery-rails (2.2.1)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
     json (1.8.0)
+    libv8 (3.11.8.13)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
@@ -56,6 +81,10 @@ GEM
     multi_json (1.7.3)
     open4 (1.3.0)
     orm_adapter (0.4.0)
+    paper_trail (2.7.1)
+      activerecord (~> 3.0)
+      railties (~> 3.0)
+    pg (0.14.1)
     polyglot (0.3.3)
     rack (1.4.5)
     rack-cache (1.2)
@@ -82,17 +111,36 @@ GEM
     rake (10.0.4)
     rdoc (3.12.2)
       json (~> 1.4)
+    ref (1.0.2)
+    sass (3.2.7)
+    sass-rails (3.2.6)
+      railties (~> 3.2.0)
+      sass (>= 3.1.10)
+      tilt (~> 1.3)
+    simple_form (2.1.0)
+      actionpack (~> 3.0)
+      activemodel (~> 3.0)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
+    therubyracer (0.11.4)
+      libv8 (~> 3.11.8.12)
+      ref
+    thin (1.5.0)
+      daemons (>= 1.0.9)
+      eventmachine (>= 0.12.6)
+      rack (>= 1.0.0)
     thor (0.18.1)
     tilt (1.4.1)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.37)
+    uglifier (1.3.0)
+      execjs (>= 0.3.0)
+      multi_json (~> 1.0, >= 1.0.2)
     warden (1.2.1)
       rack (>= 1.0)
 
@@ -100,8 +148,20 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  automateit (= 0.0.0)!
+  automate-it
+  chosen-rails
+  coffee-rails (~> 3.2.1)
   devise
+  devise-encryptable
+  haml-rails
   hoe
+  jquery-rails
   open4
+  paper_trail
+  pg
   rails (~> 3.2)
+  sass-rails (~> 3.2.3)
+  simple_form
+  therubyracer
+  thin
+  uglifier (>= 1.0.3)

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

@@ -18,6 +18,12 @@ window.Aliases = can.Control({
       domain_name: @dname
     } ) )
 
+  show_errors: (form, errors) ->
+    $.each(errors, (k, a) ->
+      el = form.find('.virtual_alias_'+k).addClass('error')
+      el.find('.controls').append('<span class="help-block">'+a[0]+'</span>')
+    )
+
   "form reset": (el, ev) ->
     @refresh()
     @show_title('')
@@ -41,16 +47,23 @@ window.Aliases = can.Control({
 
   ".edit_alias submit": (el, ev) ->
     ev.preventDefault()
+    el.find('.error .help-block').remove()
+    el.find('.error').removeClass('error')
     values = el.formParams()
-    id = el.parents('tr').attr('id').replace('alias_', '')
-    item = @model[id]
-    item.attr(values['virtual_alias'])
+    index = el.parents('tr').attr('id').replace('alias_', '')
+    item = new Alias(values["virtual_alias"])
     if item.errors()
       item.alert()
       return
-    Alias.update(values, item, el.attr('action'))
-    @show_title('')
-    @refresh()
+    self = this
+    Alias.update(values, el.attr('action')+'/'+@model[index].id, (json) ->
+      if json["errors"]
+        self.show_errors(el, json["errors"])
+      else
+        self.model[index].attr(values['virtual_alias'])
+        self.show_title('')
+        self.refresh()
+    )
     return false
 
 
@@ -78,14 +91,30 @@ window.Aliases = can.Control({
     if item.errors()
       item.alert()
       return
-    Alias.create(values, @di, (json) ->
+    Alias.create(values, self.di, (json) ->
       if json["errors"]
-        alert(json["errors"])
+        self.show_errors(el, json["errors"])
       else
-        li.removeClass('new').attr('id', 'alias_'+json.id)
+        item.attr('id', json.id)
+        item.attr('virtual_domain_id', self.di)
         self.model.unshift(item)
         self.show_title('')
         self.refresh()
     )
 
+  ".rm-alias click": (el, ev) ->
+    ev.preventDefault()
+    if not confirm('Are You sure?')
+      return false
+    id = el.parents('tr').attr('id').replace('alias_', '')
+    self = this
+    Alias.destroy(@model[id], (json) ->
+      if json["errors"]
+        alert(json["errors"])
+      else
+        self.model.splice(id, 1)
+        self.refresh()
+    )
+    return false
+
 })

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

@@ -5,7 +5,6 @@ window.Users = can.Control({
     @di = opts.domain_id
     @dname = opts.domain_name
     @model = opts.items
-    @dname = opts.domain_name
     @refresh()
 
   show_title: (type) ->
@@ -13,12 +12,19 @@ window.Users = can.Control({
     type = (if type.length then '_' else '') + type
     $(@el).find('h4 .title' + type).show()
 
-  refresh: () ->
+  refresh: () -> # render fresh list of users
     $(@el).find('table').html( can.view( 'vusers_each_EJS', {
       items: @model
       domain_name: @dname
     } ) )
 
+  show_errors: (form, errors) ->
+    $.each(errors, (k, a) ->
+      el = form.find('.virtual_user_'+k).addClass('error')
+      el.find('.controls').append('<span class="help-block">'+a[0]+'</span>')
+    )
+
+
   "form reset": (el, ev) ->
     @refresh()
     @show_title('')
@@ -44,16 +50,23 @@ window.Users = can.Control({
 
   ".edit_user submit": (el, ev) ->
     ev.preventDefault()
+    el.find('.error .help-block').remove()
+    el.find('.error').removeClass('error')
     values = el.formParams()
-    id = el.parents('tr').attr('id').replace('user_', '')
-    item = @model[id]
-    item.attr(values['virtual_user'])
+    index = el.parents('tr').attr('id').replace('user_', '')
+    item = new User(values["virtual_user"])
     if item.errors()
       item.alert()
       return
-    User.update(values, item, el.attr('action'))
-    @show_title('')
-    @refresh()
+    self = this
+    User.update(values, el.attr('action')+'/'+@model[index].id, (json) ->
+      if json["errors"]
+        self.show_errors(el, json["errors"])
+      else
+        self.model[index].attr(values['virtual_user'])
+        self.show_title('')
+        self.refresh()
+    )
     return false
 
 
@@ -81,14 +94,30 @@ window.Users = can.Control({
     if item.errors()
       item.alert()
       return
-    User.create(values, @di, (json) ->
+    User.create(values, self.di, (json) ->
       if json["errors"]
-        alert(json["errors"])
+        self.show_errors(el, json["errors"])
       else
-        li.removeClass('new').attr('id', 'user_'+json.id)
+        item.attr('id', json.id)
+        item.attr('virtual_domain_id', self.di)
         self.model.unshift(item)
         self.show_title('')
         self.refresh()
     )
 
+  ".rm-user click": (el, ev) ->
+    ev.preventDefault()
+    if not confirm('Are You sure?')
+      return false
+    id = el.parents('tr').attr('id').replace('user_', '')
+    self = this
+    User.destroy(@model[id], (json) ->
+      if json["errors"]
+        alert(json["errors"])
+      else
+        self.model.splice(id, 1)
+        self.refresh()
+    )
+    return false
+
 })

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

@@ -7,17 +7,20 @@ window.Alias = can.Model({
     url = unescape('<%= Rails.application.routes.url_helpers.domain_aliases_path("{domain_id}") %>').replace("{domain_id}", domain_id)
     return $.post(url, attrs, callback, "json")
 
-  update  : (attrs, alias, url) ->
-    alias.attr(attrs['virtual_alias'])
+  update  : (attrs, url, callback) ->
     attrs["_method"] = "PUT"
     return $.ajax({
-      url: url + '/' + alias.id
+      url: url
       type: 'POST'
       data: attrs
       dataType: 'json'
+      success: callback
     })
 
-  destroy : ('DELETE ' + unescape('<%= Rails.application.routes.url_helpers.domain_alias_path('{domain_id}', '{id}') %>'))
+  destroy : (item, callback) ->
+    url = unescape('<%= Rails.application.routes.url_helpers.domain_alias_path('{domain_id}', '{id}') %>').replace("{domain_id}", item.virtual_domain_id).replace("{id}", item.id)
+    return $.post(url, {"_method":"DELETE"}, callback, "json")
+
 
   init: () ->
     @validatePresenceOf ['source', 'destination']

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

@@ -7,18 +7,20 @@ window.User = can.Model({
     url = unescape('<%= Rails.application.routes.url_helpers.domain_users_path("{domain_id}") %>').replace("{domain_id}", domain_id)
     return $.post(url, attrs, callback, "json")
 
-  update  : (attrs, user, url ) ->
+  update  : (attrs, url, callback) ->
     attrs["_method"] = "PUT"
     return $.ajax({
-      url: url + '/' + user.id
+      url: url
       type: 'POST'
       data: attrs
       dataType: 'json'
-      success: (json) ->
-        dbg(json)
+      success: callback
     })
 
-  destroy : ('DELETE ' + unescape('<%= Rails.application.routes.url_helpers.domain_user_path('{domain_id}', '{id}') %>'))
+  destroy : (item, callback) ->
+    url = unescape('<%= Rails.application.routes.url_helpers.domain_user_path('{domain_id}', '{id}') %>').replace("{domain_id}", item.virtual_domain_id).replace("{id}", item.id)
+    return $.post(url, {"_method":"DELETE"}, callback, "json")
+
 
   init: () ->
     @validatePresenceOf ['email']

data/app/assets/stylesheets/application.sass

@@ -102,8 +102,11 @@ header
 
 #rmails
   .list .table
-    tr td *
-      display: inline-block
+    tr td
+      *
+        display: inline-block
+      .help-block
+        display: block !important
 
   .label
     display: inline !important
@@ -121,6 +124,8 @@ header
   .actions
     clear: both
     width: 100%
+  .control-group
+    vertical-align: top
 
 .aliases
   .control-group

data/app/controllers/admin_users_controller.rb

@@ -23,7 +23,7 @@ class AdminUsersController < ApplicationController
       end
     else
       respond_to do |format|
-        format.json { render :json => {:errors => @admin.errors.to_json } }
+        format.json { render :json => {:errors => @admin.errors } }
         format.html {
           flash[:error] = t('first_admin_user_error')
           render :action => 'first'
@@ -38,7 +38,7 @@ class AdminUsersController < ApplicationController
       if @admin.change_data params
         render :json => {:id => @admin.id}
       else
-        render :json => {:errors => @admin.errors.to_json}
+        render :json => {:errors => @admin.errors}
       end
     else
       render :json => {:errors => t('not_authorized')}

data/app/controllers/aliases_controller.rb

@@ -1,12 +1,12 @@
 class AliasesController < ApplicationController
 
-  before_filter :find_alias, :only => [:update]
+  before_filter :find_alias, :only => [:update, :destroy]
 
   def update
     if @alias.update_attributes(params[:virtual_alias])
       render :json => {:id => @alias.id}
     else
-      render :json => {:errors => @alias.errors.to_json}
+      render :json => {:errors => @alias.errors}
     end
   rescue
     render :json => {:errors => t('unknown_error')}
@@ -18,12 +18,20 @@ class AliasesController < ApplicationController
     if @alias.save
       render :json => {:id => @alias.id}
     else
-      render :json => {:errors => @alias.errors.to_json}
+      render :json => {:errors => @alias.errors}
     end
   rescue
     render :json => {:errors => t('unknown_error')}
   end
 
+  def destroy
+    @alias.destroy
+    render :json => {:id => nil}
+  rescue
+    render :json => {:errors => t('unknown_error')}
+  end
+
+
 
 protected