@@ -3,16 +3,19 @@ $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__)) require 'set' require 'fileutils' -begin - require 'extlib' -rescue LoadError => e - raise e, "Extlib is missing. See http://github.com/sam/extlib/" -end -begin - require 'tokyocabinet-wrapper' -rescue LoadError => e - raise e, "Tokyocabinet wrapper is missing. See http://github.com/oleganza/tokyocabinet-wrapper/" + +def git_require(name, url) + begin + require name + rescue LoadError => e + raise e, "#{name} is missing. See #{url}" + end end + +git_require 'extlib', 'http://github.com/sam/extlib/' +git_require 'tokyocabinet-wrapper', 'http://github.com/oleganza/tokyocabinet-wrapper/' +git_require 'declarations', 'http://github.com/oleganza/declarations/' + require 'strokedb/version' require 'strokedb/constants' require 'strokedb/util' lib/strokedb.rb @@ -1,7 +1,7 @@ module StrokeDB module Associations module Base - include StrokeDB::Declarations + include Declarations def register_association(association) local_declarations(:associations, []) do |list| @@ -17,6 +17,11 @@ module StrokeDB end end end + + # Returns association object for a given slotname. + def association(slotname) + associations.detect{|a| a.slotname = slotname } + end end # Base end # Associations lib/strokedb/associations/base.rb @@ -18,7 +18,7 @@ module StrokeDB end class Association - attr_accessor :slotname + attr_accessor :slotname, :options def initialize(options) @options = OptionsHash(options) @@ -27,17 +27,30 @@ module StrokeDB def setup(mod) slotname = @slotname + mod.extend StrokeObjects::SlotHooks mod.send(:define_method, slotname) do self[slotname] end mod.send(:define_method, slotname.to_s + "=") do |value| self[slotname] = value end + mod.slot_hook(slotname, AssociationSlotHook) + end - # self.on_get_slot(slotname, ) - # on slot access -> create proxy + module AssociationSlotHook + def get(doc, slotname) + ivar = "@#{slotname}" + proxy = doc.instance_variable_get(ivar) + proxy and return proxy + assoc = doc.class.association(slotname) + proxy = CollectionProxy.new(assoc) + doc.instance_variable_set(ivar, proxy) + end + def set(doc, slotname, value) + + end end - + class CollectionProxy def initialize(document) lib/strokedb/associations/has_many.rb @@ -1,6 +1,6 @@ module StrokeDB module NSURL - include StrokeDB::Declarations + include Declarations NO_NSURL = Object.new.freeze lib/strokedb/document/nsurl.rb @@ -1,7 +1,7 @@ module StrokeDB module StrokeObjects module SlotHooks - include StrokeDB::Declarations + include Declarations # Sets inheritable get/set hooks on a slot. # # Example: lib/strokedb/stroke_objects/slot_hooks.rb @@ -1,12 +1,10 @@ require 'time' -require 'strokedb/util/absolutely_all_ancestors' require 'strokedb/util/options_hash' require 'strokedb/util/uuid' require 'strokedb/util/class_factory' require 'strokedb/util/require_one_of' require 'strokedb/util/verify' require 'strokedb/util/pluggable_module' -require 'strokedb/util/declarations' require 'strokedb/util/lazy_mapping_array' require 'strokedb/util/lazy_mapping_hash' lib/strokedb/util.rb @@ -1,7 +1,7 @@ module StrokeDB module Validations module Base - include StrokeDB::Declarations + include Declarations def register_validation(validation) local_declarations(:validations, []) do |list| lib/strokedb/validations/base.rb @@ -1 +1,16 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper')) + +describe "has_many :as" do + + before(:each) do + @person_mod = Module.new do + extend Associations::HasMany + has_many :owned_accounts, :as => :owner, :kind_of => [] + end + end + + it "should description" do + + end + +end spec/lib/associations/has_many_spec.rb lib/strokedb/util/absolutely_all_ancestors.rb lib/strokedb/util/declarations.rb spec/lib/util/absolutely_all_ancestors_spec.rb spec/lib/util/declarations_spec.rb 2fe29139ac7cb4221ffa1bb18fb57bc5eb7fcb8c Oleg Andreev oleganza@gmail.com http://github.com/oleganza/strokedb-core/commit/f1feb063b66f5b48e7ae2697a3b598592fc37708 f1feb063b66f5b48e7ae2697a3b598592fc37708 2008-09-06T11:34:07-07:00 2008-09-06T11:34:07-07:00 extracted declarations, fixed has_many 2a822f6f394da197c3992cbc0c7713c03d4892c1 Oleg Andreev oleganza@gmail.com