adhearsion-activerecord 0.1.0 → 0.2.0

data/lib/adhearsion/activerecord.rb

@@ -1,4 +1,6 @@
 require "adhearsion"
+require 'active_record'
+
 require "active_support/dependencies/autoload"
 
 require "adhearsion/activerecord/version"

data/lib/adhearsion/activerecord/plugin/service.rb

@@ -9,14 +9,10 @@ module Adhearsion
           def start
             raise "Must supply an adapter argument to the ActiveRecord configuration" if (config.adapter.nil? || config.adapter.empty?)
 
-            require_dependencies
-            require_models
-
             params = config.__values.select { |k,v| !v.nil? }
 
-            # You may need to uncomment the following line for older versions of ActiveRecord
-            # ActiveRecord::Base.allow_concurrency = true
-            establish_connection params.tap { |p| p.delete :model_paths }
+            require_models(*params.delete(:model_paths))
+            establish_connection params
 
             ::ActiveRecord::Base.logger = logger
 
@@ -32,39 +28,27 @@ module Adhearsion
           private
 
           def create_call_hook_for_connection_cleanup
-            Adhearsion::Events.register_callback([:before_call]) do
+            Adhearsion::Events.punchblock Punchblock::Event::Offer  do
               ::ActiveRecord::Base.verify_active_connections!
             end
           end
 
-
-          def require_dependencies
-            begin
-              require 'active_record'
-            rescue LoadError
-              logger.fatal "Database support requires the \"activerecord\" gem."
-              # Silence the abort so we don't get an ugly backtrace
-              abort ""
-            end
-          end
-
-          def require_models
-            Array(config.model_paths).each { |model| load model }
+          def require_models(*paths)
+            paths.each { |model| require model }
           end
 
           ##
           # Start the ActiveRecord connection with the configured database
           #
           # @param params [Hash] Options to establish the database connection
-          def establish_connection params
-            p params
+          def establish_connection(params)
             ::ActiveRecord::Base.establish_connection params
           end
 
           ##
           # Access to activerecord plugin configuration
           def config
-            @config ||= Adhearsion.config[:adhearsion_activerecord]
+            @config ||= Plugin.config
           end
 
         end # class << self

data/lib/adhearsion/activerecord/version.rb

@@ -1,5 +1,5 @@
 module Adhearsion
   module ActiveRecord
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adhearsion-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-18 00:00:00.000000000 Z
+date: 2012-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adhearsion
-  requirement: &2168903400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: 2.0.0.alpha1
   type: :runtime
   prerelease: false
-  version_requirements: *2168903400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0.alpha1
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2168902700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +38,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168902700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2168901880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +54,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168901880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This gem provides an Adhearsion plugin to handle the ActiveRecord and
   database integration
 email:
@@ -84,7 +99,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3783427714437506130
+      hash: -3927977919162315355
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -93,10 +108,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3783427714437506130
+      hash: -3927977919162315355
 requirements: []
 rubyforge_project: adhearsion-activerecord
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: This gem provides an Adhearsion plugin to handle the ActiveRecord and database