elastix 0.0.3 → 0.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmY3ZWE4YzIzZjcwZTk3OGUzOTczYzM3NmQ2NGIwYjYwYzkzOTNjMg==
+    MTExMDJiNmNjNjM3NmZhMTE1MmEwYzdkODAwODExODFlY2ZiZTI5Yg==
   data.tar.gz: !binary |-
-    OWZmMjIyOTZiODkyNTMyNWI4NjI1NjRmN2JjMzAzNzBlYWMwNDBkNQ==
+    YmE3ZmVkZWFmMWUxZTAxYTgzMDEwYWJjOWRiMTIyOGE2NGIxOGNiZg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZDgzMTgyOTQ4ODA4NjdkNzJmODZlNjQ5MzMzZDExMzViYjdjODc4OTUwYzFh
-    N2UyNTNlYmNjMDQ5YmY3NzZmYjQ2NjY3OTViZDg0ZGNhNDZiM2NmOTVlZTcy
-    ODBmMjU2Nzg1MTkzMjI3OGVhZWM0NDllM2QzYjlkN2U4NDdjOGU=
+    OWE3OGRjYjgxYmRlYTVkNzRmNTVhYzBlMGZiYzAzNjViNGEyNzk2ODUxZjcz
+    YzBhODQ1YjUyYzViMzM0MmYwYWM0OTE3NDdlZjU4MjNmMjQzZDA1NmRlOWNk
+    MDEyOWI4MTYyNTk5NDJiMzQ5YWIxNGQyM2Q2ZjM1ZmUxM2RmYjI=
   data.tar.gz: !binary |-
-    YzU2ZTUxMGU2MWQ1ZTc4NzgyNjVjNTcxNDZlMjE4NjM4ZDNjNzM1MDA2MWI2
-    ZDVlZjMzZjJiYzhjMDRhOGEyNzVhNjhhNGE5YmQ5YjQ4MmMyYTI5N2RhNzQ0
-    ZmEwZDZhNDFjNDlhMzhlMzdkMTkyYTg4ZTEzZGE4ZjEyZWY2YTk=
+    ZWU3OTJhMWI2OTkzYzU1ZWJmYWM4YWE3ZDI2MjBjOTNlOTliNWMzNDUyMTFj
+    MTYxOTZkMWVmZTRmMjBkM2Q5OWE3NmE2ZWQ1YWQ4ODA3OTAwNzczNzE2NjEx
+    YzNkZTE5NjJiMWQ5ZDEyZDJmMWVmZWIxZjIyNWJjNTIzMGZhNDU=

data/README.md

@@ -40,7 +40,7 @@ Here is a list of methods that have been implemented:
   * all
   * ==
   * to\_hash
-  * update\_attributes
+  * update\_attributes!
 
 ## Contributing
 

data/elastix.gemspec

@@ -19,4 +19,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'mechanize', '~> 2.7' 
+  spec.add_dependency 'activerecord', '~> 3.2' 
+  spec.add_dependency 'mysql2'
 end

data/lib/elastix.rb

@@ -1,6 +1,8 @@
 require "elastix/version"
 require "elastix/base"
 require "elastix/extension"
+require "elastix/sip"
+require "elastix/user"
 
 module Elastix
   # Your code goes here...

data/lib/elastix/base.rb

@@ -1,25 +1,53 @@
 require 'mechanize'
 module Elastix
-  attr_accessor :elastix
   class Base
-    def self.establish_connection( ip, username, password)
-      $elastix = Mechanize.new
-      $elastix.agent.http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      $base_address = "https://#{ip}"
-      $elastix.get($base_address) 
-      login_form = $elastix.page.forms[0]
-      login_form.input_user = username
-      login_form.input_pass = password
-      $elastix.submit(login_form,login_form.button_with("submit_login"))
+    def self.establish_web_connection host, username, password
+      @@elastix = Mechanize.new
+      @@elastix.agent.http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      @@base_address = "https://#{host}"
+      login username, password
     end
+    
 
