noodall-core 0.3.2 → 0.3.3

data/Gemfile.lock

@@ -1,9 +1,9 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.1)
-    bson (1.1.1)
-    bson_ext (1.1.1)
+    activesupport (3.0.3)
+    bson (1.1.2)
+    bson_ext (1.1.2)
     canable (0.1.1)
     database_cleaner (0.5.2)
     diff-lcs (1.1.2)
@@ -21,7 +21,7 @@ GEM
     json_pure (1.4.6)
     mm-multi-parameter-attributes (0.1.1)
       mongo_mapper
-    mongo (1.1.1)
+    mongo (1.1.2)
       bson (>= 1.1.1)
     mongo_mapper (0.8.6)
       activesupport (>= 2.3.4)

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/lib/noodall/node.rb

@@ -8,7 +8,7 @@ module Noodall
     plugin Indexer
     plugin Search
     plugin Tagging
-    plugin GlobalUpdateTime
+    plugin Noodall::GlobalUpdateTime
 
     key :title, String, :required => true
     key :name, String
@@ -169,7 +169,15 @@ module Noodall
 
     before_validation :set_permalink
     def set_permalink
-      self.permalink = Permalink.new(*(ancestors << self).map{ |a| a.title.parameterize }) if permalink.blank? and not title.blank?
+      if permalink.blank?
+        # inherit the parents permalink and append the current node's .name or .title attribute
+        # this code takes name over title for the current node's slug
+        # this way enables children to inherit the parent's custom (user defined) permalink also
+        permalink_args = self.parent.permalink unless self.parent.nil?
+        self_slug = (self.name.blank? ? self.title : self.name).parameterize
+        permalink_args << self_slug unless self_slug.blank?
+        self.permalink = Permalink.new(*permalink_args)
+      end
     end
 
     before_save :set_position

data/noodall-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{noodall-core}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve England"]
-  s.date = %q{2010-11-03}
+  s.date = %q{2010-11-24}
   s.description = %q{Core data objects for Noodall}
   s.email = %q{steve@wearebeef.co.uk}
   s.extra_rdoc_files = [
@@ -47,10 +47,10 @@ Gem::Specification.new do |s|
   s.summary = %q{Core data objects for Noodall}
   s.test_files = [
     "spec/component_spec.rb",
-     "spec/factories/component.rb",
-     "spec/factories/node.rb",
+     "spec/spec_helper.rb",
      "spec/node_spec.rb",
-     "spec/spec_helper.rb"
+     "spec/factories/component.rb",
+     "spec/factories/node.rb"
   ]
 
   if s.respond_to? :specification_version then

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: noodall-core
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Steve England
@@ -15,11 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-03 00:00:00 +00:00
+date: 2010-11-24 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
   name: mongo_mapper
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -34,8 +33,8 @@ dependencies:
         - 6
         version: 0.8.6
   requirement: *id001
-- !ruby/object:Gem::Dependency 
   type: :runtime
+- !ruby/object:Gem::Dependency 
   prerelease: false
   name: ramdiv-mongo_mapper_acts_as_tree
   version_requirements: &id002 !ruby/object:Gem::Requirement 
@@ -50,8 +49,8 @@ dependencies:
         - 1
         version: 0.1.1
   requirement: *id002
-- !ruby/object:Gem::Dependency 
   type: :runtime
+- !ruby/object:Gem::Dependency 
   prerelease: false
   name: mm-multi-parameter-attributes
   version_requirements: &id003 !ruby/object:Gem::Requirement 
@@ -66,8 +65,8 @@ dependencies:
         - 1
         version: 0.1.1
   requirement: *id003
-- !ruby/object:Gem::Dependency 
   type: :runtime
+- !ruby/object:Gem::Dependency 
   prerelease: false
   name: canable
   version_requirements: &id004 !ruby/object:Gem::Requirement 
@@ -82,8 +81,8 @@ dependencies:
         - 1
         version: 0.1.1
   requirement: *id004
-- !ruby/object:Gem::Dependency 
   type: :runtime
+- !ruby/object:Gem::Dependency 
   prerelease: false
   name: ruby-stemmer
   version_requirements: &id005 !ruby/object:Gem::Requirement 
@@ -96,6 +95,7 @@ dependencies:
         - 0
         version: "0"
   requirement: *id005
+  type: :runtime
 description: Core data objects for Noodall
 email: steve@wearebeef.co.uk
 executables: []
@@ -164,7 +164,7 @@ specification_version: 3
 summary: Core data objects for Noodall
 test_files: 
 - spec/component_spec.rb
+- spec/spec_helper.rb
+- spec/node_spec.rb
 - spec/factories/component.rb
 - spec/factories/node.rb
-- spec/node_spec.rb
-- spec/spec_helper.rb