sequel 0.4.5 → 0.5

data/CHANGELOG

@@ -1,4 +1,8 @@
-=== 0.4.5 (2007-12-25) 
+=== 0.5 (2007-12-30)
+
+* Removed model code into separate sub-project. Rearranged trunk into core, model and model_plugins.
+
+=== 0.4.5 (2007-12-25)
 
 * Added rdoc for new alter_table functionality (#109).
 

data/README

@@ -24,6 +24,10 @@ If you have any comments or suggestions please send an email to ciconia at gmail
 
   sudo gem install sequel
   
+Note: as of version 0.5, Sequel models are distributed in a separate gem. In order to use sequel models, you should install the sequel_model gem:
+
+  sudo gem install sequel_model
+  
 == Supported Databases
 
 Sequel currently supports:
@@ -74,178 +78,4 @@ Or getting results as a transposed hash, with one column as key and another as v
 
   middle_east.to_hash(:name, :area) #=> {'Israel' => 20000, 'Greece' => 120000, ...}
 
-Much of Sequel is still undocumented (especially the part relating to model classes). The following section provides examples of common usage. Feel free to explore...
-
-== Getting Started
-
-=== Connecting to a database
-
-To connect to a database you simply provide Sequel with a URL:
-
-  require 'sequel'
-  DB = Sequel.open 'sqlite:///blog.db'
-  
-The connection URL can also include such stuff as the user name and password:
-
-  DB = Sequel.open 'postgres://cico:12345@localhost:5432/mydb'
-
-You can also specify optional parameters, such as the connection pool size, or a logger for logging SQL queries:
-
-  DB = Sequel.open("postgres://postgres:postgres@localhost/my_db",
-    :max_connections => 10, :logger => Logger.new('log/db.log'))
-
-=== Arbitrary SQL queries
-
-  DB.execute("create table t (a text, b text)")
-  DB.execute("insert into t values ('a', 'b')")
-
-Or more succinctly:
-
-  DB << "create table t (a text, b text)"
-  DB << "insert into t values ('a', 'b')"
-
-=== Getting Dataset Instances
-
-Dataset is the primary means through which records are retrieved and manipulated. You can create an blank dataset by using the dataset method:
-
-  dataset = DB.dataset
-
-Or by using the from methods:
-
-  posts = DB.from(:posts)
-
-You can also use the equivalent shorthand:
-
-  posts = DB[:posts]
-
-Note: the dataset will only fetch records when you explicitly ask for them, as will be shown below. Datasets can be manipulated to filter through records, change record order and even join tables, as will also be shown below.
-
-=== Retrieving Records
-
-You can retrieve records by using the all method:
-
-  posts.all
-
-The all method returns an array of hashes, where each hash corresponds to a record.
-
-You can also iterate through records one at a time:
-
-  posts.each {|row| p row}
-
-Or perform more advanced stuff:
-
-  posts.map(:id)
-  posts.inject({}) {|h, r| h[r[:id]] = r[:name]}
-  
-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
-  
-=== Filtering Records
-
-The simplest way to filter records is to provide a hash of values to match:
-
-  my_posts = posts.filter(:category => 'ruby', :author => 'david')
-  
-You can also specify ranges:
-
-  my_posts = posts.filter(:stamp => (2.weeks.ago)..(1.week.ago))
-  
-Or lists of values:
-
-  my_posts = posts.filter(:category => ['ruby', 'postgres', 'linux'])
-  
-Sequel now also accepts expressions as closures, AKA block filters:
-
-  my_posts = posts.filter {:category == ['ruby', 'postgres', 'linux']}
-  
-Which also lets you do stuff like:
-
-  my_posts = posts.filter {:stamp > 1.month.ago}
-  
-Some adapters (like postgresql) will also let you specify Regexps:
-
-  my_posts = posts.filter(:category => /ruby/i)
-  
-You can also use an inverse filter:
-
-  my_posts = posts.exclude(:category => /ruby/i)
-
-You can then retrieve the records by using any of the retrieval methods:
-
-  my_posts.each {|row| p row}
-  
-You can also specify a custom WHERE clause:
-
-  posts.filter('(stamp < ?) AND (author <> ?)', 3.days.ago, author_name)
-
-Datasets can also be used as subqueries:
-
-  DB[:items].filter('price > ?', DB[:items].select('AVG(price) + 100'))
-
-=== Summarizing Records
-
-Counting records is easy:
-  posts.filter(:category => /ruby/i).count
-
-And you can also query maximum/minimum values:
-  max_value = DB[:history].max(:value)
-  
-Or calculate a sum:
-  total = DB[:items].sum(:price)
-  
-=== Ordering Records
-
-  posts.order(:stamp)
-  
-You can also specify descending order
-
-  posts.order(:stamp.DESC)
-
-=== Deleting Records
-
-  posts.filter('stamp < ?', 3.days.ago).delete
-  
-=== Inserting Records
-
-  posts.insert(:category => 'ruby', :author => 'david')
-  
-Or alternatively:
-
-  posts << {:category => 'ruby', :author => 'david'}
-  
-=== Updating Records
-
-  posts.filter('stamp < ?', 3.days.ago).update(:state => 'archived')
-
-=== Joining Tables
-
-Joining is very useful in a variety of scenarios, for example many-to-many relationships. With Sequel it's really easy:
-
-  order_items = DB[:items].join(:order_items, :item_id => :id).
-    filter(:order_items__order_id => 1234)
-  
-This is equivalent to the SQL:
-
-  SELECT * FROM items LEFT OUTER JOIN order_items
-  ON order_items.item_id = items.id 
-  WHERE order_items.order_id = 1234
-
-You can then do anything you like with the dataset:
-
-  order_total = order_items.sum(:price)
-  
-Which is equivalent to the SQL:
-
-  SELECT sum(price) FROM items LEFT OUTER JOIN order_items
-  ON order_items.item_id = items.id
-  WHERE order_items.order_id = 1234
-  
+You can find more information on getting started with Sequel {here}[http://code.google.com/p/ruby-sequel/wiki/GettingStarted]

data/Rakefile

@@ -9,11 +9,11 @@ include FileUtils
 # Configuration
 ##############################################################################
 NAME = "sequel"
-VERS = "0.4.5"
+VERS = "0.5"
 CLEAN.include ["**/.*.sw?", "pkg/*", ".config", "doc/*", "coverage/*"]
 RDOC_OPTS = [
   "--quiet", 
-  "--title", "Sequel: Concise ORM for Ruby",
+  "--title", "Sequel: Database access for Ruby",
   "--opname", "index.html",
   "--line-numbers", 
   "--main", "README",
@@ -29,7 +29,7 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = "doc/rdoc"
   rdoc.options += RDOC_OPTS
   rdoc.main = "README"
-  rdoc.title = "Sequel: Lightweight ORM library for Ruby"
+  rdoc.title = "Sequel: Database access for Ruby"
   rdoc.rdoc_files.add ["README", "COPYING", "lib/sequel.rb", "lib/**/*.rb"]
 end
 
@@ -49,7 +49,7 @@ spec = Gem::Specification.new do |s|
   s.extra_rdoc_files = ["README", "CHANGELOG", "COPYING"]
   s.rdoc_options += RDOC_OPTS + 
     ["--exclude", "^(examples|extras)\/", "--exclude", "lib/sequel.rb"]
-  s.summary = "Lightweight ORM library for Ruby"
+  s.summary = "Database access for Ruby"
   s.description = s.summary
   s.author = "Sharon Rosner"
   s.email = "ciconia@gmail.com"
@@ -57,9 +57,6 @@ spec = Gem::Specification.new do |s|
   s.executables = ["sequel"]
   s.required_ruby_version = ">= 1.8.4"
 
-  # Instead of requiring this, how about we simply use it if it's available
-  # by rescuing LoadError where we require it in model/validations.rb?
-  # s.add_dependency("validatable")
   case RUBY_PLATFORM
   when /mswin/
     s.platform = Gem::Platform::CURRENT
@@ -100,20 +97,18 @@ task :uninstall => [:clean] do
   sh %{sudo gem uninstall #{NAME}}
 end
 
+task :tag do
+  cwd = FileUtils.pwd
+  sh %{cd ../.. && svn copy #{cwd} tags/#{NAME}-#{VERS} && svn commit -m "#{NAME}-#{VERS} tag." tags}
+end
+
 ##############################################################################
 # gem and rdoc release
 ##############################################################################
 task :release => [:package] do
   sh %{rubyforge login}
-  sh %{rubyforge add_release sequel sequel #{VERS} pkg/sequel-#{VERS}.tgz}
-  sh %{rubyforge add_file sequel sequel #{VERS} pkg/sequel-#{VERS}.gem}
-  sh %{rubyforge add_file sequel sequel #{VERS} pkg/sequel-#{VERS}-x86-mswin32-60.gem}
-end
-
-desc "Update docs and upload to rubyforge.org"
-task :doc_rforge do
-  sh %{rake doc}
-  sh %{scp -r doc/rdoc/* ciconia@rubyforge.org:/var/www/gforge-projects/sequel}
+  sh %{rubyforge add_release sequel #{NAME} #{VERS} pkg/#{NAME}-#{VERS}.tgz}
+  sh %{rubyforge add_file sequel #{NAME} #{VERS} pkg/#{NAME}-#{VERS}.gem}
 end
 
 ##############################################################################

data/lib/sequel/model.rb

@@ -1,325 +1,8 @@
 module Sequel
-  # == Sequel Models
-  # 
-  # Models in Sequel are based on the Active Record pattern described by Martin Fowler (http://www.martinfowler.com/eaaCatalog/activeRecord.html). A model class corresponds to a table or a dataset, and an instance of that class wraps a single record in the model's underlying dataset.
-  # 
-  # Model classes are defined as regular Ruby classes:
-  # 
-  #   DB = Sequel('sqlite:/blog.db')
-  #   class Post < Sequel::Model
-  #     set_dataset DB[:posts]
-  #   end
-  # 
-  # You can also use the shorthand form:
-  # 
-  #   DB = Sequel('sqlite:/blog.db')
-  #   class Post < Sequel::Model(:posts)
-  #   end
-  # 
-  # === Model instances
-  # 
-  # Model instance are identified by a primary key. By default, Sequel assumes the primary key column to be :id. The Model#[] method can be used to fetch records by their primary key:
-  # 
-  #   post = Post[123]
-  # 
-  # The Model#pk method is used to retrieve the record's primary key value:
-  # 
-  #   post.pk #=> 123
-  # 
-  # Sequel models allow you to use any column as a primary key, and even composite keys made from multiple columns:
-  # 
-  #   class Post < Sequel::Model(:posts)
-  #     set_primary_key [:category, :title]
-  #   end
-  # 
-  #   post = Post['ruby', 'hello world']
-  #   post.pk #=> ['ruby', 'hello world']
-  # 
-  # You can also define a model class that does not have a primary key, but then you lose the ability to update records.
-  # 
-  # A model instance can also be fetched by specifying a condition:
-  # 
-  #   post = Post[:title => 'hello world']
-  #   post = Post.find {:stamp < 10.days.ago}
-  # 
-  # === Iterating over records
-  # 
-  # A model class lets you iterate over specific records by acting as a proxy to the underlying dataset. This means that you can use the entire Dataset API to create customized queries that return model instances, e.g.:
-  # 
-  #   Post.filter(:category => 'ruby').each {|post| p post}
-  # 
-  # You can also manipulate the records in the dataset:
-  # 
-  #   Post.filter {:stamp < 7.days.ago}.delete
-  #   Post.filter {:title =~ /ruby/}.update(:category => 'ruby')
-  # 
-  # === Accessing record values
-  # 
-  # A model instances stores its values as a hash:
-  # 
-  #   post.values #=> {:id => 123, :category => 'ruby', :title => 'hello world'}
-  # 
-  # You can read the record values as object attributes:
-  # 
-  #   post.id #=> 123
-  #   post.title #=> 'hello world'
-  # 
-  # You can also change record values:
-  # 
-  #   post.title = 'hey there'
-  #   post.save
-  # 
-  # Another way to change values by using the #set method:
-  # 
-  #   post.set(:title => 'hey there')
-  # 
-  # === Creating new records
-  # 
-  # New records can be created by calling Model.create:
-  # 
-  #   post = Post.create(:title => 'hello world')
-  # 
-  # Another way is to construct a new instance and save it:
-  # 
-  #   post = Post.new
-  #   post.title = 'hello world'
-  #   post.save
-  # 
-  # You can also supply a block to Model.new and Model.create:
-  # 
-  #   post = Post.create {|p| p.title = 'hello world'}
-  # 
-  #   post = Post.new do |p|
-  #     p.title = 'hello world'
-  #     p.save
-  #   end
-  # 
-  # === Hooks
-  # 
-  # You can execute custom code when creating, updating, or deleting records by using hooks. The before_create and after_create hooks wrap record creation. The before_update and after_update wrap record updating. The before_save and after_save wrap record creation and updating. The before_destroy and after_destroy wrap destruction.
-  # 
-  # Hooks are defined by supplying a block:
-  # 
-  #   class Post < Sequel::Model(:posts)
-  #     after_create do
-  #       set(:created_at => Time.now)
-  #     end
-  # 
-  #     after_destroy
-  #       author.update_post_count
-  #     end
-  #   end
-  # 
-  # === Deleting records
-  # 
-  # You can delete individual records by calling #delete or #destroy. The only difference between the two methods is that #destroy invokes before_destroy and after_destroy hooks, while #delete does not:
-  # 
-  #   post.delete #=> bypasses hooks
-  #   post.destroy #=> runs hooks
-  # 
-  # Records can also be deleted en-masse by invoking Model.delete and Model.destroy. As stated above, you can specify filters for the deleted records:
-  # 
-  #   Post.filter(:category => 32).delete #=> bypasses hooks
-  #   Post.filter(:category => 32).destroy #=> runs hooks
-  # 
-  # Please note that if Model.destroy is called, each record is deleted separately, but Model.delete deletes all relevant records with a single SQL statement.
-  # 
-  # === Associations
-  # 
-  # The most straightforward way to define an association in a Sequel model is as a regular instance method:
-  # 
-  #   class Post < Sequel::Model(:posts)
-  #     def author; Author[author_id]; end
-  #   end
-  # 
-  #   class Author < Sequel::Model(:authors)
-  #     def posts; Post.filter(:author_id => pk); end
-  #   end
-  # 
-  # Sequel also provides two macros to assist with common types of associations. The one_to_one macro is roughly equivalent to ActiveRecord?'s belongs_to macro. It defines both getter and setter methods for the association:
-  # 
-  #   class Post < Sequel::Model(:posts)
-  #     one_to_one :author, :from => Author
-  #   end
-  #
-  #   post = Post.create(:name => 'hi!')
-  #   post.author = Author[:name => 'Sharon']
-  # 
-  # The one_to_many macro is roughly equivalent to ActiveRecord's has_many macro:
-  # 
-  #   class Author < Sequel::Model(:authors)
-  #     one_to_many :posts, :from => Post, :key => :author_id
-  #   end
-  # 
-  # You will have noticed that in some cases the association macros are actually more verbose than hand-coding instance methods. The one_to_one and one_to_many macros also make assumptions (just like ActiveRecord macros) about the database schema which may not be relevant in many cases.
-  # 
-  # === Caching model instances with memcached
-  # 
-  # Sequel models can be cached using memcached based on their primary keys. The use of memcached can significantly reduce database load by keeping model instances in memory. The set_cache method is used to specify caching:
-  # 
-  #   require 'memcache'
-  #   CACHE = MemCache.new 'localhost:11211', :namespace => 'blog'
-  # 
-  #   class Author < Sequel::Model(:authors)
-  #     set_cache CACHE, :ttl => 3600
-  #   end
-  # 
-  #   Author[333] # database hit
-  #   Author[333] # cache hit
-  # 
-  # === Extending the underlying dataset
-  # 
-  # The obvious way to add table-wide logic is to define class methods to the model class definition. That way you can define subsets of the underlying dataset, change the ordering, or perform actions on multiple records:
-  # 
-  #   class Post < Sequel::Model(:posts)
-  #     def self.old_posts
-  #       filter {:stamp < 30.days.ago}
-  #     end
-  # 
-  #     def self.clean_old_posts
-  #       old_posts.delete
-  #     end
-  #   end
-  # 
-  # You can also implement table-wide logic by defining methods on the dataset:
-  # 
-  #   class Post < Sequel::Model(:posts)
-  #     def dataset.old_posts
-  #       filter {:stamp < 30.days.ago}
-  #     end
-  # 
-  #     def dataset.clean_old_posts
-  #       old_posts.delete
-  #     end
-  #   end
-  # 
-  # This is the recommended way of implementing table-wide operations, and allows you to have access to your model API from filtered datasets as well:
-  # 
-  #   Post.filter(:category => 'ruby').clean_old_posts
-  # 
-  # Sequel models also provide a short hand notation for filters:
-  # 
-  #   class Post < Sequel::Model(:posts)
-  #     subset(:old_posts) {:stamp < 30.days.ago}
-  #     subset :invisible, :visible => false
-  #   end
-  # 
-  # === Defining the underlying schema
-  # 
-  # Model classes can also be used as a place to define your table schema and control it. The schema DSL is exactly the same provided by Sequel::Schema::Generator:
-  # 
-  #   class Post < Sequel::Model(:posts)
-  #     set_schema do
-  #       primary_key :id
-  #       text :title
-  #       text :category
-  #       foreign_key :author_id, :table => authors
-  #     end
-  #   end
-  # 
-  # You can then create the underlying table, drop it, or recreate it:
-  # 
-  #   Post.table_exists?
-  #   Post.create_table
-  #   Post.drop_table
-  #   Post.create_table! # drops the table if it exists and then recreates it
-  # 
   class Model
-    alias_method :model, :class
-  end
-
-end
-
-require File.join(File.dirname(__FILE__), "model/base")
-require File.join(File.dirname(__FILE__), "model/hooks")
-require File.join(File.dirname(__FILE__), "model/record")
-require File.join(File.dirname(__FILE__), "model/schema")
-require File.join(File.dirname(__FILE__), "model/relations")
-require File.join(File.dirname(__FILE__), "model/caching")
-require File.join(File.dirname(__FILE__), "model/plugins")
-require File.join(File.dirname(__FILE__), "model/validations")
-
-module Sequel
-  
-  class Model
-    
-    # Defines a method that returns a filtered dataset.
-    def self.subset(name, *args, &block)
-      dataset.meta_def(name) {filter(*args, &block)}
-    end
-    
-    # Finds a single record according to the supplied filter, e.g.:
-    #
-    #   Ticket.find :author => 'Sharon' # => record
-    #   Ticket.find {:price == 17} # => Dataset
-    #
-    def self.find(*args, &block)
-      dataset.filter(*args, &block).first
-    end
-    
-    # TODO: doc
-    def self.[](*args)
-      args = args.first if (args.size == 1)
-      if args === true || args === false
-        raise Error::InvalidFilter, "Did you mean to supply a hash?"
-      end
-      dataset[(Hash === args) ? args : primary_key_hash(args)]
-    end
-    
-    # TODO: doc
-    def self.fetch(*args)
-      db.fetch(*args).set_model(self)
-    end
-
-    # Like find but invokes create with given conditions when record does not
-    # exists.
-    def self.find_or_create(cond)
-      find(cond) || create(cond)
-    end
-
-    ############################################################################
-
-    # Deletes all records in the model's table.
-    def self.delete_all
-      dataset.delete
-    end
-
-    # Like delete_all, but invokes before_destroy and after_destroy hooks if used.
-    def self.destroy_all
-      if has_hooks?(:before_destroy) || has_hooks?(:after_destroy)
-        dataset.destroy
-      else
-        dataset.delete
-      end
-    end
-        
-    def self.is_dataset_magic_method?(m)
-      method_name = m.to_s
-      Sequel::Dataset::MAGIC_METHODS.each_key do |r|
-        return true if method_name =~ r
-      end
-      false
-    end
-    
-    def self.method_missing(m, *args, &block) #:nodoc:
-      Thread.exclusive do
-        if dataset.respond_to?(m) || is_dataset_magic_method?(m)
-          instance_eval("def #{m}(*args, &block); dataset.#{m}(*args, &block); end")
-        end
-      end
-      respond_to?(m) ? send(m, *args, &block) : super(m, *args)
-    end
-
-    # TODO: Comprehensive description goes here!
-    def self.join(*args)
-      table_name = dataset.opts[:from].first
-      dataset.join(*args).select(table_name.to_sym.ALL)
-    end
-    
-    # Returns an array containing all of the models records.
-    def self.all
-      dataset.all
+    def self.database_opened(db)
+      @db = db if (self == Model) && !@db
     end
   end
-
 end
+