-    def self.close_connection
-      $base_address = nil
-      $elastix = nil
+    def self.establish_db_connection(host, username, password)
+      ActiveRecord::Base.establish_connection(
+        :adapter  => "mysql2",
+        :host     => host,
+        :database => "asterisk",
+        :username => username,
+        :password => password,
+      )
+    end
+
+    def self.establish_connection(web_options={}, db_options={})
+      establish_web_connection(web_options[:host], web_options[:username], web_options[:password])
+      establish_db_connection(db_options[:host], db_options[:username], db_options[:password])
+    end
+
+    def self.close_db_connection
+      ActiveRecord::Base.connection.close
+    end
+
+    def self.use_existing_db_connection connection
+      establish_connection connection
+    end
+
+    def self.close_db_connection
+      @@base_address = nil
+      @@elastix = nil
     end
 
     def self.reload
-      $elastix.get("#{$base_address}/config.php?handler=reload")
+      @@elastix.get("#{@@base_address}/config.php?handler=reload")
     end
+
+    private
+      def self.login username, password
+        @@elastix.get(@@base_address) 
+        login_form = @@elastix.page.forms[0]
+        login_form.input_user = username
+        login_form.input_pass = password
+        @@elastix.submit(login_form,login_form.button_with("submit_login"))
+      end
   end
 end

data/lib/elastix/extension.rb

@@ -1,106 +1,93 @@
 module Elastix
-  class Extension
+  class Extension < Base
     attr_accessor :extension, :name, :sipname, :outboundcid, :devinfo_secret
 
-    def initialize(params)
+    def initialize params
       params.each_pair{|key,value| instance_variable_set "@#{key}", value}
     end
     
     def destroy
-      $elastix.get("#{$base_address}/config.php?type=setup&amp;display=extensions&amp;extdisplay=#{self.extension}&amp;action=del")
+      @@elastix.get("#{@@base_address}/config.php?type=setup&amp;display=extensions&amp;extdisplay=#{self.extension}&amp;action=del")
       Base.reload
     end
     
     def save
-      raise "Extension already exists" if Extension.exist? self.extension
-      Extension.new_extension_object(self.to_hash)
+      if Extension.exist? extension
+        update_extension_object
+      else
+        new_extension_object
+      end
       Base.reload
     end
     
-    def self.create(params)
-      e = Extension.new(params)
-      e.save
-      e
-    end
-
-    def self.all
-      #TODO abstract this method
-      page = $elastix.get("#{$base_address}/index.php?menu=pbxconfig")
-      extensions = []
-      page.links.each do |link|
-        extensions << Extension.find(get_extension_from_link_text(link.text)) if href_is_acceptable? link.href
-      end
-      extensions
-    end
-
-    def update_attributes!(params)
-      params[:extension] = self.extension
-      Extension.update_extension_object(params)
+    def update_attributes params
+      params.each_pair{|key,value| instance_variable_set "@#{key}", value}
+      self.update_extension_object
       Base.reload
     end
 
-    def self.find(extension)
-     get_extension_object(extension) if exist?(extension)
-    end
-
-    def ==(extension)
+    def == extension
       self.to_hash == extension.to_hash
     end
     
     def to_hash
       Hash[self.instance_variables.map{|var| [var.to_s.delete("@"), self.instance_variable_get(var)]}]
-      #my_hash.symbolize_keys
     end
     
+
+    def self.find extension
+     get_extension_object(extension) if exist?(extension)
+    end
+
+    def self.create params
+      e = Extension.new(params)
+      e.save
+      e
+    end
+
+    def self.all
+      Sip.uniq.pluck(:id)
+    end
+
     private
-      def self.get_extension_object(extension)
-        Extension.new(get_extension_attributes(get_extension_display_page(extension).forms.first))
-      end
-      
-      def self.update_extension_object(params)
-        page = get_extension_display_page(params[:extension])
-        update_and_submit_form(page, params)
+      def update_extension_object
+        page = Extension.get_extension_display_page(self.extension)
+        update_and_submit_form(page, self.to_hash)
       end
 
-      def self.new_extension_object(params)
-        page = get_extension_display_page(params[:extension])
+      def new_extension_object
         #This is necessary for new objects. It would be nice to figure out why.
+        page = @@elastix.get("#{@@base_address}/index.php?menu=pbxconfig")
         page.encoding = "utf-8"
         form = page.form("frm_extensions")
         page = form.submit(form.button_with("Submit"))
