merb_sequel 0.9.8 → 0.9.9

data/Generators

@@ -0,0 +1,4 @@
+scope 'merb-gen' do
+  dir = File.join(File.dirname(__FILE__), 'lib', 'generators/')
+  Merb.add_generators dir + 'migration', dir + 'model', dir + 'resource_controller', dir + 'session_migration'
+end

data/LICENSE

@@ -1,4 +1,5 @@
-Copyright (c) 2007 YOUR NAME
+Copyright (c) 2007-2008, 
+Duane Johnson, Wayne E. Seguin, Lance Carlson, Michael S. Klishin.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README

@@ -1,10 +1,47 @@
 = merb_sequel
 
-A plugin for the Merb framework that provides Sequel access
+A plugin for the Merb framework that provides support for Sequel models.
+
+
+= Connection options
+
+Merb Sequel plugin uses config/database.yml for connection configuration.
+
+Options are:
+
+* adapter. :sqlite is assumed by default.
+* host. localhost is assumed by default.
+* username or user, default is an empty string
+* database, default is "hey_dude_configure_your_database". This should be
+  either :memory: or file path for SQLite.
+* encoding or charset, default is utf8.
+* password. WARNING: default password is an empty string.
+* db_type: default is nil. Use "mssql" to connect to MSSQL using ODBC.
+
+
+= Generators
+
+After you install the plugin, merb-gen can generate Sequel models for you:
+
+merb-gen model --orm=sequel Article
+
+same with resources
+
+merb-gen resource --orm=sequel Article
+
+
+Note that if you have specified that you use Sequel in init.rb or environment
+specific init file (for instance, environments/development.rb)
+via use_orm :sequel, you need no specify --orm option explicitly when
+using merb-gen.
 
-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).
+Originally written by Duane Johnson (canadaduane@gmail.com).
+
+Contributions by:
+* Wayne E. Seguin
+* Lance Carlson
+
+Maintained by Michael S. Klishin (michael at novemberain.com)

data/Rakefile

@@ -18,7 +18,7 @@ GEM_EMAIL  = "wayneeseguin@gmail.com, lancecarlson@gmail.com"
 
 GEM_NAME    = "merb_sequel"
 PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.8") + PKG_BUILD
+GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.9") + PKG_BUILD
 
 RELEASE_NAME    = "REL #{GEM_VERSION}"
 
@@ -36,9 +36,9 @@ spec = Gem::Specification.new do |s|
   s.author = GEM_AUTHOR
   s.email = GEM_EMAIL
   s.homepage = PROJECT_URL
-  s.add_dependency("merb-core", ">= 0.9.8")
+  s.add_dependency("merb-core", ">= 0.9.9")
   s.add_dependency("sequel",    ">= 1.4.0")
-  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs,sequel_generators}/**/*")
+  s.files = %w(LICENSE README Rakefile TODO Generators) + Dir.glob("{lib}/**/*")
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|

data/TODO

@@ -1,5 +1,2 @@
 TODO:
-Fix LICENSE with your name
-Fix Rakefile with your name and contact info
-Add your code to lib/merb_sequel.rb
-Add your Merb rake tasks to lib/merb_sequel/merbtasks.rb
+* More meaningful messages for cases with misconfigured database.yml.

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

@@ -20,7 +20,7 @@ module Merb
             # Convert string keys to symbols
             full_config = Erubis.load_yaml_file(config_file)
             config = (Merb::Plugins.config[:merb_sequel] = {})
-            (full_config[Merb.environment.to_sym] || full_config[Merb.environment]).each do |key, value|
+            (full_config[Merb.environment.to_sym] || full_config[Merb.environment] || full_config[:development]).each do |key, value|
               config[key.to_sym] = value
             end
             config
@@ -45,14 +45,22 @@ module Merb
         
         def config_options(config = {})
           options = {}
+          
+          # Use SQLite by default
           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]
