qui 0.8.5 → 0.9.0

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 #dependencies
-gem "activerecord"
+gem "activerecord", '~> 3.2'
 gem "mysql2"
 
 #testing

data/README.md

@@ -20,7 +20,7 @@ Or install it yourself as:
 
 First, connect to your Queuemetrics database:
 
-    Qui::Base.new("192.168.1.100","username","password")
+    Qui::Base.establish_connection("192.168.1.100","username","password")
     
 Then simply create users, agents and queues using QueuemetricsAgent, QueuemetricsUser, and QueuemetricsQueue - all inhereit from ActiveRecord::Base.
 

data/lib/qui/agent.rb

@@ -1,28 +1,30 @@
 module Qui
   class Agent < ActiveRecord::Base
+    attr_accessible :supervised_by, :nome_agente, :descr_agente, :location, :aliases, :group_by, :sys_dt_creazione, :current_terminal, :xmpp_address, :payroll_code, :chiave_agente, :sys_dt_modifica
     self.table_name = 'agenti_noti'
 
     def initialize(options={})
-      if options then 
-        super set_defaults(options)
-      else
-        super
-      end
-    end
-    
-    def set_defaults(options)
-      if options[:agent_name] then options[:nome_agente] = options.delete(:agent_name) end
-      if options[:agent_description] then options[:descr_agente] = options.delete(:agent_description) end
-      options[:location] = 3
-      options[:aliases] = ""
-      options[:group_by] = 1
-      options[:sys_dt_creazione] = Time.now.to_s(:db)
-      options[:current_terminal] = " "
-      options[:xmpp_address] = " "
-      options[:payroll_code] = " "
-      options[:chiave_agente] = " "
-      options[:sys_dt_modifica] = Time.now.to_s(:db)
+      super set_defaults(options)
     end
 
+    def self.use_existing_connection connection
+      establish_connection connection
+    end
+    
+    private
+      def set_defaults(options)
+        if options[:agent_name] then options[:nome_agente] = options.delete(:agent_name) end
+        if options[:agent_description] then options[:descr_agente] = options.delete(:agent_description) end
+        options[:location] = 3
+        options[:aliases] = ""
+        options[:group_by] = 1
+        options[:sys_dt_creazione] = Time.now.to_s(:db)
+        options[:current_terminal] = " "
+        options[:xmpp_address] = " "
+        options[:payroll_code] = " "
+        options[:chiave_agente] = " "
+        options[:sys_dt_modifica] = Time.now.to_s(:db)
+        return options
+      end
   end
 end

data/lib/qui/base.rb

@@ -2,21 +2,19 @@ require 'active_record'
 
 module Qui
   class Base
-
     def self.establish_connection(host, username, password)
