peace_love 0.1.3 → 0.2.1

data/Gemfile

@@ -1,6 +1,6 @@
 source :rubygems 
 
-gem 'angry_hash', '~>0.1.1'
+gem 'angry_hash', '~>0.2.0'
 gem 'mongo'
 gem 'bson_ext'
 

data/Gemfile.lock

@@ -0,0 +1,18 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    angry_hash (0.2.2)
+    bson (1.0.9)
+    bson_ext (1.0.9)
+    exemplor (3000.3.0)
+    mongo (1.0.9)
+      bson (>= 1.0.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  angry_hash (~> 0.2.0)
+  bson_ext
+  exemplor
+  mongo

data/Rakefile

@@ -10,8 +10,8 @@ begin
 
     gemspec.test_files = []
 
-    gemspec.add_dependency("mongo", ['~>1.0.0'])
-    gemspec.add_dependency("angry_hash", ['~>0.1.0'])
+    gemspec.add_dependency("mongo", ['~>1.1.0'])
+    gemspec.add_dependency("angry_hash", ['~>0.3.2'])
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: gem install jeweler"

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.1

data/examples/eg.helper.rb

@@ -6,7 +6,8 @@ require 'exemplor'
 require 'pp'
 
 require 'pathname'
-here = Pathname(__FILE__).dirname
+
+here = Pathname('..').expand_path(__FILE__)
 $LOAD_PATH << here << (here+'../lib')
 
 class Object
@@ -28,4 +29,5 @@ class BSON::ObjectID
   end
 end
 
-$db = Mongo::Connection.new.db('sample-db')
+$mongo = Mongo::Connection.new
+$db    = $mongo.db('sample-db')

data/examples/usage.eg.rb

@@ -9,7 +9,8 @@ require 'peace_love'
 
 # Note that `PeaceLove.db` needs to be set before `mongo_collection` is called.
 # This will be fixed in the future.
-PeaceLove.db = $db
+PeaceLove.mongo = $mongo
+PeaceLove.default_db = $db
 
 module Kind
   include PeaceLove::Doc
@@ -28,7 +29,7 @@ module Bean
   sub_col :examples, Bean
   sub_hash :examples_hash, Bean
 
-  mongo_collection 'beans'
+  mongo :collection => 'beans'
 
   defaults :ham => {:sandwich => 'golly yes!'}
 
@@ -40,7 +41,7 @@ eg.setup do
   @mongo_beans = $db['beans']
   @mongo_beans.remove()
 
-  @peace_love_beans = PeaceLove['beans']
+  @peace_love_beans = PeaceLove[]['beans']
 end
 
 eg.helpers do

data/lib/peace_love/collection.rb

@@ -1,18 +1,11 @@
 module PeaceLove
   class Collection
-    attr_reader :mongo_collection
+    attr_reader :mongo_collection, :mixin
 
-    def initialize(collection)
+    def initialize(collection, mixin)
       @collection = @mongo_collection = collection
-    end
-
-    def mixin=(mixin)
-      mixin.collection = @mongo_collection.name
-    end
-    def set_mixin(mixin)
       @mixin = mixin
     end
-    attr_reader :mixin
 
     def build(seed={})
       __wrap( seed )
@@ -38,9 +31,7 @@ module PeaceLove
 
     def __wrap(hash)
       return nil unless hash.respond_to?(:to_hash)
-
-      hash = __extend( AngryHash[ hash ] )
-      hash
+      __extend( AngryHash[ hash ] )
     end
 
     def __extend(doc)
@@ -57,5 +48,4 @@ module PeaceLove
       class_eval "def #{name}(*args,&block); @collection.#{name}(*args,&block) end" unless method_defined?(name)
     end
   end
-
 end

data/lib/peace_love/db.rb

@@ -0,0 +1,18 @@
+module PeaceLove
+  class Db
+    attr_reader :db,:mixins
+
+    def initialize(db,mixins)
+      @db = db || raise("#{self} requires a non-nil db")
+      @mixins = mixins
+    end
+
+    def collections
+      @collections ||= {}
+    end
+
+    def [](collection_name)
+      collections[collection_name] ||= PeaceLove::Collection.new( db[collection_name], mixins[collection_name] )
+    end
+  end
+end

data/lib/peace_love/document.rb

@@ -1,174 +1,46 @@
+require 'angry_hash/extension'
 
 module PeaceLove
   module Doc
-    class << self
-      def included(base)
-        base.extend ClassMethods
-
-        base.module_eval do
-          def self.extend_object(obj)
-            super
-            Doc.mark_extension(obj,self)
-          end
-        end
-      end
-
-      def mark_extension(doc,mod)
-        #puts "mark_extension doc=#{doc.class} mod=#{mod}"
-        
-        # TODO store extension on the doc!
-        if (previous_mod = doc.__peace_love_extension) && previous_mod != mod
-          raise "doc #{doc} has already been extended by a different PeaceLove::Doc (was: #{previous_mod}, now: #{mod})"
-        end
-        doc.__peace_love_extension = mod
-
-        setup_extended_doc(doc,mod)
-      end
-
-      def mixin_registry
-        @mixin_registry ||= Hash.new {|h,k| h[k] = {}}
-      end
-
-      def register_mixin(target_class,field,mod,options)
-        mixin_registry[target_class][field.to_s] = [:single, mod, options]
-      end
-
-      def register_mixin_array(target_class, field, mod, options)
-        mixin_registry[target_class][field.to_s] = [:array, mod, options]
-      end
-
-      def register_mixin_hash(target_class, field, mod, options)
-        mixin_registry[target_class][field.to_s] = [:hash, mod, options]
-      end
-
-      def extend_doc(doc,mod,parent_doc)
-        # puts "extend_doc doc=#{doc.class} mod=#{mod} parent_obj=#{parent_obj.class}"
-
-        if !parent_doc.nil? && doc.nil?
-          doc = AngryHash.new
-        end
-
-        doc.extend mod
-
-        doc.__parent_doc = parent_doc if doc.respond_to?(:__parent_doc=)
-        doc
-      end
-
-      def setup_extended_doc(doc,mod)
-        mod.fill_in_defaults(doc) if mod.respond_to?(:fill_in_defaults)
-        doc
-      end
-
-      def mixin_to(parent_obj,field,obj)
-        # puts "mixin_to field=#{field}"
-
-        extension = parent_obj.__peace_love_extension
-        # puts "found extension=#{extension.inspect}"
-
-        if mixin = mixin_registry[extension][field.to_s]
-          kind,mod,options = *mixin
-
-          if options.key?(:default) && obj.nil?
-            obj = options[:default]
-          end
-
-          case kind
-          when :single
-            obj = extend_doc(obj,mod,parent_obj)
-          when :array
-            # XXX - this is ok for now... we really need to typecheck, perhaps wrap in a smart-array
-            obj ||= []
-            obj = obj.map {|elt| extend_doc(elt, mod, parent_obj)}
-          when :hash
-            obj ||= {}
-            obj = obj.inject(AngryHash.new) do |h,(k,elt)|
-              h[k] = extend_doc(elt,mod,parent_obj)
-              h
-            end
-          end
-        end
-
-        obj
-      end
-    end
-
-    def [](key)
-      Doc.mixin_to(self,key,super)
-    end
-
-    def id
-      self['id']
+    def self.included(base)
+      base.send :include, AngryHash::Extension
+      base.extend ClassMethods
     end
 
     def __collection=(col)
       @collection = col
     end
 
-    def __parent_doc=(doc)
+    def __parent_hash=(doc)
       self.__collection = doc.__collection if doc.respond_to?(:__collection)
-      @parent_doc = doc
-    end
-
-    def __parent_doc
-      @parent_doc
+      super
     end
 
     def __collection
       @collection
     end
 
-    def __peace_love_extension=(mod)
-      @__peace_love_extension = mod
-    end
-
-    def __peace_love_extension
-      @__peace_love_extension
-    end
-
     module ClassMethods
-      def collection=(collection_name)
-        @collection = PeaceLove[collection_name]
-        @collection.set_mixin(self)
+      def mongo(options)
+        PeaceLove.mixin_config[options[:db]][options[:collection]] = self
+      end
+      def mongo_collection(collection_name)
+        PeaceLove.mixin_config[nil][collection_name] = self
       end
-      alias mongo_collection collection=
 
       def collection
-        @collection
+        @collection ||= PeaceLove.collection_for_mixin(self)
       end
 
-      def defaults(default_form=nil)
-        if default_form
-          @default_form = default_form
-        end
-        @default_form
-      end
+      include AngryHash::Extension::ClassMethods
 
-      def fill_in_defaults(doc)
-        if defaults
-          doc.reverse_deep_update(defaults)
-        end
-      end
-      
-      def sub_document(field,mod,options={})
-        Doc.register_mixin(self,field,mod,options)
-      end
-      alias_method :sub_doc, :sub_document
+      alias_method :sub_document, :extend_value
+      alias_method :sub_doc, :extend_value
 
-      def sub_collection(field,mod,options={})
-        Doc.register_mixin_array(self,field,mod,options)
-      end
-      alias_method :sub_col, :sub_collection
+      alias_method :sub_document, :extend_array
+      alias_method :sub_col, :extend_array
 
-      def sub_hash(field,mod,options={})
-        Doc.register_mixin_hash(self,field,mod,options)
-      end
-
-      def build(seed={})
-        doc = AngryHash[ seed ]
-        self.fill_in_defaults(doc)
-        doc.extend self
-        doc
-      end
+      alias_method :sub_hash, :extend_hash
     end
   end
 end

data/lib/peace_love.rb

@@ -2,22 +2,38 @@ require 'mongo'
 require 'angry_hash'
 
 module PeaceLove
-end
-
-require 'peace_love/document'
-require 'peace_love/collection'
-require 'peace_love/cursor'
+  autoload :Db, 'peace_love/db'
+  autoload :Doc, 'peace_love/document'
+  autoload :Collection, 'peace_love/collection'
+  autoload :Cursor, 'peace_love/cursor'
 
-module PeaceLove
   class << self
-    attr_accessor :db, :connection
+    attr_accessor :default_db, :mongo, :connection
 
-    def collections
-      @collections ||= {}
+    def dbs
+      @dbs ||= {}
     end
 
-    def [](collection_name)
-      collections[collection_name.to_s] ||= PeaceLove::Collection.new( db[collection_name] )
+    def [](*db_name)
+      if db_name = db_name.flatten.compact.pop
+        dbs[db_name.to_s] ||= PeaceLove::Db.new( mongo[db_name], mixin_config[db_name] )
+      else
+        @wrapped_default_db ||= PeaceLove::Db.new( default_db, mixin_config[nil] )
+      end
+    end
+
+    def mixin_config
+      @mixin_config ||= Hash.new {|h,k| h[k] = {}}
+    end
+
+    def collection_for_mixin(mixin)
+      mixin_config.each do |db,db_mixins|
+        db_mixins.each do |col,col_mixin|
+          if col_mixin == mixin
+            return self[db][col]
+          end
+        end
+      end
     end
 
     def connect(options)
@@ -29,9 +45,8 @@ module PeaceLove
 
       options.delete('adapter') # XXX check?
 
-      # TODO - support paired servers
       self.connection = Mongo::Connection.new(options.delete('host'), options.delete('port'), options)
-      self.db         = connection.db(options.database)
+      self.default_db = connection.db(options.database)
     end
   end
 end

data/peace_love.gemspec

@@ -5,16 +5,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{peace_love}
-  s.version = "0.1.3"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lachie Cox"]
-  s.date = %q{2010-08-23}
+  s.date = %q{2010-10-24}
   s.description = %q{A simple mixin layer for enhancing hashes retrieved from MongoDB. It eschews the normal 'mapping' compulsion of mongo libraries.}
   s.email = %q{lachie@smartbomb.com.au}
   s.files = [
     ".gitignore",
      "Gemfile",
+     "Gemfile.lock",
      "License",
      "Rakefile",
      "Readme.md",
@@ -24,6 +25,7 @@ Gem::Specification.new do |s|
      "lib/peace_love.rb",
      "lib/peace_love/collection.rb",
      "lib/peace_love/cursor.rb",
+     "lib/peace_love/db.rb",
      "lib/peace_love/document.rb",
      "lib/peace_love/railtie.rb",
      "peace_love.gemspec"
@@ -39,15 +41,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mongo>, ["~> 1.0.0"])
-      s.add_runtime_dependency(%q<angry_hash>, ["~> 0.1.0"])
+      s.add_runtime_dependency(%q<mongo>, ["~> 1.1.0"])
+      s.add_runtime_dependency(%q<angry_hash>, ["~> 0.3.2"])
     else
-      s.add_dependency(%q<mongo>, ["~> 1.0.0"])
-      s.add_dependency(%q<angry_hash>, ["~> 0.1.0"])
+      s.add_dependency(%q<mongo>, ["~> 1.1.0"])
+      s.add_dependency(%q<angry_hash>, ["~> 0.3.2"])
     end
   else
-    s.add_dependency(%q<mongo>, ["~> 1.0.0"])
-    s.add_dependency(%q<angry_hash>, ["~> 0.1.0"])
+    s.add_dependency(%q<mongo>, ["~> 1.1.0"])
+    s.add_dependency(%q<angry_hash>, ["~> 0.3.2"])
   end
 end
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 2
   - 1
-  - 3
-  version: 0.1.3
+  version: 0.2.1
 platform: ruby
 authors: 
 - Lachie Cox
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-23 00:00:00 +10:00
+date: 2010-10-24 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,9 +26,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 1
+        - 1
         - 0
-        - 0
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -40,9 +40,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 1
-        - 0
-        version: 0.1.0
+        - 3
+        - 2
+        version: 0.3.2
   type: :runtime
   version_requirements: *id002
 description: A simple mixin layer for enhancing hashes retrieved from MongoDB. It eschews the normal 'mapping' compulsion of mongo libraries.
@@ -56,6 +56,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - Gemfile
+- Gemfile.lock
 - License
 - Rakefile
 - Readme.md
@@ -65,6 +66,7 @@ files:
 - lib/peace_love.rb
 - lib/peace_love/collection.rb
 - lib/peace_love/cursor.rb
+- lib/peace_love/db.rb
 - lib/peace_love/document.rb
 - lib/peace_love/railtie.rb
 - peace_love.gemspec