sam-dm-core 0.9.6 → 0.9.7

data/Manifest.txt

@@ -1,4 +1,5 @@
 .autotest
+.gitignore
 CONTRIBUTING
 FAQ
 History.txt
@@ -9,10 +10,12 @@ README.txt
 Rakefile
 SPECS
 TODO
+dm-core.gemspec
 lib/dm-core.rb
 lib/dm-core/adapters.rb
 lib/dm-core/adapters/abstract_adapter.rb
 lib/dm-core/adapters/data_objects_adapter.rb
+lib/dm-core/adapters/in_memory_adapter.rb
 lib/dm-core/adapters/mysql_adapter.rb
 lib/dm-core/adapters/postgres_adapter.rb
 lib/dm-core/adapters/sqlite3_adapter.rb
@@ -86,6 +89,7 @@ spec/lib/logging_helper.rb
 spec/lib/mock_adapter.rb
 spec/lib/model_loader.rb
 spec/lib/publicize_methods.rb
+spec/models/content.rb
 spec/models/vehicles.rb
 spec/models/zoo.rb
 spec/spec.opts
@@ -93,6 +97,7 @@ spec/spec_helper.rb
 spec/unit/adapters/abstract_adapter_spec.rb
 spec/unit/adapters/adapter_shared_spec.rb
 spec/unit/adapters/data_objects_adapter_spec.rb
+spec/unit/adapters/in_memory_adapter_spec.rb
 spec/unit/adapters/postgres_adapter_spec.rb
 spec/unit/associations/many_to_many_spec.rb
 spec/unit/associations/many_to_one_spec.rb

data/QUICKLINKS

@@ -1,7 +1,7 @@
 = Quick Links
 
 * Setup and Configuration - DataMapper
-* Finders and CRUD - 
+* Finders and CRUD -
 * Properties - DataMapper::Property
 * FAQ[link:/files/FAQ.html]
 * Contact Us
@@ -9,4 +9,3 @@
   * Bug Reports - http://wm.lighthouseapp.com/projects/4819-datamapper/overview
   * IRC Channel - <tt>##datamapper</tt> on irc.freenode.net
   * Mailing List - http://groups.google.com/group/datamapper/
-

data/Rakefile

@@ -13,9 +13,9 @@ AUTHOR = "Sam Smoot"
 EMAIL  = "ssmoot@gmail.com"
 GEM_NAME = "dm-core"
 GEM_VERSION = DataMapper::VERSION
-GEM_DEPENDENCIES = ["data_objects", ">=0.9.5"], ["extlib", ">=0.9.5"],
-                   ["rspec", ">=1.1.3"], ["addressable", ">=1.0.4"]
-
+GEM_DEPENDENCIES = ["data_objects", "~>0.9.9"],
+                   ["extlib", "~>0.9.9"],
+                   ["addressable", "~>2.0.1"]
 
 PROJECT_NAME = "datamapper"
 PROJECT_DESCRIPTION = "Faster, Better, Simpler."

data/SPECS

@@ -2,14 +2,14 @@ Reading Specs
 =============
 
   Blah blah blah...
-  
+
 Writing Specs
 =============
 
   Here are some general dos and don'ts
-  
+
   = DO:
-  
+
   * Write more specs for error conditions than clean conditions.
   * Write specs with readability in mind. Somebody knew to DataMapper should be
     able to read specs to learn how something works.
@@ -18,14 +18,14 @@ Writing Specs
   * Limit a describe block to 10 - 15 examples.
   * Group specs by method being tested. (See the 'Ordering Specs' section)
   * Use custom matchers.
-  
+
   = DON'T:
-  
+
   * Spec more than one unit of functionality in an example. An example should be
     as short as possible (while still remaining readable).
   * Spec implementation. Refactoring code should not break specs.
   * Declare models in the spec file.
-  
+
   And a final do: Do go against the guidelines if your best judgement tells you
   to. These are just guidelines and are obviously not fast rules.
 
@@ -39,7 +39,7 @@ Models
   few simple metaphors, such as a zoo, a blog implementation, etc... Following
   metaphors makes it easier for a reader to guess what is going on with respect
   to the models.
-  
+
   The second reason is to allow the spec environment to be as pristine as
   possible going into an example. Models being loaded from the model directory
   are tracked and reloaded before each example. Any changes that might be made
@@ -51,13 +51,12 @@ Mocks and Stubs
   Obviously, mocks and stubs are a powerful feature when it comes to BDD;
   however, remember that you are writing specs for behavior and NOT
   implementation.
