Merge pull request #1 from nkts/whitespaces

Cosmetic clean up - whitespaces and empty lines

app/controllers/application_controller.rb

@@ -1,17 +1,17 @@
-class ApplicationController < ActionController::Base  
+class ApplicationController < ActionController::Base
   protect_from_forgery
   before_filter :check_honeypot
   around_filter :set_timezone
   helper_method :client_remote_ip
   layout :scoped_layout
-  
+
   rescue_from ActiveScaffold::ActionNotAllowed do |exception|
     flash.now[:error] = I18n.t("errors.action_not_allowed")
     render_access_denied
   end
-  
+
   protected
-  
+
   def set_timezone
     old_time_zone = Time.zone
     Time.zone = cookies[:time_zone] if cookies[:time_zone].present?
@@ -19,13 +19,13 @@ class ApplicationController < ActionController::Base
   ensure
     Time.zone = old_time_zone
   end
-  
+
   def scoped_layout
     return false if request.xhr?
     return 'admin' if devise_controller? && resource_name == :admin
     user_signed_in? ? 'users' : 'public'
   end
-    
+
   def render_access_denied
     layout = request.xhr? ? false : 'errors'
     render :template => 'errors/access_denied', :layout => layout
@@ -34,36 +34,36 @@ class ApplicationController < ActionController::Base
   def client_remote_ip
     @client_remote_ip ||= Settings.uses_proxy ? request.remote_ip : request.ip
   end
-  
+
   def check_honeypot
     render :nothing => true if params[Settings.honeypot].present?
   end
-  
+
   def after_sign_out_path_for(resource_or_scope)
     page_path('signed_out')
   end
-  
+
   def current_ability
     @current_ability ||= ::UserAbility.new(current_user)
   end
-  
+
   class UserParameterSanitizer < Devise::ParameterSanitizer
-    
+
     def sign_up
       default_params.permit(:full_name, :email, :password)
     end
-    
+
     def account_update
       default_params.permit(:full_name, :email, :password, :current_password)
     end
-    
+
   end
-  
+
   def devise_parameter_sanitizer
     super unless resource_class == User
     UserParameterSanitizer.new(User, :user, params)
   end
-  
+
   def user_for_paper_trail
     if user_signed_in?
       current_user.to_paper_trail
@@ -71,5 +71,5 @@ class ApplicationController < ActionController::Base
       "Public ip:#{client_remote_ip}"
     end
   end
-  
+
 end

app/controllers/concerns/records_controller_common.rb

@@ -1,26 +1,26 @@
 # some common bits of code for records related controllers
 module RecordsControllerCommon
   extend ActiveSupport::Concern
-  
+
   included do
     before_filter :ensure_nested_under_domain
   end
-  
+
   protected
-  
+
   def before_create_save(record)
     record.domain = nested_parent_record
     record.user = record.domain_user
   end
-  
+
   def nested_via_records?
-    nested? && nested.association && nested.association.collection? && 
+    nested? && nested.association && nested.association.collection? &&
       nested.association.name == :records
   end
-  
+
   # override to close create form after success
   # RecordsController is the only one that does not really need this
   def render_parent?
     nested_singular_association? # || params[:parent_sti]
   end
-end
+end

app/controllers/public/pages_controller.rb

@@ -1,5 +1,5 @@
 class Public::PagesController < PublicController
-  
+
   rescue_from ActionView::MissingTemplate do |exception|
     if exception.message =~ %r{Missing template pages/}
       raise ActionController::RoutingError, "No such page: #{params[:id]}"
@@ -10,7 +10,7 @@ class Public::PagesController < PublicController
 
   def show
     return redirect_to(domains_path) if user_signed_in? && params[:id] == "home"
-    
+
     options = {template: current_page}
     case params[:id]
     when "contact"
@@ -24,10 +24,10 @@ class Public::PagesController < PublicController
         redirect_to after_sign_in_path_for(current_user) and return
       end
     end
-    
+
     render options
   end
-  
+
   def contact
     @contact_form = ContactForm.new(params[:contact_form])
     if !@contact_form.deliver
@@ -38,19 +38,19 @@ class Public::PagesController < PublicController
   end
 
   protected
-  
+
   def current_page
     @current_page ||= "public/pages/#{clean_path}"
   end
-  
+
   def clean_path
     Pathname.new("/#{params[:id]}").cleanpath.to_s[1..-1]
   end
-  
+
   def resource; User.new end
   helper_method :resource
 
   def resource_name; :user end
   helper_method :resource_name
-  
+
 end

app/controllers/users/aaaas_controller.rb

@@ -10,13 +10,13 @@ class Users::AaaasController < UsersController
     conf.actions.exclude :show
   end
   include RecordsControllerCommon
-  
+
   protected
-  
+
   def beginning_of_chain
     (nested_via_records? ? nested_parent_record.aaaa_records : super).readonly(false)
   end
-  
+
   # override, we make our own sti logic
   def new_model
     record = beginning_of_chain.new
@@ -24,4 +24,4 @@ class Users::AaaasController < UsersController
     before_create_save(record)
     record
   end
-end
+end

app/controllers/users/as_controller.rb

@@ -12,7 +12,7 @@ class Users::AsController < UsersController
       type: :member, position: false, confirm: 'Are you sure?'
   end
   include RecordsControllerCommon
-  
+
   def new_token
     process_action_link_action do |record|
       record.instance_variable_set(:@readonly, false)
@@ -23,13 +23,13 @@ class Users::AsController < UsersController
       end
     end
   end
-  
+
   protected
-  
+
   def beginning_of_chain
     (nested_via_records? ? nested_parent_record.a_records : super).readonly(false)
   end
-  
+
   # override, we make our own sti logic
   def new_model
     record = beginning_of_chain.new
@@ -38,4 +38,4 @@ class Users::AsController < UsersController
     before_create_save(record)
     record
   end
-end
+end

app/controllers/users/cnames_controller.rb

@@ -11,18 +11,18 @@ class Users::CnamesController < UsersController
     conf.actions.exclude :show
   end
   include RecordsControllerCommon
-  
+
   protected
-  
+
   def beginning_of_chain
     (nested_via_records? ? nested_parent_record.cname_records : super).readonly(false)
   end
-  
+
   # override, we make our own sti logic
   def new_model
     record = beginning_of_chain.new
     before_create_save(record)
     record
   end
-  
-end
+
+end

app/controllers/users/domains_controller.rb

@@ -21,28 +21,28 @@ class Users::DomainsController < UsersController
     end
     conf.list.sorting = [{rgt: :desc}, {lftp: :asc}] # preorder
     conf.columns[:name].css_class = 'sorted'
-    
+
     # conf.columns[:records].label = 'All Records'
   end
-  
+
   protected
-  
+
   def beginning_of_chain
     super.readonly(false)
   end
-  
+
   def do_new
     super
     @record.setup(current_user.email)
   end
-  
+
   def do_create
     super
     if !successful? && @record.domain_ownership_failed
       @record.user = current_user
     end
   end
-  
+
   def do_destroy
     @record ||= destroy_find_record
     begin
@@ -57,13 +57,13 @@ class Users::DomainsController < UsersController
       self.successful = false
     end
   end
-  
+
   def new_model
     record = super
     before_create_save(record)
     record
   end
-  
+
   # override to add locking
   def update_save(options = {})
     attributes = options[:attributes] || params[:record]
@@ -95,7 +95,7 @@ class Users::DomainsController < UsersController
       ActiveRecord::Base.connection.execute("UNLOCK TABLES") if @name_changed
     end
   end
-    
+
   def before_create_save(record)
     record.type = 'NATIVE'
     record.user = record.parent_domain.present? ? record.parent_domain.user : current_user
@@ -118,5 +118,5 @@ class Users::DomainsController < UsersController
     end
     @record.reload
   end
-  
+
 end

app/controllers/users/hosts_controller.rb

@@ -19,7 +19,7 @@ class Users::HostsController < UsersController
     conf.action_links.add 'new_token', label: 'New Token', method: :put,
       type: :member, position: false, confirm: 'Are you sure?'
   end
-  
+
   def new_token
     process_action_link_action do |record|
       record.instance_variable_set(:@readonly, false)
@@ -30,22 +30,22 @@ class Users::HostsController < UsersController
       end
     end
   end
-  
+
   protected
 
   def new_model
     record = super
-    record.content = client_remote_ip    
+    record.content = client_remote_ip
     before_create_save(record)
     record
   end
-  
+
   def beginning_of_chain
     super.includes(:domain).
       where(:domains => {:name => Settings.host_domains}).
       readonly(false)
   end
-  
+
   def before_create_save(record)
     record.user = current_user
   end

app/controllers/users/mxes_controller.rb

@@ -10,9 +10,9 @@ class Users::MxesController < UsersController
     conf.actions.exclude :show
   end
   include RecordsControllerCommon
-  
+
   protected
-  
+
   def do_new
     super
     @record.prio ||= begin
@@ -20,11 +20,11 @@ class Users::MxesController < UsersController
       maximum.nil? ? Settings.default_prio : maximum + 10
     end
   end
-  
+
   def beginning_of_chain
     (nested_via_records? ? nested_parent_record.mx_records : super).readonly(false)
   end
-  
+
   # override, we make our own sti logic
   def new_model
     record = beginning_of_chain.new
@@ -32,4 +32,4 @@ class Users::MxesController < UsersController
     before_create_save(record)
     record
   end
-end
+end

app/controllers/users/ns_controller.rb

@@ -10,13 +10,13 @@ class Users::NsController < UsersController
     conf.actions.exclude :show
   end
   include RecordsControllerCommon
-  
+
   protected
-  
+
   def beginning_of_chain
     (nested_via_records? ? nested_parent_record.ns_records : super).readonly(false)
   end
-  
+
   # override, we make our own sti logic
   def new_model
     record = beginning_of_chain.new
@@ -25,7 +25,7 @@ class Users::NsController < UsersController
     before_create_save(record)
     record
   end
-  
+
   def after_update_save(record)
     domain = @record.domain
     soa_record = domain.soa_record
@@ -33,7 +33,7 @@ class Users::NsController < UsersController
       flash.now[:warning] = "SOA record's primary NS is no longer among this domain's NS records"
     end
   end
-  
+
   def do_destroy
     if nested_parent_record.ns_records.count > 1
       @record ||= destroy_find_record
@@ -50,4 +50,4 @@ class Users::NsController < UsersController
       flash[:error] = "Cannot delete it, the domain must have at least one nameserver!"
     end
   end
-end
+end

app/controllers/users/omniauth_callbacks_controller.rb

@@ -15,34 +15,34 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
     @user.remember_me! if session.delete(:user_remember_me) == "1"
     sign_in_and_redirect @user, event: :authentication
   end
-  
+
   def find_or_create_user(provider)
     user = if resource then resource
     elsif email then User.where(email: email).first
     elsif uid then Authentication.where(uid: uid).first.try(:user)
     else raise "Bad provider data: #{auth.inspect}"
     end
-    
+
     if user.nil?
       user = User.new(user_attrs.merge(password: Devise.friendly_token[0,20]))
       user.skip_confirmation!
       user.save!(validate: false)
     end
-    
+
     authentication = user.authentications.where(provider: provider).first
     if authentication.nil?
       authentication_attrs = authorization_attrs.merge(provider: provider)
       authentication = user.authentications.build(authentication_attrs)
       user.authentications << authentication
     end
-    
+
     return user
   end
-  
+
   def auth; env["omniauth.auth"] end
   def uid; @uid ||= auth['uid'] rescue nil end
   def email; @email ||= auth['info']['email'] rescue nil end
-  
+
   def authorization_attrs
     @authorization_attrs ||= {
       uid: uid,
@@ -51,11 +51,11 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
       name: auth['info']['name']
     }
   end
-  
+
   def user_attrs
     @user_attrs ||= { email: email, full_name: auth['info']['name'] }
   end
-  
+
   def handle_unverified_request; true end
 
 end

app/controllers/users/permissions_controller.rb

@@ -12,15 +12,15 @@ class Users::PermissionsController < UsersController
       including it's records, it's subdomains and their records.
     DOC
     conf.create.link.label = 'Share Domain'
-    
+
     # conf.columns[:user_email].search_sql = 'user.email'
     # conf.columns[:user].search_sql = 'full_name'
   end
   before_filter :ensure_nested_under_domain
-  
+
   protected
-  
+
   def beginning_of_chain
     super.readonly(false)
   end
-end 
+end

app/controllers/users/records_controller.rb

@@ -15,9 +15,9 @@ class Users::RecordsController < UsersController
       active_scaffold_config.action_links.collection.create.name = "Add Record"
     end
   end
-  
+
   respond_to :html, :xml, :json
