@@ -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 merb_sequel/LICENSE @@ -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) \ No newline at end of file merb_sequel/README @@ -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 \ No newline at end of file +* More meaningful messages for cases with misconfigured database.yml. \ No newline at end of file merb_sequel/TODO @@ -45,14 +45,21 @@ module Merb def config_options(config = {}) options = {} + + # Use SQLite by default options[:adapter] = (config[:adapter] || "sqlite") - options[:host] = (config[:host] || "localhost") + # 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] if config[:password] - if (config[:encoding] || config[:charset]) - options[:encoding] = (config[:encoding] || config[:charset]) - end - options[:database] = config[:database] if config[:database] + + 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 merb_sequel/lib/merb/orms/sequel/connection.rb f5a3f55eaf44b224a454ddc08c624130811ae65b Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-plugins/commit/39fabf3e69c50d7eca4d54f1dd47e720c432f139 39fabf3e69c50d7eca4d54f1dd47e720c432f139 2008-12-12T16:15:53-08:00 2008-10-10T06:06:36-07:00 Add contributors to LICENSE, update README, tweak connection defaults. 1a03ef0bb7879c7d29ff1f82e5c038c701041b0f Matt Aimonetti mattaimonetti@gmail.com