-      connection = {
+      ActiveRecord::Base.configurations['queuemetrics'] = {
         :adapter 	=> "mysql2",
         :host 		=> host,
         :database => "queuemetrics",
         :username => username,
         :password => password,
       }
-      ActiveRecord::Base.establish_connection connection
+      ActiveRecord::Base.establish_connection
     end
 
     def self.close_connection
       ActiveRecord::Base.connection.close
     end
-
   end
 end

data/lib/qui/user.rb

@@ -1,26 +1,27 @@
 module Qui
   class User < ActiveRecord::Base
+    attr_accessible :login, :real_name, :classe, :PASSWORD, :abilitato, :masterkey, :n_logon, :chiavi_utente, :ultimo_logon, :sys_dt_creazione, :sys_dt_modifica
     self.table_name = 'arch_users'
     
     def initialize(options={})
-      if options then 
-        super set_defaults(options) 
-      else
-        super
-      end
+      super set_defaults(options) 
     end
 
-    private
+    def self.use_existing_connection connection
+      establish_connection connection
+    end
 
+    private
       def set_defaults(options)
+        options[:PASSWORD] ||= options.delete(:password)
         options[:abilitato] = "1"
         options[:masterkey] = "0"
         options[:n_logon]  = "0"
         options[:chiavi_utente] = " "
-        options[:ultimo_logon] = Time.now.to_s(:db)
-        options[:sys_dt_creazione] = Time.now.to_s(:db)
-        options[:sys_dt_modifica] = Time.now.to_s(:db)
+        options[:ultimo_logon] = Time.now
+        options[:sys_dt_creazione] = Time.now
+        options[:sys_dt_modifica] = Time.now
+        return options
       end
-
   end
 end

data/qui.gemspec

@@ -1,14 +1,6 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'qui/base'
-require 'qui/agent'
-require 'qui/user'
-require 'qui/queue'
-
 Gem::Specification.new do |spec|
   spec.name          = "qui"
-  spec.version       = "0.8.5"
+  spec.version       = "0.9.0"
   spec.authors       = ["Kevin Collette"]
   spec.email         = ["kevcollette@gmail.com"]
   spec.description   = %q{Qui, or Queuemetrics User Integration, is a gem that creates an ActiveRecord wrapper for manipulating users, agents, and queues within the Queuemetrics calling platform.}
@@ -23,6 +15,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "mysql2"
-  spec.add_development_dependency "activerecord"
+  spec.add_dependency "mysql2"
+  spec.add_dependency "activerecord", "~> 3.2"
 end

data/spec/lib/agent_spec.rb

@@ -5,9 +5,7 @@ require 'qui/agent'
 describe Qui::Agent do
 
   it "should wrap ActiveRecord" do
-    #@q = YAML::load_file(File.join(__dir__, 'config.yml'))
-    #Qui::Base.establish_connection(@q["host"], @q["username"], @q["password"])
-    Qui::Agent.superclass.should == ActiveRecord::Base
+    Qui::Agent.ancestors.should include ActiveRecord::Base
   end
 
 end

data/spec/lib/queue_spec.rb

@@ -10,9 +10,7 @@ describe Qui::Queue do
   end
 
   it "should wrap ActiveRecord" do
-    # @q = YAML::load_file(File.join(__dir__, 'config.yml'))
-    # Qui::Base.establish_connection(@q["host"], @q["username"], @q["password"])
-    Qui::Queue.superclass.should == ActiveRecord::Base
+    Qui::Queue.ancestors.should include ActiveRecord::Base
   end
 
   describe ".add_agent!" do

data/spec/lib/user_spec.rb

@@ -5,9 +5,7 @@ require 'qui/user'
 describe Qui::User do
 
   it "should wrap ActiveRecord" do
-    # @q = YAML::load_file(File.join(__dir__, 'config.yml'))
-    # Queuemetrics.establish_connection(@q["host"], @q["username"], @q["password"])
-    Qui::User.superclass.should == ActiveRecord::Base
+    Qui::User.ancestors.should include ActiveRecord::Base
   end
 
 end

metadata

@@ -1,71 +1,60 @@
 --- !ruby/object:Gem::Specification
 name: qui
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.9.0
+  prerelease: 
 platform: ruby
 authors:
 - Kevin Collette
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-18 00:00:00.000000000 Z
+date: 2013-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70293688656140 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
+  version_requirements: *70293688656140
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70293688655740 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70293688655740
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70293688655280 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70293688655280
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70293688654700 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '3.2'
+  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70293688654700
 description: Qui, or Queuemetrics User Integration, is a gem that creates an ActiveRecord
   wrapper for manipulating users, agents, and queues within the Queuemetrics calling
   platform.
@@ -97,26 +86,27 @@ files:
 homepage: ''
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 1.8.17
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Qui creates and manages Queuemetrics users and queues.
 test_files:
 - spec/lib/agent_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 33ced5ed8190bac66954a479a646fe54be968162
-  data.tar.gz: ab2286b5efc9c26bb52d31278f33c4ef61ab19c1
-SHA512:
-  metadata.gz: e123202253baca94111462b049c8c511848f7271bc08c0b8892170648f6dbdd19e356a5f19d7391f54287955ef3d935ce1b6a786e565bbe807df7f2e073ecf25
-  data.tar.gz: e8d75deef63de86c07423d30cf9309d39ae410631764b295991bf0014258deecd1580a5240515255bcb50a37a5599746300822bd0a468ee6300b8664a73c32b2