sequella 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adc52d89fdc151212e3bd84bba160ec42288eda8
-  data.tar.gz: caa1f464289d2ad9550260c1e496132ab264eaba
+  metadata.gz: e0bdf5e1ab2671f320f5f33765a231801b3a7a3e
+  data.tar.gz: 2969740d19233ce04ba00da1e7e6569bc7ed373a
 SHA512:
-  metadata.gz: 7d8c8eaadecbf66a86836ffcfe32c9f564d99bdb1478869e2d64f05393d9ef47939d8ac5c17977f69f57301fccb7afdb4a006f3ed88a6556407e50d7e2db76bf
-  data.tar.gz: 19077d991eab0f14bc693e903e8a63136ff2e69dd7632cf11805a60ac572a41bb5ff21631285deeb05b0bb6b0b81565435ddac011f98531d7b238231710f51f5
+  metadata.gz: 7bc8902ed56d9cb2a6750ecb48f08934a40f2c9e427425eca73d2959d9b5d9391bcf605f1a7b81c4dcf8f8f4b697c0a63bfa9649794ef732d20548d8f5fe21b4
+  data.tar.gz: 7d272f5288b8cd9ba4cd93d0ec35b6343b7a785993cb0d7e5c3f075d50f9670a3e507fe41e5414c0ac560e8950fd14a935db03378e072947b5221f03ab9dfec1

data/.gitignore

@@ -2,3 +2,5 @@
 .DS_Store
 /Gemfile.lock
 /coverage
+/pkg
+.bundle

data/.travis.yml

@@ -1,9 +1,14 @@
 language: ruby
 rvm:
-  - 1.9.2
   - 1.9.3
+  - 2.0.0
+  - 2.1.0
   - jruby-19mode
-  - rbx-19mode
+  - rbx-2.1.1
   - ruby-head
+matrix:
+  allow_failures:
+    - rvm: rbx-2.1.1
+    - rvm: ruby-head
 notifications:
   irc: "irc.freenode.org#adhearsion"

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# develop
+
+# [1.1.0](https://github.com/bklang/sequella/compare/v1.0.0...v1.1.0) - [2014-01-14](https://rubygems.org/gems/sequella/versions/1.1.0)
+  * Feature: Rake tasks to clean and reset the database
+  * Feature: Automatically use JDBC on JRuby
+  * Cleanup: No more autoloading (or dependency on activesupport)
+
 # [1.0.0](https://github.com/bklang/sequella/tags/v1.0.0) - [2013-05-20](https://rubygems.org/gems/sequella/versions/1.0.0)
 
 * Initial release

data/lib/sequella/plugin.rb

@@ -1,34 +1,47 @@
 require 'sequel'
 require 'sequella/service'
 
-class Sequella::Plugin < Adhearsion::Plugin
-  # Configure a database to use Sequel-backed models.
-  # See http://sequel.rubyforge.org/rdoc/classes/Sequel/Database.html
-  #
-  # MySQL options are preconfigured. If you want o use another adapter, make sure to include the
-  # required options in your configuration file
-  config :sequella do
-    adapter     'mysql'          , :desc => 'Database adapter. It should be an adapter supported by Sequel'
-    database    'test'           , :desc => 'Database name'
-    username    'admin'          , :desc => 'valid database username'
-    password    ''               , :desc => 'valid database password'
-    host        'localhost'      , :desc => 'host where the database is running'
-    port        3306             , :desc => 'port where the database is listening'
-    model_paths []               , :desc => 'paths to model files to load', :transform => Proc.new {|v| Array(v)}
-  end
+module Sequella
+  class Plugin < Adhearsion::Plugin
+    # Configure a database to use Sequel-backed models.
+    # See http://sequel.rubyforge.org/rdoc/classes/Sequel/Database.html
+    #
+    # MySQL options are preconfigured. If you want o use another adapter, make sure to include the
+    # required options in your configuration file
+    config :sequella do
+      uri         ''               , :desc => 'URI to the database instance. Use this or specify each piece of connection information separately below.'
+      adapter     'mysql'          , :desc => 'Database adapter. It should be an adapter supported by Sequel'
+      database    'test'           , :desc => 'Database name'
+      username    'admin'          , :desc => 'valid database username'
+      password    ''               , :desc => 'valid database password'
+      host        'localhost'      , :desc => 'host where the database is running'
+      port        3306             , :desc => 'port where the database is listening'
+      model_paths []               , :desc => 'paths to model files to load', :transform => Proc.new {|v| Array(v)}
+    end
 
