datamapper 0.1.0 → 0.1.1

data/spec/save_command_spec.rb

@@ -0,0 +1,13 @@
+describe DataMapper::Adapters::Sql::Commands::SaveCommand do
+  
+  it "should create a new row" do
+    Zoo.create({ :name => 'bob' })
+  end
+  
+  it "should update an existing row" do
+    dallas = Zoo[:name => 'Dallas']
+    dallas.name = 'bob'
+    dallas.save
+  end
+  
+end

data/spec/spec_helper.rb

@@ -15,6 +15,14 @@ when 'sqlite3' then
     log_stream 'spec.log'
     log_level Logger::DEBUG
   end
+when 'postgresql' then
+  DataMapper::Database.setup do
+    adapter  'postgresql'
+    database 'data_mapper_1'
+    username 'postgres'
+    log_stream 'spec.log'
+    log_level Logger::DEBUG
+  end
 else
   DataMapper::Database.setup do
     adapter 'mysql'
@@ -48,6 +56,7 @@ def fixtures(name)
   entry = YAML::load_file(File.dirname(__FILE__) + "/fixtures/#{name}.yaml")
   klass = Kernel::const_get(Inflector.classify(Inflector.singularize(name)))
   
+  database.schema[klass].create!
   klass.truncate!
   
   (entry.kind_of?(Array) ? entry : [entry]).each do |hash|
@@ -58,4 +67,4 @@ end
 # Pre-fill the database so non-destructive tests don't need to reload fixtures.
 Dir[File.dirname(__FILE__) + "/fixtures/*.yaml"].each do |path|
   fixtures(File::basename(path).sub(/\.yaml$/, ''))
-end
+end

data/spec/support/string_spec.rb

@@ -0,0 +1,7 @@
+describe DataMapper::Support::String do
+  
+  it 'should underscore camel-cased words' do
+    String::memoized_underscore('DataMapper').should == 'data_mapper'
+  end
+  
+end

data/spec/validates_confirmation_of.rb

@@ -3,7 +3,7 @@ context 'A Cow' do
   setup do
     class Cow
 
-      include DataMapper::Extensions::ValidationHelper
+      include DataMapper::Validations::ValidationHelper
       
       attr_accessor :name, :name_confirmation, :age
     end

data/spec/validates_format_of.rb

@@ -3,7 +3,7 @@ context 'An Employee' do
   setup do
     class Employee
 
-      include DataMapper::Extensions::ValidationHelper
+      include DataMapper::Validations::ValidationHelper
       
       attr_accessor :email
     end

data/spec/validates_length_of.rb

@@ -3,7 +3,7 @@ context 'A Cow' do
   setup do
     class Cow
 
-      include DataMapper::Extensions::ValidationHelper
+      include DataMapper::Validations::ValidationHelper
       
       attr_accessor :name, :age
     end

data/spec/validations.rb

@@ -3,7 +3,7 @@ context 'Validations' do
   setup do
     class Cow
       
-      include DataMapper::Extensions::ValidationHelper
+      include DataMapper::Validations::ValidationHelper
       
       attr_accessor :name, :age
     end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: datamapper
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2007-06-09 00:00:00 -05:00
+  version: 0.1.1
+date: 2007-08-12 00:00:00 -05:00
 summary: An Object/Relational Mapper for Ruby
 require_paths: 
 - lib
@@ -42,39 +42,38 @@ files:
 - lib/data_mapper/callbacks.rb
 - lib/data_mapper/database.rb
 - lib/data_mapper/identity_map.rb
-- lib/data_mapper/loaded_set.rb
 - lib/data_mapper/session.rb
 - lib/data_mapper/unit_of_work.rb
 - lib/data_mapper/adapters/abstract_adapter.rb
 - lib/data_mapper/adapters/mysql_adapter.rb
+- lib/data_mapper/adapters/postgresql_adapter.rb
+- lib/data_mapper/adapters/sql_adapter.rb
 - lib/data_mapper/adapters/sqlite3_adapter.rb
+- lib/data_mapper/adapters/sql/coersion.rb
+- lib/data_mapper/adapters/sql/quoting.rb
+- lib/data_mapper/adapters/sql/commands/advanced_load_command.rb
+- lib/data_mapper/adapters/sql/commands/conditions.rb
+- lib/data_mapper/adapters/sql/commands/delete_command.rb
+- lib/data_mapper/adapters/sql/commands/load_command.rb
+- lib/data_mapper/adapters/sql/commands/save_command.rb
+- lib/data_mapper/adapters/sql/commands/table_exists_command.rb
+- lib/data_mapper/adapters/sql/mappings/column.rb
+- lib/data_mapper/adapters/sql/mappings/schema.rb
+- lib/data_mapper/adapters/sql/mappings/table.rb
+- lib/data_mapper/associations/advanced_has_many_association.rb
 - lib/data_mapper/associations/belongs_to_association.rb
 - lib/data_mapper/associations/has_and_belongs_to_many_association.rb
 - lib/data_mapper/associations/has_many_association.rb
 - lib/data_mapper/associations/has_one_association.rb
