mongoid-included 0.0.3 → 0.0.4

data/.gitignore

@@ -1,4 +1,5 @@
 *.gem
 .bundle
+.rvmrc
 Gemfile.lock
 pkg/*

data/.rspec

@@ -0,0 +1 @@
+--color --format nested --fail-fast

data/.rvmrc

@@ -1 +1 @@
-rvm 1.9.2
+rvm ruby-head

data/lib/mongoid-included/document_inclusion.rb

@@ -32,10 +32,12 @@ module Mongoid
       end
       
       def model_name
-        if self.parent != Object
-          @_model_name ||= ActiveModel::Name.new(self, self.parent)
-        else
-          super
+        @_model_name ||=begin
+          if self.parent != Object
+            Mongoid::EmbeddedName.new(self, self.parent)
+          else
+            super
+          end
         end
       end
       

data/lib/mongoid-included/embedded_name.rb

@@ -0,0 +1,25 @@
+module Mongoid
+  class EmbeddedName < ActiveModel::Name
+    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
+      @plural = ActiveSupport::Inflector.pluralize(@singular).freeze
+      @plural_namespace = ActiveSupport::Inflector.pluralize(@singular_namespace).freeze
+      @element = ActiveSupport::Inflector.underscore(ActiveSupport::Inflector.demodulize(name)).freeze
+      @human = ActiveSupport::Inflector.humanize(@element).freeze
+      @collection = ActiveSupport::Inflector.tableize(name).freeze
+      @partial_path = "#{@collection.sub(@singular_namespace, @plural_namespace)}/#{@element}".freeze
+      @param_key =  _singularize(@unnamespaced).freeze
+      @route_key = ActiveSupport::Inflector.pluralize(@param_key).freeze
+      @i18n_key = name.underscore.to_sym
+    end
+  end
+end

data/lib/mongoid-included/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Included
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/lib/mongoid-included.rb

@@ -1,2 +1,3 @@
 require 'mongoid'
-require 'mongoid-included/document_inclusion'
+require 'mongoid-included/document_inclusion'
+require 'mongoid-included/embedded_name'

data/spec/unit/included_spec.rb

@@ -59,23 +59,6 @@ describe "Mongoid::Included" do
       Invoice::Item.relations["invoice"].macro.should == :embedded_in
     end
     
-    it "strips namespace from param_key" do
-      Invoice::Item.model_name.param_key.should == "item"
-    end
-    
-    it "strips namespace from #route_key" do
-      Invoice::Item.model_name.route_key.should == "items"
-    end
-    
-    it "forbids inclusion in another parent" do
-      begin
-        Invoice::Item.included_in :invoice
-      rescue => e
-        e.class.should == Mongoid::DocumentInclusion::DocumentAlreadyIncluded
-      end
-    end
-  
-    
     it "issues an error if parent is not mongoid document" do
       Object.const_set "NonMongoidDocument", Class.new
       NonMongoidDocument.const_set "NonMongoidParent", Class.new
@@ -101,6 +84,29 @@ describe "Mongoid::Included" do
       end
     end
     
+    context "when overwriting #model_name" do
+      it "strips namespace from #param_key" do
+        Invoice::Item.model_name.param_key.should == "item"
+      end
+    
+      it "strips namespace from #route_key" do
+        Invoice::Item.model_name.route_key.should == "items"
+      end
+    
+      it "pluralize namespace in #partial_path" do
+        Invoice::Item.model_name.partial_path.should == "invoices/items/item"
+      end
+    end
+    
+    it "forbids inclusion in another parent" do
+      begin
+        Invoice::Item.included_in :invoice
+      rescue => e
+        e.class.should == Mongoid::DocumentInclusion::DocumentAlreadyIncluded
+      end
+    end
+    
+    
   end
   
 end

metadata

@@ -1,91 +1,71 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mongoid-included
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
+version: !ruby/object:Gem::Version
+  version: 0.0.4
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Alexandre Angelim
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-05 00:00:00 -03:00
+date: 2011-07-06 00:00:00.000000000 -03:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activemodel
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2160464360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 1
-        - 0
-        - beta1
+      - !ruby/object:Gem::Version
         version: 3.1.0.beta1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mongoid
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2160464360
+- !ruby/object:Gem::Dependency
+  name: mongoid
+  requirement: &2160463820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2160463820
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2160463300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 6
-        version: "2.6"
+      - !ruby/object:Gem::Version
+        version: '2.6'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: bson_ext
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2160463300
+- !ruby/object:Gem::Dependency
+  name: bson_ext
+  requirement: &2160462780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
-  version_requirements: *id004
-description: Helper to facilitate inclusion of namespaced documents in another Mongoid Document
+  prerelease: false
+  version_requirements: *2160462780
+description: Helper to facilitate inclusion of namespaced documents in another Mongoid
+  Document
 email: angelim@angelim.com.br
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .document
 - .gitignore
+- .rspec
 - .rvmrc
 - Gemfile
 - LICENSE
@@ -93,6 +73,7 @@ files:
 - Rakefile
 - lib/mongoid-included.rb
 - lib/mongoid-included/document_inclusion.rb
+- lib/mongoid-included/embedded_name.rb
 - lib/mongoid-included/version.rb
 - log/development.log
 - mongoid-included.gemspec
@@ -107,36 +88,29 @@ files:
 has_rdoc: true
 homepage: http://github.com/angelim/mongoid-included
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: mongoid-included
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Included namespaces documents for Mongoid
-test_files: 
+test_files:
 - spec/functional/invoice.rb
 - spec/functional/item.rb
 - spec/models/inclusion.rb