puffer_pages 0.0.12 → 0.0.13

data/VERSION

@@ -1 +1 @@
-0.0.12
+0.0.13

data/app/models/page.rb

@@ -31,20 +31,17 @@ class Page < ActiveRecord::Base
     :message => :slug_format,
     :unless => :root?
   validates_format_of :slug,
-    :with => /\A\Z/,
+    :with => nil,
     :message => :root_slug_format,
     :if => :root?
   validates_inclusion_of :status, :in => Page.statuses
 
   attr_protected :location
 
-  before_validation :set_status
-  def set_status
+  before_validation :default_values
+  def default_values
     self.status ||= 'draft'
-  end
-
-  before_save :update_location
-  def update_location
+    self.slug = slug.presence
     self.location = [swallow_nil{parent.location}, slug].compact.join('/').presence
   end
 

data/puffer_pages.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{puffer_pages}
-  s.version = "0.0.12"
+  s.version = "0.0.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["pyromaniac"]
-  s.date = %q{2011-02-14}
+  s.date = %q{2011-02-15}
   s.description = %q{Puffer pages is integratable rails CMS with puffer admin interface}
   s.email = %q{kinwizard@gmail.com}
   s.extra_rdoc_files = [

data/spec/models/page_spec.rb

@@ -15,8 +15,8 @@ describe Page do
       @root = Fabricate :page, :layout_name => 'foo_layout'
     end
 
-    it 'should have empty slug and nil location if root' do
-      @root.slug.should == ''
+    it 'should have nil slug location if root' do
+      @root.slug.should == nil
       @root.location.should == nil
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puffer_pages
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 0
-  - 12
-  version: 0.0.12
+  - 13
+  version: 0.0.13
 platform: ruby
 authors: 
 - pyromaniac
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-14 00:00:00 +03:00
+date: 2011-02-15 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency