peace_love 0.1.1 → 0.1.3

data/Gemfile

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

data/Rakefile

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

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.3

data/lib/peace_love/collection.rb

@@ -46,7 +46,7 @@ module PeaceLove
     def __extend(doc)
       if mixin
         doc.extend mixin 
-        doc.__source_collection = self if doc.respond_to?(:__source_collection=)
+        doc.__collection = self if doc.respond_to?(:__collection=)
       end
 
       doc

data/lib/peace_love/document.rb

@@ -7,24 +7,20 @@ module PeaceLove
 
         base.module_eval do
           def self.extend_object(obj)
-            Doc.mark_extension(obj,self)
             super
+            Doc.mark_extension(obj,self)
           end
         end
       end
 
-
-      def object_extensions
-        @object_extensions ||= {}
-      end
-
       def mark_extension(doc,mod)
-        # puts "mark_extension doc=#{doc.class} mod=#{mod}"
+        #puts "mark_extension doc=#{doc.class} mod=#{mod}"
         
-        if (previous_mod = object_extensions[doc.__id__]) && previous_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
-        object_extensions[doc.__id__] = mod
+        doc.__peace_love_extension = mod
 
         setup_extended_doc(doc,mod)
       end
@@ -45,10 +41,10 @@ module PeaceLove
         mixin_registry[target_class][field.to_s] = [:hash, mod, options]
       end
 
-      def extend_doc(doc,mod,parent_obj)
+      def extend_doc(doc,mod,parent_doc)
         # puts "extend_doc doc=#{doc.class} mod=#{mod} parent_obj=#{parent_obj.class}"
 
-        if !parent_obj.nil? && doc.nil?
+        if !parent_doc.nil? && doc.nil?
           doc = AngryHash.new
         end
 
@@ -64,7 +60,10 @@ module PeaceLove
       end
 
       def mixin_to(parent_obj,field,obj)
-        extension = object_extensions[parent_obj.__id__]
+        # 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
@@ -73,15 +72,15 @@ module PeaceLove
             obj = options[:default]
           end
 
-          # XXX - what happens when obj is nil
-
           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
@@ -101,12 +100,12 @@ module PeaceLove
       self['id']
     end
 
-    def __source_collection=(col)
-      @source_collection = col
+    def __collection=(col)
+      @collection = col
     end
 
-    def __parent_doc(doc)
-      self.__source_collection = doc.__source_collection if doc.respond_to?(:__source_collection)
+    def __parent_doc=(doc)
+      self.__collection = doc.__collection if doc.respond_to?(:__collection)
       @parent_doc = doc
     end
 
@@ -114,8 +113,16 @@ module PeaceLove
       @parent_doc
     end
 
-    def __source_collection
-      @source_collection
+    def __collection
+      @collection
+    end
+
+    def __peace_love_extension=(mod)
+      @__peace_love_extension = mod
+    end
+
+    def __peace_love_extension
+      @__peace_love_extension
     end
 
     module ClassMethods

data/lib/peace_love/railtie.rb

@@ -9,7 +9,11 @@ module Rails #:nodoc:
         config_file = Rails.root + "config/database.yml"
         if config_file.file?
           settings = YAML.load( ERB.new(config_file.read).result )[Rails.env]
-          ::PeaceLove.connect(settings)
+          if settings
+            ::PeaceLove.connect(settings)
+          else
+            raise "Unable to connect to mongo; #{config_file.relative_path_from(Rails.root)} doesn't have an entry for the #{Rails.env} environment."
+          end
         end
       end
 
@@ -24,7 +28,7 @@ You need to set up a #{cfg_file} looking like\n
   host: localhost
 
           EOMSG
-          raise( "Unable to connect to mongodb using #{Rails.root+'config/database.yml'}" )
+          raise( "Unable to connect to mongodb using #{Rails.root+'config/database.yml'} env=#{Rails.env}" )
         end
       end
     end

data/peace_love.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{peace_love}
-  s.version = "0.1.1"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lachie Cox"]
-  s.date = %q{2010-08-02}
+  s.date = %q{2010-08-23}
   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 = [
@@ -40,14 +40,14 @@ Gem::Specification.new do |s|
 
     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.0.5"])
+      s.add_runtime_dependency(%q<angry_hash>, ["~> 0.1.0"])
     else
       s.add_dependency(%q<mongo>, ["~> 1.0.0"])
-      s.add_dependency(%q<angry_hash>, ["= 0.0.5"])
+      s.add_dependency(%q<angry_hash>, ["~> 0.1.0"])
     end
   else
     s.add_dependency(%q<mongo>, ["~> 1.0.0"])
-    s.add_dependency(%q<angry_hash>, ["= 0.0.5"])
+    s.add_dependency(%q<angry_hash>, ["~> 0.1.0"])
   end
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Lachie Cox
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-02 00:00:00 +10:00
+date: 2010-08-23 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,13 +36,13 @@ dependencies:
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
+        - 1
         - 0
-        - 5
-        version: 0.0.5
+        version: 0.1.0
   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.