-  
+
 Ordering Specs
 ==============
 
   Specs aren't much use if nobody can find where anything is, so keeping specs
   well organized is critical. Currently, we are trying out the following
   structure:
-  
+
     * List guidelines here...
-  

data/lib/dm-core.rb

@@ -11,22 +11,22 @@
 
 require 'date'
 require 'pathname'
+require 'rubygems'
 require 'set'
 require 'time'
 require 'yaml'
 
-require 'rubygems'
-
-gem 'addressable', '>=1.0.4'
+gem 'addressable', '~>2.0.1'
 require 'addressable/uri'
 
-gem 'extlib', '>=0.9.5'
+gem 'extlib', '~>0.9.9'
 require 'extlib'
-require "extlib/inflection"
+require 'extlib/inflection'
 
 begin
+  gem 'fastthread', '~>1.0.1'
   require 'fastthread'
-rescue LoadError
+rescue Gem::LoadError
   # fastthread not installed
 end
 
@@ -133,8 +133,8 @@ module DataMapper
     case uri_or_options
       when Hash
         adapter_name = uri_or_options[:adapter].to_s
-      when String, Addressable::URI
-        uri_or_options = Addressable::URI.parse(uri_or_options) if uri_or_options.kind_of?(String)
+      when String, DataObjects::URI, Addressable::URI
+        uri_or_options = DataObjects::URI.parse(uri_or_options) if uri_or_options.kind_of?(String)
         adapter_name = uri_or_options.scheme
     end
 
@@ -169,26 +169,19 @@ module DataMapper
   # @param [Symbol] args the name of a repository to act within or return, :default is default
   # @yield [Proc] (optional) block to execute within the context of the named repository
   # @demo spec/integration/repository_spec.rb
-  def self.repository(*args, &block) # :yields: current_context
-    if args.size > 1
-      raise ArgumentError, "Can only pass in one optional argument, but passed in #{args.size} arguments", caller
-    end
-
-    if args.any? && !args.first.kind_of?(Symbol)
-      raise ArgumentError, "First optional argument must be a Symbol, but was #{args.first.inspect}", caller
-    end
-
-    name = args.first
-
+  def self.repository(name = nil) # :yields: current_context
     current_repository = if name
+      raise ArgumentError, "First optional argument must be a Symbol, but was #{args.first.inspect}" unless name.is_a?(Symbol)
       Repository.context.detect { |r| r.name == name } || Repository.new(name)
     else
       Repository.context.last || Repository.new(Repository.default_name)
     end
 
-    return current_repository unless block_given?
-
-    current_repository.scope(&block)
+    if block_given?
+      current_repository.scope { |*block_args| yield(*block_args) }
+    else
+      current_repository
+    end
   end
 
   # A logger should always be present. Lets be consistent with DO

data/lib/dm-core/adapters.rb

@@ -1,4 +1,22 @@
 dir = Pathname(__FILE__).dirname.expand_path / 'adapters'
 
 require dir / 'abstract_adapter'
+require dir / 'in_memory_adapter'
+
+# TODO Factor these out into dm-more
 require dir / 'data_objects_adapter'
+begin
+  require dir / 'sqlite3_adapter'
+rescue LoadError
+  # ignore it
+end
+begin
+  require dir / 'mysql_adapter'
+rescue LoadError
+  # ignore it
+end
+begin
+  require dir / 'postgres_adapter'
+rescue LoadError
+  # ignore it
+end

data/lib/dm-core/adapters/abstract_adapter.rb

@@ -38,7 +38,7 @@ module DataMapper
       # connection string for configuration.
       def initialize(name, uri_or_options)
         assert_kind_of 'name',           name,           Symbol
-        assert_kind_of 'uri_or_options', uri_or_options, Addressable::URI, Hash, String
+        assert_kind_of 'uri_or_options', uri_or_options, Addressable::URI, DataObjects::URI, Hash, String
 
         @name = name
         @uri  = normalize_uri(uri_or_options)
@@ -46,12 +46,7 @@ module DataMapper
         @resource_naming_convention = NamingConventions::Resource::UnderscoredAndPluralized
         @field_naming_convention    = NamingConventions::Field::Underscored
 
-        @transactions = Hash.new do |hash, key|
-          hash.delete_if do |k, v|
-            !k.respond_to?(:alive?) || !k.alive?
-          end
-          hash[key] = []
-        end
+        @transactions = {}
       end
 
       # TODO: move to dm-more/dm-migrations
