make most specs work once more

app.rb

@@ -5,9 +5,10 @@
 
 require_relative "options"
 
-require_relative 'node/main'
-require_relative 'node/context'
-require_relative 'node/super_admin'
+require_relative 'controller/main'
+require_relative 'controller/context'
+require_relative 'controller/super_admin'
+require_relative 'controller/admin'
 
 require_relative 'model/init'
 

controller/admin.rb

@@ -0,0 +1,8 @@
+module FXC
+  class Admins < Controller
+    map '/admin'
+
+    def new_agent
+    end
+  end
+end

node/super_admin.rb → controller/super_admin.rb

@@ -1,5 +1,11 @@
 module FXC
   class SuperAdmins < Controller
     map '/super_admin'
+
+    def new_super_admin
+    end
+
+    def new_admin
+    end
   end
 end

layout/main.xhtml

@@ -27,7 +27,14 @@
           <ul class="nav-bar">
             <li>#{FXC::Main.a 'Home', :/}</li>
             <li>#{FXC::ContextAdmin.a 'Context Editor', :/}</li>
-            <li>#{FXC::SuperAdmins.a 'Create Admin', :/}</li>
+            <li class="has-flyout">
+              <a href="#">Create</a>
+              <ul class="flyout">
+                <li>#{FXC::SuperAdmins.a 'Create SuperAdmin', :new_super_admin}</li> 
+                <li>#{FXC::SuperAdmins.a 'Create Admin', :new_admin}</li> 
+                <li>#{FXC::Admins.a 'Create Agent', :new_agent}</li> 
+              </ul>
+            </li>
           </ul>
         </nav>
         <hr />

lib/fxc.rb

@@ -1,21 +1,24 @@
-require 'pathname'
+require 'fsr'
+require 'pgpass'
+require 'sequel'
 
-class Pathname
-  def /(other)
-    join(other.to_s)
+module FXC
+  class Pathname < ::Pathname
+    def /(other)
+      join(other.to_s)
+    end
   end
-end
 
-module FXC
-  ROOT = Pathname(File.expand_path('../../', __FILE__))
-  LIBROOT = ROOT/:lib
-  MIGRATION_ROOT = ROOT/:db/:migrate
-  MODEL_ROOT = ROOT/:model
-  SPEC_HELPER_PATH = ROOT/:spec
-  def self.load_fsr
-    require "fsr"
-  rescue LoadError
-    require "rubygems"
-    require "fsr"
+  ROOT = File.expand_path('../../', __FILE__)
+  MIGRATION_ROOT = File.expand_path('db/migrate', ROOT)
+
+  @db ||= nil
+
+  def self.db
+    @db ||= Sequel.connect(FXC.options.db)
+  end
+
+  def self.db=(other)
+    @db = Sequel.connect(other)
   end
 end

lib/fxc/dialstring.rb

@@ -1,13 +1,15 @@
 module FXC
   class Dialstring
     attr_reader :user, :targets, :default_dialstring, :provider
+
     def initialize(user, targets, default_dialstring = nil, provider = nil)
       @user = user
       @targets = targets
       @default_dialstring = default_dialstring || @user.values[:dialstring]
-      @provider = provider
-      @provider = FXC::Provider[:priority => 0] if @provider.nil?
-      @provider = FXC::Provider.new(:host => "sip.example.com", :prefix => "1") if @provider.nil?
+
+      @provider = provider ||
+        FXC::Provider[:priority => 0] ||
+        FXC::Provider.new(host: "sip.example.com", prefix: "1")
     end
 
     def to_s

model/init.rb

@@ -1,9 +1,8 @@
 require_relative '../lib/fxc'
 require_relative '../options'
-require_relative '../lib/fxc/db'
+
 raise "No DB Available" unless FXC.db
 
-# Here go your requires for models:
 require_relative 'user'
 require_relative 'user_variable'
 require_relative 'target'
@@ -12,9 +11,7 @@
 require_relative 'server'
 require_relative 'context'
 require_relative 'voicemail'
-# require "sequel_orderable"
 require_relative 'extension'
 require_relative 'condition'
 require_relative 'action'
 require_relative 'anti_action'
-# require_relative 'configuration'

model/user.rb

@@ -1,6 +1,7 @@
-require File.expand_path("../../lib/fxc", __FILE__)
-require FXC::ROOT/:lib/:fxc/:dialstring
+require_relative '../lib/fxc'
+require_relative '../lib/fxc/dialstring'
 require "digest/sha1"