-  
+
   active_scaffold :record do |conf|
     conf.sti_children = [:SOA, :NS, :MX, :A, :CNAME, :TXT, :AAAA, :SRV]
     conf.columns = [:name, :type, :content, :ttl, :prio, :change_date, :authentication_token]
@@ -36,10 +36,10 @@ class Users::RecordsController < UsersController
     c.skip_authorize_resource
   end
   protect_from_forgery :except => 'modify'
-  
+
   MODIFY_ERROR = 'ERROR: only A records can be modified with this API'
   MODIFY_OK = 'OK'
-  
+
   # TODO: externalize
   def modify
     @record = Record.where(:authentication_token => params[:authentication_token]).first!
@@ -48,17 +48,17 @@ class Users::RecordsController < UsersController
     @record.save!
     render(:text => MODIFY_OK)
   end
-    
+
   protected
-  
+
   def new_model
     record = super
     before_create_save(record)
     record
   end
-  
+
   # just to limit the action to A type records
   def a_record?(record)
     record.class == A
   end
-end
+end

app/controllers/users/registrations_controller.rb

@@ -1,6 +1,6 @@
 class Users::RegistrationsController < Devise::RegistrationsController
   protected
-  
+
   def after_inactive_sign_up_path_for(resource_or_scope)
     page_path('notice')
   end

app/controllers/users/soas_controller.rb

@@ -8,21 +8,21 @@ class Users::SoasController < UsersController
     conf.actions.exclude :delete, :show
   end
   include RecordsControllerCommon
-  
+
   protected
-  
+
   def beginning_of_chain
     (nested_via_records? ? nested_parent_record.soa_records : super).readonly(false)
   end
-  
+
   # override, we make our own sti logic
   def new_model
     record = beginning_of_chain.new
     before_create_save(record)
     record
   end
-  
+
   def after_update_save(record)
     flash.now[:warning] = "SOA record's primary NS is no longer among this domain's NS records" unless record.ns?
   end
-end
+end

app/controllers/users/srvs_controller.rb

@@ -10,18 +10,18 @@ class Users::SrvsController < UsersController
     conf.actions.exclude :show
   end
   include RecordsControllerCommon
-  
+
   protected
-  
+
   def do_new
     super
     @record.prio ||= 0
   end
-  
+
   def beginning_of_chain
     (nested_via_records? ? nested_parent_record.srv_records : super).readonly(false)
   end
-  
+
   # override, we make our own sti logic
   def new_model
     record = beginning_of_chain.new
@@ -29,5 +29,5 @@ class Users::SrvsController < UsersController
     before_create_save(record)
     record
   end
-  
-end
+
+end

app/controllers/users/txts_controller.rb

@@ -10,13 +10,13 @@ class Users::TxtsController < UsersController
     conf.actions.exclude :show
   end
   include RecordsControllerCommon
-  
+
   protected
-  
+
   def beginning_of_chain
     (nested_via_records? ? nested_parent_record.txt_records : super).readonly(false)
   end
-  
+
   # override, we make our own sti logic
   def new_model
     record = beginning_of_chain.new
@@ -24,4 +24,4 @@ class Users::TxtsController < UsersController
     before_create_save(record)
     record
   end
-end 
+end

app/controllers/users_controller.rb

@@ -10,11 +10,11 @@ class UsersController < ApplicationController
   end
 
   protected
-  
+
   def set_user_current
     User.current = current_user
   end
-  
+
   def unset_user_current
     User.current = nil
   end

app/helpers/application_helper.rb

@@ -7,7 +7,7 @@ module ApplicationHelper
     alert: :warning, warning: :warning, warn: :warning,
     info: :info,   notice: :info
   )
-  
+
   # for each record in the rails flash this
   # function wraps the message in an appropriate div
   # and displays it
@@ -18,7 +18,7 @@ module ApplicationHelper
     }.join
     flashes.present? ? content_tag(:div, flashes.html_safe, :class => clazz) : nil
   end
-  
+
   def error_messages_for(resource)
     return "" if resource.errors.empty?
 
@@ -36,18 +36,18 @@ module ApplicationHelper
 
     html.html_safe
   end
-  
+
   def honeypot
     content_tag('div', :style => 'position: absolute; left: -2000px;') do
       text_field_tag("#{Settings.honeypot}", nil, :tabindex => 900)
     end
   end
-  
+
   # ActiveScaffold
-  
+
   def active_scaffold_column_timestamp(record, column)
     value = record.send(column.name)
     value.nil? ? nil : Time.at(value)
   end
-  
+
 end

app/helpers/users/authentications_helper.rb

@@ -12,4 +12,4 @@ module Users::AuthenticationsHelper
       record.provider.camelcase
     end
   end
-end
+end

app/helpers/users/domains_helper.rb

@@ -2,7 +2,7 @@ module Users::DomainsHelper
   def domain_list_row_class(record)
     cannot?(:crud_permissions, record) ? "shared-domain" : ''
   end
-  
+
   # Indents and dedents to create a tree structure,
   # assuming that the records are sorted in preorder.
   # Adds a visual cue if the record is shared via permissions feature.
@@ -26,4 +26,4 @@ module Users::DomainsHelper
     @previous_record = record
     elements.join.html_safe
   end
-end
+end

app/helpers/users/records_helper.rb

@@ -2,4 +2,4 @@ module Users::RecordsHelper
   def record_authentication_token_column(record, column)
     record.type == 'A' ? record.authentication_token : '-'
   end
-end
+end

app/mailers/contact_form.rb

@@ -4,9 +4,9 @@ class ContactForm < MailForm::Base
   attribute :message, :validate => true
   attribute :file, :attachment => true, :allow_blank => true
   attribute :nickname, :captcha  => true # antispam
-  
+
   validates :email, email: true
-  
+
   # Declare the e-mail headers. It accepts anything the mail method
   # in ActionMailer accepts.
   def headers

app/mailers/users/permission_mailer.rb

@@ -1,7 +1,7 @@
 class Users::PermissionMailer < ActionMailer::Base
   layout "emails"
   default from: Settings.support_mail
