dm-ambition 1.0.0.rc2 → 1.0.0.rc3

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Dan Kubb
+Copyright (c) 2010 Dan Kubb
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -96,7 +96,7 @@ With git and local working copy:
 
 == License
 
-Copyright (c) 2009 Dan Kubb
+Copyright (c) 2010 Dan Kubb
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -17,13 +17,15 @@ begin
 
     gem.version = DataMapper::Ambition::VERSION
 
+    gem.required_ruby_version = '~> 1.8.6'
+
     gem.rubyforge_project = 'dm-ambition'
 
-    gem.add_dependency 'dm-core',   '~> 1.0.0.rc2'
-    gem.add_dependency 'ParseTree', '~> 3.0.4'
+    gem.add_dependency 'dm-core',   '~> 1.0.0.rc3'
+    gem.add_dependency 'ParseTree', '~> 3.0.5'
     gem.add_dependency 'ruby2ruby', '~> 1.2.4'
 
-    gem.add_development_dependency 'dm-migrations', '~> 1.0.0.rc2'
+    gem.add_development_dependency 'dm-migrations', '~> 1.0.0.rc3'
     gem.add_development_dependency 'rspec',         '~> 1.3'
   end
 

data/dm-ambition.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-ambition}
-  s.version = "1.0.0.rc2"
+  s.version = "1.0.0.rc3"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Kubb"]
-  s.date = %q{2010-05-19}
+  s.date = %q{2010-05-28}
   s.description = %q{DataMapper plugin providing an Ambition-like API}
   s.email = %q{dan.kubb@gmail.com}
   s.extra_rdoc_files = [
@@ -50,6 +50,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/dkubb/dm-ambition}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
+  s.required_ruby_version = Gem::Requirement.new("~> 1.8.6")
   s.rubyforge_project = %q{dm-ambition}
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{DataMapper plugin providing an Ambition-like API}
@@ -66,23 +67,23 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.0.rc2"])
-      s.add_runtime_dependency(%q<ParseTree>, ["~> 3.0.4"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.0.rc3"])
+      s.add_runtime_dependency(%q<ParseTree>, ["~> 3.0.5"])
       s.add_runtime_dependency(%q<ruby2ruby>, ["~> 1.2.4"])
-      s.add_development_dependency(%q<dm-migrations>, ["~> 1.0.0.rc2"])
+      s.add_development_dependency(%q<dm-migrations>, ["~> 1.0.0.rc3"])
       s.add_development_dependency(%q<rspec>, ["~> 1.3"])
     else
-      s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc2"])
-      s.add_dependency(%q<ParseTree>, ["~> 3.0.4"])
+      s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc3"])
+      s.add_dependency(%q<ParseTree>, ["~> 3.0.5"])
       s.add_dependency(%q<ruby2ruby>, ["~> 1.2.4"])
-      s.add_dependency(%q<dm-migrations>, ["~> 1.0.0.rc2"])
+      s.add_dependency(%q<dm-migrations>, ["~> 1.0.0.rc3"])
       s.add_dependency(%q<rspec>, ["~> 1.3"])
     end
   else
-    s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc2"])
-    s.add_dependency(%q<ParseTree>, ["~> 3.0.4"])
+    s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc3"])
+    s.add_dependency(%q<ParseTree>, ["~> 3.0.5"])
     s.add_dependency(%q<ruby2ruby>, ["~> 1.2.4"])
-    s.add_dependency(%q<dm-migrations>, ["~> 1.0.0.rc2"])
+    s.add_dependency(%q<dm-migrations>, ["~> 1.0.0.rc3"])
     s.add_dependency(%q<rspec>, ["~> 1.3"])
   end
 end

data/lib/dm-ambition/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module Ambition
-    VERSION = '1.0.0.rc2'
+    VERSION = '1.0.0.rc3'
   end
 end

data/lib/dm-ambition.rb

@@ -1,50 +1,10 @@
-require 'pathname'
-
-dir = Pathname(__FILE__).dirname.expand_path + 'dm-ambition'
-
-require dir / 'collection'
-require dir / 'model'
-require dir / 'query'
-require dir / 'version'
+require 'dm-ambition/collection'
+require 'dm-ambition/model'
+require 'dm-ambition/query'
+require 'dm-ambition/version'
 
 module DataMapper
-  class Collection
-    include Ambition::Collection
-  end
-
-  module Model
-    include Ambition::Model
-  end
-
-  class Query
-    include Ambition::Query
-  end
-
-  if Gem::Version.new(DataMapper::VERSION) < Gem::Version.new('0.10')
-    module Model
-      def self.descendants
-        Resource.descendants
-      end
-    end
-
-    class Collection
-      def new_collection(query, resources = nil, &block)
-        collection = self.class.new(query, &block)
-
-        if resources
-          collection.replace(resources)
-        end
-
-        collection
-      end
-    end
-
-    module Resource
-      def saved?
-        !new_record?
-      end
-
-      alias new? new_record?
-    end
+  %w[ Collection Model Query ].each do |mod|
+    const_get(mod).class_eval { include Ambition.const_get(mod) }
   end
 end

data/spec/public/collection_spec.rb

@@ -3,7 +3,9 @@ require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
 
 [ false, true ].each do |loaded|
   describe DataMapper::Ambition::Collection do
-    cattr_accessor :loaded
+    class << self
+      attr_accessor :loaded
+    end
 
     self.loaded = loaded
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: dm-ambition
 version: !ruby/object:Gem::Version 
-  hash: 977940575
+  hash: 977940572
   prerelease: true
   segments: 
   - 1
   - 0
   - 0
-  - rc2
-  version: 1.0.0.rc2
+  - rc3
+  version: 1.0.0.rc3
 platform: ruby
 authors: 
 - Dan Kubb
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-19 00:00:00 -07:00
+date: 2010-05-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,13 +27,13 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 977940575
+        hash: 977940572
         segments: 
         - 1
         - 0
         - 0
-        - rc2
-        version: 1.0.0.rc2
+        - rc3
+        version: 1.0.0.rc3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -44,12 +44,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 13
         segments: 
         - 3
         - 0
-        - 4
-        version: 3.0.4
+        - 5
+        version: 3.0.5
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -76,13 +76,13 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 977940575
+        hash: 977940572
         segments: 
         - 1
         - 0
         - 0
-        - rc2
-        version: 1.0.0.rc2
+        - rc3
+        version: 1.0.0.rc3
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -151,12 +151,14 @@ require_paths:
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ~>
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 59
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 8
+      - 6
+      version: 1.8.6
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: