sequel 0.4.1.2 → 0.4.1.3

data/CHANGELOG

@@ -1,4 +1,14 @@
-== 0.4.1.2 (2007-12-04)
+=== SVN
+
+* Better plugin conventions.
+
+* Added experimental OpenBase adapter.
+
+* Fixed Sequel.<xxx> methods to accept options hash as well as database name. Fixed Sequel.connect to accept options hash as well as URI (Wayne).
+
+=== 0.4.1.2 (2007-12-04)
+
+* Added release rake task (using RubyForge).
 
 * Changed Model.is to accept variable arity.
 

data/COPYING

@@ -1,4 +1,4 @@
-Copyright (c) 2006 Sharon Rosner
+Copyright (c) 2006-2007 Sharon Rosner
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

data/README

@@ -37,7 +37,7 @@ Sequel currently supports:
 * PostgreSQL
 * SQLite 3
 
-There is also an experimental adapter for DB2.
+There are also experimental adapters for DB2 and OpenBase.
 
 == The Sequel Console
 

data/Rakefile

@@ -6,7 +6,7 @@ require 'fileutils'
 include FileUtils
 
 NAME = "sequel"
-VERS = "0.4.1.2"
+VERS = "0.4.1.3"
 CLEAN.include ['**/.*.sw?', 'pkg/*', '.config', 'doc/*', 'coverage/*']
 RDOC_OPTS = ['--quiet', '--title', "Sequel: Concise ORM for Ruby",
   "--opname", "index.html",
@@ -104,6 +104,13 @@ task :uninstall => [:clean] do
   sh %{sudo gem uninstall #{NAME}}
 end
 
+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}

data/lib/sequel.rb

@@ -23,7 +23,6 @@ module Sequel #:nodoc:
     def connect(*args)
       Database.connect(*args)
     end
-    
     alias_method :open, :connect
     
     def single_threaded=(value)
@@ -35,7 +34,7 @@ module Sequel #:nodoc:
       begin
         case args.size
         when 1: # Sequel.dbi(db_name)
-          opts = {:database => args[0]}
+          opts = args[0].is_a?(Hash) ? args[0] : {:database => args[0]}
         when 0 # Sequel.dbi
           opts = {}
         else # Sequel.dbi(db_name, opts)

data/lib/sequel/adapters/openbase.rb

@@ -0,0 +1,93 @@
+if !Object.const_defined?('Sequel')
+  require File.join(File.dirname(__FILE__), '../../sequel')
+end
+
+require 'openbase'
+
+module Sequel
+  module OpenBase
+    class Database < Sequel::Database
+      set_adapter_scheme :openbase
+      
+      def connect
+        OpenBase.new(
+          opts[:database],
+          opts[:host] || 'localhost',
+          opts[:user],
+          opts[:password]
+        )
+      end
+      
+      def disconnect
+        # would this work?
+        @pool.disconnect {|c| c.disconnect}
+      end
+    
+      def dataset(opts = nil)
+        OpenBase::Dataset.new(self, opts)
+      end
+    
+      def execute(sql)
+        @logger.info(sql) if @logger
+        @pool.hold {|conn| conn.execute(sql)}
+      end
+      
+      alias_method :do, :execute
+    end
+    
+    class Dataset < Sequel::Dataset
+      def literal(v)
+        case v
+        when Time: literal(v.iso8601)
+        else
+          super
+        end
+      end
+
+      def fetch_rows(sql, &block)
+        @db.synchronize do
+          result = @db.execute sql
+          begin
+            @columns = result.column_infos.map {|c| c.name.to_sym}
+            result.each do |r|
+              row = {}
+              r.each_with_index {|v, i| row[@columns[i]] = v}
+              yield row
+            end
+          ensure
+            # result.close
+          end
+        end
+        self
+      end
+      
+      def array_tuples_fetch_rows(sql, &block)
+        @db.synchronize do
+          result = @db.execute sql
+          begin
+            @columns = result.column_infos.map {|c| c.name.to_sym}
+            result.each do |r|
+              r.keys = @columns
+              yield r
+            end
+          ensure
+            # cursor.close
+          end
+        end
+        self
+      end
+      
+      def insert(*values)
+        @db.do insert_sql(*values)
+      end
+    
+      def update(values, opts = nil)
+        @db.do update_sql(values, opts)
+      end
+    
+      def delete(opts = nil)
+        @db.do delete_sql(opts)
+      end
+    end
+  end
+end

data/lib/sequel/adapters/oracle.rb

@@ -60,7 +60,7 @@ module Sequel
             @columns = cursor.get_col_names.map {|c| c.to_sym}
             while r = cursor.fetch
               row = {}
-              r.each_with_index {|v, i| row[columns[i]] = v}
+              r.each_with_index {|v, i| row[@columns[i]] = v}
               yield row
             end
           ensure
@@ -70,13 +70,6 @@ module Sequel
         self
       end
       
-      def hash_row(row)
-        @columns.inject({}) do |m, c|
-          m[c] = row.shift
-          m
-        end
-      end
-    
       def array_tuples_fetch_rows(sql, &block)
         @db.synchronize do
           cursor = @db.execute sql

data/lib/sequel/database.rb

@@ -268,19 +268,34 @@ module Sequel
         
     # call-seq:
     #   Sequel::Database.connect(conn_string)
+    #   Sequel::Database.connect(opts)
     #   Sequel.connect(conn_string)
+    #   Sequel.connect(opts)
     #   Sequel.open(conn_string)
+    #   Sequel.open(opts)
+    #
+    # Creates a new database object based on the supplied connection string
+    # and or options. If a URI is used, the URI scheme determines the database
+    # class used, and the rest of the string specifies the connection options. 
+    # For example:
     #
-    # Creates a new database object based on the supplied connection string.
-    # The specified scheme determines the database class used, and the rest
-    # of the string specifies the connection options. For example:
     #   DB = Sequel.open 'sqlite:///blog.db'
-    def self.connect(conn_string, more_opts = nil)
-      uri = URI.parse(conn_string)
-      scheme = uri.scheme
-      scheme = :dbi if scheme =~ /^dbi-(.+)/
-      c = adapter_class(scheme)
-      c.new(c.uri_to_options(uri).merge(more_opts || {}))
+    #
+    # The second form of this method takes an options:
+    #
+    #   DB = Sequel.open :adapter => :sqlite, :database => 'blog.db'
+    def self.connect(conn_string, opts = nil)
+      if conn_string.is_a?(String)
+        uri = URI.parse(conn_string)
+        scheme = uri.scheme
+        scheme = :dbi if scheme =~ /^dbi-(.+)/
+        c = adapter_class(scheme)
+        c.new(c.uri_to_options(uri).merge(opts || {}))
+      else
+        opts = conn_string.merge(opts || {})
+        c = adapter_class(opts[:adapter])
+        c.new(opts)
+      end
     end
     
     @@single_threaded = false

data/lib/sequel/model/plugins.rb

@@ -6,7 +6,22 @@ module Sequel
       # Loads a plugin for use with the model class, passing optional arguments
       # to the plugin.
       def is(plugin, *args)
-        plugin_module(plugin).apply(self, *args)
+        m = plugin_module(plugin)
+        if m.respond_to?(:apply)
+          m.apply(self, *args)
+        end
+        if m.const_defined?("InstanceMethods")
+          class_def(:"#{plugin}_opts") {args.first}
+          include(m::InstanceMethods)
+        end
+        if m.const_defined?("ClassMethods")
+          meta_def(:"#{plugin}_opts") {args.first}
+          metaclass.send(:include, m::ClassMethods)
+        end
+        if m.const_defined?("DatasetMethods")
+          dataset.meta_def(:"#{plugin}_opts") {args.first}
+          dataset.metaclass.send(:include, m::DatasetMethods)
+        end
       end
       alias_method :is_a, :is
     

data/spec/database_spec.rb

@@ -390,6 +390,16 @@ context "A Database adapter with a scheme" do
     c = Sequel.ccc
     c.should be_a_kind_of(CCC)
     c.opts.should == {}
+    
+    c = Sequel.ccc(:database => 'mydb', :host => 'localhost')
+    c.should be_a_kind_of(CCC)
+    c.opts.should == {:database => 'mydb', :host => 'localhost'}
+  end
+  
+  specify "should be accessible through Sequel.connect with options" do
+    c = Sequel.connect(:adapter => :ccc, :database => 'mydb')
+    c.should be_a_kind_of(CCC)
+    c.opts.should == {:adapter => :ccc, :database => 'mydb'}
   end
 end
 

data/spec/model_spec.rb

@@ -1048,6 +1048,14 @@ module Sequel::Plugins
       m.meta_def(:stamp_opts) {opts}
       m.before_save {@values[:stamp] = Time.now}
     end
+    
+    module InstanceMethods
+      def abc; timestamped_opts; end
+    end
+    
+    module ClassMethods
+      def deff; timestamped_opts; end
+    end
   end
 end
 
@@ -1073,8 +1081,13 @@ context "A model using a plugin" do
     
     m = c.new
     m.should respond_to(:get_stamp)
+    m.should respond_to(:abc)
+    m.abc.should == {:a => 1, :b => 2}
     t = Time.now
     m[:stamp] = t
     m.get_stamp.should == t
+    
+    c.should respond_to(:deff)
+    c.deff.should == {:a => 1, :b => 2}
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sequel
 version: !ruby/object:Gem::Version 
-  version: 0.4.1.2
+  version: 0.4.1.3
 platform: ruby
 authors: 
 - Sharon Rosner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2007-12-04 00:00:00 +02:00
+date: 2007-12-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -83,6 +83,7 @@ files:
 - lib/sequel/adapters/mysql.rb
 - lib/sequel/adapters/odbc.rb
 - lib/sequel/adapters/odbc_mssql.rb
+- lib/sequel/adapters/openbase.rb
 - lib/sequel/adapters/oracle.rb
 - lib/sequel/adapters/postgres.rb
 - lib/sequel/adapters/sqlite.rb