datamapper 0.2.0 → 0.2.1

data/plugins/dataobjects/swig_mysql/mysql_c.i

@@ -1,8 +1,67 @@
 %module mysql_c
 %{
-#include <mysql.h>
-#include <errmsg.h>
-#include <mysqld_error.h>
+ #include <mysql.h>
+ #include <errmsg.h>
+ #include <mysqld_error.h>
+
+ VALUE mysql_c_fetch_field_names(MYSQL_RES *reader, int count) {
+   VALUE arr = rb_ary_new();
+   int i;
+   for(i = 0; i < count; i++) {
+     rb_ary_push(arr, rb_str_new2(mysql_fetch_field_direct(reader, i)->name));
+   }
+   return arr;
+ }
+
+ VALUE mysql_c_fetch_field_types(MYSQL_RES *reader, int count) {
+   VALUE arr = rb_ary_new();
+   int i;
+   for(i = 0; i < count; i++) {
+     rb_ary_push(arr, INT2NUM(mysql_fetch_field_direct(reader, i)->type));
+   }
+   return arr;
+ }
+
+ VALUE mysql_c_fetch_row(MYSQL_RES *reader) {
+   VALUE arr = rb_ary_new();
+   MYSQL_ROW result = (MYSQL_ROW)mysql_fetch_row(reader);
+   if(!result) return Qnil;
+   int i;
+   
+   for(i = 0; i < reader->field_count; i++) {
+     if(result[i] == NULL) rb_ary_push(arr, Qnil);
+     else rb_ary_push(arr, rb_str_new2(result[i]));
+   }
+   return arr;
+ }
+
 %}
 
-%include "/opt/local/include/mysql5/mysql/mysql.h"
+%ignore st_mysql_options;
+%include "/usr/local/mysql-5.0.45-osx10.4-i686/include/mysql.h"
+
+VALUE mysql_c_fetch_field_names(MYSQL_RES *reader, int count);
+VALUE mysql_c_fetch_field_types(MYSQL_RES *reader, int count);
+VALUE mysql_c_fetch_row(MYSQL_RES *reader);
+
+enum enum_field_types { MYSQL_TYPE_DECIMAL, MYSQL_TYPE_TINY,
+			MYSQL_TYPE_SHORT,  MYSQL_TYPE_LONG,
+			MYSQL_TYPE_FLOAT,  MYSQL_TYPE_DOUBLE,
+			MYSQL_TYPE_NULL,   MYSQL_TYPE_TIMESTAMP,
+			MYSQL_TYPE_LONGLONG,MYSQL_TYPE_INT24,
+			MYSQL_TYPE_DATE,   MYSQL_TYPE_TIME,
+			MYSQL_TYPE_DATETIME, MYSQL_TYPE_YEAR,
+			MYSQL_TYPE_NEWDATE, MYSQL_TYPE_VARCHAR,
+			MYSQL_TYPE_BIT,
+                        MYSQL_TYPE_NEWDECIMAL=246,
+			MYSQL_TYPE_ENUM=247,
+			MYSQL_TYPE_SET=248,
+			MYSQL_TYPE_TINY_BLOB=249,
+			MYSQL_TYPE_MEDIUM_BLOB=250,
+			MYSQL_TYPE_LONG_BLOB=251,
+			MYSQL_TYPE_BLOB=252,
+			MYSQL_TYPE_VAR_STRING=253,
+			MYSQL_TYPE_STRING=254,
+			MYSQL_TYPE_GEOMETRY=255
+
+};

data/profile_data_mapper.rb

@@ -1,8 +1,6 @@
 #!/opt/local/bin/ruby
 
-ENV['LOGGER'] = 'false'
-
-require 'example'
+require 'environment'
 require 'ruby-prof'
 
 # RubyProf, making profiling Ruby pretty since 1899!
@@ -17,10 +15,12 @@ end
 
 profile do
   1000.times do