+          # Use localhost as default host
+          options[:host]     = (config[:host]     || "localhost")          
+          # Default user is an empty string. Both username and user keys are supported.
+          options[:user]     = (config[:username] || config[:user] || "")
+          
+          options[:password] = config[:password] || ""
+          
+          # Both encoding and charset options are supported, default is utf8
+          options[:encoding] = (config[:encoding] || config[:charset] || "utf8")
+          # Default database is hey_dude_configure_your_database
+          options[:database] = config[:database] || "hey_dude_configure_your_database"
+          # MSSQL support
+          options[:db_type] = config[:db_type]  if config[:db_type]
           options[:logger]   = Merb.logger
           options
         end

data/lib/merb_sequel.rb

@@ -1,5 +1,6 @@
 if defined?(Merb::Plugins)
   Merb::Plugins.config[:merb_sequel] = {}
+  require File.join(File.dirname(__FILE__) / "sequel_ext" / "model")
   require File.join(File.dirname(__FILE__) / "merb" / "orms" / "sequel" / "connection")
   Merb::Plugins.add_rakefiles "merb_sequel" / "merbtasks"
   

data/lib/sequel_ext/model.rb

@@ -0,0 +1,7 @@
+module Sequel
+  class Model
+    def new_record?
+      self.new?
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb_sequel
 version: !ruby/object:Gem::Version 
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors: 
 - Wayne E. Seguin, Lance Carlson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-07 00:00:00 +03:00
+date: 2008-10-14 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.8
+        version: 0.9.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: sequel
@@ -47,6 +47,7 @@ files:
 - README
 - Rakefile
 - TODO
+- Generators
 - lib/generators
 - lib/generators/migration.rb
 - lib/generators/model.rb
@@ -85,9 +86,8 @@ files:
 - lib/merb_sequel
 - lib/merb_sequel/merbtasks.rb
 - lib/merb_sequel.rb
-- specs/merb_sequel_session_spec.rb
-- specs/merb_sequel_spec.rb
-- specs/spec_helper.rb
+- lib/sequel_ext
+- lib/sequel_ext/model.rb
 has_rdoc: true
 homepage: http://merbivore.com
 post_install_message: 

data/specs/merb_sequel_session_spec.rb

@@ -1,46 +0,0 @@
-$:.push File.join(File.dirname(__FILE__), '..', 'lib')
-require 'merb-core'
-require 'merb-core/test'
-require 'merb-core/test/helpers'
-
-Merb::BootLoader.before_app_loads do
-  require 'sequel'
-  DB = Sequel.sqlite
-  require "merb/session/sequel_session"
-end
-
-Merb.start :environment => 'test', :adapter => 'runner', :session_store => 'sequel'
-
-Spec::Runner.configure do |config|
-  config.include Merb::Test::RequestHelper
-end
-
-# Load up the shared specs from merb-core
-if (gem_spec = Gem.source_index.search(Gem::Dependency.new('merb-core', '>=0.9.6')).last) && 
-  gem_spec.files.include?('spec/public/session/controllers/sessions.rb')
-  require gem_spec.full_gem_path / 'spec/public/session/controllers/sessions.rb'
-  require gem_spec.full_gem_path / 'spec/public/session/session_spec.rb' 
-end
-
-describe Merb::SequelSession do
-
-  before do 
-    @session_class = Merb::SequelSession
-    @session = @session_class.generate
-  end
-
-  it_should_behave_like "All session-store backends"
-
-  it "should have a session_store_type class attribute" do
-    @session.class.session_store_type.should == :sequel
-  end
-
-end
-
-describe Merb::SequelSession, "mixed into Merb::Controller" do
-
-  before(:all) { @session_class = Merb::SequelSession }
-
-  it_should_behave_like "All session-stores mixed into Merb::Controller"
-
-end

data/specs/merb_sequel_spec.rb

@@ -1,15 +0,0 @@
-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 +0,0 @@
-$:.push File.join(File.dirname(__FILE__), "..", "lib")