sequel_core 1.4.0 → 1.5.0

data/spec/pretty_table_spec.rb

@@ -35,14 +35,6 @@ context "PrettyTable" do
       /\n(\|x\|y\|)|(\|y\|x\|)\n/
   end
   
-  specify "should infer columns from array with keys" do
-    a = [1, 2, 3]
-	  a.keys = [:a, :b, :c]
-	  Sequel::PrettyTable.print([a])
-    @output.rewind
-    @output.read.should =~ /\n\|a\|b\|c\|\n/
-  end
-  
   specify "should calculate the maximum width of each column correctly" do
     Sequel::PrettyTable.print(@data2, [:a, :b])
     @output.rewind
@@ -63,4 +55,4 @@ context "PrettyTable" do
     @output.read.should == \
       "+--+\n|a |\n+--+\n|23|\n|45|\n+--+\n"
   end
-end
+end

data/spec/schema_generator_spec.rb

@@ -82,6 +82,9 @@ describe Sequel::Schema::AlterTableGenerator do
       add_index [:fff, :ggg]
       drop_index :hhh
       add_full_text_index :blah
+      add_spatial_index :geom
+      add_index :blah, :type => :hash
+      add_index :blah, :where => {:something => true}
       add_constraint :con1, ':fred > 100'
       drop_constraint :con2
     end
@@ -96,7 +99,10 @@ describe Sequel::Schema::AlterTableGenerator do
       {:op => :set_column_default, :name => :eee, :default => 1},
       {:op => :add_index, :columns => [:fff, :ggg]},
       {:op => :drop_index, :columns => [:hhh]},
-      {:op => :add_index, :columns => [:blah], :full_text => true},
+      {:op => :add_index, :columns => [:blah], :type => :full_text},
+      {:op => :add_index, :columns => [:geom], :type => :spatial},
+      {:op => :add_index, :columns => [:blah], :type => :hash},
+      {:op => :add_index, :columns => [:blah], :where => {:something => true}},
       {:op => :add_constraint, :type => :check, :name => :con1, :check => [':fred > 100']},
       {:op => :drop_constraint, :name => :con2}
     ]

data/spec/schema_spec.rb

@@ -204,6 +204,33 @@ context "DB#create_table" do
     }.should raise_error(Sequel::Error)
   end
 
+  specify "should raise on spatial index definitions" do
+    proc {
+      @db.create_table(:cats) do
+        point :geom
+        spatial_index :geom
+      end
+    }.should raise_error(Sequel::Error)
+  end
+
+  specify "should raise on partial index definitions" do
+    proc {
+      @db.create_table(:cats) do
+        text :name
+        index :name, :where => {:something => true}
+      end
+    }.should raise_error(Sequel::Error)
+  end
+
+  specify "should raise index definitions with type" do
+    proc {
+      @db.create_table(:cats) do
+        text :name
+        index :name, :type => :hash
+      end
+    }.should raise_error(Sequel::Error)
+  end
+
   specify "should accept multiple index definitions" do
     @db.create_table(:cats) do
       integer :id

data/spec/sequelizer_spec.rb

@@ -247,8 +247,8 @@ context "Proc#to_sql" do
   end
   
   specify "should support functions on columns" do
-    proc {:x.MAX > 100}.sql.should == "(max(x) > 100)"
-    proc {:x.COUNT > 100}.sql.should == "(count(x) > 100)"
+    proc {:max[:x] > 100}.sql.should == "(max(x) > 100)"
+    proc {:count[:x] > 100}.sql.should == "(count(x) > 100)"
   end
   
   specify "should support SQL functions" do

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 require 'rubygems'
-require File.join(File.dirname(__FILE__), "../lib/sequel_core") 
-
+unless Object.const_defined?('Sequel')
+  $:.unshift(File.join(File.dirname(__FILE__), "../lib/"))
+  require 'sequel_core'
+end
 if File.exists?(File.join(File.dirname(__FILE__), 'spec_config.rb'))
   require File.join(File.dirname(__FILE__), 'spec_config.rb')
 end

metadata

@@ -3,12 +3,12 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: sequel_core
 version: !ruby/object:Gem::Version 
-  version: 1.4.0
-date: 2008-04-08 00:00:00 -07:00
+  version: 1.5.0
+date: 2008-04-29 00:00:00 -07:00
 summary: "The Database Toolkit for Ruby: Core Library and Adapters"
 require_paths: 
 - lib
-email: themastermind1@gmail.com
+email: code@jeremyevans.net
 homepage: http://sequel.rubyforge.org
 rubyforge_project: sequel
 description: "The Database Toolkit for Ruby: Core Library and Adapters"
@@ -27,28 +27,29 @@ signing_key:
 cert_chain: 
 post_install_message: 
 authors: 
-- Aman Gupta
+- Jeremy Evans
 files: 
 - COPYING
 - README
 - Rakefile
 - bin/sequel
 - spec/adapters
-- spec/array_keys_spec.rb
+- spec/dataset_spec.rb
 - spec/core_ext_spec.rb
 - spec/core_sql_spec.rb
 - spec/database_spec.rb
-- spec/dataset_spec.rb
+- spec/schema_spec.rb
 - spec/migration_spec.rb
 - spec/pretty_table_spec.rb
 - spec/rcov.opts
 - spec/schema_generator_spec.rb
-- spec/schema_spec.rb
+- spec/spec_helper.rb
 - spec/sequelizer_spec.rb
 - spec/spec.opts
 - spec/spec_config.rb.example
-- spec/spec_helper.rb
 - spec/worker_spec.rb
+- spec/connection_pool_spec.rb
+- spec/object_graph_spec.rb
 - spec/adapters/informix_spec.rb
 - spec/adapters/mysql_spec.rb
 - spec/adapters/oracle_spec.rb
@@ -57,19 +58,20 @@ files:
 - lib/sequel_core.rb
 - lib/sequel_core
 - lib/sequel_core/adapters
-- lib/sequel_core/array_keys.rb
+- lib/sequel_core/dataset.rb
 - lib/sequel_core/core_ext.rb
 - lib/sequel_core/core_sql.rb
 - lib/sequel_core/database.rb
-- lib/sequel_core/dataset.rb
-- lib/sequel_core/dataset
 - lib/sequel_core/exceptions.rb
+- lib/sequel_core/dataset
+- lib/sequel_core/object_graph.rb
 - lib/sequel_core/migration.rb
-- lib/sequel_core/model.rb
+- lib/sequel_core/worker.rb
 - lib/sequel_core/pretty_table.rb
 - lib/sequel_core/schema.rb
 - lib/sequel_core/schema
-- lib/sequel_core/worker.rb
+- lib/sequel_core/connection_pool.rb
+- lib/sequel_core/deprecated.rb
 - lib/sequel_core/adapters/adapter_skeleton.rb
 - lib/sequel_core/adapters/ado.rb
 - lib/sequel_core/adapters/db2.rb
@@ -87,6 +89,7 @@ files:
 - lib/sequel_core/dataset/convenience.rb
 - lib/sequel_core/dataset/sequelizer.rb
 - lib/sequel_core/dataset/sql.rb
+- lib/sequel_core/dataset/pagination.rb
 - lib/sequel_core/schema/generator.rb
 - lib/sequel_core/schema/sql.rb
 - CHANGELOG
@@ -94,18 +97,10 @@ test_files: []
 
 rdoc_options: 
 - --quiet
-- --title
-- "Sequel: The Database Toolkit for Ruby"
-- --opname
-- index.html
 - --line-numbers
-- --main
-- README
 - --inline-source
 - --exclude
 - ^(examples|extras)/
-- --exclude
-- lib/sequel_core.rb
 extra_rdoc_files: 
 - README
 - CHANGELOG
@@ -126,39 +121,3 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.0.0
     version: 
-- !ruby/object:Gem::Dependency 
-  name: assistance
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0.1"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: RubyInline
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 3.6.6
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: ParseTree
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.1.1
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: ruby2ruby
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-    version: 

data/lib/sequel_core/array_keys.rb

@@ -1,322 +0,0 @@
-# ArrayKeys provide support for accessing array elements by keys. ArrayKeys are
-# based on the arrayfields gem by Ara Howard, and can be used as substitutes
-# for fetching records tuples as Ruby hashes.
-#
-# The main advantage offered by ArrayKeys over hashes is that the values are 
-# always ordered according to the column order in the query. Another purported
-# advantage is that they reduce the memory footprint, but this has turned out
-# to be a false claim.
-module ArrayKeys
-  # The KeySet module contains methods that extend an array of keys to return
-  # a key's position in the key set.
-  module KeySet
-    # Returns the key's position in the key set. Provides indifferent access
-    # for symbols and strings.
-    def key_pos(key)
-      @key_indexes ||= inject({}) {|h, k| h[k.to_sym] = h.size; h}
-      @key_indexes[key] || @key_indexes[key.to_sym] || @key_indexes[key.to_s]
-    end
- 
-    # Adds a key to the key set.
-    def add_key(key)
-      self << key
-      @key_indexes[key] = @key_indexes.size
-    end
-    
-    # Removes a key from the key set by its index.
-    def del_key(idx)
-      delete_at(idx)
-      @key_indexes = nil # reset key indexes
-    end
-  end
-  
-  # The KeyAccess provides a large part of the Hash API for arrays with keys.
-  module KeyAccess
-    # Returns a value referenced by an array index or a key.
-    def [](idx, *args)
-      if String === idx or Symbol === idx
-        (idx = @keys.key_pos(idx)) ? super(idx, *args) : nil
-      else
-        super
-      end
-    end
- 
-    # Sets the value referenced by an array index or a key.
-    def []=(idx,*args)
-      if String === idx or Symbol === idx
-        idx = @keys.key_pos(idx) || @keys.add_key(idx.to_sym)
-      end
-      super(idx, *args)
-    end
-    
-    # Stores a value by index or key.
-    def store(k, v); self[k] = v; end
-    
-    # Slices the array, and returns an array with its keys sliced accordingly.
-    def slice(*args)
-      s = super(*args)
-      s.keys = @keys.slice(*args)
-      s
-    end
-    
-    # Converts the array into a hash.
-    def to_hash
-      h = {}
-      each_with_index {|v, i| h[(k = @keys[i]) ? k.to_sym : nil] = v}
-      h
-    end
-    alias_method :to_h, :to_hash
-    
-    # Iterates over each key-value pair in the array.
-    def each_pair
-      each_with_index {|v, i| yield @keys[i], v}
-    end
-    
-    # Iterates over the array's associated keys.
-    def each_key(&block)
-      @keys.each(&block)
-    end
-    
-    # Iterates over the array's values.
-    def each_value(&block)
-      each(&block)
-    end
-    
-    # Deletes a value by its key.
-    def delete(key, *args)
-      if (idx = @keys.key_pos(key))
-        delete_at(idx)
-      end
-    end
-    
-    # Deletes a value by its index.
-    def delete_at(idx)
-      super(idx)
-      @keys = @keys.clone
-      @keys.del_key(idx)
-    end
-    
-    # Returns true if the array's key set contains the given key.
-    def include?(k)
-      @keys.include?(k) || @keys.include?(k.to_sym) || @keys.include?(k.to_s)
-    end
-    
-    # Returns true if the array's key set contains the given key.
-    def has_key?(k)
-      @keys.include?(k) || @keys.include?(k.to_sym) || @keys.include?(k.to_s)
-    end
-    alias_method :member?, :has_key?
-    alias_method :key?, :has_key?
-    
-    # Returns true if the array contains the given value.
-    def has_value?(k); orig_include?(k); end
-    alias_method :value?, :has_value?
-    
-    # Fetches a value by its key and optionally passes it through the given
-    # block:
-    #
-    #   row.fetch(:name) {|v| v.to_sym}
-    #
-    # You can also give a default value
-    #
-    #   row.fetch(:name, 'untitled')
-    #
-    def fetch(k, *args, &block)
-      if idx = @keys.key_pos(k)
-        v = at idx
-      else
-        !args.empty? ? (v = args.first) : (raise IndexError, "key not found")
-      end
-      block ? block[v] : v
-    end
-    
-    # Returns self.
-    def values
-      self
-    end
-    
-    # Creates a copy of self with the same key set.
-    def dup
-      copy = super
-      copy.keys = @keys
-      copy
-    end
-    
-    # Creates a copy of self with a copy of the key set.
-    def clone
-      copy = super
-      copy.keys = @keys.clone
-      copy
-    end
-    
-    # Returns an array merged from self and the given array.
-    def merge(values, &block)
-      clone.merge!(values, &block)
-    end
-    
-    # Merges the given array with self, optionally passing the values from self
-    # through the given block:
-    #
-    #   row.merge!(new_values) {|k, old, new| (k == :name) ? old : new}
-    #
-    def merge!(values, &block)
-      values.each_pair do |k, v|
-        self[k] = (has_key?(k) && block) ? block[k, self[k], v] : v
-      end
-      self
-    end
-    alias_method :update, :merge!
-    alias_method :update!, :merge!
-  end
-  
-  # The ArrayExtensions module provides extensions for the Array class.
-  module ArrayExtensions
-    attr_reader :keys
-    
-    # Sets the key set for the array. Once a key set has been set for an array,
-    # it is extended with the KeyAccess API
-    def keys=(keys)
-      extend ArrayKeys::KeyAccess if keys
-      @keys = keys.frozen? ? keys.dup : keys
-      unless @keys.respond_to?(:key_pos)
-        @keys.extend(ArrayKeys::KeySet)
-      end
-    end
- 
-    alias_method :columns, :keys
-    alias_method :columns=, :keys=
-  end
-  
-  # The DatasetExtensions module provides extensions that modify
-  # a dataset to return Array tuples instead of Hash tuples.
-  module DatasetExtensions
-    # Fetches a dataset's records, converting each tuple into an array with keys.
-    def array_tuples_each(opts = nil, &block)
-      fetch_rows(select_sql(opts)) {|h| block[Array.from_hash(h)]}
-    end
-
-    # Provides the corresponding behavior to Sequel::Dataset#update_each_method,
-    # using array tuples.
-    def array_tuples_update_each_method
-      # warning: ugly code generation ahead
-      if @row_proc && @transform
-        class << self
-          def each(opts = nil, &block)
-            if opts && opts[:naked]
-              fetch_rows(select_sql(opts)) {|r| block[transform_load(Array.from_hash(r))]}
-            else
-              fetch_rows(select_sql(opts)) {|r| block[@row_proc[transform_load(Array.from_hash(r))]]}
-            end
-            self
-          end
-        end
-      elsif @row_proc
-        class << self
-          def each(opts = nil, &block)
-            if opts && opts[:naked]
-              fetch_rows(select_sql(opts)) {|r| block[Array.from_hash(r)]}
-            else
-              fetch_rows(select_sql(opts)) {|r| block[@row_proc[Array.from_hash(r)]]}
-            end
-            self
-          end
-        end
-      elsif @transform
-        class << self
-          def each(opts = nil, &block)
-            fetch_rows(select_sql(opts)) {|r| block[transform_load(Array.from_hash(r))]}
-            self
-          end
-        end
-      else
-        class << self
-          def each(opts = nil, &block)
-            fetch_rows(select_sql(opts)) {|r| block[Array.from_hash(r)]}
-            self
-          end
-        end
-      end
-    end
-
-    def array_tuples_transform_load(r)
-      puts "transform_load"
-      
-      a = []; a.keys = []
-      r.each_pair do |k, v|
-        a[k] = (tt = @transform[k]) ? tt[0][v] : v
-      end
-      a
-    end
-    
-    # Applies the value transform for data saved to the database.
-    def array_tuples_transform_save(r)
-      a = []; a.keys = []
-      r.each_pair do |k, v|
-        a[k] = (tt = @transform[k]) ? tt[1][v] : v
-      end
-      a
-    end
-  end
-end
-
-# Array extensions.
-class Array
-  alias_method :orig_include?, :include?
-
-  include ArrayKeys::ArrayExtensions
-
-  # Converts a hash into an array with keys.
-  def self.from_hash(h)
-    a = []; a.keys = []
-    a.merge!(h)
-  end
-end
-
-module Sequel
-  # Modifies all dataset classes to fetch records as arrays with keys. By 
-  # default records are fetched as hashes.
-  def self.use_array_tuples
-    Dataset.dataset_classes.each do |c|
-      c.class_eval do
-        if method_defined?(:array_tuples_fetch_rows)
-          alias_method :hash_tuples_fetch_rows, :fetch_rows
-          alias_method :fetch_rows, :array_tuples_fetch_rows
-        else
-          alias_method :orig_each, :each
-          alias_method :orig_update_each_method, :update_each_method
-          
-          include ArrayKeys::DatasetExtensions
-          alias_method :each, :array_tuples_each
-          alias_method :update_each_method, :array_tuples_update_each_method
-        end
-        
-        if method_defined?(:array_tuples_transform_load)
-          alias_method :transform_load, :array_tuples_transform_load
-        end
-        if method_defined?(:array_tuples_transform_save)
-          alias_method :transform_save, :array_tuples_transform_save
-        end
-      end
-    end
-  end
-  
-  # Modifies all dataset classes to fetch records as hashes.
-  def self.use_hash_tuples
-    Dataset.dataset_classes.each do |c|
-      c.class_eval do
-        if method_defined?(:hash_tuples_fetch_rows)
-          alias_method :fetch_rows, :hash_tuples_fetch_rows
-        else
-          if method_defined?(:orig_each)
-            alias_method :each, :orig_each
-            undef_method :orig_each
-          end
-          if method_defined?(:orig_update_each_method)
-            alias_method :update_each_method, :orig_update_each_method
-            undef_method :orig_update_each_method
-          end
-        end
-      end
-    end
-  end
-end