-    Zoo.all
+    database.query("SELECT * FROM zoos")
   end
 end
 
+puts "Done!"
+
 # require 'benchmark'
 # 
 # N = 100_000

data/rakefile.rb

@@ -10,6 +10,8 @@ Dir[File.dirname(__FILE__) + '/tasks/*'].each { |t| require(t) }
 
 task :default => 'dm:spec'
 
+task :environment => 'dm:environment'
+
 namespace :dm do
 
   desc "Setup Environment"
@@ -19,10 +21,10 @@ namespace :dm do
   
   desc "Run specifications"
   Spec::Rake::SpecTask.new('spec') do |t|
-    t.spec_opts = [ '-rspec/spec_helper' ]
+    t.spec_opts = ["--format", "specdoc", "--colour"]
     t.spec_files = FileList[(ENV['FILES'] || 'spec/**/*_spec.rb')]
   end
-
+  
   desc "Run comparison with ActiveRecord"
   task :perf do
     load 'performance.rb'
@@ -35,7 +37,7 @@ namespace :dm do
 
 end
 
-PACKAGE_VERSION = '0.2.0'
+PACKAGE_VERSION = '0.2.1'
 
 PACKAGE_FILES = FileList[
   'README',
@@ -48,10 +50,14 @@ PACKAGE_FILES = FileList[
   'plugins/**/*'
 ].to_a
 
+DOCUMENTED_FILES = PACKAGE_FILES.reject do |path|
+  FileTest.directory?(path) || path =~ /(^spec|\/spec|\/swig\_)/
+end
+
 PROJECT = 'datamapper'
 
 task :ls do
-  p PACKAGE_FILES.reject { |path| path =~ /(^spec|\/spec|\/swig\_)/ }.sort
+  p DOCUMENTED_FILES
 end
 
 desc "Generate Documentation"
@@ -59,7 +65,7 @@ rd = Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'doc'
   rdoc.title = "DataMapper -- An Object/Relational Mapper for Ruby"
   rdoc.options << '--line-numbers' << '--inline-source' << '--main' << 'README'
-  rdoc.rdoc_files.include(PACKAGE_FILES.reject { |path| path =~ /(^spec|\/spec|\/swig\_)/ })
+  rdoc.rdoc_files.include(*DOCUMENTED_FILES)
 end
 
 gem_spec = Gem::Specification.new do |s|
@@ -82,8 +88,8 @@ gem_spec = Gem::Specification.new do |s|
   s.add_dependency('fastthread')
 
   s.has_rdoc = true 
-  s.rdoc_options << '--line-numbers' << '--inline-source' << '--main' << 'README' 
-  s.extra_rdoc_files = PACKAGE_FILES.reject { |path| path =~ /(^spec|\/spec|\/swig\_)/ }.to_a 
+  s.rdoc_options << '--line-numbers' << '--inline-source' << '--main' << 'README'
+  s.extra_rdoc_files = DOCUMENTED_FILES
 end
 
 Rake::GemPackageTask.new(gem_spec) do |p|

data/spec/acts_as_tree_spec.rb

@@ -1,3 +1,5 @@
+require File.dirname(__FILE__) + "/spec_helper"
+
 describe('A tree') do
   
   before(:all) do

data/spec/associations_spec.rb

@@ -1,3 +1,5 @@
+require File.dirname(__FILE__) + "/spec_helper"
+
 describe DataMapper::Associations::BelongsToAssociation do
   before(:each) do
     @aviary = Exhibit[:name => 'Monkey Mayhem']
@@ -64,6 +66,16 @@ describe DataMapper::Associations::HasManyAssociation do
     @zoo.destroy!
   end
   
+  it "should return an empty Enumerable for new objects" do
+    project = Project.new
+    project.sections.should be_a_kind_of(Enumerable)
+    project.sections.should be_empty
+  end
+  
+  it "should display correctly when inspected" do
+    Zoo.first(:name => 'Dallas').exhibits.inspect.should match(/\#\<Exhibit\:0x.{7}/)
+  end
+  
   it 'should lazily-load the association when Enumerable methods are called' do
     database do |db|
       san_diego = Zoo[:name => 'San Diego']

data/spec/attributes_spec.rb

@@ -1,3 +1,5 @@
+require File.dirname(__FILE__) + "/spec_helper"
+
 describe DataMapper::Base do
     
   it 'should allow mass-assignment of attributes' do

data/spec/base_spec.rb

@@ -1,3 +1,5 @@
+require File.dirname(__FILE__) + "/spec_helper"
+
 describe DataMapper::Base do
   
   it "attributes method should load all lazy-loaded values" do

data/spec/callbacks_spec.rb

@@ -1,3 +1,5 @@
+require File.dirname(__FILE__) + "/spec_helper"
+
 describe DataMapper::Callbacks do
   
   it "should allow for a callback to be set, then called" do

data/spec/can_has_sphinx.rb

@@ -1,6 +1,5 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-
 describe DataMapper::Plugins::CanHasSphinx do
   
 end

data/spec/coersion_spec.rb

@@ -1,3 +1,5 @@
+require File.dirname(__FILE__) + "/spec_helper"
+
 describe DataMapper::Adapters::Sql::Coersion do
   
   before(:all) do
@@ -19,7 +21,7 @@ describe DataMapper::Adapters::Sql::Coersion do
     bob2 = Person[:name => 'DateCoersionTest']
     
     bob.date_of_birth.should eql(dob)
-    bob.date_of_birth.should eql(bob2.date_of_birth)
+    bob2.date_of_birth.should eql(dob)
   end
   
   it 'should cast to a Date' do
@@ -30,5 +32,10 @@ describe DataMapper::Adapters::Sql::Coersion do
     @coersive.type_cast_date(DateTime::parse('2001-1-1')).should eql(target)
     @coersive.type_cast_date(Time::parse('2001-1-1')).should eql(target)
   end
-  
-end
+
+  it 'should cast to a String' do
+    target = "\n\ttest\n\n\ntest\n\n"
+
+    @coersive.type_cast_text(target).should == target
+  end
+end

data/spec/column_spec.rb

@@ -0,0 +1,23 @@
+require File.dirname(__FILE__) + "/spec_helper"
+
+describe DataMapper::Adapters::Sql::Mappings::Column do
+  
+  it "should be unique within a set" do
+    
+    mappings = DataMapper::Adapters::Sql::Mappings
+    
+    columns = SortedSet.new
+
+    columns << mappings::Column.new(database(:mock).adapter, nil, :one, :string, 1)
+    columns << mappings::Column.new(database(:mock).adapter, nil, :two, :string, 2)
+    columns << mappings::Column.new(database(:mock).adapter, nil, :three, :string, 3)
+    columns.should have(3).entries
+    
+    columns << mappings::Column.new(database(:mock).adapter, nil, :two, :integer, 3)
+    columns.should have(3).entries
+    
+    columns << mappings::Column.new(database(:mock).adapter, nil, :id, :integer, -1)
+    columns.should have(4).entries
+  end
+  
+end

data/spec/conditions_spec.rb

@@ -1,4 +1,6 @@
-describe DataMapper::Adapters::Sql::Commands::Conditions do
+require File.dirname(__FILE__) + "/spec_helper"
+
+describe DataMapper::Adapters::Sql::Commands::LoadCommand do
   
   def conditions_for(klass, options = {})
     session = database(:mock)
@@ -8,42 +10,40 @@ describe DataMapper::Adapters::Sql::Commands::Conditions do
   end
   
   it 'empty? should be false if conditions are present' do
-    conditions_for(Zoo, :name => 'Galveston').empty?.should == false
+    conditions_for(Zoo, :name => 'Galveston').should_not be_empty
   end
   
   it 'should map implicit option names to field names' do
-    conditions_for(Zoo, :name => 'Galveston').to_parameterized_sql.should == ["(`name` = ?)", 'Galveston']
+    conditions_for(Zoo, :name => 'Galveston').should eql([["`name` = ?", 'Galveston']])
   end
   
   it 'should qualify with table name when using a join' do
-    conditions = conditions_for(Zoo, :name => 'Galveston', :include => :exhibits)
-    conditions.to_parameterized_sql.should == ["(`zoos`.`name` = ?)", 'Galveston']
+    conditions_for(Zoo, :name => 'Galveston', :include => :exhibits).should eql([["`zoos`.`name` = ?", 'Galveston']])
   end
   
   it 'should use Symbol::Operator to determine operator' do
-    conditions_for(Person, :age.gt => 28).to_parameterized_sql.should == ["(`age` > ?)", 28]
-    conditions_for(Person, :age.gte => 28).to_parameterized_sql.should == ["(`age` >= ?)", 28]
+    conditions_for(Person, :age.gt => 28).should eql([["`age` > ?", 28]])
+    conditions_for(Person, :age.gte => 28).should eql([["`age` >= ?", 28]])
     
-    conditions_for(Person, :age.lt => 28).to_parameterized_sql.should == ["(`age` < ?)", 28]
-    conditions_for(Person, :age.lte => 28).to_parameterized_sql.should == ["(`age` <= ?)", 28]
+    conditions_for(Person, :age.lt => 28).should eql([["`age` < ?", 28]])
+    conditions_for(Person, :age.lte => 28).should eql([["`age` <= ?", 28]])
     
-    conditions_for(Person, :age.not => 28).to_parameterized_sql.should == ["(`age` <> ?)", 28]
-    conditions_for(Person, :age.eql => 28).to_parameterized_sql.should == ["(`age` = ?)", 28]
+    conditions_for(Person, :age.not => 28).should eql([["`age` <> ?", 28]])
+    conditions_for(Person, :age.eql => 28).should eql([["`age` = ?", 28]])
     
-    conditions_for(Person, :name.like => 'S%').to_parameterized_sql.should == ["(`name` LIKE ?)", 'S%']
+    conditions_for(Person, :name.like => 'S%').should eql([["`name` LIKE ?", 'S%']])
     
-    conditions_for(Person, :age.in => [ 28, 29 ]).to_parameterized_sql.should == ["(`age` IN ?)", [ 28, 29 ]]
+    conditions_for(Person, :age.in => [ 28, 29 ]).should eql([["`age` IN ?", [ 28, 29 ]]])
   end
   
   it 'should use an IN clause for an Array' do
-    conditions = conditions_for(Person, :age => [ 28, 29 ])
-    conditions.to_parameterized_sql.should == ["(`age` IN ?)", [ 28, 29 ]]
+    conditions_for(Person, :age => [ 28, 29 ]).should eql([["`age` IN ?", [ 28, 29 ]]])
   end
   
   it 'should use "not" for not-equal operations' do
-    conditions_for(Person, :name.not => 'Bob').to_parameterized_sql.should == ["(`name` <> ?)", 'Bob']
-    conditions_for(Person, :name.not => nil).to_parameterized_sql.should == ["(`name` IS NOT ?)", nil]
-    conditions_for(Person, :name.not => ['Sam', 'Bob']).to_parameterized_sql.should == ["(`name` NOT IN ?)", ['Sam', 'Bob']]
+    conditions_for(Person, :name.not => 'Bob').should eql([["`name` <> ?", 'Bob']])
+    conditions_for(Person, :name.not => nil).should eql([["`name` IS NOT ?", nil]])
+    conditions_for(Person, :name.not => ['Sam', 'Bob']).should eql([["`name` NOT IN ?", ['Sam', 'Bob']]])
   end
 
 end

data/spec/count_command_spec.rb

@@ -1,3 +1,5 @@
+require File.dirname(__FILE__) + "/spec_helper"
+
 describe DataMapper::Adapters::AbstractAdapter do
     
   before(:all) do

data/spec/dataobjects_spec.rb

@@ -0,0 +1,26 @@
+require File.dirname(__FILE__) + "/spec_helper"
+
+describe DataObject do
+  
+  # These specs only fail in MySQL because:
+  # 1) An insert happened in the previous connection
+  # 2) We are searching for NULL
+  # 
+  # It turns out that this is actually by design o.O:
+  #   http://dev.mysql.com/doc/refman/5.0/en/myodbc-usagenotes-functionality.html
+  #
+  #   Certain ODBC applications (including Delphi and Access) may have trouble 
+  #   obtaining the auto-increment value using the previous examples. In this case, 
+  #   try the following statement as an alternative:
+  #     SELECT * FROM tbl WHERE auto IS NULL;
+  it "should return an empty reader" do
+    database.adapter.connection do |connection|
+      command = connection.create_command('SELECT `id`, `name` FROM `zoos` WHERE (`id` IS NULL)')
+
+      command.execute_reader do |reader|
+        reader.has_rows?.should eql(ENV['ADAPTER'] == 'mysql')
+      end
+    end
+  end
+  
+end

data/spec/delete_command_spec.rb

@@ -1,3 +1,5 @@
+require File.dirname(__FILE__) + "/spec_helper"
+
 describe "Delete Command" do
   
   it "should drop and create the table" do

data/spec/embedded_value_spec.rb

@@ -1,3 +1,5 @@
+require File.dirname(__FILE__) + "/spec_helper"
+
 describe DataMapper::EmbeddedValue do
     
   before(:all) do

data/spec/fixtures/people.yaml

@@ -7,7 +7,7 @@
   state: TX
   zip_code: "75000"
   notes: 
-  date_of_birth: 2007-10-24T22:48:51-05:00
+  date_of_birth: 2007-10-24
 - name: Amy
   age: 28
   occupation: Business Analyst Manager

data/spec/fixtures/posts.yaml

@@ -0,0 +1,3 @@
+- title: One
+- title: Two
+- title: Three

data/spec/legacy_spec.rb

@@ -1,3 +1,5 @@
+require File.dirname(__FILE__) + "/spec_helper"
+
 describe 'Legacy mappings' do
   
   it('should allow models to map with custom attribute names') do

data/spec/load_command_spec.rb

@@ -1,3 +1,5 @@
+require File.dirname(__FILE__) + "/spec_helper"
+
 describe DataMapper::Adapters::Sql::Commands::LoadCommand do
   
   before(:all) do
@@ -158,8 +160,32 @@ describe DataMapper::Adapters::Sql::Commands::LoadCommand do
    end
    
    it "should be able to search on UTF-8 strings" do
-     Zoo.create(:name => 'Danish Vowels: Smøøt!')
-     Zoo.first(:name.like => '%Smøøt%').should be_a_kind_of(Zoo)
+     Zoo.create(:name => 'Danish Vowels: Smoot!') # øø
+     Zoo.first(:name.like => '%Smoot%').should be_a_kind_of(Zoo)
+   end
+   
+   it "should destructively reload the loaded attributes of an object" do
+     zoo = Zoo.first(:name => 'Dallas')
+     zoo.name.should eql('Dallas')
+     zoo.name = 'bob'
+     zoo.name.should eql('bob')
+     zoo.reload!
+     zoo.name.should eql('Dallas')
+   end
+   
+   # See the comment in dataobjects_spec for why this is failing
+   it "should return nil when finding by id, and the id is not present and/or invalid" do
+     Zoo.find(nil).should be_nil
+   end
+   
+   it "should return in order" do
+     fixtures(:posts)
+          
+     one = Post.first
+     one.title.should eql('One')
+     two = one.next
+     two.title.should eql('Two')
+     one.next.next.previous.previous.next.previous.next.next.title.should eql('Three')
    end
 end