mongoid-included 0.2.0 → 0.3.1

data/lib/mongoid-included/document_inclusion.rb

@@ -12,36 +12,62 @@ module Mongoid
     
     module ClassMethods
       def included_in(_model, args = {})
+        if args && args[:class_name]
+          _class_name = args[:class_name]
+        else
+          _class_name = _model
+        end
+        
         raise NotMongoidDocument,       "Parent must be Mongoid::Document" unless _mongoid_document? self.parent
-        raise DocumentAlreadyIncluded,  "Document already included" if included_by.present?
+        raise DocumentAlreadyIncluded,  "Document already included" if (!included_by.blank? && included_by!=[_model_klass(_class_name)]) 
         embedded_in _model, args
         
-        self.included_by = _model
+        self.included_by ||= []
+        self.included_by << _model_klass(_class_name) unless included_by.include? _model_klass(_class_name)
         self.extend ActiveModel::Naming
         _overwrite_model_name
       end
       
       def includes_many(_model, args = {})
-        _verify_dependencies(_model)
-        embeds_many _model, args.merge(:class_name => _included_klass(_model))
-        (self.including_many ||= []) << _model
+        if args && args[:class_name]
+          _class_name = args[:class_name]
+          self.including_many ||= []
+          self.including_many << _model_klass(_class_name) unless including_many.include? _model_klass(_class_name)
+        else
+          _verify_dependencies(_model)
+          _class_name = _included_klass_name(_model)
+          self.including_many ||= []
+          self.including_many << _included_klass(_model) unless including_many.include? _included_klass(_model)
+        end
+        embeds_many _model, args.merge(:class_name => _class_name )
       end
       
       def includes_one(_model, args = {})
-        _verify_dependencies(_model)
-        embeds_one _model, args.merge(:class_name => _included_klass(_model))
-        (self.including_one ||= []) << _model
+        if args && args[:class_name]
+          _class_name = args[:class_name]
+          self.including_one ||= []
+          self.including_one << _model_klass(_class_name) unless including_one.include? _model_klass(_class_name)
+        else
+          _verify_dependencies(_model)
+          _class_name = _included_klass_name(_model)
+          self.including_one ||= []
+          self.including_one << _included_klass(_model) unless including_one.include? _included_klass(_model)
+        end
+        embeds_one _model, args.merge(:class_name => _class_name)
       end
       
       private
       
       def _overwrite_model_name
         self.class_eval <<-EOF
-          @_model_name ||=begin
-            if self.parent != Object
-              Mongoid::EmbeddedName.new(self, self.parent)
-            else
-              super
+          def self.model_name
+            @_model_name ||=begin
+              if self.parent != Object
+                Mongoid::EmbeddedName.new(self, self.parent)
+              else
+                namespace = self.parents.detect { |n| n.respond_to?(:_railtie) }
+                ActiveModel::Name.new(self, namespace)
+              end
             end
           end
         EOF
@@ -55,18 +81,21 @@ module Mongoid
         _model.to_s.classify.constantize
       end
       
-      def _included_klass(_model)
+      def _included_klass_name(_model)
         "#{self}::#{_model_klass_name(_model)}"
       end
+      
+      def _included_klass(_model)
+        "#{self}::#{_model_klass_name(_model)}".constantize
+      end
         
       def _mongoid_document?(_model)
-        _model.ancestors.include?(Mongoid::Document)
+        _model.included_modules.include?(Mongoid::Document)
       end
       
       def _verify_dependencies(_model)
-        raise NotMongoidDocument, "Child must be Mongoid::Document" unless _mongoid_document? _model_klass(_included_klass(_model))
+        raise NotMongoidDocument, "Child must be Mongoid::Document" unless _mongoid_document? _model_klass(_included_klass_name(_model))
       end
     end
   end
 end
-Mongoid::Document.send(:include, ::Mongoid::DocumentInclusion)

data/lib/mongoid-included/embedded_name.rb

@@ -1,12 +1,12 @@
 module Mongoid
-  class EmbeddedName < ActiveModel::Name
+  class EmbeddedName < String
     attr_reader :singular, :plural, :element, :collection, :partial_path, :route_key, :param_key, :i18n_key
     alias_method :cache_key, :collection
 
     def initialize(klass, namespace, pluralize_namespace = true)
       name ||= klass.name
