sequella 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7384529f1adb3ceb73ece05ef95bac77c0e4630d
-  data.tar.gz: ca6f06a1dae2217a1723b10b3580d4f3e3ce7273
+  metadata.gz: adc52d89fdc151212e3bd84bba160ec42288eda8
+  data.tar.gz: caa1f464289d2ad9550260c1e496132ab264eaba
 SHA512:
-  metadata.gz: 95d1fe5b1d672b7c43a848b7ef4c57aeece638a4e812ae6afc480c2e44f0401fadc987fe40edb66b84f5c733d8e1e449718f8e842ce62fe597367175ab0f1446
-  data.tar.gz: 8b430feb1586b4baefa98e23a4f875ef6594f874caa14ca12429ef952752512b3973b679c420c3fb696f5a20467a3cb74a4c824a2924b8ff126626f4158d619f
+  metadata.gz: 7d8c8eaadecbf66a86836ffcfe32c9f564d99bdb1478869e2d64f05393d9ef47939d8ac5c17977f69f57301fccb7afdb4a006f3ed88a6556407e50d7e2db76bf
+  data.tar.gz: 19077d991eab0f14bc693e903e8a63136ff2e69dd7632cf11805a60ac572a41bb5ff21631285deeb05b0bb6b0b81565435ddac011f98531d7b238231710f51f5

data/lib/sequella/plugin.rb

@@ -1,10 +1,7 @@
 require 'sequel'
+require 'sequella/service'
 
 class Sequella::Plugin < Adhearsion::Plugin
-  extend ActiveSupport::Autoload
-
-  autoload :Service, 'sequella/plugin/service'
-
   # Configure a database to use Sequel-backed models.
   # See http://sequel.rubyforge.org/rdoc/classes/Sequel/Database.html
   #
@@ -30,7 +27,7 @@ class Sequella::Plugin < Adhearsion::Plugin
       task :migrate => :environment do
         Service.start Adhearsion.config[:sequella]
         Sequel.extension :migration
-        Sequel::Migrator.run Sequella::Plugin::Service.connection, File.join(Adhearsion.root, 'db', 'migrations'), :use_transactions=>true
+        Sequel::Migrator.run Sequella::Service.connection, File.join(Adhearsion.root, 'db', 'migrations'), :use_transactions=>true
         puts "Successfully migrated database"
       end
     end

data/lib/sequella/service.rb

@@ -0,0 +1,64 @@
+module Sequella
+  class Service
+    cattr_accessor :connection
+
+    class << self
+
+      ##
+      # Start the Sequel connection with the configured database
+      def start(config)
+        raise "Must supply an adapter argument to the Sequel configuration" if (config.adapter.nil? || config.adapter.empty?)
+
+        params = config.to_hash.select { |k,v| !v.nil? }
+
+        @@connection = establish_connection params
+        require_models(*params.delete(:model_paths))
+
+        # Provide Sequel a handle on the Adhearsion logger
+        params[:loggers] = Array(params[:loggers]) << logger
+
+        create_call_hook_for_connection_cleanup
+      end
+
+      ##
+      # Stop the database connection
+      def stop
+        logger.warn "Todo: Close down Sequel connections"
+      end
+
+      def create_call_hook_for_connection_cleanup
+        # There does not seem to be an equivalent in Sequel
+        #Adhearsion::Events.punchblock Punchblock::Event::Offer  do
+        #  ::ActiveRecord::Base.verify_active_connections!
+        #end
+      end
+
+      def require_models(*paths)
+        paths.each do |path|
+          path = qualify_path path
+          logger.debug "Loading Sequel models from #{path}"
+          Dir.glob("#{path}/*.rb") do |model|
+            require model
+          end
+        end
+      end
+
+      def qualify_path(path)
+        if path =~ /^\//
+          path
+        else
+          File.join Adhearsion.root, path
+        end
+      end
+
+      ##
+      # Start the Sequel connection with the configured database
+      #
+      # @param params [Hash] Options to establish the database connection
+      def establish_connection(params)
+        ::Sequel.connect params
+      end
+
+    end # class << self
+  end # Service
+end

data/lib/sequella/version.rb

@@ -1,3 +1,3 @@
 module Sequella
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/sequella.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency %q<adhearsion>, ["~> 2.1"]
-  s.add_runtime_dependency %q<activesupport>, [">= 3.0.10"]
   s.add_runtime_dependency %q<sequel>, [">= 3.40.0"]
 
   s.add_development_dependency %q<bundler>, ["~> 1.0"]

data/spec/sequella/{plugin/service_spec.rb → service_spec.rb}

@@ -1,8 +1,8 @@
 require 'spec_helper'
 require 'ostruct'
 
-describe Sequella::Plugin::Service do
-  subject { Sequella::Plugin::Service }
+describe Sequella::Service do
+  subject { Sequella::Service }
 
   describe '#start' do
     it 'should raise if start attempted without an adapter specified' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequella
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Ben Klang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-20 00:00:00.000000000 Z
+date: 2013-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adhearsion
@@ -24,20 +24,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.10
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.10
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -167,10 +153,10 @@ files:
 - TODO.md
 - lib/sequella.rb
 - lib/sequella/plugin.rb
-- lib/sequella/plugin/service.rb
+- lib/sequella/service.rb
 - lib/sequella/version.rb
 - sequella.gemspec
-- spec/sequella/plugin/service_spec.rb
+- spec/sequella/service_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
@@ -196,6 +182,5 @@ signing_key:
 specification_version: 4
 summary: Sequel ORM plugin for Adhearsion
 test_files:
-- spec/sequella/plugin/service_spec.rb
+- spec/sequella/service_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 

data/lib/sequella/plugin/service.rb

@@ -1,63 +0,0 @@
-class Sequella::Plugin::Service
-  cattr_accessor :connection
-
-  class << self
-
-    ##
-    # Start the Sequel connection with the configured database
-    def start(config)
-      raise "Must supply an adapter argument to the Sequel configuration" if (config.adapter.nil? || config.adapter.empty?)
-
-      params = config.to_hash.select { |k,v| !v.nil? }
-
-      @@connection = establish_connection params
-      require_models(*params.delete(:model_paths))
-
-      # Provide Sequel a handle on the Adhearsion logger
-      params[:loggers] = Array(params[:loggers]) << logger
-
-      create_call_hook_for_connection_cleanup
-    end
-
-    ##
-    # Stop the database connection
-    def stop
-      logger.warn "Todo: Close down Sequel connections"
-    end
-
-    def create_call_hook_for_connection_cleanup
-      # There does not seem to be an equivalent in Sequel
-      #Adhearsion::Events.punchblock Punchblock::Event::Offer  do
-      #  ::ActiveRecord::Base.verify_active_connections!
-      #end
-    end
-
-    def require_models(*paths)
-      paths.each do |path|
-        path = qualify_path path
-        logger.debug "Loading Sequel models from #{path}"
-        Dir.glob("#{path}/*.rb") do |model|
-          require model
-        end
-      end
-    end
-
-    def qualify_path(path)
-      if path =~ /^\//
-        path
-      else
-        File.join Adhearsion.root, path
-      end
-    end
-
-    ##
-    # Start the Sequel connection with the configured database
-    #
-    # @param params [Hash] Options to establish the database connection
-    def establish_connection(params)
-      ::Sequel.connect params
-    end
-
-  end # class << self
-end # Service
-