merb_sequel 0.4.1 → 0.4.2

data/README

@@ -1,7 +1,11 @@
-merb_sequel
-=================
+= merb_sequel
 
 A plugin for the Merb framework that provides Sequel access
 
 After you install the plugin, you have access to the sequel_migration generator in your merb projects
 example: /merb/root/script/generate sequel_migration new_migration
+
+
+= Contributors
+
+originally written by Duane Johnson (canadaduane@gmail.com).

data/Rakefile

@@ -1,36 +1,43 @@
-require 'rubygems'
-require 'rake/gempackagetask'
+require "rubygems"
+require "rake/gempackagetask"
 
-PLUGIN = "merb_sequel"
-NAME = "merb_sequel"
-VERSION = "0.4.1"
-AUTHOR = "Duane Johnson"
-EMAIL = "canadaduane@gmail.com"
+PLUGIN   = "merb_sequel"
+NAME     = "merb_sequel"
+VERSION  = "0.4.2"
+AUTHOR   = "Wayne E. Seguin"
+EMAIL    = "wayneeseguin@gmail.com"
 HOMEPAGE = "http://merb-plugins.rubyforge.org/merb_sequel/"
-SUMMARY = "Merb plugin that provides support for the Sequel database object"
+SUMMARY  = "Merb plugin that provides support for Sequel and Sequel::Model"
 