+
 module FXC
   class User < Sequel::Model
     set_dataset FXC.db[:users]

spec/directory_data.rb

@@ -1,20 +1,25 @@
-require FXC::SPEC_HELPER_PATH/:db_helper
+require_relative 'helper'
 
-user1 = FXC::User.create(:extension => "1901", :pin => "2121", :mailbox => "1901")
+FXC::User.delete
+FXC::Did.delete
+FXC::Target.delete
+FXC::Voicemail.delete
+
+user1 = FXC::User.find_or_create(:extension => "1901", :pin => "2121", :mailbox => "1901")
 user1.active = true
 user1.save
 
 user1.add_did(FXC::Did.new(:number => "1901", :clid_name => "Joe Smith", :description => "Inbound DID Test"))
 
-user2 = FXC::User.create(:extension => "1902", :pin => "3131", :mailbox => "1902")
+user2 = FXC::User.find_or_create(:extension => "1902", :pin => "3131", :mailbox => "1902")
 user2.active = true
 user2.save
 
 user2.add_did(FXC::Did.new(:number => "1902", :clid_name => "John Doe", :description => "Inbound DID Test #2"))
 
 user2.add_target(FXC::Target.new(:value => "${sofia_contact(default/1902@${dialed_domain})}"))
 
-user3 = FXC::User.create(:extension => "1903", :pin => "3131")
+user3 = FXC::User.find_or_create(:extension => "1903", :pin => "3131")
 user3.active = true
 user3.save
 

spec/fxc/lib/dialstring.rb

@@ -1,5 +1,6 @@
-require File.expand_path("../../../db_helper", __FILE__)
-require FXC::ROOT/:lib/:fxc/:dialstring
+require_relative '../../helper'
+require_relative '../../../lib/fxc/dialstring'
+
 describe "Dialstring" do
   @user = FXC::User.create(:extension => "1909", :pin => "1234")
   it "should return the user's dialstring when there are no targets given, and no default" do

spec/helper.rb

@@ -1,12 +1,9 @@
-require File.expand_path('../../app', __FILE__)
+require_relative '../app'
 require 'nokogiri'
-require 'innate/spec/bacon'
-Innate::Log.loggers = [Logger.new(FXC::ROOT/:log/"innate.log")]
-Innate.middleware! :spec do |m|
-  m.use Rack::Lint
-  m.use Rack::CommonLogger, Innate::Log
-  m.use FXC::Rack::Middleware
-  m.innate
-end
+require 'ramaze/spec/bacon'
 
-Innate.options.roots = [FXC::ROOT]
+Ramaze::Log.loggers = [
+  Logger.new(File.expand_path('log/innate.log', FXC::ROOT))
+]
+
+Ramaze.options.roots = [FXC::ROOT]

spec/model/context.rb

@@ -1,31 +1,27 @@
-require File.expand_path('../../db_helper', __FILE__)
-require FXC::ROOT/:spec/:directory_data
+require_relative '../directory_data'
 
 describe 'FXC::Context' do
-  User, Target, Context, Did = FXC::User, FXC::Target, FXC::Context, FXC::Did
-
   it 'should always have a default context' do
-    default = Context.default
+    default = FXC::Context.default
     default.should.not.be.nil?
     default.name.should.equal "default"
   end
 
   it 'should always have a public context' do
-    pub = Context.public
+    pub = FXC::Context.public
     pub.should.not.be.nil?
     pub.name.should.equal "public"
   end
 
   it "should list users in the context" do
-    user = User.find_or_create(:username => "msfoo")
-    Context.default.add_user(user).should.not.be.nil
-    Context.default.users.map { |u| u.username }.should.include "msfoo"
+    user = FXC::User.find_or_create(:username => "msfoo")
+    FXC::Context.default.add_user(user).should.not.be.nil
+    FXC::Context.default.users.map { |u| u.username }.should.include "msfoo"
   end
 
   it "should list DIDs in the context" do
-    did = Did.find_or_create(:number => "8675309")
-    Context.public.add_did(did).should.not.be.nil
-    Context.public.dids.map { |n| n.number }.should.include "8675309"
+    did = FXC::Did.find_or_create(:number => "8675309")
+    FXC::Context.public.add_did(did).should.not.be.nil
+    FXC::Context.public.dids.map { |n| n.number }.should.include "8675309"
   end
-
 end