rails_dm_datastore 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/generators/{dm_model/dm_model_generator.rb → dd_model/dd_model_generator.rb}

@@ -2,7 +2,7 @@ require 'rails_generator/generators/components/model/model_generator'
 require 'active_record'
 require 'dm-core'
  
-class DmModelGenerator < ModelGenerator
+class DdModelGenerator < ModelGenerator
  
   def manifest
     record do |m|

data/lib/rails_dm_datastore.rb

@@ -4,7 +4,7 @@ require 'dm-ar-finders'
 require 'dm-timestamps'
 require 'dm-validations'
 DataMapper.setup(:default, "appengine://auto")
-
+#DataMapper.setup(:ephemeral, "in_memory::")
 module DataMapper
   module Resource
     # avoid object references in URLs
@@ -19,20 +19,43 @@ end
 # DataMapper::Validate
 class Dictionary; alias count length; end
  
+ 
+ #Override Extlib::Hook::ClassMethods.inline_call to check in the given weak reference
+
+module LocalObjectSpace
+  def self.extended(klass)
+    (class << klass; self;end).send :attr_accessor, :hook_scopes
+   
+    klass.hook_scopes = []
+  end
+  
+  def object_by_id(object_id)
+    self.hook_scopes.each do |object|
+      return object if object.object_id == object_id
+    end
+  end
+  
+end
+ 
 module Extlib
   module Hook
     module ClassMethods
+      
+      extend LocalObjectSpace
+        
+      #end
+      
       def inline_call(method_info, scope)
+        Extlib::Hook::ClassMethods.hook_scopes << method_info[:from]
         name = method_info[:name]
+        
         if scope == :instance
