noodall-core 0.5.0 → 0.5.1

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/lib/noodall/indexer.rb

@@ -2,7 +2,6 @@ module Noodall
   module Indexer
     def self.configure(model)
       model.class_eval do
-        puts "index on"
         cattr_accessor :indexes
       end
       model.indexes = []

data/lib/noodall/node.rb

@@ -38,7 +38,7 @@ module Noodall
     # if there are any children that are not of an allowed template, error
     validates_true_for :template,
       :message => "cannot be changed as sub content is not allowed in this template",
-      :logic => lambda { children.empty? || children.select{|c| !self._type.constantize.template_classes.include?(c.class)}.empty? }
+      :logic => lambda { !_type_changed? or children.empty? or children.select{|c| !self._type.constantize.template_classes.include?(c.class)}.empty? }
 
     scope :published, lambda { where(:published_at => { :$lte => current_time }, :published_to => { :$gte => current_time }) }
 
@@ -214,7 +214,6 @@ module Noodall
 
           index = key[/#{slot_type}_slot_(\d+)$/, 1].to_i
 
-          logger.debug "Deleting #{key} #{self.send(key).inspect}" if index >= slot_count
           # set the slot to nil
           write_attribute(key.to_sym, nil) if index >= slot_count
         end

data/noodall-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{noodall-core}
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve England"]
-  s.date = %q{2011-02-01}
+  s.date = %q{2011-02-03}
   s.description = %q{Core data objects for Noodall}
   s.email = %q{steve@wearebeef.co.uk}
   s.extra_rdoc_files = [

data/spec/node_spec.rb

@@ -422,4 +422,31 @@ describe Noodall::Node do
     Noodall::Node.collection.index_information.keys.should include('dude_1')
   end
 
+  describe "when template changing" do
+
+    before(:each) do
+      class LandingPage < Noodall::Node
+        root_template!
+        sub_templates Page, LandingPage
+      end
+      class Article < Noodall::Node
+      end
+      @page = Factory(:page)
+      Factory(:page, :parent => @page) # add a child
+    end
+
+    it "should not error if we haven't changed template" do
+      @page.save!
+    end
+
+    it "should throw an validation error if the children are not valid" do
+      @page.template = 'Article'
+      @page.save.should be(false)
+    end
+
+    it "should allow us to change template" do
+      @page.template = 'Landing Page'
+      @page.save!
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: noodall-core
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Steve England
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-01 00:00:00 +00:00
+date: 2011-02-03 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency