sequel 0.0.4 → 0.0.5

data/CHANGELOG

@@ -1,3 +1,11 @@
+*0.0.5*
+
+* Added Dataset#[] method. Refactored Model#find and Model#[].
+
+* Renamed Pool#conn_maker to Pool#connection_proc.
+
+* Added automatic require 'sequel' to all adapters for convenience.
+
 *0.0.4*
 
 * Added preliminary MySQL support.

data/README

@@ -1,6 +1,8 @@
-== about Sequel
+== Serquel: Concise ORM for Ruby
 
-Sequel is an ORM framework for Ruby. Sequel provides thread safety, connection pooling, and a DSL for constructing queries and table schemas.
+Sequel is an ORM framework for Ruby. Sequel provides thread safety, connection pooling, and a concise DSL for constructing queries and table schemas.
+
+Sequel makes it easy to deal with multiple records without having to break your teeth on SQL.
 
 == Resources
 
@@ -31,7 +33,7 @@ Sequel currently supports:
 
 == The Sequel Console
 
-Sequel now includes an IRB console for quick'n'dirty access to databases. You can use it like this:
+Sequel includes an IRB console for quick'n'dirty access to databases. You can use it like this:
 
   sequel sqlite:///test.db
 
@@ -41,6 +43,12 @@ You get an IRB session with the database object stored in DB.
 
 === Connecting to a database
 
+Before connecting to a database, you should require the corresponding adaptor, for example:
+
+  require 'sequel/sqlite'
+
+Note: you don't need to require 'sequel' separately before that, as each adapter requires 'sequel' if it hasn't yet been required.
+
 There are two ways to create a connection to a database. The easier way is to provide a connection URL:
 
   DB = Sequel.connect("sqlite:///blog.db")
@@ -59,7 +67,7 @@ The second, more verbose, way is to create an instance of a database class:
   DB.execute("create table t (a text, b text)")
   DB.execute("insert into t values ('a', 'b')")
 
-Or more succintly:
+Or more succinctly:
 
   DB << "create table t (a text, b text)"
   DB << "insert into t values ('a', 'b')"
@@ -101,6 +109,10 @@ You can also retrieve the first record in a dataset:
 
   posts.first
   
+Or retrieve a single record with a specific value:
+
+  posts[:id => 1]
+  
 If the dataset is ordered, you can also ask for the last record:
 
   posts.order(:stamp).last

data/Rakefile

@@ -6,9 +6,9 @@ require 'fileutils'
 include FileUtils
 
 NAME = "sequel"
-VERS = "0.0.4"
+VERS = "0.0.5"
 CLEAN.include ['**/.*.sw?', 'pkg/*', '.config', 'doc/*', 'coverage/*']