-        update_and_submit_form(page, params)
+        update_and_submit_form(page, self.to_hash)
       end
 
-      def self.update_and_submit_form(page, params)
+      def update_and_submit_form(page, params)
         form = page.form("frm_extensions")
         form.encoding = "utf-8"
         params.each{|key,value| form[key.to_s] = value unless value.nil?}
-        $elastix.submit(form, form.button_with("Submit"))
+        @@elastix.submit(form, form.button_with("Submit"))
       end
 
-      def self.get_extension_display_page(extension)
-        $elastix.get "#{$base_address}/config.php?type=setup&display=extensions&extdisplay=#{extension}"
+      def self.get_extension_object(extension)
+        Extension.new(get_extension_attributes(extension))
       end
 
-      def self.get_extension_attributes(form)
-        Hash[form.fields.map{|field| [field.name, field.value] if is_a_class_attribute(field.name) and not field.value.empty?}]
+      def self.get_extension_display_page(extension)
+        @@elastix.get "#{@@base_address}/config.php?type=setup&display=extensions&extdisplay=#{extension}"
       end
 
-      def self.is_a_class_attribute attr
-        Extension.instance_methods.grep(/\w=$/).include? "#{attr}=".to_sym
+      #TODO make it easier to add fields. Right now it's just hardcoded what is returned.
+      def self.get_extension_attributes extension
+        secret = Sip.where(id: extension, keyword: "secret").first.data
+        user_fields = User.find_by_extension(extension)
+        {extension: extension, name: user_fields.name, sipname: user_fields.sipname, outboundcid: user_fields.outboundcid, devinfo_secret: secret}
       end
 
       def self.exist? extension
-        if $elastix.get("#{$base_address}/index.php?menu=pbxconfig")
-          .body.match(/#{extension}/) then true else false end
-      end
-
-      def self.href_is_acceptable?(href)
-        href.include? "config.php?type=setup&display=extensions&extdisplay=" unless href.nil?
-      end
-
-      def self.get_extension_from_link_text(link_text)
-        link_text.scan(/<(.*)>/).first.first
+        !!Sip.find_by_id(extension)
       end
   end
 end

data/lib/elastix/sip.rb

@@ -0,0 +1,7 @@
+require 'active_record'
+
+module Elastix
+  class Sip < ActiveRecord::Base
+    self.table_name = "sip"
+  end
+end

data/lib/elastix/user.rb

@@ -0,0 +1,4 @@
+module Elastix
+  class User < ActiveRecord::Base
+  end
+end

data/lib/elastix/version.rb

@@ -1,3 +1,3 @@
 module Elastix
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

data/spec/extension_spec.rb

@@ -8,7 +8,7 @@ describe Extension do
       }
   }
 
-  before { Base.establish_connection $auth_options[:ip], $auth_options[:username], $auth_options[:password] }
+  before(:all) { Base.establish_connection $auth_options[:ip], $auth_options[:username], $auth_options[:password] }
   after(:all){ Base.close_connection }
   after(:each) do
     Extension.new(params).destroy if Extension.find(params["extension"])
@@ -97,7 +97,7 @@ describe Extension do
   describe ".update_attributes" do
     it "should only update the attributes that are input" do
       e = Extension.create(params)
-      e.update_attributes!("sipname" => "testing")
+      e.update_attributes("sipname" => "testing")
       new_ext = Extension.find(e.extension)
       e.to_hash.should eq new_ext.to_hash
     end

data/spec/spec_helper.rb

@@ -3,5 +3,5 @@ require 'elastix'
 include Elastix
 
 $auth_options = {
-  ip: "ipaddress", username: "username", password: "password"
+  ip: "192.168.1.227", username: "admin", password: "x0ctallc0x"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastix
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - David Hahn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-22 00:00:00.000000000 Z
+date: 2013-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -24,6 +24,34 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.7'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! ' A wrapper of the Elastix Call Center Module that deals primarily
   with extension management.'
 email:
@@ -42,6 +70,8 @@ files:
 - lib/elastix.rb
 - lib/elastix/base.rb
 - lib/elastix/extension.rb
+- lib/elastix/sip.rb
+- lib/elastix/user.rb
 - lib/elastix/version.rb
 - spec/base_spec.rb
 - spec/extension_spec.rb