datamapper 0.2.0 → 0.2.1

data/spec/magic_columns_spec.rb

@@ -1,3 +1,5 @@
+require File.dirname(__FILE__) + "/spec_helper"
+
 describe "Magic Columns" do
   
   it "should update updated_at on save" do

data/spec/models/person.rb

@@ -4,7 +4,7 @@ class Person < DataMapper::Base
   property :occupation, :string
   property :type, :class
   property :notes, :text
-  property :date_of_birth, :datetime
+  property :date_of_birth, :date
   
   embed :address do
     property :street, :string

data/spec/models/post.rb

@@ -1,4 +1,12 @@
 class Post < DataMapper::Base
   property :title, :string
   property :created_at, :datetime
+  
+  def next
+    Post.first(:created_at.gte => self.created_at, :id.gt => self.id, :order => "created_at, id")
+  end
+
+  def previous
+    Post.first(:created_at.lte => self.created_at, :id.lt => self.id, :order => "created_at DESC, id DESC")
+  end
 end

data/spec/query_spec.rb

@@ -1,3 +1,5 @@
+require File.dirname(__FILE__) + "/spec_helper"
+
 describe('A query') do
   
   it 'should return a simple Array of primitives' do

data/spec/save_command_spec.rb

@@ -1,3 +1,5 @@
+require File.dirname(__FILE__) + "/spec_helper"
+
 describe "Save Commands" do
   
   it "should create a new row" do

data/spec/schema_spec.rb

@@ -1,3 +1,5 @@
+require File.dirname(__FILE__) + "/spec_helper"
+
 if ENV['ADAPTER'] == 'postgresql' && false
   
   describe DataMapper::Adapters::PostgresqlAdapter::Mappings::Table do

data/spec/serialization_spec.rb

@@ -0,0 +1,58 @@
+require File.dirname(__FILE__) + "/spec_helper"
+
+describe DataMapper::Support::Serialization do
+  
+  before(:all) do
+    fixtures(:animals)
+  end
+  
+  it "should serialize to YAML" do
+    Animal.first(:name => 'Frog').to_yaml.should == <<-EOS.margin
+      --- 
+      id: 1
+      name: Frog
+      notes: I am a Frog!
+      
+    EOS
+  end
+  
+  it "should serialize to XML" do
+    Animal.first(:name => 'Frog').to_xml.should == <<-EOS.compress_lines(false)
+      <animal id="1">
+        <name>Frog</name>
+        <notes>I am a Frog!</notes>
+      </animal>
+    EOS
+    
+    san_diego_zoo = Zoo.first(:name => 'San Diego')
+    san_diego_zoo.to_xml.should == <<-EOS.compress_lines(false)
+      <zoo id="2">
+        <name>San Diego</name>
+        <notes/>
+        <updated_at>#{san_diego_zoo.updated_at}</updated_at>
+      </zoo>
+    EOS
+  end
+  
+  it "should serialize to JSON" do
+    
+    Animal.first(:name => 'Frog').to_json.should == <<-EOS.compress_lines
+      {
+        "id": 1,
+        "name": "Frog",
+        "notes": "I am a Frog!"
+      }
+    EOS
+    
+    san_diego_zoo = Zoo.first(:name => 'San Diego')
+    san_diego_zoo.to_json.should == <<-EOS.compress_lines
+      {
+        "id": 2,
+        "name": "San Diego",
+        "notes": null,
+        "updated_at": #{san_diego_zoo.updated_at.to_json}
+      }
+    EOS
+  end
+  
+end

data/spec/single_table_inheritance_spec.rb

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

data/spec/symbolic_operators_spec.rb

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

data/spec/validates_confirmation_of_spec.rb

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

data/spec/validates_format_of_spec.rb

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

data/spec/validates_length_of_spec.rb

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

data/spec/validates_uniqueness_of_spec.rb

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

data/spec/validations_spec.rb

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

data/tasks/fixtures.rb

@@ -5,35 +5,40 @@ namespace :dm do
     def fixtures_path
       return ENV['FIXTURE_PATH'] if ENV['FIXTURE_PATH']
       