@@ -144,7 +139,7 @@ module DataMapper
         #
         # TODO: move to dm-more/dm-transaction
         def push_transaction(transaction)
-          @transactions[Thread.current] << transaction
+          transactions(Thread.current) << transaction
         end
 
         #
@@ -156,7 +151,7 @@ module DataMapper
         #
         # TODO: move to dm-more/dm-transaction
         def pop_transaction
-          @transactions[Thread.current].pop
+          transactions(Thread.current).pop
         end
 
         #
@@ -169,7 +164,7 @@ module DataMapper
         #
         # TODO: move to dm-more/dm-transaction
         def current_transaction
-          @transactions[Thread.current].last
+          transactions(Thread.current).last
         end
 
         #
@@ -194,6 +189,18 @@ module DataMapper
         def transaction_primitive
           raise NotImplementedError
         end
+
+        private
+        def transactions(thread)
+          unless @transactions[thread]
+            @transactions.delete_if do |key, value|
+              !key.respond_to?(:alive?) || !key.alive?
+            end
+            @transactions[thread] = []
+          end
+          @transactions[thread]
+        end
+
       end
 
       include Transaction

data/lib/dm-core/adapters/data_objects_adapter.rb

@@ -1,4 +1,4 @@
-gem 'data_objects', '>=0.9.5'
+gem 'data_objects', '~>0.9.9'
 require 'data_objects'
 
 module DataMapper
@@ -117,24 +117,26 @@ module DataMapper
       protected
 
       def normalize_uri(uri_or_options)
-        if uri_or_options.kind_of?(String)
-          uri_or_options = Addressable::URI.parse(uri_or_options)
+        if uri_or_options.kind_of?(String) || uri_or_options.kind_of?(Addressable::URI)
+          uri_or_options = DataObjects::URI.parse(uri_or_options)
         end
 
-        if uri_or_options.kind_of?(Addressable::URI)
-          return uri_or_options.normalize
+        if uri_or_options.kind_of?(DataObjects::URI)
+          return uri_or_options
         end
 
-        adapter  = uri_or_options.delete(:adapter).to_s
-        user     = uri_or_options.delete(:username)
-        password = uri_or_options.delete(:password)
-        host     = uri_or_options.delete(:host)
-        port     = uri_or_options.delete(:port)
-        database = uri_or_options.delete(:database)
-        query    = uri_or_options.to_a.map { |pair| pair * '=' } * '&'
-        query    = nil if query == ''
+        query = uri_or_options.except(:adapter, :username, :password, :host, :port, :database).map { |pair| pair.join('=') }.join('&')
+        query = nil if query.blank?
 
-        return Addressable::URI.new(adapter, user, password, host, port, database, query, nil)
+        return DataObjects::URI.parse(Addressable::URI.new(
+          :scheme   => uri_or_options[:adapter].to_s,
+          :user     => uri_or_options[:username],
+          :password => uri_or_options[:password],
+          :host     => uri_or_options[:host],
+          :port     => uri_or_options[:port],
+          :path     => uri_or_options[:database],
+          :query    => query
+        ))
       end
 
       # TODO: clean up once transaction related methods move to dm-more/dm-transactions
@@ -164,7 +166,7 @@ module DataMapper
         end
       end
 
-      def with_connection(&block)
+      def with_connection
         connection = nil
         begin
           connection = create_connection
@@ -177,7 +179,7 @@ module DataMapper
         end
       end
 
-      def with_reader(statement, bind_values = [], &block)
+      def with_reader(statement, bind_values = [])
         with_connection do |connection|
           reader = nil
           begin

data/lib/dm-core/adapters/mysql_adapter.rb

@@ -1,4 +1,4 @@
-gem 'do_mysql', '>=0.9.5'
+gem 'do_mysql', '~>0.9.9'
 require 'do_mysql'
 
 module DataMapper

data/lib/dm-core/adapters/postgres_adapter.rb

@@ -1,4 +1,4 @@
-gem 'do_postgres', '>=0.9.5'
+gem 'do_postgres', '~>0.9.9'
 require 'do_postgres'
 
 module DataMapper
@@ -86,7 +86,7 @@ module DataMapper
           end
 
           # TODO: move to dm-more/dm-migrations
-          def without_notices(&block)
+          def without_notices
             # execute the block with NOTICE messages disabled
             begin
               execute('SET client_min_messages = warning')