-spec = Gem::Specification.new do |s|
-  s.name = NAME
-  s.version = VERSION
-  s.platform = Gem::Platform::RUBY
-  s.has_rdoc = true
-  s.extra_rdoc_files = ["README", "LICENSE", 'TODO']
-  s.summary = SUMMARY
-  s.description = s.summary
-  s.author = AUTHOR
-  s.email = EMAIL
-  s.homepage = HOMEPAGE
-  s.add_dependency('merb', '>= 0.4.0')
-  s.require_path = 'lib'
-  s.autorequire = PLUGIN
-  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs,sequel_generators}/**/*")
+specification = Gem::Specification.new do |spec|
+  spec.name         = NAME
+  spec.email        = EMAIL
+  spec.author       = AUTHOR
+  spec.version      = VERSION
+  spec.summary      = SUMMARY
+  spec.platform     = Gem::Platform::RUBY
+  spec.has_rdoc     = true
+  spec.homepage     = HOMEPAGE
+  spec.description  = SUMMARY
+  spec.autorequire  = PLUGIN
+  spec.require_path = "lib"
+  spec.extra_rdoc_files = ["README", "LICENSE", 'TODO']
+  # Dependencies
+  spec.add_dependency("merb",         ">= 0.4.0")
+  spec.add_dependency("sequel",       ">= 1.0.0")
+  spec.add_dependency("sequel_model", ">= 0.2")
+  spec.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs,sequel_generators}/**/*")
 end
 
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
+Rake::GemPackageTask.new(specification) do |package|
+  package.gem_spec = specification
 end
 
 task :install do
   sh %{rake package}
   sh %{sudo gem install pkg/#{NAME}-#{VERSION}}
-end
+end
+
+task :release => :package do
+  sh %{rubyforge add_release merb #{PLUGIN} #{VERSION} pkg/#{NAME}-#{VERSION}.gem}
+end

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

@@ -1,4 +1,4 @@
-require 'fileutils'
+require "fileutils"
 
 module Merb
   module Orms
@@ -25,50 +25,35 @@ module Merb
       
         # Database connects as soon as the gem is loaded
         def connect
+          require "sequel"
+          require "sequel_model"
+
           if File.exists?(config_file)
-            puts "Connecting to database..."
-            # Load the correct Sequel adapter and set it up according to the yaml file
-            case config[:adapter]
-            when 'mysql'
-              require "sequel/mysql"
-              host = config[:host] || 'localhost'
-              user = config[:user] || config[:username] || 'root'
-              password = config[:password]
-              # Use Sequel::Model.db to access this object
-              ::Sequel.mysql(config[:database], :host => host, :user => user, :password => password, :logger => MERB_LOGGER)
-            when 'postgresql'
-              require "sequel/postgres"
-              host = config[:host] || 'localhost'
-              user = config[:user] || config[:username] || 'root'
-              password = config[:password]
-              encoding = config[:encoding] || config[:charset] || nil
-              
-              if encoding
-                ::Sequel.postgres(config[:database], :host => host, :user => user, :password => password, :encoding => encoding, :logger => MERB_LOGGER)
-              else
-                ::Sequel.postgres(config[:database], :host => host, :user => user, :password => password, :logger => MERB_LOGGER)
-              end
-            when 'sqlite'
-              require "sequel/sqlite"
-              if config[:database]
-                ::Sequel.sqlite(config[:database], :logger => MERB_LOGGER)
-              else
-                ::Sequel.sqlite(:logger => MERB_LOGGER)
-              end
-            else
-              require "sequel/sqlite"
-              p full_config
-              puts "No adapter specified in config/database.yml... trying a memory-only sqlite database"
-              ::Sequel.sqlite
-            end
+            puts "#{Time.now.httpdate}: Connecting to the '#{config[:adapter]}' database '#{config[:hosts]}' ..."
+            connection = ::Sequel.connect(config_options(config))
+            MERB_LOGGER.error("Connection Error: #{e}") unless connection
           else
             copy_sample_config
-            puts "No database.yml file found in #{MERB_ROOT}/config."
-            puts "A sample file was created called database.sample.yml for you to copy and edit."
+            puts "#{Time.now.httpdate}: No database.yml file found in #{MERB_ROOT}/config."
+            puts "A sample file was created called config/database.sample.yml for you to copy and edit."
             exit(1)
           end
         end
         
+        def config_options(config = {})
+          options = {}
+          options[:adapter]  = (config[:adapter]  || "sqlite")
+          options[:host]     = (config[:host]     || "localhost")
+          options[:user]     = (config[:username] || config[:user] || "root")
+          options[:password] = config[:password] if config[:password]
+          if (config[:encoding] || config[:charset])
+            options[:encoding] = (config[:encoding] || config[:charset])
+          end
+          options[:database] = config[:database]  if config[:database]
+          options[:logger]   = MERB_LOGGER
+          options
+        end
+        
         # Registering this ORM lets the user choose sequel as a session store
         # in merb.yml's session_store: option.
         def register_session_type
@@ -76,7 +61,9 @@ module Merb
             "merb/session/sequel_session",
             "Using Sequel database sessions")
         end
+
       end
     end
   end
-end
+
+end

data/lib/merb/session/001_add_sessions_table.rb

@@ -1,14 +1,16 @@
 class AddSessionsTable < Sequel::Migration
+
   def up
     create_table :sessions do
       primary_key :id
-      varchar     :session_id, :size => 32, :unique => true
+      varchar     :session_id, :size => 64, :unique => true
       timestamp   :created_at
       text        :data
     end
   end
   
   def down
-    execute 'DROP TABLE sessions'
+    execute "DROP TABLE sessions"
   end
-end
+
+end

data/lib/merb/session/sequel_session.rb

@@ -1,5 +1,8 @@
+require 'base64'
+
 module Merb
   module SessionMixin
+    
     def setup_session
       MERB_LOGGER.info("Setting up session")
       before = cookies[_session_id_key]
@@ -13,6 +16,7 @@ module Merb
       request.session.save if @_fingerprint != Marshal.dump(request.session.data).hash
       set_cookie(_session_id_key, request.session.values[:session_id], _session_expiry) if (@_new_cookie || request.session.needs_new_cookie)
     end
+    
   end
 
   table_name = (Merb::Plugins.config[:sequel][:session_table_name] || "sessions")
@@ -22,6 +26,7 @@ module Merb
       primary_key :id
       varchar :session_id
       varchar :data
+      timestamp :created_at
     end
   
     attr_accessor :needs_new_cookie
@@ -29,7 +34,8 @@ module Merb
     class << self
       # Generates a new session ID and creates a row for the new session in the database.
       def generate
-        create(:session_id => Merb::SessionMixin::rand_uuid, :data => marshal({}))
+        create(:session_id => Merb::SessionMixin::rand_uuid,
+                       :data => marshal({}), :created_at => Time.now)
       end
     
       # Gets the existing session based on the <tt>session_id</tt> available in cookies.
@@ -53,7 +59,10 @@ module Merb
         255
       end
     
-      def marshal(data)   Base64.encode64(Marshal.dump(data)) if data end
+      def marshal(data)
+        Base64.encode64(Marshal.dump(data)) if data
+      end
+      
       def unmarshal(data)
         Marshal.load(Base64.decode64(data)) if data
       end
@@ -75,8 +84,8 @@ module Merb
     end
   
     # Lazy-delete of session data 
-    def delete
-      self.data = {}
+    def delete(key = nil)
+      key ? self.data.delete(key) : self.data.clear
     end
   
     def [](key)
@@ -87,6 +96,14 @@ module Merb
       data[key] = val
     end
   
+    def empty?
+      data.empty?
+    end
+  
+    def each(&b)
+      data.each(&b)
+    end
+  
     # Lazy-unmarshal session state.
     def data
       @data ||= self.class.unmarshal(@values[:data]) || {}
@@ -98,6 +115,7 @@ module Merb
     end
   
   private
+  
     attr_writer :data
   
     before_save do # marshal_data!
@@ -126,4 +144,5 @@ module Merb
 
     puts "Created sessions table."
   end
+  
 end

data/lib/merbtasks.rb

@@ -1,16 +1,21 @@
-require 'fileutils'
+require "fileutils"
 
 namespace :sequel do
+
   namespace :db do
+
     desc "Perform migration using migrations in schema/migrations"
     task :migrate => :merb_env do
       Sequel::Migrator.apply(Merb::Orms::Sequel.connect, "schema/migrations", ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
     end
+
   end
   
   namespace :sessions do
+
     desc "Creates session migration"
     task :create => :merb_env do
+      # TODO: this should not use '001' always...
       dest = File.join(MERB_ROOT, "schema", "migrations","001_add_sessions_table.rb")
       source = File.join(File.dirname(__FILE__), "merb", "session","001_add_sessions_table.rb")
       
@@ -23,5 +28,7 @@ namespace :sequel do
       
       Merb::Orms::Sequel.connect.execute("DELETE FROM #{table_name}")
     end
+
   end
-end
+
+end

data/sequel_generators/migration/migration_generator.rb

@@ -1,4 +1,4 @@
-require 'merb/generators/merb_generator_helpers'
+require "merb/generators/merb_generator_helpers"
 
 class MigrationGenerator < Merb::GeneratorHelpers::MigrationGeneratorBase
   

data/sequel_generators/migration/templates/new_migration.erb

@@ -1,17 +1,25 @@
+# For details on Sequel migrations see 
+# http://sequel.rubyforge.org/
+# http://code.google.com/p/ruby-sequel/wiki/Migrations
+
 class <%= class_name.snake_case.camel_case %> < Sequel::Migration
+
   def up
     <%= "create_table :#{table_name} do" if table_name %>
-<% for attribute in table_attributes -%>
+<% if table_attributes.empty? -%>
+      primary_key :id
+<% else -%>
+<% table_attributes.each do |attribute| -%>
       <%= attribute.type %> :<%= attribute.name %>
 <% end -%>
-    <%= "end" if table_name %>    
+<% end -%>
+    <%= "end" if table_name %>
   end
 
   def down
 <% if table_name -%>
-    execute 'DROP TABLE <%= table_name %>'
+    execute "DROP TABLE <%= table_name %>"
 <% end -%>
   end
-end
-
 
+end

data/sequel_generators/model/model_generator.rb

@@ -1,4 +1,4 @@
-require 'merb/generators/merb_generator_helpers'
+require "merb/generators/merb_generator_helpers"
 
 class ModelGenerator < Merb::GeneratorHelpers::ModelGeneratorBase
   

data/sequel_generators/model/templates/sequel_model_template.erb

@@ -1,2 +1,2 @@
-class <%= class_name %> < Sequel::Model
-end
+class <%= class_name %> < Sequel::Model(:<%= class_name.snake_case.pluralize %>)
+end

data/sequel_generators/resource_controller/resource_controller_generator.rb

@@ -1,4 +1,4 @@
-require 'merb/generators/merb_generator_helpers'
+require "merb/generators/merb_generator_helpers"
 
 class ResourceControllerGenerator < Merb::GeneratorHelpers::ControllerGeneratorBase
 
@@ -7,7 +7,7 @@ class ResourceControllerGenerator < Merb::GeneratorHelpers::ControllerGeneratorB
     name, *actions = args.flatten
     runtime_options[:actions] = %w[index show new edit]
     runtime_options[:test_stub_generator] = "merb_controller_test"
-    super( [name], runtime_options )
+    super([name], runtime_options)
   end
 
   def self.superclass
@@ -15,12 +15,13 @@ class ResourceControllerGenerator < Merb::GeneratorHelpers::ControllerGeneratorB
   end
   
   protected
+
   def banner
-        <<-EOS
+    <<-EOS
   Creates a Merb controller, views and specs using Sequel Models
 
   USAGE: #{$0} #{spec.name} resource_name"
   EOS
   end
   
-end
+end

data/sequel_generators/resource_controller/templates/controller.rb

@@ -1,6 +1,7 @@
 <% klass = class_name.singularize -%>
 <% ivar = class_name.snake_case.singularize -%>
 class <%= class_name %> < Application
+
   provides :xml, :js, :yaml
   
   def index
@@ -9,7 +10,7 @@ class <%= class_name %> < Application
   end
   
   def show
-    @<%= ivar %> = <%= klass %>[:id => params[:id]]
+    @<%= ivar %> = <%= klass %>[params[:id]]
     render @<%= ivar %>
   end
   
@@ -30,12 +31,12 @@ class <%= class_name %> < Application
   
   def edit
     only_provides :html
-    @<%= ivar %> = <%= klass %>[:id => params[:id]]
+    @<%= ivar %> = <%= klass %>[params[:id]]
     render
   end
   
   def update
-    @<%= ivar %> = <%= klass %>[:id => params[:id]]
+    @<%= ivar %> = <%= klass %>[params[:id]]
     if @<%= ivar %>.update(params[:<%= ivar %>])
       redirect url(:<%= ivar %>, @<%= ivar %>)
     else
@@ -44,11 +45,12 @@ class <%= class_name %> < Application
   end
   
   def destroy
-    @<%= ivar %> = <%= klass %>[:id => params[:id]]
+    @<%= ivar %> = <%= klass %>[params[:id]]
     if @<%= ivar %>.destroy
       redirect url(:<%= ivar %>s)
     else
       raise BadRequest
     end
   end
-end
+
+end

data/sequel_generators/resource_controller/templates/helper.rb

@@ -1,5 +1,5 @@
 module Merb
-module <%= class_name %>Helper
+  module <%= class_name %>Helper
   
   end
 end

data/specs/merb_sequel_spec.rb

@@ -1,7 +1,15 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + "/spec_helper"
 
 describe "merb_sequel" do
+
   it "should do nothing" do
     true.should == true
   end
+
+end
+
+describe "merb_sequel Generators" do
+  it "should description" do
+    
+  end
 end

data/specs/spec_helper.rb

@@ -1,2 +1,2 @@
 $TESTING=true
-$:.push File.join(File.dirname(__FILE__), '..', 'lib')
+$:.push File.join(File.dirname(__FILE__), "..", "lib")

metadata

@@ -1,91 +1,116 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
-specification_version: 1
 name: merb_sequel
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
-date: 2007-11-12 00:00:00 -06:00
-summary: Merb plugin that provides support for the Sequel database object
-require_paths: 
-- lib
-email: canadaduane@gmail.com
-homepage: http://merb-plugins.rubyforge.org/merb_sequel/
-rubyforge_project: 
-description: Merb plugin that provides support for the Sequel database object
-autorequire: merb_sequel
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.4.2
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
-- Duane Johnson
+- Wayne E. Seguin
+autorequire: merb_sequel
+bindir: bin
+cert_chain: []
+
+date: 2008-01-03 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: merb
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.4.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: sequel
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: sequel_model
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0.2"
+    version: 
+description: Merb plugin that provides support for Sequel and Sequel::Model
+email: wayneeseguin@gmail.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README
+- LICENSE
+- TODO
 files: 
 - LICENSE
 - README
 - Rakefile
 - TODO
 - lib/merb
-- lib/merb_sequel.rb
-- lib/merbtasks.rb
 - lib/merb/orms
-- lib/merb/session
 - lib/merb/orms/sequel
 - lib/merb/orms/sequel/connection.rb
 - lib/merb/orms/sequel/database.sample.yml
+- lib/merb/session
 - lib/merb/session/001_add_sessions_table.rb
 - lib/merb/session/sequel_session.rb
+- lib/merb_sequel.rb
+- lib/merbtasks.rb
 - specs/merb_sequel_spec.rb
 - specs/spec_helper.rb
 - sequel_generators/migration
-- sequel_generators/model
-- sequel_generators/resource_controller
 - sequel_generators/migration/migration_generator.rb
 - sequel_generators/migration/templates
-- sequel_generators/migration/USAGE
 - sequel_generators/migration/templates/new_migration.erb
+- sequel_generators/migration/USAGE
+- sequel_generators/model
 - sequel_generators/model/model_generator.rb
 - sequel_generators/model/templates
-- sequel_generators/model/USAGE
 - sequel_generators/model/templates/sequel_model_template.erb
+- sequel_generators/model/USAGE
+- sequel_generators/resource_controller
 - sequel_generators/resource_controller/resource_controller_generator.rb
 - sequel_generators/resource_controller/templates
-- sequel_generators/resource_controller/USAGE
 - sequel_generators/resource_controller/templates/controller.rb
 - sequel_generators/resource_controller/templates/edit.html.erb
 - sequel_generators/resource_controller/templates/helper.rb
 - sequel_generators/resource_controller/templates/index.html.erb
 - sequel_generators/resource_controller/templates/new.html.erb
 - sequel_generators/resource_controller/templates/show.html.erb
-test_files: []
-
+- sequel_generators/resource_controller/USAGE
+has_rdoc: true
+homepage: http://merb-plugins.rubyforge.org/merb_sequel/
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: 
-- README
-- LICENSE
-- TODO
-executables: []
-
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: merb
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.4.0
-    version: 
+rubyforge_project: 
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: Merb plugin that provides support for Sequel and Sequel::Model
+test_files: []
+