-- lib/data_mapper/extensions/active_record_impersonation.rb
-- lib/data_mapper/extensions/callback_helpers.rb
-- lib/data_mapper/mappings/column.rb
-- lib/data_mapper/mappings/schema.rb
-- lib/data_mapper/mappings/table.rb
-- lib/data_mapper/queries/conditions.rb
-- lib/data_mapper/queries/connection.rb
-- lib/data_mapper/queries/create_table_statement.rb
-- lib/data_mapper/queries/delete_statement.rb
-- lib/data_mapper/queries/drop_table_statement.rb
-- lib/data_mapper/queries/insert_statement.rb
-- lib/data_mapper/queries/reader.rb
-- lib/data_mapper/queries/result.rb
-- lib/data_mapper/queries/select_statement.rb
-- lib/data_mapper/queries/table_exists_statement.rb
-- lib/data_mapper/queries/truncate_table_statement.rb
-- lib/data_mapper/queries/update_statement.rb
+- lib/data_mapper/support/active_record_impersonation.rb
+- lib/data_mapper/support/blank.rb
 - lib/data_mapper/support/blank_slate.rb
 - lib/data_mapper/support/connection_pool.rb
 - lib/data_mapper/support/enumerable.rb
 - lib/data_mapper/support/inflector.rb
 - lib/data_mapper/support/proc.rb
 - lib/data_mapper/support/string.rb
+- lib/data_mapper/support/struct.rb
 - lib/data_mapper/support/symbol.rb
 - lib/data_mapper/support/weak_hash.rb
 - lib/data_mapper/validations/confirmation_validator.rb
@@ -89,10 +88,13 @@ files:
 - lib/data_mapper/validations/formats/email.rb
 - spec/basic_finder.rb
 - spec/belongs_to.rb
+- spec/delete_command_spec.rb
 - spec/has_and_belongs_to_many.rb
 - spec/has_many.rb
 - spec/legacy.rb
+- spec/load_command_spec.rb
 - spec/new_record.rb
+- spec/save_command_spec.rb
 - spec/spec_helper.rb
 - spec/sub_select.rb
 - spec/symbolic_operators.rb
@@ -108,6 +110,7 @@ files:
 - spec/models/post.rb
 - spec/models/sales_person.rb
 - spec/models/zoo.rb
+- spec/support/string_spec.rb
 - spec/fixtures/animals.yaml
 - spec/fixtures/exhibits.yaml
 - spec/fixtures/fruit.yaml

data/lib/data_mapper/extensions/callback_helpers.rb