data/lib/dm-core/adapters/sqlite3_adapter.rb

@@ -1,4 +1,4 @@
-gem 'do_sqlite3', '>=0.9.5'
+gem 'do_sqlite3', '~>0.9.9'
 require 'do_sqlite3'
 
 module DataMapper

data/lib/dm-core/associations.rb

@@ -45,8 +45,8 @@ module DataMapper
     end
 
     def relationships(repository_name = default_repository_name)
-      @relationships ||= Hash.new { |h,k| h[k] = k == Repository.default_name ? {} : h[Repository.default_name].dup }
-      @relationships[repository_name]
+      @relationships ||= {}
+      @relationships[repository_name] ||= repository_name == Repository.default_name ? {} : relationships(Repository.default_name).dup
     end
 
     def n
@@ -145,6 +145,7 @@ module DataMapper
     #
     # @api public
     def belongs_to(name, options={})
+      @_valid_relations = false
       relationship = ManyToOne.setup(name, self, options)
       # Please leave this in - I will release contextual serialization soon
       # which requires this -- guyvdb

data/lib/dm-core/associations/many_to_many.rb

@@ -48,7 +48,7 @@ module DataMapper
         opts[:mutable]                  =   true
 
         names        = [ opts[:child_model], opts[:parent_model].name ].sort
-        model_name   = names.join
+        model_name   = names.join.gsub("::", "")
         storage_name = Extlib::Inflection.tableize(Extlib::Inflection.pluralize(names[0]) + names[1])
 
         opts[:near_relationship_name] = Extlib::Inflection.tableize(model_name).to_sym
@@ -67,7 +67,7 @@ module DataMapper
           EOS
 
           names.each do |n|
-            model.belongs_to(Extlib::Inflection.underscore(n).to_sym)
+            model.belongs_to(Extlib::Inflection.underscore(n).gsub("/", "_").to_sym, :class_name => n)
           end
 
           Object.const_set(model_name, model)

data/lib/dm-core/associations/many_to_one.rb

@@ -48,7 +48,7 @@ module DataMapper
       class Proxy
         include Assertions
 
-        instance_methods.each { |m| undef_method m unless %w[ __id__ __send__ class kind_of? respond_to? assert_kind_of should should_not instance_variable_set instance_variable_get ].include?(m) }
+        instance_methods.each { |m| undef_method m unless %w[ __id__ __send__ kind_of? respond_to? assert_kind_of should should_not instance_variable_set instance_variable_get ].include?(m.to_s) }
 
         def replace(parent)
           @parent = parent

data/lib/dm-core/associations/one_to_many.rb

@@ -72,7 +72,7 @@ module DataMapper
       class Proxy
         include Assertions
 
-        instance_methods.each { |m| undef_method m unless %w[ __id__ __send__ class kind_of? respond_to? assert_kind_of should should_not instance_variable_set instance_variable_get ].include?(m) }
+        instance_methods.each { |m| undef_method m unless %w[ __id__ __send__ class kind_of? respond_to? assert_kind_of should should_not instance_variable_set instance_variable_get ].include?(m.to_s) }
 
         # FIXME: remove when RelationshipChain#get_children can return a Collection
         def all(query = {})
@@ -132,7 +132,7 @@ module DataMapper
           orphan_resource(super)
         end
 
-        def delete(resource, &block)
+        def delete(resource)
           assert_mutable
           orphan_resource(super)
         end
@@ -156,6 +156,15 @@ module DataMapper
           resource
         end
 
+        def new(attributes = {})
+          assert_mutable
+          raise UnsavedParentError, 'You cannot intialize until the parent is saved' if @parent.new_record?
+          attributes = default_attributes.merge(attributes)
+          resource = children.respond_to?(:new) ? super(attributes) : @relationship.child_model.new(attributes)
+          self << resource
+          resource
+        end
+
         def create(attributes = {})
           assert_mutable
           raise UnsavedParentError, 'You cannot create until the parent is saved' if @parent.new_record?
@@ -297,11 +306,8 @@ module DataMapper
         end
 
         def method_missing(method, *args, &block)
-          results = children.__send__(method, *args, &block) if children.respond_to?(method)
-
-          return self if LazyArray::RETURN_SELF.include?(method) && results.kind_of?(Array)
-
-          results
+          results = children.send(method, *args, &block)
+          results.equal?(children) ? self : results
         end
       end # class Proxy
     end # module OneToMany