-      %w(db dev schema spec).find do |parent|
-        test_for_dir = "#{DM_APP_ROOT}/#{parent}/fixtures"
-        File.exists?(test_for_dir) ? test_for_dir : nil
+      fixture_path = %w(db dev schema spec).find do |parent|
+        File.exists?("#{DM_APP_ROOT}/#{parent}/fixtures")
       end
+      
+      raise "Fixtures path not found." unless fixture_path
+      
+      "#{DM_APP_ROOT}/#{fixture_path}/fixtures"
     end
     
     desc 'Dump database fixtures'
     task :dump do
+      ENV['AUTO_MIGRATE'] = 'false'
+      Rake::Task['environment'].invoke
       directory fixtures_path
-      puts DataMapper::Base.subclasses.join("\n")
       DataMapper::Base.subclasses.each do |table|
         puts "Dumping #{table}"
-        File.open( "#{fixtures_path}/#{table.to_s.underscore}.yml", "w") do |f|
-          f.write YAML::dump(table.all.map{|r| r.attributes})
+        File.open( "#{fixtures_path}/#{Inflector.underscore(table.to_s)}.yml", "w+") do |file|
+          file.write YAML::dump(table.all)
         end
       end
     end
     
     desc 'Load database fixtures'
     task :load do
+      Rake::Task['environment'].invoke
       directory fixtures_path
       DataMapper::Base.subclasses.each do |table|
-        file_name = "#{fixtures_path}/#{table.to_s.underscore}.yml"
+        file_name = "#{fixtures_path}/#{Inflector.underscore(table.to_s)}.yml"
         next unless File.exists?( file_name )
         puts "Loading #{table}"
         table.delete_all
-        File.open( file_name, "r") do |f|
-          YAML::load(f).each do |attrs|
-            table.create attrs
+        File.open( file_name, "r") do |file|
+          YAML::load(file).each do |attributes|
+            table.create(attributes)
           end
         end
       end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: datamapper
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2007-10-25 00:00:00 -05:00
+  version: 0.2.1
+date: 2007-11-02 00:00:00 -05:00
 summary: An Object/Relational Mapper for Ruby
 require_paths: 
 - lib
@@ -43,9 +43,7 @@ files:
 - lib/data_mapper/adapters/mysql_adapter.rb
 - lib/data_mapper/adapters/postgresql_adapter.rb
 - lib/data_mapper/adapters/sql/coersion.rb
-- lib/data_mapper/adapters/sql/commands/conditions.rb
 - lib/data_mapper/adapters/sql/commands/load_command.rb
-- lib/data_mapper/adapters/sql/commands/loader.rb
 - lib/data_mapper/adapters/sql/mappings/associations_set.rb
 - lib/data_mapper/adapters/sql/mappings/column.rb
 - lib/data_mapper/adapters/sql/mappings/schema.rb
@@ -92,9 +90,10 @@ files:
 - spec/callbacks_spec.rb
 - spec/can_has_sphinx.rb
 - spec/coersion_spec.rb
+- spec/column_spec.rb
 - spec/conditions_spec.rb
-- spec/conversions_to_yaml_spec.rb
 - spec/count_command_spec.rb
+- spec/dataobjects_spec.rb
 - spec/delete_command_spec.rb
 - spec/embedded_value_spec.rb
 - spec/legacy_spec.rb
@@ -114,6 +113,7 @@ files:
 - spec/query_spec.rb
 - spec/save_command_spec.rb
 - spec/schema_spec.rb
+- spec/serialization_spec.rb
 - spec/single_table_inheritance_spec.rb
 - spec/spec_helper.rb
 - spec/symbolic_operators_spec.rb
@@ -127,6 +127,7 @@ files:
 - spec/fixtures/exhibits.yaml
 - spec/fixtures/fruit.yaml
 - spec/fixtures/people.yaml
+- spec/fixtures/posts.yaml
 - spec/fixtures/zoos.yaml
 - tasks/drivers.rb
 - tasks/fixtures.rb
@@ -155,10 +156,13 @@ files:
 - plugins/dataobjects/spec/do_spec.rb
 - plugins/dataobjects/spec/spec_helper.rb
 - plugins/dataobjects/swig_mysql
-- plugins/dataobjects/swig_mysql/do_mysql.bundle
 - plugins/dataobjects/swig_mysql/extconf.rb