+      super(name)
       @unnamespaced = name.sub(/^#{namespace.name}::/, '') if namespace
-
       @klass = klass
       @singular = _singularize(name).freeze
       @singular_namespace = _singularize(namespace.name).freeze
@@ -21,6 +21,21 @@ module Mongoid
       @i18n_key = name.underscore.to_sym
     end
     
+    def human(options={})
+      return @human unless @klass.respond_to?(:lookup_ancestors) &&
+                           @klass.respond_to?(:i18n_scope)
+
+      defaults = @klass.lookup_ancestors.map do |klass|
+        klass.model_name.i18n_key
+      end
+
+      defaults << options[:default] if options[:default]
+      defaults << @human
+
+      options = {:scope => [@klass.i18n_scope, :models], :count => 1, :default => defaults}.merge(options.except(:default))
+      I18n.translate(defaults.shift, options)
+    end
+    
     def _singularize(string, replacement='_')
       ActiveSupport::Inflector.underscore(string).tr('/', replacement)
     end

data/lib/mongoid-included/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Included
-    VERSION = "0.2.0"
+    VERSION = "0.3.1"
   end
 end

data/lib/mongoid-included.rb

@@ -1 +1,3 @@
+require 'mongoid'
 require 'mongoid-included/document_inclusion'
+Mongoid::Document.send(:include, ::Mongoid::DocumentInclusion)

data/spec/models/inclusion.rb

@@ -1,12 +1,16 @@
 class Invoice
   includes_many :items
-  includes_one :user, :inverse_of => :invoice, :index => true
+  includes_one :user, :inverse_of => :invoice
+  includes_one :other_user, :class_name => "Invoice::User", :inverse_of => :user_invoice
+  includes_many :other_items, :class_name => "Invoice::Item"
 end
 
 class Invoice::Item
-  included_in :invoice
+  included_in :invoice, :inverse_of => :items
+  included_in :invoiced_by, :class_name => "Invoice", :inverse_of => :other_items
 end
 
 class Invoice::User
   included_in :invoice, :inverse_of => :user
+  included_in :user_invoice, :class_name => "Invoice", :inverse_of => :other_user
 end

data/spec/unit/included_spec.rb

@@ -23,12 +23,24 @@ describe "Child Model" do
       Invoice::Item.relations["invoice"].macro.should == :embedded_in
     end
     it "#includded_in returns parent model" do
-      Invoice::Item.included_by.should == :invoice
+      Invoice::Item.included_by.should include Invoice
     end
     it "forbids inclusion in another parent" do
-      expect { Invoice::Item.included_in :invoice }.
+      Object.const_set "AnotherDocument", Class.new
+      AnotherDocument.send(:include, Mongoid::Document)
+      expect { Invoice::Item.included_in :another_document }.
       to raise_error Mongoid::DocumentInclusion::DocumentAlreadyIncluded, /Document already included/
     end
+    context "when included with custom relation name" do
+      it "returns relation name" do
+        Invoice::Item.relations["invoiced_by"].macro.should == :embedded_in
+      end
+      it "returns relation class" do
+        Invoice::Item.relations["invoiced_by"].class_name.should == "Invoice"
+      end
+      
+      
+    end
   end
   
   context "when not included" do

data/spec/unit/including_spec.rb

@@ -7,7 +7,7 @@ describe "Parent Model" do
   describe "#includes_many" do
     context "when including one model" do
       it "#includding_many returns array with one model" do
-        parent.including_many.should include(:items)
+        parent.including_many.should include(Invoice::Item)
       end
       it "embeds child with association name" do
         parent.relations.keys.should include "items"
@@ -20,7 +20,7 @@ describe "Parent Model" do
     context "when including two models" do
       it "#includding_many returns array with two models" do
         parent.includes_many :not_includeds
-        parent.including_many.should include(:items, :not_includeds)
+        parent.including_many.should include(Invoice::Item, Invoice::NotIncluded)
       end
     end
     context "when not including with #includes_many" do
@@ -28,12 +28,21 @@ describe "Parent Model" do
         Invoice::Item.including_many.should be_blank
       end
     end
+    context "when including with custom relation name" do
+      it "embeds child with association name" do
+        parent.relations.keys.should include "other_items"
+        parent.relations["other_items"].macro.should == :embeds_many
+      end
+      it "embeds child with association class" do
+        parent.relations["other_items"].class_name.should == "Invoice::Item"
+      end
+    end
   end
   
   describe "#includes_one" do
     context "when including one model" do
       it "#including_one returns array with one model" do
-        parent.including_one.should include(:user)
+        parent.including_one.should include(Invoice::User)
       end
       it "delegates options to mongoid relation macro" do
         parent.relations["user"].inverse_of.should == :invoice
@@ -46,7 +55,7 @@ describe "Parent Model" do
     context "when including two models" do
       it "#includding_one returns array with two models" do
         parent.includes_one :not_includeds
-        parent.including_one.should include(:user, :not_includeds)
+        parent.including_one.should include(Invoice::User, Invoice::NotIncluded)
       end
     end
     context "when not including with #includes_one" do
@@ -54,6 +63,15 @@ describe "Parent Model" do
         Invoice::Item.including_one.should be_blank
       end
     end
+    context "when including with custom relation name" do
+      it "embeds child with association name" do
+        parent.relations.keys.should include "other_items"
+        parent.relations["other_user"].macro.should == :embeds_one
+      end
+      it "embeds child with association class" do
+        parent.relations["other_user"].class_name.should == "Invoice::User"
+      end
+    end
   end
 
   it "issues an error if child is not mongoid document" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-included
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-07 00:00:00.000000000 -03:00
-default_executable: 
+date: 2012-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &2152036440 !ruby/object:Gem::Requirement
+  requirement: &70172149957920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +21,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152036440
+  version_requirements: *70172149957920
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152300640 !ruby/object:Gem::Requirement
+  requirement: &70172149946960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +32,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2152300640
+  version_requirements: *70172149946960
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2152299720 !ruby/object:Gem::Requirement
+  requirement: &70172149946180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +43,7 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *2152299720
+  version_requirements: *70172149946180
 description: Helper to facilitate inclusion of namespaced documents in another Mongoid
   Document
 email: angelim@angelim.com.br
@@ -89,7 +88,6 @@ files:
 - spec/spec_helper.rb
 - spec/unit/included_spec.rb
 - spec/unit/including_spec.rb
-has_rdoc: true
 homepage: http://github.com/angelim/mongoid-included
 licenses: []
 post_install_message: 
@@ -110,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mongoid-included
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Included namespaces documents for Mongoid
@@ -125,3 +123,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/unit/included_spec.rb
 - spec/unit/including_spec.rb
+has_rdoc: