sequel 0.1.9.11 → 0.1.9.12

data/CHANGELOG

@@ -1,8 +1,22 @@
-=== 0.19.11 (2007-08-24)
+=== 0.1.9.12 (2007-08-26)
+
+* Added spec for PrettyTable.
+
+* Added specs for Schema::Generator and Model (#36 thanks technoweenie).
+
+* Fixed Sequel::Model.set_schema (#36 thanks technoweenie.)
+
+* Added support for no options on Schema::Generator#foreign_key (#36 thanks technoweenie.)
+
+* Implemented (restored?) Schema::Generator#primary_key_name (#36 thanks technoweenie.)
+
+* Better spec code coverage.
+
+=== 0.1.9.11 (2007-08-24)
 
 * Changed Dataset#set_model to allow supplying additional arguments to the model's initialize method (#35). Thanks Sunny Hirai.
 
-=== 0.19.10 (2007-08-22)
+=== 0.1.9.10 (2007-08-22)
 
 * Changed schema generation code to generate separate statements for CREATE TABLE and each CREATE INDEX (#34).
 

data/Rakefile

@@ -6,7 +6,7 @@ require 'fileutils'
 include FileUtils
 
 NAME = "sequel"
-VERS = "0.1.9.11"
+VERS = "0.1.9.12"
 CLEAN.include ['**/.*.sw?', 'pkg/*', '.config', 'doc/*', 'coverage/*']
 RDOC_OPTS = ['--quiet', '--title', "Sequel: Concise ORM for Ruby",
   "--opname", "index.html",

data/lib/sequel/model.rb

@@ -64,7 +64,7 @@ module Sequel
     
     def self.set_schema(name = nil, &block)
       name ? set_table_name(name) : name = table_name
-      @schema = Schema::Generator.new(name, &block)
+      @schema = Schema::Generator.new(db, name, &block)
       if @schema.primary_key_name
         set_primary_key @schema.primary_key_name
       end

data/lib/sequel/pretty_table.rb

@@ -7,7 +7,7 @@
 # +--+-------+
 
 module Sequel
-  class PrettyTable
+  module PrettyTable
     def self.hash_columns(records)
       columns = []
       records.each do |r|

data/lib/sequel/schema/schema_generator.rb

@@ -14,6 +14,10 @@ module Sequel
         column(name, type, opts)
       end
       
+      def primary_key_name
+        @primary_key ? @primary_key[:name] : nil
+      end
+      
       def primary_key(name, type = nil, opts = nil)
         @primary_key = @db.serial_primary_key_options.merge({
           :name => name
@@ -27,7 +31,7 @@ module Sequel
         @columns << {:name => name, :type => type}.merge(opts || {})
       end
       
-      def foreign_key(name, opts)
+      def foreign_key(name, opts = nil)
         @columns << {:name => name, :type => :integer}.merge(opts || {})
       end
       

data/spec/connection_pool_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../lib/sequel')
+require File.join(File.dirname(__FILE__), 'spec_helper')
 
 context "An empty ConnectionPool" do
   setup do

data/spec/core_ext_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../lib/sequel')
+require File.join(File.dirname(__FILE__), 'spec_helper')
 
 context "Enumerable#send_each" do
   specify "should send the supplied method to each item" do

data/spec/database_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../lib/sequel')
+require File.join(File.dirname(__FILE__), 'spec_helper')
 
 context "A new Database" do
   setup do

data/spec/dataset_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../lib/sequel')
+require File.join(File.dirname(__FILE__), 'spec_helper')
 
 context "Dataset" do
   setup do
@@ -1502,6 +1502,14 @@ context "Dataset#print" do
     @output.read.should == \
       "+-+-+\n|a|b|\n+-+-+\n|1|2|\n|3|4|\n|5|6|\n+-+-+\n"
   end
+
+  specify "should default to the dataset's columns" do
+    @dataset.meta_def(:columns) {[:a, :b]}
+    @dataset.print
+    @output.rewind
+    @output.read.should == \
+      "+-+-+\n|a|b|\n+-+-+\n|1|2|\n|3|4|\n|5|6|\n+-+-+\n"
+  end
 end
 
 context "Dataset#multi_insert" do

data/spec/expressions_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../lib/sequel')
+require File.join(File.dirname(__FILE__), 'spec_helper')
 
 context "A Proc object containing a single comparison" do
   setup do

data/spec/migration_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../lib/sequel')
+require File.join(File.dirname(__FILE__), 'spec_helper')
 
 context "Migration classes" do
   setup do
@@ -86,7 +86,7 @@ MIGRATION_001 = %[
       create(1111)
     end
     
-    def drop
+    def down
       drop(1111)
     end
   end
@@ -174,6 +174,11 @@ context "Sequel::Migrator" do
       [CreateSessions, CreateNodes, CreateUsers]
   end
   
+  specify "should load the migration classes for the specified range" do
+    Sequel::Migrator.migration_classes('.', 0, 5, :down).should == \
+      [CreateAttributes, CreateUsers, CreateNodes, CreateSessions]
+  end
+  
   specify "should start from current + 1 for the up direction" do
     Sequel::Migrator.migration_classes('.', 3, 1, :up).should == \
       [CreateNodes, CreateUsers]
@@ -238,4 +243,11 @@ context "Sequel::Migrator" do
 
     Sequel::Migrator.get_current_migration_version(@db).should == 5
   end
+
+  specify "should apply migrations down to 0 version correctly" do
+    Sequel::Migrator.apply(@db, '.', 0, 5)
+    @db.drops.should == [5555, 3333, 2222, 1111]
+
+    Sequel::Migrator.get_current_migration_version(@db).should == 0
+  end
 end

data/spec/model_spec.rb

@@ -0,0 +1,47 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+Sequel::Model.db = SchemaDummyDatabase.new
+
+describe Sequel::Model do
+  before do
+    @model = Class.new(Sequel::Model(:items))
+  end
+  
+  it "creates dynamic model subclass with set table name" do
+    @model.table_name.should == :items
+  end
+  
+  it "defaults to primary key of id" do
+    @model.primary_key.should == :id
+  end
+  
+  it "allow primary key change" do
+    @model.set_primary_key :ssn
+    @model.primary_key.should == :ssn
+  end
+  
+  it "allows table name change" do
+    @model.set_table_name :foo
+    @model.table_name.should == :foo
+  end
+  
+  it "sets schema with implicit table name" do
+    @model.set_schema do
+      primary_key :ssn, :string
+    end
+    @model.primary_key.should == :ssn
+    @model.table_name.should == :items
+  end
+  
+  it "sets schema with explicit table name" do
+    @model.set_schema :foo do
+      primary_key :id
+    end
+    @model.primary_key.should == :id
+    @model.table_name.should == :foo
+  end
+
+  it "puts the lotion in the basket or it gets the hose again" do
+    # just kidding!
+  end
+end

data/spec/pretty_table_spec.rb

@@ -0,0 +1,58 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+require 'stringio'
+
+context "PrettyTable" do
+  setup do
+    @data1 = [
+      {:x => 3, :y => 4}
+    ]
+    
+    @data2 = [
+      {:a => 23, :b => 45},
+      {:a => 45, :b => 2377}
+    ]
+
+    @data3 = [
+      {:aaa => 1},
+      {:bb => 2},
+      {:c => 3}
+    ]
+
+    @output = StringIO.new
+    @orig_stdout = $stdout
+    $stdout = @output
+  end
+
+  teardown do
+    $stdout = @orig_stdout
+  end
+  
+  specify "should infer the columns if not given" do
+    Sequel::PrettyTable.print(@data1)
+    @output.rewind
+    @output.read.should =~ \
+      /\n(\|x\|y\|)|(\|y\|x\|)\n/
+  end
+  
+  specify "should calculate the maximum width of each column correctly" do
+    Sequel::PrettyTable.print(@data2, [:a, :b])
+    @output.rewind
+    @output.read.should == \
+      "+--+----+\n|a |b   |\n+--+----+\n|23|45  |\n|45|2377|\n+--+----+\n"
+  end
+
+  specify "should also take header width into account" do
+    Sequel::PrettyTable.print(@data3, [:aaa, :bb, :c])
+    @output.rewind
+    @output.read.should == \
+      "+---+--+-+\n|aaa|bb|c|\n+---+--+-+\n|1  |  | |\n|   |2 | |\n|   |  |3|\n+---+--+-+\n"
+  end
+  
+  specify "should print only the specified columns" do
+    Sequel::PrettyTable.print(@data2, [:a])
+    @output.rewind
+    @output.read.should == \
+      "+--+\n|a |\n+--+\n|23|\n|45|\n+--+\n"
+  end
+end

data/spec/schema_generator_spec.rb

@@ -0,0 +1,60 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+describe Sequel::Schema::Generator do
+  before :all do
+    @generator = Sequel::Schema::Generator.new(SchemaDummyDatabase.new, :items) do
+      string :title
+      column :body, :text
+      foreign_key :parent_id
+      primary_key :id
+      index :title
+      index [:title, :body]
+    end
+    @table_name, @columns, @indexes = @generator.create_info
+  end
+  
+  {:name => :id, :primary_key => true}.each do |field, expected|
+    it "uses default primary key #{field}" do
+      @columns.first[field].should == expected
+    end
+  end
+  
+  it "counts primary key as column" do
+    @columns.size.should == 4
+  end
+  
+  it "places primary key first" do
+    @columns[0][:primary_key].should     be_true
+    @columns[1][:primary_key].should_not be_true
+    @columns[2][:primary_key].should_not be_true
+  end
+
+  it "retrieves primary key name" do
+    @generator.primary_key_name.should == :id
+  end
+
+  it "keeps columns in order" do
+    @columns[1][:name].should == :title
+    @columns[1][:type].should == :string
+    @columns[2][:name].should == :body
+    @columns[2][:type].should == :text
+  end
+  
+  it "creates foreign key column" do
+    @columns[3][:name].should == :parent_id
+    @columns[3][:type].should == :integer
+  end
+  
+  it "finds columns" do
+    [:title, :body, :parent_id, :id].each do |col|
+      @generator.has_column?(col).should be_true
+    end
+    @generator.has_column?(:foo).should_not be_true
+  end
+  
+  it "creates indexes" do
+    @indexes[0][:columns].should include(:title)
+    @indexes[1][:columns].should include(:title)
+    @indexes[1][:columns].should include(:body)
+  end
+end

data/spec/schema_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../lib/sequel')
+require File.join(File.dirname(__FILE__), 'spec_helper')
 
 class SchemaDummyDatabase < Sequel::Database
   attr_reader :sqls

data/spec/spec_helper.rb

@@ -0,0 +1,10 @@
+require File.join(File.dirname(__FILE__), '../lib/sequel')
+
+class SchemaDummyDatabase < Sequel::Database
+  attr_reader :sqls
+  
+  # def execute(sql)
+  #   @sqls ||= []
+  #   @sqls << sql
+  # end
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: sequel
 version: !ruby/object:Gem::Version 
-  version: 0.1.9.11
-date: 2007-08-24 00:00:00 +03:00
+  version: 0.1.9.12
+date: 2007-08-26 00:00:00 +03:00
 summary: Lightweight ORM library for Ruby
 require_paths: 
 - lib
@@ -33,6 +33,7 @@ files:
 - README
 - Rakefile
 - bin/sequel
+- doc/rdoc
 - spec/adapters
 - spec/connection_pool_spec.rb
 - spec/core_ext_spec.rb
@@ -40,7 +41,11 @@ files:
 - spec/dataset_spec.rb
 - spec/expressions_spec.rb
 - spec/migration_spec.rb
+- spec/model_spec.rb
+- spec/pretty_table_spec.rb
+- spec/schema_generator_spec.rb
 - spec/schema_spec.rb
+- spec/spec_helper.rb
 - spec/adapters/mysql_spec.rb
 - spec/adapters/sqlite_spec.rb
 - lib/sequel