+- plugins/dataobjects/swig_mysql/Makefile
+- plugins/dataobjects/swig_mysql/mkmf.log
+- plugins/dataobjects/swig_mysql/mysql_c.bundle
 - plugins/dataobjects/swig_mysql/mysql_c.c
 - plugins/dataobjects/swig_mysql/mysql_c.i
+- plugins/dataobjects/swig_mysql/mysql_c.o
 - plugins/dataobjects/swig_mysql/mysql_supp.i
 - plugins/dataobjects/swig_postgres
 - plugins/dataobjects/swig_postgres/extconf.rb
@@ -193,9 +197,7 @@ extra_rdoc_files:
 - lib/data_mapper/adapters/mysql_adapter.rb
 - lib/data_mapper/adapters/postgresql_adapter.rb
 - lib/data_mapper/adapters/sql/coersion.rb
-- lib/data_mapper/adapters/sql/commands/conditions.rb
 - lib/data_mapper/adapters/sql/commands/load_command.rb
-- lib/data_mapper/adapters/sql/commands/loader.rb
 - lib/data_mapper/adapters/sql/mappings/associations_set.rb
 - lib/data_mapper/adapters/sql/mappings/column.rb
 - lib/data_mapper/adapters/sql/mappings/schema.rb
@@ -237,21 +239,16 @@ extra_rdoc_files:
 - lib/data_mapper.rb
 - tasks/drivers.rb
 - tasks/fixtures.rb
-- plugins/can_has_sphinx
 - plugins/can_has_sphinx/init.rb
 - plugins/can_has_sphinx/install.rb
-- plugins/can_has_sphinx/lib
 - plugins/can_has_sphinx/lib/acts_as_sphinx.rb
 - plugins/can_has_sphinx/lib/sphinx.rb
 - plugins/can_has_sphinx/LICENSE
 - plugins/can_has_sphinx/Rakefile
 - plugins/can_has_sphinx/README
 - plugins/can_has_sphinx/REVISION
-- plugins/can_has_sphinx/scripts
 - plugins/can_has_sphinx/scripts/sphinx.sh
-- plugins/can_has_sphinx/tasks
 - plugins/can_has_sphinx/tasks/acts_as_sphinx_tasks.rake
-- plugins/dataobjects
 - plugins/dataobjects/do.rb
 - plugins/dataobjects/do_mysql.rb
 - plugins/dataobjects/do_postgres.rb

data/lib/data_mapper/adapters/sql/commands/conditions.rb

@@ -1,130 +0,0 @@
-module DataMapper
-  module Adapters
-    module Sql
-      module Commands
-    
-        class Conditions
-      
-          def initialize(adapter, loader, conditions_hash)
-            @adapter, @loader = adapter, loader
-            @conditions = parse_conditions(conditions_hash)
-          end
-      
-          def empty?
-            @conditions.empty?
-          end
-      
-          def to_parameterized_sql
-            sql = []
-            parameters = []
-            
-            @conditions.each do |condition|
-              case condition
-              when String then sql << condition
-              when Array then
-                  sql << condition.shift
-                  parameters += condition
-              else
-                raise "Unable to parse condition: #{condition.inspect}" if condition
-              end
-            end
-            
-            parameters.unshift("(#{sql.join(') AND (')})")
-          end
-          
-          private
-            
-            class ConditionsError < StandardError
-              
-              attr_reader :inner_error
-              
-              def initialize(clause, value, inner_error)
-                @clause, @value, @inner_error = clause, value, inner_error
-              end
-              
-              def message
-                "Conditions (:clause => #{@clause.inspect}, :value => #{@value.inspect}) failed: #{@inner_error}"
-              end
-              
-              def backtrace
-                @inner_error.backtrace
-              end              
-              
-            end
-            
-            def expression_to_sql(clause, value, collector)
-              qualify_columns = @loader.qualify_columns?
-              
-              case clause
-              when Symbol::Operator then
-                operator = case clause.type
-                when :gt then '>'
-                when :gte then '>='
-                when :lt then '<'
-                when :lte then '<='
-                when :not then inequality_operator(value)
-                when :eql then equality_operator(value)
-                when :like then equality_operator(value, 'LIKE')
-                when :in then equality_operator(value)
-                else raise ArgumentError.new('Operator type not supported')
-                end
-                collector << ["#{primary_class_table[clause].to_sql(qualify_columns)} #{operator} ?", value]
-              when Symbol then
-                collector << ["#{primary_class_table[clause].to_sql(qualify_columns)} #{equality_operator(value)} ?", value]
-              when String then
-                collector << [clause, value]
-              when Mappings::Column then
-                collector << ["#{clause.to_sql(qualify_columns)} #{equality_operator(value)} ?", value]
-              else raise "CAN HAS CRASH? #{clause.inspect}"
-              end
-            rescue => e
-              raise ConditionsError.new(clause, value, e)
-            end
-            
-            def equality_operator(value, default = '=')
-              case value
-              when NilClass then 'IS'
-              when Array then 'IN'
-              else default
-              end
-            end
-            
-            def inequality_operator(value, default = '<>')
-              case value
-              when NilClass then 'IS NOT'
-              when Array then 'NOT IN'
-              else default
-              end
-            end
-            
-            def parse_conditions(conditions_hash)
-              collection = []
-              
-              case x = conditions_hash.delete(:conditions)
-              when Array then
-                clause = x.shift
-                expression_to_sql(clause, x, collection)
-              when Hash then
-                x.each_pair do |key,value|
-                  expression_to_sql(key, value, collection)
-                end
-              else
-                raise "Unable to parse conditions: #{x.inspect}" if x
-              end
-              
-              conditions_hash.each_pair do |key,value|
-                expression_to_sql(key, value, collection)
-              end
-              
-              collection              
-            end
-            
-            def primary_class_table
-              @primary_class_table || (@primary_class_table = @loader.send(:primary_class_table))
-            end
-        end
-    
-      end
-    end
-  end
-end