-  
+
   def created(permission)
     @permission = permission
     mail(

app/models/a.rb

@@ -12,7 +12,7 @@
 #
 class A < Record
   has_paper_trail
-  
+
   validates :name, :hostname2 => {:allow_wildcard_hostname => true}
   validates :content, :presence => true, :ip => {:ip_type => :v4} # Only accept valid IPv4 addresses
 
@@ -23,18 +23,18 @@ class A < Record
     :length => {:minimum => 4},
     :uniqueness => {:scope => [:domain_id, :type]},
     :if => :host?
-  
+
   validate do
     if host? && Settings.protected_hostnames.any? {|hn| name =~ /^#{hn}/i}
       errors[:name] << "cannot be used, please try another"
     end
   end
-  
+
   before_validation do
     if host_domain.present? && Settings.host_domains.include?(host_domain)
       self.domain_id = Domain.find_by_name(host_domain).try(:id)
     end
   end
-  
+
   def host?; domain.present? && Settings.host_domains.include?(domain.name) end
 end

app/models/aaaa.rb

@@ -7,10 +7,10 @@
 # @see http://www.zytrax.com/books/dns/ch8/aaaa.html
 class AAAA < Record
   has_paper_trail
-  
+
   validates :name, :hostname2 => {:allow_wildcard_hostname => true}
   validates :content, :presence => true, :ip => {:ip_type => :v6}
-  
+
 end
 
 Aaaa = AAAA

app/models/admin.rb

@@ -7,7 +7,7 @@ class Admin < ActiveRecord::Base
 
   # Setup accessible (or protected) attributes for your model
   # attr_accessible :email, :password, :password_confirmation, :remember_me
-  
+
   # Called by Devise to see if an user can currently be signed in
   def active_for_authentication?
     active? && super
@@ -17,5 +17,5 @@ class Admin < ActiveRecord::Base
   def inactive_message
     !active? ? :deactivated : super
   end
-  
+
 end

app/models/admin_ability.rb

@@ -7,4 +7,4 @@ class AdminAbility
     cannot [:ban, :unban], :all
     can [:ban, :unban], User
   end
-end
+end

app/models/authentication.rb

@@ -1,5 +1,5 @@
 class Authentication < ActiveRecord::Base
   has_paper_trail
-  
+
   belongs_to :user, :inverse_of => :authentications
 end

app/models/blacklisted_domain.rb

@@ -1,6 +1,6 @@
 class BlacklistedDomain < ActiveRecord::Base
   # attr_accessible :name
-  
+
   scope :of, ->(domain_name) {
     domain_name_quoted = connection.quote(domain_name)
     where{
@@ -8,7 +8,7 @@ class BlacklistedDomain < ActiveRecord::Base
       (`#{domain_name_quoted}` =~ CONCAT('%.', name))
     }
   }
-  
+
   def self.include?(domain_name)
     of(domain_name).exists? # || Dnsbl.include?(domain_name)
   end

app/models/cname.rb

@@ -9,7 +9,7 @@
 #
 class CNAME < Record
   has_paper_trail
-  
+
   validates :name, :hostname2 =>  {:allow_wildcard_hostname => true}
   validates :content, :presence => true, :length => { :maximum => 20000 }, :hostname2 => true
 

app/models/concerns/stampable.rb

@@ -1,14 +1,14 @@
 module Stampable
   extend ActiveSupport::Concern
-  
+
   included do
     belongs_to :creator, :class_name => 'User'
     belongs_to :updator, :class_name => 'User'
-                                 
+
     before_create :set_creator_attribute
     before_save   :set_updator_attribute
   end
-  
+
   def set_creator_attribute
     self.creator = User.current unless creator_id?
   end
@@ -16,4 +16,4 @@ module Stampable
   def set_updator_attribute
     self.updator = User.current unless updator_id? && updator_id_changed?
   end
-end
+end

app/models/domain.rb

@@ -7,9 +7,9 @@ class Domain < ActiveRecord::Base
   # optional IP for create form, results in a type A record
   attr_accessor :ip
   attr_accessor :domain_ownership_failed
-  
+
   # attr_accessible :name, :ip, :soa_record, :ns_records, :apply_subdomains
-  
+
   belongs_to :user, :inverse_of => :domain
   has_many :records, :inverse_of => :domain, :dependent => :destroy
   has_many :permissions, :inverse_of => :domain, :dependent => :destroy
@@ -17,20 +17,20 @@ class Domain < ActiveRecord::Base
 
   cattr_reader :types
   @@types = ['NATIVE', 'MASTER', 'SLAVE', 'SUPERSLAVE']
-  
+
   has_one :soa_record,
     -> { where(type: 'SOA') },
-    :class_name => 'SOA', 
+    :class_name => 'SOA',
     :inverse_of => :domain
-  
+
   Record.types.each do |type|
     has_many :"#{type.downcase}_records",
-      :class_name => type, 
+      :class_name => type,
       :inverse_of => :domain
     validates_associated :"#{type.downcase}_records"
   end
-  
-  validates :name, :presence => true, :uniqueness => true, 
+
+  validates :name, :presence => true, :uniqueness => true,
     :domainname => {:require_valid_tld => false},
     :exclusion => {:in => BlacklistedDomain}
   validates :master, :presence => true, :if => :slave?
@@ -42,7 +42,7 @@ class Domain < ActiveRecord::Base
     :minimum => 2, :maximum => 10, :message => "must have be at least 2, at most 10"}
   validates_associated :records
   validates :user_id, :presence => true
-  
+
   validate :max_domains_per_user, :on => :create
   delegate :domains_exceeding?, :to => :user
   def max_domains_per_user
@@ -59,25 +59,25 @@ class Domain < ActiveRecord::Base
   end
 
   concerned_with :tree_structure, :name_change_subdomains, :name_change_records
-  
+
   scope :host_domains, -> { where(:name => Settings.host_domains) }
-  
+
   def host_domain?
     Settings.host_domains.include?(name)
   end
-  
+
   # domains per user limit for DOS protection
   def records_exceeding?
     records.count >= Settings.max_records_per_domain.to_i
   end
-  
+
   # domain.has_ns?('129.168.0.1')
   def has_ns?(ns)
     ns_records.any? {|ns_record| ns_record.content == ns}
   end
-  
+
   def slave?; self.type == 'SLAVE' end
-  
+
   def setup(email)
     build_soa_record
     soa = soa_record
@@ -91,5 +91,5 @@ class Domain < ActiveRecord::Base
     ns2.content = Settings.ns.second
     ns3.content = Settings.ns.third
   end
-    
+
 end

app/models/domain/name_change_records.rb

@@ -1,5 +1,5 @@
 class Domain < ActiveRecord::Base
-  
+
   before_validation(:on => :update) do
     if name_changed?
       name_was_pattern = /#{Regexp.escape(name_was)}$/
@@ -24,11 +24,11 @@ class Domain < ActiveRecord::Base
       end
     end
   end
-  
+
   def each_update_involved_record
     yield soa_record
     soa_records.each { |record| yield record }
     records.each     { |record| yield record }
   end
-  
-end
+
+end

app/models/domain/name_change_subdomains.rb

@@ -4,34 +4,34 @@ class Domain < ActiveRecord::Base
   def apply_subdomains=(v)
     @apply_subdomains = ActiveRecord::ConnectionAdapters::Column.value_to_boolean(v)
   end
-  
+
   before_update do
     self.parent = parent_domain if name_changed? # recompute parent
   end
-  
+
   after_update do
     (apply_subdomains ? chain_rename : sync_orphan_children) if name_changed?
   end
-  
+
   protected
-  
+
   # previous subdomains in the system for the previous domain name
   # in case of domain name change
   def previous_subdomains
     Domain.where(:name_reversed.matches => "#{name_reversed_was}.%")
   end
-  
+
   # only immediate children
   def previous_children_subdomains
     descendants = previous_subdomains.preorder.all
     first = descendants.first
     return [] unless first.present?
-      
+
     # only immediate children
     depth = first.depth
     descendants.select { |d| d.depth == depth }
   end
-  
+
   # Syncs with nested interval when the parent is added later than the children
   def sync_orphan_children
     previous_children_subdomains.each do |subdomain|
@@ -39,7 +39,7 @@ class Domain < ActiveRecord::Base
       subdomain.save!
     end
   end
-  
+
   # applies the tail rename to children
   def chain_rename
     name_was_pattern = /#{Regexp.escape(name_was)}$/
@@ -49,5 +49,5 @@ class Domain < ActiveRecord::Base
       subdomain.save! # rest will chain recursively
     end
   end
-  
+
 end

app/models/domain/tree_structure.rb

@@ -1,19 +1,19 @@
 class Domain < ActiveRecord::Base
   include ActsAsNestedInterval
-  
+
   attr_accessor :parent_synced
-  
+
   # this goes before acts_as_nested_interval call
   before_save do
     self.name_reversed = name.reverse if name_changed?
     sync_parent
   end
-  
+
   after_save :sync_children
-  
-  # this goes after sync_parent, to order callbacks correctly 
+
+  # this goes after sync_parent, to order callbacks correctly
   acts_as_nested_interval virtual_root: true, dependent: :restrict_with_error
-  
+
   validate :domain_ownership
   def domain_ownership
     # non-TLD validation
@@ -26,14 +26,14 @@ class Domain < ActiveRecord::Base
       errors[:name] = "issue, the parent domain `#{parent_domain.name}` is registered to another user"
     end
   end
-  
+
   # If current user present authorize it
   # If current user not present, just allow (rake tasks etc)
   def can_be_managed_by_current_user?
     return true if User.current.nil?
     UserAbility::CRUD.all?{|operation| User.current.can?(operation, self)}
   end
-  
+
   # Returns the first immediate parent, if exists (and caches the search)
   def parent_domain
     return nil if name.nil?
@@ -45,23 +45,23 @@ class Domain < ActiveRecord::Base
   def subdomains
     Domain.where(:name_reversed.matches => "#{name_reversed}.%")
   end
-  
+
   def subdomain_of?(domain)
     name.end_with?('.' + domain.name)
   end
-  
+
   # override
   def self.rebuild_nested_interval_tree!
     skip_callback :update, :before, :sync_children
     super
     set_callback :update, :before, :sync_children
   end
-  
+
   # Syncs with nested interval when a child is added and parent exists
   def sync_parent
     self.parent = parent_domain if !@parent_synced && new_parent?
   end
-  
+
   # acts_as_nested_interval monkeypatch for lock
   def update_nested_interval
     changed = send(:"#{nested_interval_foreign_key}_changed?")
@@ -75,9 +75,9 @@ class Domain < ActiveRecord::Base
     end
   end
   def connection; self.class.connection end
-  
+
   protected
-  
+
   def new_parent?
     parent_domain.present? && self.parent_id != parent_domain.id
   end
@@ -93,13 +93,13 @@ class Domain < ActiveRecord::Base
     end
     return nil
   end
-  
+
   # only immediate children
   def children_subdomains
     descendants = subdomains.preorder.to_a
     first = descendants.first
     return [] unless first.present?
-      
+
     # only immediate children
     depth = first.depth
     descendants.select { |d| d.depth == depth }
@@ -113,5 +113,5 @@ class Domain < ActiveRecord::Base
       subdomain.save! # rest will chain recursively
     end
   end
-  
+
 end

app/models/mx.rb

@@ -8,16 +8,16 @@
 #
 class MX < Record
   has_paper_trail
-  
+
   validates :name, :hostname2 => {:allow_wildcard_hostname => true}
   validates :content, :presence => true, :hostname2 => {:allow_wildcard_hostname => true}
   validates :prio, :presence => true, :numericality => {
-    :greater_than_or_equal_to => 0, 
-    :less_than_or_equal_to => 65535, 
+    :greater_than_or_equal_to => 0,
+    :less_than_or_equal_to => 65535,
     :only_integer => true
   }
-  
+
   def supports_priority?; true end
 end
 
-Mx = MX
+Mx = MX

app/models/ns.rb

@@ -21,7 +21,7 @@
 #
 class NS < Record
   has_paper_trail
-  
+
   validates :name, :hostname2 => true
   validates :content, :presence => true, :hostname2 => true #, :inclusion => {:in => Settings.ns}
 

app/models/permission.rb

@@ -1,10 +1,10 @@
 class Permission < ActiveRecord::Base
   include Stampable
   has_paper_trail
-  
+
   belongs_to :domain, :inverse_of => :permissions
   belongs_to :user, :inverse_of => :permissions
-  
+
   validates :domain_id, :presence => true
   validates :user_id, :presence => true, :uniqueness => {
     :scope => :domain_id,
@@ -17,7 +17,7 @@ class Permission < ActiveRecord::Base
   validate do
     errors[:user] = 'cannot be yourself' if user_id == domain.user_id
   end
-  
+
   after_create do
     Users::PermissionMailer.created(self).deliver
   end
@@ -27,19 +27,19 @@ class Permission < ActiveRecord::Base
   after_destroy do
     Users::PermissionMailer.destroyed(self).deliver
   end
-  
+
   def user_email
     @user_email || user.try(:email)
   end
-  
+
   def user_email=(email)
     @user_email = email
     self.user = User.find_by_email(email)
   end
-  
+
   def to_label
     user.try(:email) || @user_email || '-'
   end
-  
+
   def as_marked=(v); end #shim
 end

app/models/record.rb

@@ -1,19 +1,19 @@
 class Record < ActiveRecord::Base
   include Stampable
-  
+
   belongs_to :domain, :inverse_of => :records
   belongs_to :user, :inverse_of => :records
-  
+
   cattr_reader :types
   @@types = %w(SOA NS A MX TXT CNAME AAAA SRV)
   # attr_accessible :name, :content, :ttl, :prio
-  
+
   validates :domain, :name, :presence => true
   validates :type, :inclusion => {:in => @@types, :message => "Unknown record type"}
   validates :content, :uniqueness => {:scope => [:domain_id, :type, :name]}
   # RFC 2181, 8
-  validates :ttl, :numericality => { 
-    # :greater_than_or_equal_to => 0, 
+  validates :ttl, :numericality => {
+    # :greater_than_or_equal_to => 0,
     :greater_than_or_equal_to => Settings.min_ttl.to_i,
     :less_than => 2**31,
     :only_integer => true
@@ -25,7 +25,7 @@ class Record < ActiveRecord::Base
       errors.add :base, "as a security measure, you cannot have more than #{Settings.max_records_per_domain} records on one domain"
     end
   end
-  
+
   before_validation :generate_token, :on => :create
   before_validation :prepare_name!
   before_save :update_change_date
@@ -33,16 +33,16 @@ class Record < ActiveRecord::Base
   after_initialize do
     self.ttl ||= Settings.default_ttl
   end
-  
+
   # By default records don't support priorities.
   # Those who do can overwrite this in their own classes.
   def supports_priority?; false end
 
   def shortname; name.gsub(/\.?#{self.domain.name}$/, '') end
   def shortname=(value); self.name = value end
-  
+
   def to_label; "#{type} #{content}" end
-  
+
   # Generate a token by looping and ensuring does not already exist.
   # stolen from Devise
   def generate_token
@@ -51,10 +51,10 @@ class Record < ActiveRecord::Base
       break token unless Record.exists?(authentication_token: token)
     end
   end
-  
+
   delegate :host_domain?, :records_exceeding?, :to => :domain
   delegate :user, :to => :domain, :prefix => :domain
-  
+
   protected
 
   def prepare_name!
@@ -62,19 +62,19 @@ class Record < ActiveRecord::Base
     self.name = domain.name if name.blank? or name == '@'
     self.name << ".#{domain.name}" unless name =~ /#{Regexp.escape(domain.name)}$/
   end
-  
+
   # Update the change date for automatic serial number generation
   def update_change_date; self.change_date = Time.now.to_i end
-  
+
   def update_soa_serial #:nodoc:
     unless type == 'SOA' || @serial_updated || domain.slave?
       domain.soa_record.update_serial!
       @serial_updated = true
     end
   end
- 
+
   def name_equals_domain_name
     errors.add :name, "must be equal to domain's name" unless name == domain.name
   end
-  
+
 end

app/models/soa.rb

@@ -8,7 +8,7 @@
 #
 class SOA < Record
   has_paper_trail
-  
+
   validates :domain, :presence => true
   validates :domain_id, :uniqueness => true # one SOA per domain
   validates :name, :presence => true, :hostname2 => true
@@ -21,7 +21,7 @@ class SOA < Record
   before_validation :assemble_content
   before_update :update_serial
   after_initialize :disassemble_content
-  
+
   before_validation do
     self.primary_ns ||= domain.ns_records.first.try(:content)
   end
@@ -54,7 +54,7 @@ class SOA < Record
     return if content_changed?
     compute_serial
   end
-  
+
   def reset_serial
     @serial = nil
     compute_serial
@@ -65,16 +65,16 @@ class SOA < Record
     update_serial
     save!
   end
-  
+
   # if SOA record's primary NS is among it's domain's NS records
   def ns?
     domain.has_ns?(primary_ns)
   end
 
   def to_label; "#{primary_ns} #{contact}" end
-  
+
   private
-  
+
   def assemble_content
     self.content = "#{@primary_ns} #{@contact} #{@serial}".strip
   end
@@ -85,12 +85,12 @@ class SOA < Record
     @serial = @serial.to_i unless @serial.nil?
     update_serial if @serial.nil? || @serial.zero?
   end
-  
+
   def compute_serial
     date_serial = Time.now.strftime( "%Y%m%d00" ).to_i
-    @serial = (@serial.nil? || date_serial > @serial) ? date_serial : @serial + 1    
+    @serial = (@serial.nil? || date_serial > @serial) ? date_serial : @serial + 1
   end
-  
+
 end
 
 Soa = SOA

app/models/srv.rb

@@ -6,7 +6,7 @@
 # @see http://www.zytrax.com/books/dns/ch8/srv.html
 class SRV < Record
   has_paper_trail
-  
+
   validates :name, :hostname2 => {:allow_wildcard_hostname => true}
   validates :content, :format => /\A\d+ \d+ [A-Za-z0-9\-_.]+\z/
   # RFC 2872
@@ -26,16 +26,16 @@ class SRV < Record
     :only_integer => true
   }
   validates :host, :presence => true, :hostname2 => {:allow_wildcard_hostname => true}
-  
+
   attr_accessor :weight, :port, :host
-  
+
   before_validation :assemble_content
   after_initialize :disassemble_content
-  
+
   def supports_priority?; true end
-  
+
   protected
-  
+
   def assemble_content
     self.content = "#{@weight} #{@port} #{@host}".strip
   end
@@ -44,7 +44,7 @@ class SRV < Record
   def disassemble_content
     @weight, @port, @host = content.split(/\s+/) unless content.blank?
   end
-  
+
 end
 
 Srv = SRV

app/models/tld.rb

@@ -1,8 +1,8 @@
 class Tld
-  
+
   @@lines = []
   cattr_accessor :lines
-  
+
   File.open(Rails.root.join('db', 'data', 'tlds.txt').to_s) do |fd|
     fd.each do |line|
       unless line[0..1] == '//' || line =~ /^\s$/ # neither comment neither blank
@@ -14,12 +14,12 @@ class Tld
       end
     end
   end
-  
+
   def self.include?(name)
     for line in @@lines
       return true if name =~ line
     end
     return false
   end
-  
+
 end

app/models/txt.rb

@@ -2,18 +2,18 @@
 
 # = Text Record (TXT)
 # Provides the ability to associate some text with a host or other name. The TXT
-# record is used to define the Sender Policy Framework (SPF) information record 
-# which may be used to validate legitimate email sources from a domain. The SPF 
-# record while being increasing deployed is not (July 2004) a formal IETF RFC 
+# record is used to define the Sender Policy Framework (SPF) information record
+# which may be used to validate legitimate email sources from a domain. The SPF
+# record while being increasing deployed is not (July 2004) a formal IETF RFC
 # standard.
-# 
+#
 # Obtained from http://www.zytrax.com/books/dns/ch8/txt.html
 class TXT < Record
   has_paper_trail
-  
+
   validates :name, :hostname2 => {:allow_wildcard_hostname => true}
   validates :content, :presence => true, :length => { :maximum => 255 }
-  
+
   def to_label; type end
 end
 

app/models/user.rb

@@ -2,41 +2,41 @@ class User < ActiveRecord::Base
   include SentientModel
   include Stampable
   has_paper_trail
-  
+
   # Include default devise modules. Others available are:
   # :token_authenticatable, :encryptable, :timeoutable and :omniauthable
-  devise :database_authenticatable, 
+  devise :database_authenticatable,
     :registerable,
-    :recoverable, 
-    :rememberable, 
-    :trackable, 
+    :recoverable,
+    :rememberable,
+    :trackable,
     :validatable,
     :confirmable,
     :lockable,
     :omniauthable,
     :omniauth_providers => [:google_oauth2]
-  
+
   validates :full_name, :presence => true
 
   # Setup accessible (or protected) attributes for your model
-  # attr_accessible :email, :password, :password_confirmation, :remember_me, 
+  # attr_accessible :email, :password, :password_confirmation, :remember_me,
   #   :full_name
-  
+
   has_many :authentications, :inverse_of => :user, :dependent => :destroy
   has_many :domains, :inverse_of => :user, :dependent => :destroy
   has_many :records, :inverse_of => :user, :dependent => :destroy
   has_many :permissions, :inverse_of => :user, :dependent => :destroy
   has_many :permitted_domains, :through => :permissions, :source => :domain
-  
+
   def name
     full_name.blank? ? email : full_name
   end
-  
+
   # domains per user limit for DOS protection
   def domains_exceeding?
     domains.count >= Settings.max_domains_per_user.to_i
   end
-  
+
   # Called by Devise to see if an user can currently be signed in
   def active_for_authentication?
     active? && super
@@ -46,7 +46,7 @@ class User < ActiveRecord::Base
   def inactive_message
     !active? ? :deactivated : super
   end
-  
+
   def ban!
     self.class.transaction do
       update_column :active, false
@@ -55,38 +55,38 @@ class User < ActiveRecord::Base
       permissions.each &:destroy
     end
   end
-  
+
   def unban!
     update_column :active, true
   end
-  
+
   def to_paper_trail
     "#{id} #{email} name:#{full_name} ip:#{current_sign_in_ip} last_ip:#{last_sign_in_ip}"
   end
-  
+
   # @override
   def update_tracked_fields!(*)
     self.paper_trail_event = "sign_in"
     PaperTrail.whodunnit = to_paper_trail
     super
   end
-  
+
   delegate :can?, :cannot?, :to => :ability
-  
+
   def ability(options = {:reload => false})
     options[:reload] ? _ability : (@ability ||= _ability)
   end
-  
+
   def self.do_as(user)
     self.current = user
     yield
     self.current = nil
   end
-  
+
   protected
 
   def _ability
     UserAbility.new(self)
   end
 
-end
+end

app/models/user_ability.rb

@@ -1,6 +1,6 @@
 class UserAbility
   CRUD = [:read, :create, :update, :destroy]
-  
+
   include CanCan::Ability
   attr_accessor :user
   attr_accessor :context
@@ -9,7 +9,7 @@ class UserAbility
   def initialize(user, options = {})
     @user = user || User.new
     @context = options[:context] || :application
-    
+
     as_action_aliases
     action_aliases
     if @user.persisted?
@@ -17,40 +17,40 @@ class UserAbility
       sharing_abilities
     end
   end
-  
+
   protected
-  
+
   def owner_abilities
     # can manage his domains and records
     can CRUD, Domain, :user_id => user.id
     can CRUD, Record, :domain => {:user_id => user.id}
     cannot :delete, SOA # it's deleted with the parent domain
-      
+
     # can manage his hosts
     can CRUD, A, :user_id => user.id #, :domain => {:name => Settings.host_domains}
-      
+
     # can manage permissions for his domains
     can CRUD, Permission, :domain => {:user_id => user.id}
     can :crud_permissions, Domain, :user_id => user.id
-    
+
     # can manage his authentications
     can CRUD, Authentication, :user_id => user.id
   end
-  
+
   def sharing_abilities
     # can manage shared domains and records
     can CRUD, Domain, :permissions.outer => {:user_id => user.id}
     can CRUD, Record, :domain => {:permissions.outer => {:user_id => user.id}}
-    
+
     # can manage shared domains and records descendants
     for domain in user.permitted_domains
       can CRUD, Domain, :name_reversed.matches => "#{domain.name_reversed}.%" # descendants
       can CRUD, Record, :domain => {:name_reversed.matches => "#{domain.name_reversed}.%"} # descendants
     end
   end
-  
+
   def action_aliases
     alias_action :new_token, :to => :update
   end
-  
+
 end

app/validators/hostname2_validator.rb

@@ -1,6 +1,6 @@
 # skips length validations, more permissive defaults
 class Hostname2Validator < PAK::ValidatesHostname::HostnameValidator
-  
+
   def initialize(options)
     opts = {
       :allow_underscore        => true,
@@ -14,7 +14,7 @@ class Hostname2Validator < PAK::ValidatesHostname::HostnameValidator
 
   def validate_each(record, attribute, value)
     value ||= ''
-    
+
     # split each hostname into labels and do various checks
     if value.is_a?(String)
       labels = value.split '.'
@@ -26,14 +26,14 @@ class Hostname2Validator < PAK::ValidatesHostname::HostnameValidator
         # Take care of wildcard first label
         next if options[:allow_wildcard_hostname] and label == '*' and index == 0
 
-        # CHECK 3: hostname can only contain characters: 
+        # CHECK 3: hostname can only contain characters:
         #          a-z, 0-9, hyphen, optional underscore, optional asterisk
         valid_chars = 'a-z0-9\-'
         valid_chars << '_' if options[:allow_underscore] == true
         add_error(record, attribute, :label_contains_invalid_characters, :valid_chars => valid_chars) unless label =~ /^[#{valid_chars}]+$/i
       end
 
-      # CHECK 4: the unqualified hostname portion cannot consist of 
+      # CHECK 4: the unqualified hostname portion cannot consist of
       #          numeric values only
       if options[:allow_numeric_hostname] == false
         is_numeric_only = (
@@ -54,5 +54,5 @@ class Hostname2Validator < PAK::ValidatesHostname::HostnameValidator
       end
     end
   end
-  
-end
+
+end

app/validators/ip_validator.rb

@@ -7,7 +7,7 @@ class IpValidator < ActiveModel::EachValidator
       (?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}
       (?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)
     $/x
-  
+
   IPV6_REGEX = /^
       (
          (([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})
@@ -23,7 +23,7 @@ class IpValidator < ActiveModel::EachValidator
         |(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})
         |(([0-9A-Fa-f]{1,4}:){1,7}:)
       )$/x
-  
+
   # @param [Hash] options Options for validation
   # @option options [Symbol] :ip_type (:any) The IP address type (:any, :v4 or :v6)
   # @see ActiveModel::EachValidator#new
@@ -31,7 +31,7 @@ class IpValidator < ActiveModel::EachValidator
     options[:ip_type] ||= :any
     super
   end
-  
+
   def validate_each(record, attribute, value)
     case options[:ip_type]
       when :v4
@@ -49,14 +49,14 @@ private
   def ipv4?(address)
     address =~ IPV4_REGEX
   end
-  
+
   # Validates IPv6 address
   # @param [String] address the ipv6 address
   # @return [Boolean] the validation result
   def ipv6?(address)
     address =~ IPV6_REGEX
   end
-  
+
   # Validates IP (v4 or v6) address
   # @param [String] address the ip address
   # @return [Boolean] the validation result

app/validators/zone_validator.rb

@@ -6,9 +6,9 @@ class ZoneValidator < ActiveModel::Validator
     record.errors.add(:mname, options[:message] || :mname) if mname_is_zone_name?(record)
     record.errors.add(:base,  options[:message] || :missing_ns_record) unless has_two_ns_rr?(record)
     record.errors.add(:mname, options[:message] || :not_a_defined_nameserver) unless mname_is_a_defined_nameserver?(record)
-    record.errors.add(:base,  options[:message] || :duplicate_nameservers_found) unless nameservers_are_unique?(record)    
+    record.errors.add(:base,  options[:message] || :duplicate_nameservers_found) unless nameservers_are_unique?(record)
   end
-  
+
 private
   # Check if the zone name equals the primary nameserver
   # @param [Zone] record The Zone to check
@@ -16,14 +16,14 @@ private
   def mname_is_zone_name?(zone)
     zone.name == zone.mname
   end
-  
+
   # Check if the zone has at least two associated NS resource records
   # @param [Zone] zone The Zone to check
   # @return [Boolean] True if the zone has at least two associated NS resource records
   def has_two_ns_rr?(zone)
     zone.ns_resource_records.length >= 2
   end
-  
+
   # Check if the primary nameserver of the zone is defined as one of the
   #   associated NS resource records
   # @param [Zone] zone The Zone to check
@@ -43,4 +43,4 @@ private
     nameserver_data_fields = zone.ns_resource_records.map(&:rdata)
     nameserver_data_fields.inject({}) {|h,v| h[v]=h[v].to_i+1; h}.reject{|k,v| v==1}.keys.empty?
   end
-end
+end

config/application.rb

@@ -41,9 +41,9 @@ module Entrydns
 
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
-    
+
     config.to_prepare do
-      layout = proc { |c| 
+      layout = proc { |c|
         return false if request.xhr?
         return 'admin' if devise_controller? && resource_name == :admin
         user_signed_in? ? 'users' : 'public'
@@ -53,9 +53,9 @@ module Entrydns
       Devise::ConfirmationsController.layout layout
       Devise::UnlocksController.layout layout
       Devise::PasswordsController.layout layout
-      
+
       Devise::Mailer.layout "emails"
     end
-    
+
   end
 end

config/deploy.rb

@@ -15,7 +15,7 @@ set :ssh_options, :forward_agent => true
 set :deploy_via, :remote_cache
 # set :branch, "master"
 # set :scm_verbose, true
-# set :git_enable_submodules, 
+# set :git_enable_submodules,
 # set :scm_passphrase, "passwd0" # the deploy user's password
 
 after 'deploy:update_code', 'deploy:symlink_database_yml'
@@ -44,7 +44,7 @@ namespace :deploy do
   task :restart, :roles => :app, :except => { :no_release => true } do
     run "touch #{current_release}/tmp/restart.txt"
   end
-  
+
   desc "Symlinks the database.yml"
   task :symlink_database_yml, :roles => :app do
     run "ln -nfs #{deploy_to}/shared/config/database.yml #{release_path}/config/database.yml"
@@ -54,7 +54,7 @@ namespace :deploy do
   task :symlink_settings_yml, :roles => :app do
     run "ln -nfs #{deploy_to}/shared/config/settings.yml #{release_path}/config/settings.yml"
   end
-  
+
   desc "Populates the Production Database"
   task :seed do
     run "cd #{current_path}; #{rake} db:seed RAILS_ENV=production"

config/deploy/production.rb

@@ -3,4 +3,4 @@ set :domain, 'n0.entrydns.net'
 role :web, domain                   # Your HTTP server, Apache/etc
 role :app, domain                   # This may be the same as your `Web` server
 role :db,  domain, :primary => true # This is where Rails migrations will run
-# role :db,  "your slave db-server here"
+# role :db,  "your slave db-server here"

config/deploy/staging.rb

@@ -4,4 +4,4 @@ set :port, 2212
 role :web, domain                   # Your HTTP server, Apache/etc
 role :app, domain                   # This may be the same as your `Web` server
 role :db,  domain, :primary => true # This is where Rails migrations will run
-# role :db,  "your slave db-server here"
+# role :db,  "your slave db-server here"

config/environments/development.rb

@@ -28,9 +28,9 @@ Entrydns::Application.configure do
   config.action_mailer.delivery_method = :letter_opener
   # config.action_mailer.delivery_method = :smtp
   # config.action_mailer.smtp_settings = { address: "localhost", port: 1025 }
-  
+
   config.eager_load = false
-  
+
   config.after_initialize do
     Bullet.enable = true
     Bullet.alert = true

config/environments/production.rb

@@ -49,7 +49,7 @@ Entrydns::Application.configure do
     :expires_in => 1.day,
     :compress => true
   }
-  
+
   # Enable serving of images, stylesheets, and JavaScripts from an asset server
   # config.action_controller.asset_host = "http://assets.example.com"
 
@@ -68,7 +68,7 @@ Entrydns::Application.configure do
 
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
-  
+
   ActionMailer::Base.add_delivery_method :ses, AWS::SES::Base,
     :access_key_id     => Settings.ses_access_key_id,
     :secret_access_key => Settings.ses_secret_access_key
@@ -80,10 +80,10 @@ Entrydns::Application.configure do
   #    :domain  => 'entrydns.net'
   #  }
   config.action_mailer.delivery_method = :ses
-  
+
   # Compress JavaScripts and CSS
   config.assets.js_compressor = :uglifier
-  
+
   # disable paper-trail in production
   config.after_initialize do
     PaperTrail.enabled = false

config/environments/test.rb

@@ -36,7 +36,7 @@ Entrydns::Application.configure do
 
   # Allow pass debug_assets=true as a query parameter to load pages with unpackaged assets
   config.assets.allow_debugging = true
-  
+
   config.action_mailer.default_url_options = {:host => 'entrydns.net'}
 
   config.eager_load = false

config/initializers/cancan.rb

@@ -9,20 +9,20 @@ module Squeel
     class PredicateVisitor < Visitor
       def visit_String(o, parent)
         Arel::Nodes::SqlLiteral.new(o)
-      end      
+      end
     end
   end
 end
 
 module CanCan
-  
+
   module ModelAdapters
     class ActiveRecordAdapter < AbstractAdapter
 
       def self.override_condition_matching?(subject, name, value)
         name.kind_of?(Squeel::Nodes::Predicate) if defined? Squeel
       end
-      
+
       def self.matches_condition?(subject, name, value)
         subject_value = subject.send(name.expr)
         method_name = name.method_name.to_s
@@ -34,7 +34,7 @@ module CanCan
           squeel_match? subject_value, name.method_name, value
         end
       end
-      
+
       def self.squeel_match?(subject_value, method, value)
         case method.to_sym
         when :eq      then subject_value == value
@@ -67,9 +67,9 @@ module CanCan
           end
         end
       end
-      
+
       private
-      
+
       # override to fix overwrites
       # do not write existing hashes using empty hashes
       def merge_joins(base, add)
@@ -84,7 +84,7 @@ module CanCan
 
     end
   end
-  
+
   class Rule # allow Squeel
     def matches_conditions_hash?(subject, conditions = @conditions)
       return true if conditions.empty?
@@ -114,7 +114,7 @@ module CanCan
         end
       end
     end
-    
+
   end
-  
-end
+
+end

config/initializers/devise.rb

@@ -184,7 +184,7 @@ Devise.setup do |config|
   # The default HTTP method used to sign out a resource. Default is :delete.
   # config.sign_out_via = :delete
   config.sign_out_via = :get
-  
+
   # http://blog.plataformatec.com.br/2013/08/devise-3-1-now-with-more-secure-defaults/
   config.allow_insecure_sign_in_after_confirmation = true
   config.secret_key = '0db2fbf12dd3a0c5f1512b4ab4301bb5362772f664981abe167faa185203eaa491e037e9f0e66153184e498560b0509f234fa201f667f010014ae77f5fb4a7cf'

config/initializers/navigasmic.rb

@@ -6,7 +6,7 @@ end
 module Navigasmic
   # lazy monkey patch, makes it work with twitter bootstrap
   class HtmlNavigationBuilder
-    
+
     def item(label = '', options = {}, &proc)
       buffer = block_given? ? template.capture(self, &proc) : ''
       label = (label + buffer).html_safe
@@ -24,7 +24,7 @@ module Navigasmic
 
       item.hidden? ? '' : template.content_tag(Navigasmic.item_tag, label, options.delete(:html))
     end
-    
+
     def group(options = {}, &proc)
       raise ArgumentError, "Missing block" unless block_given?
 
@@ -37,6 +37,6 @@ module Navigasmic
       visible = options[:hidden_unless].nil? ? true : options[:hidden_unless].is_a?(Proc) ? template.instance_eval(&options[:hidden_unless]) : options[:hidden_unless]
       visible ? group.html_safe : ''
     end
-    
+
   end
-end
+end

config/initializers/paper_trail.rb

@@ -1 +1 @@
-PaperTrail::Version.send :include, Stampable
+PaperTrail::Version.send :include, Stampable

config/initializers/rails_admin.rb

@@ -41,7 +41,7 @@ RailsAdmin.config do |config|
   # config.excluded_models = [A, AAAA, Admin, CNAME, Domain, MX, NS, Permission, Record, SOA, SRV, TXT, User]
 
   # Add models here if you want to go 'whitelist mode':
-  config.included_models = [A, AAAA, Admin, CNAME, Domain, MX, NS, Permission, 
+  config.included_models = [A, AAAA, Admin, CNAME, Domain, MX, NS, Permission,
     Record, SOA, SRV, TXT, User, Authentication, BlacklistedDomain, PaperTrail::Version]
 
   config.model Authentication do |conf|
@@ -51,15 +51,15 @@ RailsAdmin.config do |config|
   config.model Permission do |conf|
     parent User
   end
-  
+
   config.model Record do |conf|
     parent Domain
   end
-  
+
   config.actions do
     # root actions
     dashboard                     # mandatory
-    # collection actions 
+    # collection actions
     index                         # mandatory
     new
     export
@@ -74,7 +74,7 @@ RailsAdmin.config do |config|
     ban
     unban
   end
-  
+
   # Application wide tried label methods for models' instances
   # config.label_methods << :description # Default is [:name, :title]
 
@@ -121,25 +121,25 @@ RailsAdmin.config do |config|
   config.model Setting do
     configure :value, :text
   end
-  
+
   # config.model A do
   #   # Found associations:
-  #     configure :domain, :belongs_to_association 
-  #     configure :user, :belongs_to_association 
+  #     configure :domain, :belongs_to_association
+  #     configure :user, :belongs_to_association
   #     configure :creator, :belongs_to_association   #   # Found columns:
-  #     configure :id, :integer 
-  #     configure :domain_id, :integer         # Hidden 
-  #     configure :name, :string 
-  #     configure :type, :string 
-  #     configure :content, :string 
-  #     configure :ttl, :integer 
-  #     configure :prio, :integer 
-  #     configure :change_date, :integer 
-  #     configure :authentication_token, :string 
-  #     configure :created_at, :datetime 
-  #     configure :updated_at, :datetime 
-  #     configure :user_id, :integer         # Hidden 
-  #     configure :creator_id, :integer         # Hidden 
+  #     configure :id, :integer
+  #     configure :domain_id, :integer         # Hidden
+  #     configure :name, :string
+  #     configure :type, :string
+  #     configure :content, :string
+  #     configure :ttl, :integer
+  #     configure :prio, :integer
+  #     configure :change_date, :integer
+  #     configure :authentication_token, :string
+  #     configure :created_at, :datetime
+  #     configure :updated_at, :datetime
+  #     configure :user_id, :integer         # Hidden
+  #     configure :creator_id, :integer         # Hidden
   #     configure :updator_id, :integer   #   # Sections:
   #   list do; end
   #   export do; end
@@ -150,22 +150,22 @@ RailsAdmin.config do |config|
   # end
   # config.model AAAA do
   #   # Found associations:
-  #     configure :domain, :belongs_to_association 
-  #     configure :user, :belongs_to_association 
+  #     configure :domain, :belongs_to_association
+  #     configure :user, :belongs_to_association
   #     configure :creator, :belongs_to_association   #   # Found columns:
-  #     configure :id, :integer 
-  #     configure :domain_id, :integer         # Hidden 
-  #     configure :name, :string 
-  #     configure :type, :string 
-  #     configure :content, :string 
-  #     configure :ttl, :integer 
-  #     configure :prio, :integer 
-  #     configure :change_date, :integer 
-  #     configure :authentication_token, :string 
-  #     configure :created_at, :datetime 
-  #     configure :updated_at, :datetime 
-  #     configure :user_id, :integer         # Hidden 
-  #     configure :creator_id, :integer         # Hidden 
+  #     configure :id, :integer
+  #     configure :domain_id, :integer         # Hidden
+  #     configure :name, :string
+  #     configure :type, :string
+  #     configure :content, :string
+  #     configure :ttl, :integer
+  #     configure :prio, :integer
+  #     configure :change_date, :integer
+  #     configure :authentication_token, :string
+  #     configure :created_at, :datetime
+  #     configure :updated_at, :datetime
+  #     configure :user_id, :integer         # Hidden
+  #     configure :creator_id, :integer         # Hidden
   #     configure :updator_id, :integer   #   # Sections:
   #   list do; end
   #   export do; end
@@ -177,19 +177,19 @@ RailsAdmin.config do |config|
   # config.model Admin do
   #   # Found associations:
   #   # Found columns:
-  #     configure :id, :integer 
-  #     configure :email, :string 
-  #     configure :password, :password         # Hidden 
-  #     configure :password_confirmation, :password         # Hidden 
-  #     configure :reset_password_token, :string         # Hidden 
-  #     configure :reset_password_sent_at, :datetime 
-  #     configure :remember_created_at, :datetime 
-  #     configure :sign_in_count, :integer 
-  #     configure :current_sign_in_at, :datetime 
-  #     configure :last_sign_in_at, :datetime 
-  #     configure :current_sign_in_ip, :string 
-  #     configure :last_sign_in_ip, :string 
-  #     configure :created_at, :datetime 
+  #     configure :id, :integer
+  #     configure :email, :string
+  #     configure :password, :password         # Hidden
+  #     configure :password_confirmation, :password         # Hidden
+  #     configure :reset_password_token, :string         # Hidden
+  #     configure :reset_password_sent_at, :datetime
+  #     configure :remember_created_at, :datetime
+  #     configure :sign_in_count, :integer
+  #     configure :current_sign_in_at, :datetime
+  #     configure :last_sign_in_at, :datetime
+  #     configure :current_sign_in_ip, :string
+  #     configure :last_sign_in_ip, :string
+  #     configure :created_at, :datetime
   #     configure :updated_at, :datetime   #   # Sections:
   #   list do; end
   #   export do; end
@@ -200,22 +200,22 @@ RailsAdmin.config do |config|
   # end
   # config.model CNAME do
   #   # Found associations:
-  #     configure :domain, :belongs_to_association 
-  #     configure :user, :belongs_to_association 
+  #     configure :domain, :belongs_to_association
+  #     configure :user, :belongs_to_association
   #     configure :creator, :belongs_to_association   #   # Found columns:
-  #     configure :id, :integer 
-  #     configure :domain_id, :integer         # Hidden 
-  #     configure :name, :string 
-  #     configure :type, :string 
-  #     configure :content, :string 
-  #     configure :ttl, :integer 
-  #     configure :prio, :integer 
-  #     configure :change_date, :integer 
-  #     configure :authentication_token, :string 
-  #     configure :created_at, :datetime 
-  #     configure :updated_at, :datetime 
-  #     configure :user_id, :integer         # Hidden 
-  #     configure :creator_id, :integer         # Hidden 
+  #     configure :id, :integer
+  #     configure :domain_id, :integer         # Hidden
+  #     configure :name, :string
+  #     configure :type, :string
+  #     configure :content, :string
+  #     configure :ttl, :integer
+  #     configure :prio, :integer
+  #     configure :change_date, :integer
+  #     configure :authentication_token, :string
+  #     configure :created_at, :datetime
+  #     configure :updated_at, :datetime
+  #     configure :user_id, :integer         # Hidden
+  #     configure :creator_id, :integer         # Hidden
   #     configure :updator_id, :integer   #   # Sections:
   #   list do; end
   #   export do; end
@@ -226,41 +226,41 @@ RailsAdmin.config do |config|
   # end
   # config.model Domain do
   #   # Found associations:
-  #     configure :user, :belongs_to_association 
-  #     configure :creator, :belongs_to_association 
-  #     configure :parent, :belongs_to_association 
-  #     configure :records, :has_many_association 
-  #     configure :permissions, :has_many_association 
-  #     configure :permitted_users, :has_many_association 
-  #     configure :soa_record, :has_one_association 
-  #     configure :soa_records, :has_many_association 
-  #     configure :ns_records, :has_many_association 
-  #     configure :a_records, :has_many_association 
-  #     configure :mx_records, :has_many_association 
-  #     configure :txt_records, :has_many_association 
-  #     configure :cname_records, :has_many_association 
-  #     configure :aaaa_records, :has_many_association 
-  #     configure :srv_records, :has_many_association 
+  #     configure :user, :belongs_to_association
+  #     configure :creator, :belongs_to_association
+  #     configure :parent, :belongs_to_association
+  #     configure :records, :has_many_association
+  #     configure :permissions, :has_many_association
+  #     configure :permitted_users, :has_many_association
+  #     configure :soa_record, :has_one_association
+  #     configure :soa_records, :has_many_association
+  #     configure :ns_records, :has_many_association
+  #     configure :a_records, :has_many_association
+  #     configure :mx_records, :has_many_association
+  #     configure :txt_records, :has_many_association
+  #     configure :cname_records, :has_many_association
+  #     configure :aaaa_records, :has_many_association
+  #     configure :srv_records, :has_many_association
   #     configure :children, :has_many_association   #   # Found columns:
-  #     configure :id, :integer 
-  #     configure :user_id, :integer         # Hidden 
-  #     configure :name, :string 
-  #     configure :master, :string 
-  #     configure :last_check, :integer 
-  #     configure :type, :string 
-  #     configure :notified_serial, :integer 
-  #     configure :account, :string 
-  #     configure :created_at, :datetime 
-  #     configure :updated_at, :datetime 
-  #     configure :name_reversed, :string 
-  #     configure :creator_id, :integer         # Hidden 
-  #     configure :updator_id, :integer 
-  #     configure :parent_id, :integer         # Hidden 
-  #     configure :lftp, :integer 
-  #     configure :lftq, :integer 
-  #     configure :rgtp, :integer 
-  #     configure :rgtq, :integer 
-  #     configure :lft, :float 
+  #     configure :id, :integer
+  #     configure :user_id, :integer         # Hidden
+  #     configure :name, :string
+  #     configure :master, :string
+  #     configure :last_check, :integer
+  #     configure :type, :string
+  #     configure :notified_serial, :integer
+  #     configure :account, :string
+  #     configure :created_at, :datetime
+  #     configure :updated_at, :datetime
+  #     configure :name_reversed, :string
+  #     configure :creator_id, :integer         # Hidden
+  #     configure :updator_id, :integer
+  #     configure :parent_id, :integer         # Hidden
+  #     configure :lftp, :integer
+  #     configure :lftq, :integer
+  #     configure :rgtp, :integer
+  #     configure :rgtq, :integer
+  #     configure :lft, :float
   #     configure :rgt, :float   #   # Sections:
   #   list do; end
   #   export do; end
@@ -271,22 +271,22 @@ RailsAdmin.config do |config|
   # end
   # config.model MX do
   #   # Found associations:
-  #     configure :domain, :belongs_to_association 
-  #     configure :user, :belongs_to_association 
+  #     configure :domain, :belongs_to_association
+  #     configure :user, :belongs_to_association
   #     configure :creator, :belongs_to_association   #   # Found columns:
-  #     configure :id, :integer 
-  #     configure :domain_id, :integer         # Hidden 
-  #     configure :name, :string 
-  #     configure :type, :string 
-  #     configure :content, :string 
-  #     configure :ttl, :integer 
-  #     configure :prio, :integer 
-  #     configure :change_date, :integer 
-  #     configure :authentication_token, :string 
-  #     configure :created_at, :datetime 
-  #     configure :updated_at, :datetime 
-  #     configure :user_id, :integer         # Hidden 
-  #     configure :creator_id, :integer         # Hidden 
+  #     configure :id, :integer
+  #     configure :domain_id, :integer         # Hidden
+  #     configure :name, :string
+  #     configure :type, :string
+  #     configure :content, :string
+  #     configure :ttl, :integer
+  #     configure :prio, :integer
+  #     configure :change_date, :integer
+  #     configure :authentication_token, :string
+  #     configure :created_at, :datetime
+  #     configure :updated_at, :datetime
+  #     configure :user_id, :integer         # Hidden
+  #     configure :creator_id, :integer         # Hidden
   #     configure :updator_id, :integer   #   # Sections:
   #   list do; end
   #   export do; end
@@ -297,22 +297,22 @@ RailsAdmin.config do |config|
   # end
   # config.model NS do
   #   # Found associations:
-  #     configure :domain, :belongs_to_association 
-  #     configure :user, :belongs_to_association 
+  #     configure :domain, :belongs_to_association
+  #     configure :user, :belongs_to_association
   #     configure :creator, :belongs_to_association   #   # Found columns:
-  #     configure :id, :integer 
-  #     configure :domain_id, :integer         # Hidden 
-  #     configure :name, :string 
-  #     configure :type, :string 
-  #     configure :content, :string 
-  #     configure :ttl, :integer 
-  #     configure :prio, :integer 
-  #     configure :change_date, :integer 
-  #     configure :authentication_token, :string 
-  #     configure :created_at, :datetime 
-  #     configure :updated_at, :datetime 
-  #     configure :user_id, :integer         # Hidden 
-  #     configure :creator_id, :integer         # Hidden 
+  #     configure :id, :integer
+  #     configure :domain_id, :integer         # Hidden
+  #     configure :name, :string
+  #     configure :type, :string
+  #     configure :content, :string
+  #     configure :ttl, :integer
+  #     configure :prio, :integer
+  #     configure :change_date, :integer
+  #     configure :authentication_token, :string
+  #     configure :created_at, :datetime
+  #     configure :updated_at, :datetime
+  #     configure :user_id, :integer         # Hidden
+  #     configure :creator_id, :integer         # Hidden
   #     configure :updator_id, :integer   #   # Sections:
   #   list do; end
   #   export do; end
@@ -323,15 +323,15 @@ RailsAdmin.config do |config|
   # end
   # config.model Permission do
   #   # Found associations:
-  #     configure :domain, :belongs_to_association 
-  #     configure :user, :belongs_to_association 
+  #     configure :domain, :belongs_to_association
+  #     configure :user, :belongs_to_association
   #     configure :creator, :belongs_to_association   #   # Found columns:
-  #     configure :id, :integer 
-  #     configure :domain_id, :integer         # Hidden 
-  #     configure :user_id, :integer         # Hidden 
-  #     configure :created_at, :datetime 
-  #     configure :updated_at, :datetime 
-  #     configure :creator_id, :integer         # Hidden 
+  #     configure :id, :integer
+  #     configure :domain_id, :integer         # Hidden
+  #     configure :user_id, :integer         # Hidden
+  #     configure :created_at, :datetime
+  #     configure :updated_at, :datetime
+  #     configure :creator_id, :integer         # Hidden
   #     configure :updator_id, :integer   #   # Sections:
   #   list do; end
   #   export do; end
@@ -342,22 +342,22 @@ RailsAdmin.config do |config|
   # end
   # config.model Record do
   #   # Found associations:
-  #     configure :domain, :belongs_to_association 
-  #     configure :user, :belongs_to_association 
+  #     configure :domain, :belongs_to_association
+  #     configure :user, :belongs_to_association
   #     configure :creator, :belongs_to_association   #   # Found columns:
-  #     configure :id, :integer 
-  #     configure :domain_id, :integer         # Hidden 
-  #     configure :name, :string 
-  #     configure :type, :string 
-  #     configure :content, :string 
-  #     configure :ttl, :integer 
-  #     configure :prio, :integer 
-  #     configure :change_date, :integer 
-  #     configure :authentication_token, :string 
-  #     configure :created_at, :datetime 
-  #     configure :updated_at, :datetime 
-  #     configure :user_id, :integer         # Hidden 
-  #     configure :creator_id, :integer         # Hidden 
+  #     configure :id, :integer
+  #     configure :domain_id, :integer         # Hidden
+  #     configure :name, :string
+  #     configure :type, :string
+  #     configure :content, :string
+  #     configure :ttl, :integer
+  #     configure :prio, :integer
+  #     configure :change_date, :integer
+  #     configure :authentication_token, :string
+  #     configure :created_at, :datetime
+  #     configure :updated_at, :datetime
+  #     configure :user_id, :integer         # Hidden
+  #     configure :creator_id, :integer         # Hidden
   #     configure :updator_id, :integer   #   # Sections:
   #   list do; end
   #   export do; end
@@ -368,22 +368,22 @@ RailsAdmin.config do |config|
   # end
   # config.model SOA do
   #   # Found associations:
-  #     configure :domain, :belongs_to_association 
-  #     configure :user, :belongs_to_association 
+  #     configure :domain, :belongs_to_association
+  #     configure :user, :belongs_to_association
   #     configure :creator, :belongs_to_association   #   # Found columns:
-  #     configure :id, :integer 
-  #     configure :domain_id, :integer         # Hidden 
-  #     configure :name, :string 
-  #     configure :type, :string 
-  #     configure :content, :string 
-  #     configure :ttl, :integer 
-  #     configure :prio, :integer 
-  #     configure :change_date, :integer 
-  #     configure :authentication_token, :string 
-  #     configure :created_at, :datetime 
-  #     configure :updated_at, :datetime 
-  #     configure :user_id, :integer         # Hidden 
-  #     configure :creator_id, :integer         # Hidden 
+  #     configure :id, :integer
+  #     configure :domain_id, :integer         # Hidden
+  #     configure :name, :string
+  #     configure :type, :string
+  #     configure :content, :string
+  #     configure :ttl, :integer
+  #     configure :prio, :integer
+  #     configure :change_date, :integer
+  #     configure :authentication_token, :string
+  #     configure :created_at, :datetime
+  #     configure :updated_at, :datetime
+  #     configure :user_id, :integer         # Hidden
+  #     configure :creator_id, :integer         # Hidden
   #     configure :updator_id, :integer   #   # Sections:
   #   list do; end
   #   export do; end
@@ -394,22 +394,22 @@ RailsAdmin.config do |config|
   # end
   # config.model SRV do
   #   # Found associations:
-  #     configure :domain, :belongs_to_association 
-  #     configure :user, :belongs_to_association 
+  #     configure :domain, :belongs_to_association
+  #     configure :user, :belongs_to_association
   #     configure :creator, :belongs_to_association   #   # Found columns:
-  #     configure :id, :integer 
-  #     configure :domain_id, :integer         # Hidden 
-  #     configure :name, :string 
-  #     configure :type, :string 
-  #     configure :content, :string 
-  #     configure :ttl, :integer 
-  #     configure :prio, :integer 
-  #     configure :change_date, :integer 
-  #     configure :authentication_token, :string 
-  #     configure :created_at, :datetime 
-  #     configure :updated_at, :datetime 
-  #     configure :user_id, :integer         # Hidden 
-  #     configure :creator_id, :integer         # Hidden 
+  #     configure :id, :integer
+  #     configure :domain_id, :integer         # Hidden
+  #     configure :name, :string
+  #     configure :type, :string
+  #     configure :content, :string
+  #     configure :ttl, :integer
+  #     configure :prio, :integer
+  #     configure :change_date, :integer
+  #     configure :authentication_token, :string
+  #     configure :created_at, :datetime
+  #     configure :updated_at, :datetime
+  #     configure :user_id, :integer         # Hidden
+  #     configure :creator_id, :integer         # Hidden
   #     configure :updator_id, :integer   #   # Sections:
   #   list do; end
   #   export do; end
@@ -420,22 +420,22 @@ RailsAdmin.config do |config|
   # end
   # config.model TXT do
   #   # Found associations:
-  #     configure :domain, :belongs_to_association 
-  #     configure :user, :belongs_to_association 
+  #     configure :domain, :belongs_to_association
+  #     configure :user, :belongs_to_association
   #     configure :creator, :belongs_to_association   #   # Found columns:
-  #     configure :id, :integer 
-  #     configure :domain_id, :integer         # Hidden 
-  #     configure :name, :string 
-  #     configure :type, :string 
-  #     configure :content, :string 
-  #     configure :ttl, :integer 
-  #     configure :prio, :integer 
-  #     configure :change_date, :integer 
-  #     configure :authentication_token, :string 
-  #     configure :created_at, :datetime 
-  #     configure :updated_at, :datetime 
-  #     configure :user_id, :integer         # Hidden 
-  #     configure :creator_id, :integer         # Hidden 
+  #     configure :id, :integer
+  #     configure :domain_id, :integer         # Hidden
+  #     configure :name, :string
+  #     configure :type, :string
+  #     configure :content, :string
+  #     configure :ttl, :integer
+  #     configure :prio, :integer
+  #     configure :change_date, :integer
+  #     configure :authentication_token, :string
+  #     configure :created_at, :datetime
+  #     configure :updated_at, :datetime
+  #     configure :user_id, :integer         # Hidden
+  #     configure :creator_id, :integer         # Hidden
   #     configure :updator_id, :integer   #   # Sections:
   #   list do; end
   #   export do; end
@@ -446,34 +446,34 @@ RailsAdmin.config do |config|
   # end
   # config.model User do
   #   # Found associations:
-  #     configure :creator, :belongs_to_association 
-  #     configure :domains, :has_many_association 
-  #     configure :records, :has_many_association 
-  #     configure :permissions, :has_many_association 
+  #     configure :creator, :belongs_to_association
+  #     configure :domains, :has_many_association
+  #     configure :records, :has_many_association
+  #     configure :permissions, :has_many_association
   #     configure :permitted_domains, :has_many_association   #   # Found columns:
-  #     configure :id, :integer 
-  #     configure :email, :string 
-  #     configure :password, :password         # Hidden 
-  #     configure :password_confirmation, :password         # Hidden 
-  #     configure :reset_password_token, :string         # Hidden 
-  #     configure :reset_password_sent_at, :datetime 
-  #     configure :remember_created_at, :datetime 
-  #     configure :sign_in_count, :integer 
-  #     configure :current_sign_in_at, :datetime 
-  #     configure :last_sign_in_at, :datetime 
-  #     configure :current_sign_in_ip, :string 
-  #     configure :last_sign_in_ip, :string 
-  #     configure :confirmation_token, :string 
-  #     configure :confirmed_at, :datetime 
-  #     configure :confirmation_sent_at, :datetime 
-  #     configure :unconfirmed_email, :string 
-  #     configure :failed_attempts, :integer 
-  #     configure :unlock_token, :string 
-  #     configure :locked_at, :datetime 
-  #     configure :created_at, :datetime 
-  #     configure :updated_at, :datetime 
+  #     configure :id, :integer
+  #     configure :email, :string
+  #     configure :password, :password         # Hidden
+  #     configure :password_confirmation, :password         # Hidden
+  #     configure :reset_password_token, :string         # Hidden
+  #     configure :reset_password_sent_at, :datetime
+  #     configure :remember_created_at, :datetime
+  #     configure :sign_in_count, :integer
+  #     configure :current_sign_in_at, :datetime
+  #     configure :last_sign_in_at, :datetime
+  #     configure :current_sign_in_ip, :string
+  #     configure :last_sign_in_ip, :string
+  #     configure :confirmation_token, :string
+  #     configure :confirmed_at, :datetime
+  #     configure :confirmation_sent_at, :datetime
+  #     configure :unconfirmed_email, :string
+  #     configure :failed_attempts, :integer
+  #     configure :unlock_token, :string
+  #     configure :locked_at, :datetime
+  #     configure :created_at, :datetime
+  #     configure :updated_at, :datetime
   #     configure :full_name, :string
-  #     configure :creator_id, :integer         # Hidden 
+  #     configure :creator_id, :integer         # Hidden
   #     configure :updator_id, :integer   #   # Sections:
   #   list do; end
   #   export do; end

config/initializers/rails_config.rb

@@ -1,3 +1,3 @@
 RailsConfig.setup do |config|
   config.const_name = "Settings"
-end
+end

config/initializers/session_store.rb

@@ -1,7 +1,7 @@
 # Be sure to restart your server when you modify this file.
 
 require 'action_dispatch/middleware/session/dalli_store'
-Rails.application.config.session_store :dalli_store, 
+Rails.application.config.session_store :dalli_store,
   :memcache_server => ['127.0.0.1'],
   :namespace => 'entrydns',
   :key => '_entrydns_session',

config/initializers/simple_form.rb

@@ -30,18 +30,18 @@ end
 # Use this setup block to configure all options available in SimpleForm.
 SimpleForm.setup do |config|
   config.boolean_style = :nested
-  
+
   config.wrappers :bootstrap3, tag: 'div', class: 'form-group', error_class: 'has-error',
       defaults: { input_html: { class: 'default_class' } } do |b|
-    
+
     b.use :html5
-    
+
     b.use :min_max
     b.use :maxlength
     b.use :placeholder
     b.optional :pattern
     b.optional :readonly
-    
+
     b.use :label_input
     b.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
     b.use :error, wrap_with: { tag: 'span', class: 'help-inline' }
@@ -49,15 +49,15 @@ SimpleForm.setup do |config|
 
   config.wrappers :inlabel, tag: 'div', class: 'form-group', error_class: 'has-error',
       defaults: { input_html: { class: 'default_class' } } do |b|
-    
+
     b.use :html5
-    
+
     b.use :min_max
     b.use :maxlength
     b.use :placeholder
     b.optional :pattern
     b.optional :readonly
-    
+
     b.use :labeled_input
     b.use :input
     b.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }

config/routes.rb

@@ -1,5 +1,5 @@
 Entrydns::Application.routes.draw do
-  
+
   mount RailsAdmin::Engine => '/rails_admin', as: 'rails_admin'
 
   devise_for :admins
@@ -8,13 +8,13 @@ Entrydns::Application.routes.draw do
     registrations: 'users/registrations',
     omniauth_callbacks: 'users/omniauth_callbacks'
   }
-    
+
   scope module: 'users' do
-  
+
     resources :authentications do
       as_routes
     end
-    
+
     resources :domains do
       as_routes
     end
@@ -26,7 +26,7 @@ Entrydns::Application.routes.draw do
       end
     end
 
-    match '/records/modify/:authentication_token', to: 'records#modify', 
+    match '/records/modify/:authentication_token', to: 'records#modify',
       as: :modify_record, via: [:get, :post, :put]
     resources :records do
       as_routes
@@ -70,11 +70,11 @@ Entrydns::Application.routes.draw do
     resources :permissions do
       as_routes
     end
-    
+
   end
 
   scope module: 'public' do
-    
+
     resources :pages, only: :show, path: ''
     post 'contact', to: 'pages#contact'
 

spec/controllers/users/domains_controller_spec.rb

@@ -31,26 +31,26 @@ describe Users::DomainsController do
       it "is wired with the current user by #new_model" do
         @controller.send(:new_model).user.should == user
       end
-    
+
       it "is wired with the current user by #before_create_save" do
         domain = build(:domain)
         @controller.send(:before_create_save, domain)
         domain.user.should == user
       end
     end
-    
+
     # a domain who's parent domain is in our system
     context "subdomain" do
       before do
         sign_in user2
       end
-      
+
       it "is wired with the user of the parent domain by #before_create_save" do
         subdomain = build(:domain, :user => user2, :name => "x.#{domain.name}")
         @controller.send(:before_create_save, subdomain)
         subdomain.user.should == user
       end
     end
-    
+
   end
 end

spec/controllers/users/hosts_controller_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Users::HostsController do
   include_context "data"
-  
+
   before do
     sign_in user
     @controller.stub(:nested_parent_record => host_domain)
@@ -11,7 +11,7 @@ describe Users::HostsController do
   it "#new_model is wired" do
     @controller.send(:new_model).user.should == user
   end
-    
+
   it "#before_create_save wires" do
     @controller.send(:before_create_save, host_a_record)
     host_a_record.user.should == user

spec/controllers/users/records_controller_spec.rb

@@ -2,14 +2,14 @@ require 'spec_helper'
 
 describe Users::RecordsController do
   it_should_behave_like "wiring controller"
-  
+
   describe "GET modify" do
     include_context "data"
-    
+
     before do
       sign_in user
     end
-    
+
     it "modifies @record when IP given" do
       ip = '127.0.0.2'
       get :modify, :authentication_token => a_record.authentication_token, :ip => ip
@@ -18,7 +18,7 @@ describe Users::RecordsController do
       assigns(:record).should == a_record
       assigns(:record).content.should == ip
     end
-    
+
     it "modifies @record with remote IP" do
       ip = '127.0.0.3'
       @request.env['REMOTE_ADDR'] = ip
@@ -36,7 +36,7 @@ describe Users::RecordsController do
       response.should be_success
       response.body.should == Users::RecordsController::MODIFY_ERROR
     end
-    
+
   end
 
 end

spec/factories.rb

@@ -1,10 +1,10 @@
 FactoryGirl.define do
-  
+
   sequence(:email){|n| "#{Faker::Internet.user_name}#{n}@example.com"}
   sequence(:password){|n| "password#{n}"}
   sequence(:domain_name){|n| "#{n}#{Faker::Internet.domain_name}"}
   sequence(:domain_word){|n| "#{n}#{Faker::Internet.domain_word}"}
-  
+
   factory :user do
     full_name {Faker::Name.first_name + ' ' + Faker::Name.last_name}
     email
@@ -14,7 +14,7 @@ FactoryGirl.define do
       u.confirm!
     end
   end
-  
+
   factory :domain do
     name {FactoryGirl.generate(:domain_name)}
     type 'NATIVE'
@@ -35,18 +35,18 @@ FactoryGirl.define do
     name {FactoryGirl.generate(:domain_name)}
     content {Faker::Internet.ip_v4_address}
   end
-  
+
   factory :permission do
   end
-  
+
   factory :admin do
     email
     password
     password_confirmation {password}
   end
-  
+
   factory :blacklisted_domain do
     name {FactoryGirl.generate(:domain_name)}
   end
-  
+
 end

spec/features/devise_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 feature "devise" do
   include_context "data"
   let(:new_user) { build(:user) }
-  
+
   def sign_up_user
     visit new_user_registration_path
     within('#new_user') do
@@ -16,39 +16,39 @@ feature "devise" do
 
   scenario "sign up" do
     sign_up_user
-    
+
     # was success
     current_path.should == page_path('notice')
     expect(page).to have_content I18n.t('devise.registrations.signed_up_but_unconfirmed')
-    
+
     # sent mail
     assert_equal [new_user.email], ActionMailer::Base.deliveries.last.to
-    
+
     # saved user
     user = User.order(:id).last
     assert_equal user.email, new_user.email
   end
-  
+
   scenario "sign in" do
     user
-    
+
     visit new_user_session_path
     within('#new_user') do
       fill_in 'Email', with: user.email
       fill_in 'Password', with: user.password
       click_link_or_button 'Sign in'
     end
-    
+
     # was success
     current_path.should == domains_path
     find('.navbar-main').should have_content user.email
-    
+
     # sent mail
     assert_equal [user.email], ActionMailer::Base.deliveries.last.to
   end
-  
+
   let(:friendly_token) { 'abcdef' }
-  
+
   def forgot_password
     Devise.stub(:friendly_token).and_return(friendly_token)
     visit new_user_password_path
@@ -57,20 +57,20 @@ feature "devise" do
       click_link_or_button 'Send reset password instructions'
     end
   end
-  
+
   scenario "forgot password" do
     user
-    
+
     forgot_password
-    
+
     # was success
     current_path.should == new_user_session_path
     expect(page).to have_content I18n.t('devise.passwords.send_instructions')
   end
-  
+
   scenario "reset password" do
     user
-    
+
     forgot_password
     visit edit_user_password_path(:reset_password_token => friendly_token)
     within('#new_user') do

spec/features/simple_api_spec.rb

@@ -7,4 +7,4 @@ feature "devise" do
     visit modify_record_path(:authentication_token => a_record.authentication_token)
     expect(page).to have_content Users::RecordsController::MODIFY_OK
   end
-end
+end

spec/lib/dnsbl_spec.rb

@@ -8,10 +8,10 @@ describe Dnsbl do
   it "queries correctly" do
     Dnsbl.query('does-not-exist-domain-1234567890.net') == nil
   end
-  
+
   it "distinguishes bad domains from good ones" do
     Dnsbl.include?('place4porn.net').should == true
     Dnsbl.include?('entrydns.net').should == false
   end
-  
+
 end

spec/mailers/users/permission_mailer_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Users::PermissionMailer do
   include_context "data"
-  
+
   it "has sends to the right email" do
     created_mail = Users::PermissionMailer.created(permission)
     created_mail.to.should == [permission.user.email]

spec/models/admin_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Admin do
   include_context "data"
-  
+
   it "is inactive by default" do
     admin_admin.should_not be_active
   end

spec/models/domain_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Domain do
   include_context "data"
-  
+
   it "has correct soa record" do
     domain.soa_record.should be_present
   end
@@ -21,7 +21,7 @@ describe Domain do
   it "has a soa serial updated" do
     (domain.soa_record.serial % 100).should_not == 0
   end
-  
+
   it "updates name to records when name changed" do
     domain.update_attributes(:name => "changed#{domain.name}")
     domain.soa_record.name.should == domain.name
@@ -31,7 +31,7 @@ describe Domain do
     end
     (domain.soa_record.serial % 10).should == 0
   end
-  
+
   it "protects DOS on more Settings.max_domains_per_user+ domains" do
     max = Settings.max_domains_per_user.to_i
     domain.user.stub_chain('domains.count').and_return(max)
@@ -52,12 +52,12 @@ describe Domain do
     host_domain.max_domains_per_user
     host_domain.should be_valid
   end
-  
+
   it "has parent_domain" do
     subdomain = build(:domain, :user => user2, :name => "x.#{domain.name}")
     subdomain.parent_domain.should == domain
   end
-  
+
   it "validates ownership" do
     domain.name = 'co.uk'
     domain.should have(1).errors_on(:name)
@@ -68,8 +68,8 @@ describe Domain do
     User.do_as(user) do
       # stub a parent domain on another user account, with no permissions present
       mock_domain = double(
-        :user_id => user3.id, 
-        :user => user3, 
+        :user_id => user3.id,
+        :user => user3,
         :name => 'x',
         :can_be_managed_by_current_user? => false
       )
@@ -77,7 +77,7 @@ describe Domain do
       domain.should have(1).errors_on(:name)
     end
   end
-  
+
   it "validates blacklist" do
     blacklisted_domain
 
@@ -95,21 +95,21 @@ describe Domain do
     permission3
     query = Domain.accessible_by(user.ability(:reload => true))
     expected = <<-SQL
-      SELECT `domains`.* FROM `domains` 
+      SELECT `domains`.* FROM `domains`
       LEFT OUTER JOIN `permissions` ON `permissions`.`domain_id` = `domains`.`id`
-      WHERE ((((1=0 OR 
-        `domains`.`user_id` = #{user.id}) OR 
-        `permissions`.`user_id` = #{user.id}) OR 
+      WHERE ((((1=0 OR
+        `domains`.`user_id` = #{user.id}) OR
+        `permissions`.`user_id` = #{user.id}) OR
         `domains`.`name_reversed` LIKE '#{permission3.domain.name_reversed}.%'))
     SQL
     query.to_sql.should == expected.gsub("\n", '').gsub(/\s+/, ' ').strip
   end
-  
+
   it "has reversed name" do
     domain.name_reversed.should be_present
     domain.name_reversed.should == domain.name.reverse
   end
-  
+
   it "nests root's interval corectly" do
     User.current = nil
     hosts_domain = make_domain(:name => "hosts.com", :user => admin)
@@ -125,14 +125,14 @@ describe Domain do
       [other.id, 0.2, 0.25]
     ]
   end
-  
+
   it "chains rename to children" do
     domain
     subdomain
     subsubdomain
     domain.apply_subdomains = true
     domain.update_attributes(:name => "changed#{domain.name}")
-    
+
     subdomain.reload.name.should =~ /#{domain.name}$/
     subsubdomain.reload.name.should =~ /#{domain.name}$/
   end
@@ -145,23 +145,23 @@ describe Domain do
     domain.update_attributes(:name => "changed#{domain.name}")
     s = subdomain.reload
     ss = subsubdomain.reload
-    
+
     s.name.should_not =~ /#{domain.name}$/
     s.parent.should be_nil
     ss.name.should_not =~ /#{domain.name}$/
     ss.parent.should_not be_nil
   end
-  
+
   it "recomputes parent" do
     domain
     subdomain
     subsubdomain
     subdomain.update_attributes(:name => "sub.changed#{domain.name}")
-    
+
     subdomain.reload.parent.should be_nil
     subsubdomain.reload.depth.should == 2
   end
-  
+
   it "audits creations" do
     PaperTrail.enabled = true
     User.current = user
@@ -171,5 +171,5 @@ describe Domain do
     User.current = nil
     PaperTrail.enabled = false
   end
-  
+
 end

spec/models/permission_spec.rb

@@ -2,12 +2,12 @@ require 'spec_helper'
 
 describe Permission do
   include_context "data"
-  
+
   it "validates selfness" do
     permission.user_id = permission.domain.user_id
     permission.should have(1).error_on(:user)
   end
-  
+
   it "validates unexsisting email" do
     permission.user_email = "does.not@exist.in.db"
     permission.should have(1).error_on(:user)

spec/models/record_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Record do
   include_context "data"
-  
+
   it "protects DOS on more Settings.max_records_per_domain+ domains" do
     max = Settings.max_records_per_domain.to_i
     a_record.domain.stub_chain(:records, :count).and_return(max)
@@ -16,44 +16,44 @@ describe Record do
     a_record.max_records_per_domain
     a_record.should be_valid
   end
-  
+
   it "queries records corectly in index" do
     permission3
     query = Record.accessible_by(user.ability)
     expected = <<-SQL
-    SELECT `records`.* FROM `records` 
-    INNER JOIN `domains` ON `domains`.`id` = `records`.`domain_id` 
-    LEFT OUTER JOIN `permissions` ON `permissions`.`domain_id` = `domains`.`id` 
-    WHERE ((((1=0 OR 
-      `domains`.`user_id` = #{user.id}) OR 
-      `permissions`.`user_id` = #{user.id}) OR 
+    SELECT `records`.* FROM `records`
+    INNER JOIN `domains` ON `domains`.`id` = `records`.`domain_id`
+    LEFT OUTER JOIN `permissions` ON `permissions`.`domain_id` = `domains`.`id`
+    WHERE ((((1=0 OR
+      `domains`.`user_id` = #{user.id}) OR
+      `permissions`.`user_id` = #{user.id}) OR
       `domains`.`name_reversed` LIKE '#{permission3.domain.name_reversed}.%'))
     SQL
     query.to_sql.should == expected.gsub("\n", '').gsub(/\s+/, ' ').strip
   end
-  
+
   it "queries A records corectly in index" do
     permission3
     query = A.accessible_by(user.ability(:reload => true))
     expected = <<-SQL
-    SELECT `records`.* FROM `records` 
-    INNER JOIN `domains` ON `domains`.`id` = `records`.`domain_id` 
-    LEFT OUTER JOIN `permissions` ON `permissions`.`domain_id` = `domains`.`id` 
-    WHERE `records`.`type` IN ('A') AND (((((1=0 OR 
-      `domains`.`user_id` = #{user.id}) OR 
-      `records`.`user_id` = #{user.id}) OR 
-      `permissions`.`user_id` = #{user.id}) OR 
+    SELECT `records`.* FROM `records`
+    INNER JOIN `domains` ON `domains`.`id` = `records`.`domain_id`
+    LEFT OUTER JOIN `permissions` ON `permissions`.`domain_id` = `domains`.`id`
+    WHERE `records`.`type` IN ('A') AND (((((1=0 OR
+      `domains`.`user_id` = #{user.id}) OR
+      `records`.`user_id` = #{user.id}) OR
+      `permissions`.`user_id` = #{user.id}) OR
       `domains`.`name_reversed` LIKE '#{permission3.domain.name_reversed}.%'))
     SQL
     query.to_sql.should == expected.gsub("\n", '').gsub(/\s+/, ' ').strip
   end
-  
+
   it "validates host a records dubles" do
     host_a_record
     host_a_record2 = build(:a, name: host_a_record.name, content: '127.0.0.2', domain: host_domain, user: user2)
     host_a_record2.should have(1).errors_on(:name)
   end
-  
+
   it "audits creations" do
     PaperTrail.enabled = true
     expect { a_record }.to change(PaperTrail::Version, :count)
@@ -61,5 +61,5 @@ describe Record do
     # expect { a_record.update!(content: "127.0.0.2") }.to_not change(PaperTrail::Version, :count)
     PaperTrail.enabled = false
   end
-  
+
 end

spec/models/tld_spec.rb

@@ -14,7 +14,7 @@ describe Tld do
     Tld.include?('ANYTHING.ar').should be_truthy
     Tld.include?('pref.fukuoka.jp').should be_truthy
     Tld.include?('any.toyama.jp').should be_truthy
-    
+
     Tld.include?('clyfe.ro').should be_falsey
     Tld.include?('clyfe.zooz.lt').should be_falsey
   end

spec/models/user_ability_spec.rb

@@ -14,19 +14,19 @@ describe UserAbility do
       user.should_not be_able_to(:delete, soa_record) # SOA deleted only via parent
       user.should be_able_to(crud, host_a_record)
     end
-  
+
     it "denies other user to manage my domains and their records, and my hosts" do
       user2.should_not be_able_to(crud, domain)
       user2.should_not be_able_to(crud, a_record)
       user2.should_not be_able_to(crud, soa_record)
       user2.should_not be_able_to(crud, host_a_record)
     end
-  
+
     it "allows admin to manage other user's hosts" do
       admin.should be_able_to(crud, host_a_record)
     end
   end
-  
+
   context "permitted" do
     before do
       User.do_as(user) do
@@ -36,7 +36,7 @@ describe UserAbility do
         permission # ensure permission to domain
       end
     end
-    
+
     it "allows other user to manage user's domains and records, if permitted" do
       User.do_as(user2) do
         user2.should be_able_to(crud, domain)
@@ -44,7 +44,7 @@ describe UserAbility do
         user2.should be_able_to(crud, soa_record)
       end
     end
-    
+
     it "denies third user to manage user's permitted domains and records" do
       User.do_as(user3) do
         user3.should_not be_able_to(crud, domain)
@@ -67,7 +67,7 @@ describe UserAbility do
       end
     end
   end
-  
+
   context "permission" do
     it "allows me to manage my domain's permissions" do
       user.should be_able_to(crud, permission)

spec/models/user_spec.rb

@@ -2,11 +2,11 @@ require 'spec_helper'
 
 describe User do
   include_context "data"
-  
+
   it "is valid" do
     user.should be_valid
   end
-  
+
   it "audits creations" do
     PaperTrail.enabled = true
     expect { user }.to change(PaperTrail::Version, :count)

spec/support/application.rb

@@ -1,9 +1,9 @@
 module Entrydns
   module TestHelpers
-    
+
 #    def make_user
 #    end
-    
+
   end
 end
 

spec/support/database_rewinder.rb

@@ -6,4 +6,4 @@ RSpec.configure do |config|
   config.after do
     DatabaseRewinder.clean
   end
-end
+end

spec/support/factory_girl.rb

@@ -1,4 +1,3 @@
 RSpec.configure do |config|
   config.include FactoryGirl::Syntax::Methods
 end
-

spec/support/rspec.rb

@@ -1,16 +1,16 @@
 RSpec.configure do |config|
   config.mock_with :rspec
-  
+
   config.fixture_path = "#{::Rails.root}/spec/fixtures"
   config.use_transactional_fixtures = false
   config.infer_base_class_for_anonymous_controllers = false
-  
+
   config.filter_run :focus => true
   config.run_all_when_everything_filtered = true
   config.order = "random"
-  
+
   config.infer_spec_type_from_file_location!
-  
+
   config.expect_with :rspec do |c|
     c.syntax = [:should, :expect]
   end

spec/support/shared_context/data.rb

@@ -3,7 +3,7 @@ shared_context "data" do
   let(:user){create(:user)} # a regular user
   let(:user2){create(:user)}
   let(:user3){create(:user)}
-  
+
   def make_domain(options)
     domain = build(:domain, options)
     domain.setup(FactoryGirl.generate(:email))
@@ -11,7 +11,7 @@ shared_context "data" do
     domain.soa_record.update_serial!
     domain
   end
-  
+
   # user's domains
   let(:domain){make_domain(:user => user)}
   let(:subdomain){make_domain(:name => "sub.#{domain.name}", :user => user)}
@@ -21,20 +21,20 @@ shared_context "data" do
   let(:domain3){make_domain(:user => user3)}
   let(:subdomain3){make_domain(:name => "sub.#{domain.name}", :user => user3)}
   let(:subsubdomain3){make_domain(:name => "sub.#{subdomain.name}", :user => user3)}
-  
+
   # admin's host domain (like entrydns.org)
   let(:host_domain){make_domain(:user => admin, :name => Settings.host_domains.first)}
-  
+
   let(:a_record){create(:a, :content => '127.0.0.1', :domain => domain)}
   let(:soa_record){domain.soa_record}
   let(:host_a_record){create(:a, :content => '127.0.0.1', :domain => host_domain, :user => user)}
 
   let(:permission){create(:permission, :domain => domain, :user => user2)}
   let(:permission3){create(:permission, :domain => domain3, :user => user)}
-  
+
   let(:blacklisted_domain){create(:blacklisted_domain)}
-  
+
   # admin model
   let(:admin_admin){create(:admin)}
-    
+
 end

spec/support/shared_examples/wiring_controller.rb

@@ -2,39 +2,39 @@ shared_examples_for "wiring controller" do
   context "wiring" do
     include_context "data"
     let(:record){Record.new}
-    
+
     context "on owned domain" do
       before do
         sign_in user
         @controller.stub(:nested_parent_record => domain)
       end
-      
+
       it "#new_model is wired" do
         @controller.send(:new_model).user.should == domain.user
       end
-    
+
       it "#before_create_save wires" do
         @controller.send(:before_create_save, record)
         record.user.should == domain.user
       end
     end
-    
+
     context "on permitted domain" do
       before do
         sign_in user2
         permission # touch to ensure creation
         @controller.stub(:nested_parent_record => domain)
       end
-      
+
       it "#new_model is wired" do
         @controller.send(:new_model).user.should == domain.user
       end
-    
+
       it "#before_create_save wires" do
         @controller.send(:before_create_save, record)
         record.user.should == domain.user
       end
     end
-        
+
   end
-end
+end