kuhsaft 0.0.8 → 0.1.0

data/app/models/kuhsaft/localized_page.rb

@@ -9,7 +9,7 @@ class Kuhsaft::LocalizedPage < ActiveRecord::Base
   
   validates :title, :presence => true
   validates :locale, :presence => true
-  validates :slug, :presence => true
+  validates :slug, :presence => true, :unless => :allow_empty_slug
   
   accepts_nested_attributes_for :page_parts, :allow_destroy => true
   
@@ -22,21 +22,20 @@ class Kuhsaft::LocalizedPage < ActiveRecord::Base
   end
   
   def create_url
-    return if self.page_type == 'redirect'
+    return if self.page_type == Kuhsaft::PageType::REDIRECT
     complete_slug = ''
     if page.present? && page.parent.present?
       complete_slug << page.parent.url.to_s
     else
       complete_slug = "#{self.locale}"
     end
-    complete_slug << "/#{self.slug}"
+    complete_slug << "/#{self.slug}" unless self.page_type == Kuhsaft::PageType::NAVIGATION
     self.url = complete_slug
   end
   
   def create_slug
-    if title.present? && slug.blank?
-      write_attribute(:slug, read_attribute(:title).downcase.parameterize)
-    end
+    has_slug = title.present? && slug.blank?
+    write_attribute(:slug, read_attribute(:title).downcase.parameterize) if has_slug
   end
   
   def collect_fulltext
@@ -49,4 +48,8 @@ class Kuhsaft::LocalizedPage < ActiveRecord::Base
     end
     self.fulltext << [title.to_s, keywords.to_s, description.to_s].join(' ')
   end
+  
+  def allow_empty_slug
+    self.page_type == Kuhsaft::PageType::NAVIGATION
+  end
 end

data/app/models/kuhsaft/page.rb

@@ -93,7 +93,7 @@ class Kuhsaft::Page < ActiveRecord::Base
     if translation.page_parts.count == 0 && childs.count > 0
       childs.first.link
     else
-      if translation.page_type == 'redirect'
+      if translation.page_type == Kuhsaft::PageType::REDIRECT
         url
       else
         "/#{url}"

data/app/models/kuhsaft/page_type.rb

@@ -0,0 +1,11 @@
+module Kuhsaft
+  class PageType
+    REDIRECT = 'redirect'
+    NAVIGATION = 'navigation'
+    CONTENT = ''
+    
+    def self.all
+      [CONTENT, REDIRECT, NAVIGATION]
+    end
+  end
+end

data/app/views/kuhsaft/admin/pages/_form.html.haml

@@ -2,10 +2,10 @@
   = page.fields_for :localized_pages, @localized_page do |localized|
     = localized.input :title
     = localized.input :slug, :required => false
-    = localized.input :page_type, :as => :radio, :collection => ['', 'redirect']
+    = localized.input :page_type, :as => :radio, :collection => Kuhsaft::PageType.all
     = localized.input :published, :collection => Kuhsaft::PublishState.all, :label_method => :human_name, :value_method => :value
     .clear
-    - unless localized.object.page_type == 'redirect'
+    - unless localized.object.page_type == Kuhsaft::PageType::REDIRECT
       - if localized.object.published == Kuhsaft::PublishState::PUBLISHED_AT
         = localized.input :published_at, :as => :datetime
       = localized.input :keywords

data/lib/kuhsaft/version.rb

@@ -1,3 +1,3 @@
 module Kuhsaft
-  VERSION = "0.0.8"
+  VERSION = "0.1.0"
 end

data/spec/models/localized_page_spec.rb

@@ -57,18 +57,27 @@ describe Kuhsaft::LocalizedPage do
       @localized_page.should respond_to(:page_type)
     end
     
-    it 'should generate the url with an empty page_type' do
+    it 'should just generate the url when the page_type is empty' do
       page = Factory.create :page
       page.translation.url.should eq('en/english-title')
     end
     
-    it 'should take the users url with a "redirect" page_type' do
+    it 'should save the users url with a "REDIRECT" page_type' do
       page = Factory.create :page
-      page.translation.page_type = 'redirect'
+      page.translation.page_type = Kuhsaft::PageType::REDIRECT
       page.translation.url = '/en/news'
       page.save
       page.translation.url.should eq('/en/news')
     end
+    
+    it 'should not use the slug in the url when the page_type is "NAVIGATION"' do
+      page = Factory.create :page
+      child_page = Factory.create :page
+      page.childs << child_page
+      page.translation.page_type = Kuhsaft::PageType::NAVIGATION
+      page.save
+      child_page.translation.url.should eq('en/english-title')
+    end
   end
   
   describe 'validations' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kuhsaft
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 8
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors: 
 - "Immanuel H\xC3\xA4ussermann"
@@ -284,6 +284,7 @@ files:
 - app/models/kuhsaft/page_part.rb
 - app/models/kuhsaft/page_part/content.rb
 - app/models/kuhsaft/page_part/markdown.rb
+- app/models/kuhsaft/page_type.rb
 - app/models/kuhsaft/publish_state.rb
 - app/stylesheets/kuhsaft/admin/ie.sass
 - app/stylesheets/kuhsaft/admin/partials/_assets.sass