@@ -1,35 +0,0 @@
-require 'data_mapper/callbacks'
-
-module DataMapper
-  module Extensions
-    
-    module CallbackHelpers
-    
-      def self.included(base)
-        base.extend(ClassMethods)
-        
-        # declare helpers for the standard callbacks
-        Callbacks::EVENTS.each do |name|
-          base.class_eval <<-EOS
-            def self.#{name}(string = nil, &block)
-              if string.nil?
-                callbacks.add(:#{name}, &block)
-              else
-                callbacks.add(:#{name}, string)
-              end
-            end
-          EOS
-        end
-      end
-      
-      module ClassMethods
-        
-        def callbacks
-          @callbacks ||= Callbacks.new
-        end
-      end
-      
-    end
-    
-  end
-end

data/lib/data_mapper/loaded_set.rb

@@ -1,45 +0,0 @@
-require 'data_mapper/support/enumerable'
-
-module DataMapper
-
-  # LoadedSet's purpose is to give a common reference for the results of a query,
-  # so that they can be manipulated by the DataMapper, behind-the-scenes, as a set.
-  class LoadedSet
-    
-    # Provides a reference to the database that originally loaded the instances.
-    attr_reader :database
-    # Provides an Enumerable of the instances loaded in the set.
-    attr_reader :instances
-    
-    def initialize(database)
-      @database = database
-      @instances = [] # ObjectIdCollection.new
-    end
-    
-    # Not sure if this is necessary yet...
-    # In other words: Does it make sense to allow portions of a set to be
-    # garbage-collected?
-    #
-    # If so, then this isn't good enough because it's likely to
-    # throw errors. If it's not, then letting Ruby itself track the
-    # references with a simple Array is probably more effecient.
-    class ObjectIdCollection
-      
-      include Enumerable
-      include Support::Enumerable
-      
-      def initialize
-        @object_ids = []
-      end
-      
-      def each
-        @object_ids.map { |id| yield ObjectSpace::_id2ref(id) }
-      end
-      
-      def <<(object)
-        @object_ids << object.object_id
-      end
-    end
-  end
-
-end

data/lib/data_mapper/mappings/column.rb

@@ -1,78 +0,0 @@
-module DataMapper
-  module Mappings
-    
-    # TODO: There are of course many more options to add here.
-    # Ordinal, Length/Size, Nullability are just a few.
-    class Column
-    
-      attr_accessor :name, :type, :options
-    
-      def initialize(database, name, type, options = {})
-        @database = database
-        @name, @type, @options = name.to_sym, type, options
-      end
-    
-      def lazy=(value)
-        @options[:lazy] = value
-      end
-    
-      # Determines if the field should be lazy loaded.
-      # You can set this explicitly, or accept the default,
-      # which is false for all but text fields.
-      def lazy?
-        @options[:lazy] || (type == :text)
-      end
-      
-      def nullable?
-        @options[:nullable] || true
-      end
-      
-      def key?
-        @options[:key] || false
-      end
-    
-      def to_sym
-        @name
-      end
-      
-      def instance_variable_name
-        @instance_variable_name || (@instance_variable_name = "@#{@name.to_s.gsub(/\?$/, '')}".freeze)
-      end
-      
-      def to_s
-        @name.to_s
-      end
-      
-      def type_cast_value(value)
-        @database.type_cast_value(type, value)
-      end
-      
-      def column_name
-        @column_name || (@column_name = (@options.has_key?(:column) ? @options[:column].to_s : name.to_s.gsub(/\?$/, '')).freeze)
-      end
-      
-      def to_sql
-        @to_sql || (@to_sql = @database.quote_column_name(column_name).freeze)
-      end
-      
-      def size
-        @size || begin
-          return @size = @options[:size] if @options.has_key?(:size)
-          return @size = @options[:length] if @options.has_key?(:length)
-          
-          @size = case type
-            when :integer then 4
-            when :string, :class then 50
-            else nil
-          end
-        end
-      end
-      
-      def inspect
-        "#<%s:0x%x @name=%s, @type=%s, @options=%s>" % [self.class.name, (object_id * 2), to_sql, type.inspect, options.inspect]
-      end
-      
-    end
-    
-  end
-end

data/lib/data_mapper/mappings/schema.rb

@@ -1,28 +0,0 @@
-require 'data_mapper/mappings/table'
-    
-module DataMapper
-  module Mappings
-    
-    class Schema
-    
-      def initialize(database)
-        @database = database
-        @tables = Hash.new { |h,k| h[k] = Table.new(@database, k) }
-      end
-    
-      def [](klass)
-        @tables[klass]
-      rescue
-        raise "#{klass.inspect} can't be mapped to a table"
-      end
-      
-      def each
-        @tables.values.each do |table|
-          yield table
-        end
-      end
-    
-    end
-    
-  end
-end

data/lib/data_mapper/mappings/table.rb

@@ -1,99 +0,0 @@
-require 'data_mapper/mappings/column'
-
-module DataMapper
-  module Mappings
-    
-    class Table
-      
-      attr_reader :klass
-      
-      def initialize(database, klass)
-        unless database.kind_of?(DataMapper::Database) && klass.kind_of?(Class)
-          raise "Database and klass are required: #{ { :database => database, :klass => klass }.inspect }"
-        end
-        
-        @database = database
-        @klass = klass
-        @columns = []
-        @columns_hash = Hash.new { |h,k| h[k] = @columns.find { |c| c.name == k } }
-        @columns_by_column_name = Hash.new { |h,k| h[k.to_s] = @columns.find { |c| c.column_name == k.to_s } }
-      end
-      
-      def columns
-        key if @key.nil?
-        @columns
-      end
-      
-      def key
-        if @key.nil?
-          key_column = @columns.find { |c| c.key? }
-          @key = if key_column.nil?
-            add_column(:id, :integer, :key => true)
-            @klass.send(:attr_reader, :id) unless @klass.methods.include?(:id)
-            @columns.last
-          else
-            key_column
-          end
-        end
-          
-        @key
-      end
-      
-      def add_column(column_name, type, options)
-        column = @columns.find { |c| c.name == column_name.to_sym }
-        
-        if column.nil?
-          reset_derived_columns!
-          column = Column.new(@database, column_name, type, options)
-          @columns << column
-        end
-        
-        return column
-      end
-      
-      def [](column_name)
-        return key if column_name == :id
-        @columns_hash[column_name.kind_of?(Symbol) ? column_name : column_name.to_sym]
-      end
-      
-      def find_by_column_name(column_name)
-        @columns_by_column_name[column_name.kind_of?(String) ? column_name : column_name.to_s]
-      end
-      
-      def name
-        @name || begin
-          @name = if @klass.superclass != DataMapper::Base
-            @database[@klass.superclass].name
-          else
-            Inflector.tableize(@klass.name)
-          end.freeze
-        end
-      end
-      
-      def name=(value)
-        @name = value
-      end
-      
-      def default_foreign_key
-        @default_foreign_key || (@default_foreign_key = "#{Inflector.underscore(Inflector.singularize(name))}_id".freeze)
-      end
-      
-      def to_sql
-        @to_sql || (@to_sql = @database.quote_table_name(name).freeze)
-      end
-      
-      def inspect
-        "#<%s:0x%x @klass=%s, @name=%s, @columns=%s>" % [self.class.name, (object_id * 2), @klass.name, to_sql, @columns.inspect]
-      end
-      
-      private
-      def reset_derived_columns!
-        @columns_hash.clear
-        @columns_by_column_name.clear
-        @key = nil
-      end
-      
-    end
-    
-  end  
-end