-RDOC_OPTS = ['--quiet', '--title', "Sequel Documentation",
+RDOC_OPTS = ['--quiet', '--title', "Sequel: Concise ORM for Ruby",
   "--opname", "index.html",
   "--line-numbers", 
   "--main", "README",

data/bin/sequel

@@ -7,7 +7,7 @@ db = ARGV.shift
 
 if db.nil? || db.empty?
   puts "Usage: sequel <connection string>"
-  puts "Sequel, an simple ORM framework for Ruby."
+  puts "Sequel: Concise ORM for Ruby."
   puts
   puts "Examples:"
   puts "  sequel sqlite:///blog.db"

data/lib/sequel/connection_pool.rb

@@ -3,13 +3,13 @@ require 'thread'
 module Sequel
   class ConnectionPool
     attr_reader :max_size, :mutex
-    attr_accessor :conn_maker
+    attr_accessor :connection_proc
     attr_reader :available_connections, :allocated, :created_count
   
     def initialize(max_size = 4, &block)
       @max_size = max_size
       @mutex = Mutex.new
-      @conn_maker = block
+      @connection_proc = block
 
       @available_connections = []
       @allocated = {}
@@ -41,7 +41,7 @@ module Sequel
     
     def acquire(thread)
       @mutex.synchronize do
-        @allocated[thread] ||= available
+        @allocated[thread] = available
       end
     end
     
@@ -52,7 +52,7 @@ module Sequel
     def make_new
       if @created_count < @max_size
         @created_count += 1
-        @conn_maker.call
+        @connection_proc.call
       end
     end
     

data/lib/sequel/dataset.rb

@@ -357,6 +357,10 @@ module Sequel
         limit(num).all
       end
     end
+    
+    def [](condition)
+      where(condition).first
+    end
   
     def last(num = 1)
       raise RuntimeError, 'No order specified' unless

data/lib/sequel/model.rb

@@ -126,6 +126,12 @@ module Sequel
       get_hooks(:after_create) << block
     end
     
+    def self.find(cond)
+      dataset[cond.is_a?(Hash) ? cond : {primary_key => cond}]
+    end
+
+    class << self; alias_method :[], :find; end
+    
     ############################################################################
     
     attr_reader :values, :pkey
@@ -135,7 +141,7 @@ module Sequel
     end
     
     def primary_key
-      model.primary_key
+      self.class.primary_key
     end
     
     def initialize(values)
@@ -154,10 +160,6 @@ module Sequel
       self
     end
     
-    def self.find(cond)
-      dataset.filter(cond).first # || (raise RuntimeError, "Record not found.")
-    end
-    
     def self.each(&block); dataset.each(&block); end
     def self.all; dataset.all; end
     def self.filter(*arg); dataset.filter(*arg); end
@@ -172,10 +174,6 @@ module Sequel
     end
     def self.delete_all; dataset.delete; end
     
-    def self.[](key)
-      find key.is_a?(Hash) ? key : {primary_key => key}
-    end
-    
     def self.create(values = nil)
       db.transaction do
         obj = find(primary_key => dataset.insert(values))

data/lib/sequel/mysql.rb

@@ -1,3 +1,7 @@
+if !Object.const_defined?('Sequel')
+  require File.join(File.dirname(__FILE__), '../sequel')
+end
+
 require 'mysql'
 
 module Sequel
@@ -8,7 +12,7 @@ module Sequel
     
       def initialize(opts = {})
         super
-        @pool.conn_maker = proc do
+        @pool.connection_proc = proc do
           Mysql.real_connect(@opts[:host], @opts[:user], @opts[:password], 
             @opts[:database], @opts[:port])
         end

data/lib/sequel/postgres.rb

@@ -1,3 +1,7 @@
+if !Object.const_defined?('Sequel')
+  require File.join(File.dirname(__FILE__), '../sequel')
+end
+
 require 'postgres'
 
 class PGconn
@@ -103,7 +107,7 @@ module Sequel
     
       def initialize(opts = {})
         super
-        @pool.conn_maker = proc do
+        @pool.connection_proc = proc do
           PGconn.connect(
             @opts[:host] || 'localhost',
             @opts[:port] || 5432,

data/lib/sequel/sqlite.rb

@@ -1,3 +1,7 @@
+if !Object.const_defined?('Sequel')
+  require File.join(File.dirname(__FILE__), '../sequel')
+end
+
 require 'sqlite3'
 require 'metaid'
 
@@ -8,7 +12,7 @@ module Sequel
     
       def initialize(opts = {})
         super
-        @pool.conn_maker = proc do
+        @pool.connection_proc = proc do
           db = SQLite3::Database.new(@opts[:database])
           db.type_translation = true
           db

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: sequel
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
-date: 2007-03-20 00:00:00 +02:00
+  version: 0.0.5
+date: 2007-03-21 00:00:00 +02:00
 summary: ORM framework for Ruby.
 require_paths: 
 - lib
@@ -51,7 +51,7 @@ test_files: []
 rdoc_options: 
 - --quiet
 - --title
-- Sequel Documentation
+- "Sequel: Concise ORM for Ruby"
 - --opname
 - index.html
 - --line-numbers