-  init :sequella do
-    Service.start Adhearsion.config[:sequella]
-  end
+    init :sequella do
+      Service.start Adhearsion.config[:sequella]
+    end
+
+    tasks do
+      namespace :sequella do
+        desc "Run Sequel migrations"
+        task :migrate => :environment do
+          Service.start Adhearsion.config[:sequella]
+          Sequel.extension :migration
+          Sequel::Migrator.run Sequella::Service.connection, File.join(Adhearsion.root, 'db', 'migrations'), :use_transactions => true
+          puts "Successfully migrated database"
+        end
+
+        desc "Drop all tables in the database"
+        task :clean => :environment do
+          Service.start Adhearsion.config[:sequella]
+          Service.connection.tables.each { |t| Service.connection.drop_table t }
+          logger.info "Successfully dropped all tables in the database"
+        end
 
-  tasks do
-    namespace :sequella do
-      desc "Run Sequel migrations"
-      task :migrate => :environment do
-        Service.start Adhearsion.config[:sequella]
-        Sequel.extension :migration
-        Sequel::Migrator.run Sequella::Service.connection, File.join(Adhearsion.root, 'db', 'migrations'), :use_transactions=>true
-        puts "Successfully migrated database"
+        desc "clean and then migrate"
+        task :reset => [:clean, :migrate]
       end
     end
   end

data/lib/sequella/service.rb

@@ -3,15 +3,12 @@ module Sequella
     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? }
+        params = config.to_hash.select { |k, v| !v.nil? }
 
-        @@connection = establish_connection params
+        @@connection = establish_connection connection_string(params)
         require_models(*params.delete(:model_paths))
 
         # Provide Sequel a handle on the Adhearsion logger
@@ -54,9 +51,21 @@ module Sequella
       ##
       # Start the Sequel connection with the configured database
       #
+      # @param connection_uri [String] Connection URI for connecting to the database
+      def establish_connection(connection_uri)
+        logger.info "Sequella connecting: #{connection_uri}"
+        ::Sequel.connect connection_uri
+      end
+
+      ##
+      # Construct the database connection string for Sequel
+      #
       # @param params [Hash] Options to establish the database connection
-      def establish_connection(params)
-        ::Sequel.connect params
+      def connection_string(params)
+        return params[:uri] unless params[:uri].blank?
+        raise "Must supply an adapter argument to the Sequel configuration" if params[:adapter].blank?
+
+        "#{params[:adapter]}://#{params[:username]}:#{params[:password]}@#{params[:host]}:#{params[:port]}/#{params[:database]}"
       end
 
     end # class << self

data/lib/sequella/version.rb

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

data/spec/sequella/service_spec.rb

@@ -2,12 +2,44 @@ require 'spec_helper'
 require 'ostruct'
 
 describe Sequella::Service do
-  subject { Sequella::Service }
+  subject { described_class }
 
   describe '#start' do
-    it 'should raise if start attempted without an adapter specified' do
-      config = OpenStruct.new
-      expect { subject.start config }.to raise_error
+    it 'should not raise an error if start attempted with a uri specified' do
+      config = OpenStruct.new uri: 'postgres://user:password@localhost/blog'
+      subject.should_receive(:establish_connection).with(config.uri)
+      subject.should_receive(:require_models)
+
+      expect { subject.start config.marshal_dump }.to_not raise_error
+    end
+  end
+
+  describe '#connection_string' do
+    it 'should use uri if specified in params' do
+      params = { uri: 'this-is-a-connection-uri' }
+
+      connection_string = subject.connection_string params
+      expect(connection_string).to eq(params[:uri])
+    end
+
+    it 'should raise error if adapter is not specified' do
+      params = { }
+
+      expect { subject.connection_string(params) }.to raise_error 'Must supply an adapter argument to the Sequel configuration'
+    end
+
+    it 'should build successfully' do
+      connection_params = {
+        adapter: 'postgres',
+        host: 'localhost',
+        port: 5432,
+        database: 'test',
+        username: 'test-user',
+        password: 'password'
+      }
+
+      connection_string = subject.connection_string connection_params
+      expect(connection_string).to eq('postgres://test-user:password@localhost:5432/test')
     end
   end
 

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: sequella
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Ben Klang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-27 00:00:00.000000000 Z
+date: 2014-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adhearsion
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.40.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.40.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: This gem provides a plugin for Adhearsion, allowing you to create and
@@ -144,8 +144,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - README.md
@@ -167,17 +167,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: sequella
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Sequel ORM plugin for Adhearsion