data/lib/data_mapper/adapters/sql/commands/loader.rb

@@ -1,99 +0,0 @@
-module DataMapper
-  module Adapters
-    module Sql
-      module Commands
-        
-        class Loader
-          
-          def initialize(load_command, klass)
-            @load_command, @klass = load_command, klass
-            @columns = {}
-            @key = nil
-            @key_index = nil
-            @type_override_present = false
-            @type_override_index = nil
-            @type_override = nil
-            @session = load_command.session
-            @reload = load_command.reload?
-            @set = []
-          end
-          
-          def add_column(column, index)
-            if column.key?
-              @key = column 
-              @key_index = index
-            end
-            
-            if column.type == :class
-              @type_override_present = true
-              @type_override_index = index
-              @type_override = column
-            end
-            
-            @columns[index] = column
-          
-            self
-          end
-          
-          def materialize(values)
-
-            instance_id = @key.type_cast_value(values[@key_index])
-            instance = if @type_override_present
-              create_instance(instance_id, @type_override.type_cast_value(values[@type_override_index]))
-            else
-              create_instance(instance_id)
-            end
-              
-            @klass.callbacks.execute(:before_materialize, instance)
-            
-            original_hashes = instance.original_hashes
-            
-            @columns.each_pair do |index, column|
-              # This may be a little confusing, but we're
-              # setting both the original-hash value, and the
-              # instance-variable through method chaining to avoid
-              # lots of extra short-lived local variables.
-              original_hashes[column.name] = instance.instance_variable_set(
-                column.instance_variable_name,
-                column.type_cast_value(values[index])
-              ).hash
-            end
-            
-            instance.instance_variable_set(:@loaded_set, @set)
-            @set << instance
-            
-            @klass.callbacks.execute(:after_materialize, instance)
-            
-            return instance
-          end
-          
-          def loaded_set
-            @set
-          end
-          
-          private
-          
-            def create_instance(instance_id, instance_type = @klass)
-              instance = @session.identity_map.get(@klass, instance_id)
-
-              if instance.nil? || @reload
-                instance = instance_type.new() if instance.nil?
-                instance.instance_variable_set(:@__key, instance_id)
-                instance.instance_variable_set(:@new_record, false)
-                @session.identity_map.set(instance)
-              elsif instance.new_record?
-                instance.instance_variable_set(:@__key, instance_id)
-                instance.instance_variable_set(:@new_record, false)
-              end
-
-              instance.session = @session
-
-              return instance
-            end
-          
-        end
-        
-      end # module Commands
-    end # module Sql
-  end # module Adapters
-end # module DataMapper