merb_sequel 0.9.14 → 1.0.0

data/Rakefile

@@ -13,12 +13,12 @@ PROJECT_URL         = "http://merbivore.com"
 PROJECT_SUMMARY     = "Merb plugin that provides support for Sequel and Sequel::Model"
 PROJECT_DESCRIPTION = PROJECT_SUMMARY
 
-GEM_AUTHOR = "Wayne E. Seguin, Lance Carlson"
-GEM_EMAIL  = "wayneeseguin@gmail.com, lancecarlson@gmail.com"
+GEM_AUTHOR = "Wayne E. Seguin, Lance Carlson, Lori Holden"
+GEM_EMAIL  = "wayneeseguin@gmail.com, lancecarlson@gmail.com, email@loriholden.com"
 
 GEM_NAME    = "merb_sequel"
 PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.14") + PKG_BUILD
+GEM_VERSION = (Merb::MORE_VERSION rescue "1.0.0") + PKG_BUILD
 
 RELEASE_NAME    = "REL #{GEM_VERSION}"
 

data/TODO

@@ -1,2 +1,2 @@
 TODO:
-* More meaningful messages for cases with misconfigured database.yml.
+ * Figure out why using a sqlite3 memory store for the session bombs with stream errors.

data/lib/generators/templates/migration/schema/migrations/%file_name%.rb

@@ -1,6 +1,6 @@
 # For details on Sequel migrations see 
 # http://sequel.rubyforge.org/
-# http://code.google.com/p/ruby-sequel/wiki/Migrations
+# http://sequel.rubyforge.org/rdoc/classes/Sequel/Database.html#M000607
 
 class <%= class_name %> < Sequel::Migration
 

data/lib/merb/orms/sequel/connection.rb

@@ -7,8 +7,8 @@ module Merb
 
       class << self
 
-        def config_file() Merb.root / "config" / "database.yml" end
-        def sample_dest() Merb.root / "config" / "database.yml.sample" end
+        def config_file() Merb.dir_for(:config) / "database.yml" end
+        def sample_dest() Merb.dir_for(:config) / "database.yml.sample" end
         def sample_source() File.dirname(__FILE__) / "database.yml.sample" end
       
         def copy_sample_config
@@ -32,13 +32,18 @@ module Merb
           if File.exists?(config_file)
             Merb.logger.info!("Connecting to the '#{config[:database]}' database on '#{config[:host]}' using '#{config[:adapter]}' ...")
             connection = ::Sequel.connect(config_options(config))
-            Merb.logger.error!("Connection Error: #{e}") unless connection
+            begin
+              connection.test_connection
+            rescue => e
+              Merb.logger.error!("Connection Error: #{e}")
+              exit(1)
+            end
             connection
           else
             copy_sample_config
             Merb.logger.set_log(STDERR)
-            Merb.logger.error! "No database.yml file found in #{Merb.root}/config."
-            Merb.logger.error! "A sample file was created called config/database.yml.sample for you to copy and edit."
+            Merb.logger.error! "No database.yml file found at #{config_file}."
+            Merb.logger.error! "A sample file was created called #{sample_dest} for you to copy and edit."
             exit(1)
           end
         end

data/lib/merb/orms/sequel/database.yml.sample

@@ -7,6 +7,7 @@
   :password: secrets
   :host: localhost
   :socket: /tmp/mysql.sock
+  :encoding: utf8
 
 :test:
   <<: *defaults

data/lib/merb/session/sequel_session.rb

@@ -4,7 +4,32 @@ require 'base64'
 
 module Merb
 
-  table_name = (Merb::Plugins.config[:merb_sequel][:session_table_name] || "sessions")
+  Merb::Plugins.config[:merb_sequel][:session_table_name] ||= "sessions"
+
+  # Default session migration run if a sessions table does not yet exist.
+  #
+  # Will create a table with a name of 'sessions' by default, or as 
+  # set by Merb::Plugins.config[:merb_sequel][:session_table_name]
+  
+  class CreateSessionMigration < Sequel::Migration
+    def up
+      table_name = Merb::Plugins.config[:merb_sequel][:session_table_name].to_sym
+      unless table_exists?(table_name)
+        puts "Warning: The database did not contain a '#{table_name}' table for sessions."
+        
+        create_table table_name do
+          primary_key :id
+          varchar :session_id
+          text :data
+          timestamp :created_at
+        end
+        
+        puts "Created '#{table_name}' session table."
+      end
+    end
+  end
+
+  CreateSessionMigration.apply(Sequel::Model.db, :up)
 
   # Sessions stored in Sequel model.
   #
@@ -12,14 +37,7 @@ module Merb
   #
   # Merb::Config[:session_store] = 'sequel'
 
-  class SequelSessionStore < Sequel::Model(table_name.to_sym)
-    
-    set_schema do
-      primary_key :id
-      varchar :session_id
-      text :data
-      timestamp :created_at
-    end
+  class SequelSessionStore < Sequel::Model(Merb::Plugins.config[:merb_sequel][:session_table_name].to_sym)
 
     class << self
       
@@ -86,12 +104,6 @@ module Merb
     end
     
   end
-
-  unless Sequel::Model.db.table_exists?(table_name.to_sym)
-    puts "Warning: The database did not contain a '#{table_name}' table for sessions."
-    SequelSessionStore.class_eval { create_table unless table_exists? }
-    puts "Created sessions table."
-  end
   
   class SequelSession < SessionStoreContainer
     

data/lib/merb_sequel.rb

@@ -15,7 +15,7 @@ if defined?(Merb::Plugins)
         require File.join(File.dirname(__FILE__) / "merb" / "session" / "sequel_session")
       end
       
-      Merb::Router.root_behavior = Merb::Router.root_behavior.identify(Sequel::Model => :id)
+      Merb::Router.root_behavior = Merb::Router.root_behavior.identify(Sequel::Model => :pk)
     end
 
   end

data/lib/merb_sequel/merbtasks.rb

@@ -24,7 +24,7 @@ namespace :sequel do
       if migration_exists
         puts "\nThe Session Migration File already exists\n\n"
       else
-        sh %{merb-gen database_sessions_migration}
+        sh %{merb-gen session_migration}
       end
     end
     

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: merb_sequel
 version: !ruby/object:Gem::Version 
-  version: 0.9.14
+  version: 1.0.0
 platform: ruby
 authors: 
-- Wayne E. Seguin, Lance Carlson
+- Wayne E. Seguin, Lance Carlson, Lori Holden
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-12-12 00:00:00 -08:00
+date: 2009-01-02 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +33,7 @@ dependencies:
         version: 1.4.0
     version: 
 description: Merb plugin that provides support for Sequel and Sequel::Model
-email: wayneeseguin@gmail.com, lancecarlson@gmail.com
+email: wayneeseguin@gmail.com, lancecarlson@gmail.com, email@loriholden.com
 executables: []
 
 extensions: []