-          args = method_defined?(name) &&
-              instance_method(name).arity != 0 ? '*args' : ''
+          args = method_defined?(name) && instance_method(name).arity != 0 ? '*args' : ''
+          %(#{name}(#{args}) if self.class <= Extlib::Hook::ClassMethods.object_by_id(#{method_info[:from].object_id}))
         else
-          args = respond_to?(name) &&
-              method(name).arity != 0 ? '*args' : ''
+          args = respond_to?(name) && method(name).arity != 0 ? '*args' : ''
+          %(#{name}(#{args}) if self <= Extlib::Hook::ClassMethods.object_by_id(#{method_info[:from].object_id}))
         end
-        # ObjectSpace._id2ref should be replaced with WeakRef
-        %(#{name}(#{args})) # Always call hook... set_timestamps_on_save()
       end
     end
   end

data/rails_dm_datastore.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails_dm_datastore}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["joshsmoore"]
-  s.date = %q{2010-01-14}
+  s.date = %q{2010-01-25}
   s.description = %q{Integrate datamapper to Rails for the Google App Engine}
   s.email = %q{joshsmoore@gmail.com}
   s.extra_rdoc_files = [
@@ -24,18 +24,15 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "dm-rails-gae.gemspec",
-     "generators/dm_model/dm_model_generator.rb",
-     "generators/dm_model/templates/model.rb",
-     "generators/dm_model/templates/unit_test.rb",
-     "lib/USAGE",
-     "lib/generators/data_mapper/USAGE",
-     "lib/generators/data_mapper/model/model_generator.rb",
-     "lib/generators/data_mapper/model/templates/model.rb",
-     "lib/generators/data_mapper/templates/model.rb",
+     "generators/dd_model/USAGE",
+     "generators/dd_model/dd_model_generator.rb",
+     "generators/dd_model/templates/model.rb",
+     "generators/dd_model/templates/unit_test.rb",
      "lib/rails_dm_datastore.rb",
      "rails_dm_datastore.gemspec",
      "test/helper.rb",
-     "test/test_dm-rails-gae.rb"
+     "test/test_dm-rails-gae.rb",
+     "test/test_weak_reference.rb"
   ]
   s.homepage = %q{http://github.com/joshsmoore/dm-rails-gae}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -44,7 +41,8 @@ Gem::Specification.new do |s|
   s.summary = %q{Generators for dm on gae}
   s.test_files = [
     "test/helper.rb",
-     "test/test_dm-rails-gae.rb"
+     "test/test_dm-rails-gae.rb",
+     "test/test_weak_reference.rb"
   ]
 
   if s.respond_to? :specification_version then

data/test/test_weak_reference.rb

@@ -0,0 +1,83 @@
+module ActionView
+  module Partials
+   def render_partial
+    #so that we do not have to load action view but can still alias this method
+   end
+  end
+end
+
+
+require 'rubygems'
+require 'lib/rails_dm_datastore'
+require 'test/unit'
+
+class TestInlineCall
+  extend Extlib::Hook::ClassMethods
+end
+
+class Person
+  include DataMapper::Resource
+  
+  property :id, Serial
+  property :name, String
+  
+end
+
+class Child < Person
+  
+  property :grade, String
+end
+
+class TestWeakReference < Test::Unit::TestCase
+  
+  def setup
+    Extlib::Hook::ClassMethods.hook_scopes = []
+  end
+  
+  def teardown
+    Extlib::Hook::ClassMethods.hook_scopes = []
+  end
+  
+  def test_add_object_to_hooks_scope
+
+    scope_objects = [Person, Person.new]
+    scope_objects.each {|object| Extlib::Hook::ClassMethods.hook_scopes << object }
+
+    scope_objects.each {|object| assert Extlib::Hook::ClassMethods.hook_scopes.include? object}
+    assert_equal scope_objects.count, Extlib::Hook::ClassMethods.hook_scopes.count
+  end
+  
+  def test_inline_call
+    assert_nothing_raised do
+      eval TestInlineCall.inline_call({:from => Person, :name => 'person_class'},:instance)
+    end
+  end
+  
+  def test_find_object_by_id
+    objects = [Person, Person.new, Child, Child.new]
+    objects.each {|object| Extlib::Hook::ClassMethods.hook_scopes << object }
+    
+    assert_equal objects[0], Extlib::Hook::ClassMethods.object_by_id(objects[0].object_id)
+    assert_equal objects[1], Extlib::Hook::ClassMethods.object_by_id(objects[1].object_id)
+    assert_equal objects[3], Extlib::Hook::ClassMethods.object_by_id(objects[3].object_id)
+    assert_equal objects[2], Extlib::Hook::ClassMethods.object_by_id(objects[2].object_id)
+
+    assert_not_equal objects[2], Extlib::Hook::ClassMethods.object_by_id(objects[0].object_id)
+
+    
+  end
+  
+  def test_store_a_reference_for_ever_hooks_scope
+    assert_nothing_raised do
+      Extlib::Hook::ClassMethods.hook_scopes
+    end
+    #ExtLib::Hook::ClassMethods.responds_to? :hook_scopes
+  end
+  
+
+
+  #test "the model should respond with a list of subclasses" do
+    
+  #end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rails_dm_datastore
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - joshsmoore
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-14 00:00:00 +08:00
+date: 2010-01-25 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -99,18 +99,15 @@ files:
 - Rakefile
 - VERSION
 - dm-rails-gae.gemspec
-- generators/dm_model/dm_model_generator.rb
-- generators/dm_model/templates/model.rb
-- generators/dm_model/templates/unit_test.rb
-- lib/USAGE
-- lib/generators/data_mapper/USAGE
-- lib/generators/data_mapper/model/model_generator.rb
-- lib/generators/data_mapper/model/templates/model.rb
-- lib/generators/data_mapper/templates/model.rb
+- generators/dd_model/USAGE
+- generators/dd_model/dd_model_generator.rb
+- generators/dd_model/templates/model.rb
+- generators/dd_model/templates/unit_test.rb
 - lib/rails_dm_datastore.rb
 - rails_dm_datastore.gemspec
 - test/helper.rb
 - test/test_dm-rails-gae.rb
+- test/test_weak_reference.rb
 has_rdoc: true
 homepage: http://github.com/joshsmoore/dm-rails-gae
 licenses: []
@@ -142,3 +139,4 @@ summary: Generators for dm on gae
 test_files: 
 - test/helper.rb
 - test/test_dm-rails-gae.rb
+- test/test_weak_reference.rb

data/lib/generators/data_mapper/USAGE

@@ -1,8 +0,0 @@
-Description:
-    Explain the generator
-
-Example:
-    ./script/generate data_mapper Thing
-
-    This will create:
-        what/will/it/create

data/lib/generators/data_mapper/model/model_generator.rb

@@ -1,38 +0,0 @@
-#require 'data_mapper/data_mapper_generator'
-require 'rails/generators/named_base'
-
-module DataMapper
-  module Generators
-    class ModelGenerator < Rails::Generators::NamedBase #DataMapperGenerator
-      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
-
-      check_class_collision
-
-      #class_option :migration,  :type => :boolean
-      class_option :timestamps, :type => :boolean
-      #class_option :parent,     :type => :string, :desc => "The parent class for the generated model"
-
-      #def create_migration_file
-      #  return unless options[:migration] && options[:parent].nil?
-      #  migration_template "migration.rb", "db/migrate/create_#{table_name}.rb"
-      #end
-
-      def create_model_file
-        puts "I am creating a datamapper model"
-        template 'model.rb', File.join('app/models', class_path, "#{file_name}.rb")
-      end
-
-      #hook_for :test_framework
-
-      #protected
-
-        #def parent_class_name
-        #  options[:parent] || "ActiveRecord::Base"
-        #end
-        def self.source_root
-          puts File.expand_path('../templates', __FILE__)
-          @source_root ||= File.expand_path('../templates', __FILE__)
-        end
-    end
-  end
-end

data/lib/generators/data_mapper/model/templates/model.rb

@@ -1,8 +0,0 @@
-class <%= class_name %>
-  include DataMapper::Resource
-  
-  property :id, Serial
-<% for attribute in attributes -%>
-  property :<%= attribute.name %>, <%= attribute.type %>
-<% end -%>
-end

data/lib/generators/data_mapper/templates/model.rb

@@ -1,8 +0,0 @@
-class <%= class_name %>
-  include DataMapper::Resource
-  
-  property :id, Serial
-<% for attribute in attributes -%>
-  property :<%= attribute.name %>, <%= attribute.type %>
-<% end -%>
-end