kuhsaft 0.0.6 → 0.0.7

data/README

@@ -56,3 +56,12 @@ end
 == Usage
 
 ... to be continued
+
+
+== Adding new migrations in development
+
+1. create your_migration.rb in lib/temlates/kuhsaft/install
+2. drop migrations in spec/dummy/db/migrate: rm spec/dummy/db/migrate/*.rb
+3. drop existing development and test DB for the spec/dummy app: rake db:drop:all
+4. install new migrations:rails g kuhsaft:install:migrations
+5. run specs for your engine: rspec spec/, which generates your test tables with the new migrations (see spec_helper.rb)

data/app/controllers/kuhsaft/admin/admin_controller.rb

@@ -0,0 +1,18 @@
+module Kuhsaft
+  module Admin
+    class AdminController < ApplicationController
+      
+      respond_to :html
+      layout 'kuhsaft/admin'
+      before_filter :set_translation_locale
+      
+      def default_url_options
+        { :locale => params[:locale].presence || :en }
+      end
+      
+      def set_translation_locale
+        Kuhsaft::Page.current_translation_locale = params[:locale] if params[:locale].present?
+      end
+    end
+  end
+end

data/app/controllers/kuhsaft/admin/assets_controller.rb

@@ -1,9 +1,6 @@
 module Kuhsaft
   module Admin
-    class AssetsController < ApplicationController
-      respond_to :html
-      layout 'kuhsaft/admin'
-      
+    class AssetsController < AdminController
       def index
         @assets = Kuhsaft::Asset.by_date
         respond_with @assets

data/app/controllers/kuhsaft/admin/pages_controller.rb

@@ -1,26 +1,24 @@
 module Kuhsaft
   module Admin
-    class PagesController < ApplicationController
-      respond_to :html
-      layout 'kuhsaft/admin'
-      before_filter :set_translation_locale
+    class PagesController < AdminController
       helper :all
-      
+
       def index
         @pages = Kuhsaft::Page.root_pages
         respond_with @pages
       end
-    
+
       def show
         @page = Kuhsaft::Page.find(params[:id])
         respond_with @page
       end
-    
+
       def new
         @page = Kuhsaft::Page.new
+        @localized_page = @page.localized_pages.find_or_initialize_by_locale(params[:locale])
         respond_with @page
       end
-    
+
       def create
         parent = Kuhsaft::Page.find(params[:kuhsaft_page][:parent_id]) if params[:kuhsaft_page][:parent_id].present?
         @page = Kuhsaft::Page.create params[:kuhsaft_page]
@@ -28,31 +26,33 @@ module Kuhsaft
           parent.childs << @page
           parent.save
         end
-        respond_with @page, :location => admin_pages_path
+        respond_with @page, :location => edit_admin_page_path(@page)
       end
-    
+
       def edit
         @page = Kuhsaft::Page.find(params[:id])
+        @localized_page = @page.localized_pages.find_or_initialize_by_locale(params[:locale])
+
+        if params[:add_page_part].present?
+          @localized_page.page_parts.build :type => params[:kuhsaft_page][:page_part_type].constantize
+        end
+        
         respond_with @page
       end
-    
+
       def update
         @page = Kuhsaft::Page.find(params[:id])
         @page.update_attributes(params[:kuhsaft_page]) if params[:kuhsaft_page].present?
         # TODO: refactor 'reposition' as a page attribute, so it can be set through update_attributes
         @page.reposition params[:reposition] if params[:reposition].present? || params.key?(:reposition)
-        respond_with @page, :location => admin_pages_path
+        respond_with @page, :location => edit_admin_page_path(@page)
       end
-    
+
       def destroy
         @page = Kuhsaft::Page.find(params[:id])
         @page.destroy
         redirect_to admin_pages_path
       end
-      
-      def set_translation_locale
-        Kuhsaft::Page.current_translation_locale = params[:translation_locale] if params[:translation_locale].present?
-      end
     end
   end
 end

data/app/models/kuhsaft/localized_page.rb

@@ -1,20 +1,28 @@
 class Kuhsaft::LocalizedPage < ActiveRecord::Base
   belongs_to :page
-  has_many :page_parts, :class_name => 'Kuhsaft::PagePart::Content'
-  before_validation :create_slug
-  before_validation :create_url
+  has_many :page_parts, :class_name => 'Kuhsaft::PagePart::Content', :autosave => true
+  scope :published, lambda{ where('published = ? OR published_at < ?', Kuhsaft::PublishState::PUBLISHED, DateTime.now) }
+  scope :search, lambda{ |term| published.where('fulltext LIKE ?', "%#{term}%").where('locale = ?', Kuhsaft::Page.current_translation_locale) }
   
+  before_validation :create_slug, :create_url, :collect_fulltext
   delegate :childs, :to => :page
   
   validates :title, :presence => true
   validates :locale, :presence => true
   validates :slug, :presence => true
   
+  accepts_nested_attributes_for :page_parts, :allow_destroy => true
+  
+  def published?
+    published > 0 || (published_at < DateTime.now if published_at.present?)
+  end
+  
   def locale
     read_attribute(:locale).to_sym unless read_attribute(:locale).nil?
   end
   
   def create_url
+    return if self.page_type == 'redirect'
     complete_slug = ''
     if page.present? && page.parent.present?
       complete_slug << page.parent.url.to_s
@@ -30,4 +38,15 @@ class Kuhsaft::LocalizedPage < ActiveRecord::Base
       write_attribute(:slug, read_attribute(:title).downcase.parameterize)
     end
   end
+  
+  def collect_fulltext
+    self.fulltext = page_parts.inject('') do |text, page_part|
+      page_part.class.searchable_attributes.each do |attr|
+        text << ' '
+        text << page_part.send(attr).to_s
+      end
+      text
+    end
+    self.fulltext << [title.to_s, keywords.to_s, description.to_s].join(' ')
+  end
 end

data/app/models/kuhsaft/page.rb

@@ -6,33 +6,33 @@ class Kuhsaft::Page < ActiveRecord::Base
   scope :root_pages, where('parent_id IS NULL')
   default_scope order('position ASC')
   
-  delegate  :title, :title=, 
-            :slug, :slug=, 
-            :published, :published=, 
-            :keywords, :keywords=, 
-            :description, :description=, 
-            :locale, :locale=,
-            :body, :body=,
-            :url, :url=,
-            :to => :translation
+  delegate  :title, :slug, :published, :keywords, :description, :locale, :body, :url, :fulltext,
+            :to => :translation, :allow_nil => true
+  
+  accepts_nested_attributes_for :localized_pages
   
   after_save :save_translation
   after_create :set_position
   
+  #
+  # Stores the selected type of page_part when created through the form
+  #
+  attr_accessor :page_part_type
+  
   def root?
     parent.nil?
   end
   
-  def translation
-    unless @localized_page.present?
-      pages = localized_pages.where('locale = ?', Kuhsaft::Page.current_translation_locale)
-      @localized_page = pages.first unless pages.blank?
-    end
-    @localized_page ||= localized_pages.build :locale => Kuhsaft::Page.current_translation_locale
+  def translation lang = nil
+    lang ||= Kuhsaft::Page.current_translation_locale
+    @translation = localized_pages.where('locale = ?', lang).first if @translation.blank? || @translation.locale != lang
+    @translation
   end
   
   def save_translation
-    @localized_page.save unless @localized_page.blank?
+    unless @translation.blank?
+      @translation.save 
+    end
     childs.each do |child|
       child.translation.save if child.translation.persisted?
     end
@@ -90,10 +90,14 @@ class Kuhsaft::Page < ActiveRecord::Base
   end
   
   def link
-    if body.blank? && childs.count > 0
+    if translation.page_parts.count == 0 && childs.count > 0
       childs.first.link
     else
-      "/#{url}"
+      if translation.page_type == 'redirect'
+        url
+      else
+        "/#{url}"
+      end
     end
   end
   

data/app/models/kuhsaft/page_part.rb

@@ -9,4 +9,4 @@ module Kuhsaft
       descendants.map { |d| d.to_s.underscore.to_sym }
     end
   end
-end
+end

data/app/models/kuhsaft/page_part/content.rb

@@ -0,0 +1,55 @@
+module Kuhsaft
+  module PagePart
+    class Content < ActiveRecord::Base
+      belongs_to :localized_page      
+      serialize :content
+      
+      class << self
+        def serialize_attr name
+          name = name.to_sym
+          serializeable_attributes << name
+          
+          define_method name do
+            self.content ||= {}
+            self.content[name].presence
+          end
+          
+          define_method "#{name}=" do |val|
+            self.content_will_change!
+            self.content ||= {}
+            self.content[name] = val
+          end
+        end
+        
+        def searchable_attr name
+          name = name.to_sym
+          searchable_attributes << name
+        end
+        
+        def searchable_attributes
+          @searchable_attributes ||= []
+        end
+
+        def serializeable_attributes
+          @serializeable_attributes ||= []
+        end
+        
+        def page_part_types
+          descendants
+        end
+        
+        def to_name
+          self.to_s.split('::').last
+        end
+      end
+      
+      private
+      #
+      # OMFG, OMFG!!! http://stackoverflow.com/questions/5178204/what-is-a-better-way-to-create-sti-model-instance
+      #
+      def atributes_protected_by_default
+        super - [self.class.inheritance_column]
+      end
+    end
+  end
+end

data/app/models/kuhsaft/page_part/markdown.rb

@@ -0,0 +1,8 @@
+module Kuhsaft
+  module PagePart
+    class Markdown < Kuhsaft::PagePart::Content
+      serialize_attr :text
+      searchable_attr :text
+    end
+  end
+end

data/app/models/kuhsaft/publish_state.rb

@@ -0,0 +1,29 @@
+module Kuhsaft
+  class PublishState
+    
+    extend ActiveModel::Translation
+    
+    UNPUBLISHED = 0
+    PUBLISHED = 1
+    PUBLISHED_AT = 2
+    
+    attr_reader :name
+    attr_reader :value
+    
+    def initialize options
+      options.each_pair { |k,v| instance_variable_set("@#{k}", v) if respond_to?(k) }
+    end
+    
+    def human_name
+      I18n.translate(name)
+    end
+    
+    def self.all
+      @all ||= [
+        PublishState.new(:name => 'unpublished', :value => UNPUBLISHED),
+        PublishState.new(:name => 'published', :value => PUBLISHED),
+        PublishState.new(:name => 'published_at', :value => PUBLISHED_AT)
+        ]
+    end
+  end
+end

data/app/stylesheets/kuhsaft/admin/partials/_generic.sass

@@ -1,29 +1,48 @@
+$color1: #2c5eb0
+$color2: #161f38
+$color3: #e4e9f2
+
 body
-  line-height: 135%
-  font-size: 12px
+  line-height: 150%
+  font-size: 16px
+  background: #efefef
+  font-family: 'Helvetica Neue', 'Helvetica', Arial, sans-serif
+  
+#kuhsaft-wrapper
+  background: #f9f9f9
+  padding: 24px
+  margin: 48px auto
+  max-width: 912px
   
 a
   text-decoration: none
-  +link-colors(#000, #666, #000, #000, #000)
+  +link-colors($color1, $color2, $color1, $color1, $color2)
   
 .clear
   clear: both
 
+.clearfix
+  +clearfix
+
 .toolbar
   padding: 5px 0px
   a
     +float_right
 
 .module-nav
-  +horizontal-list(10px)
+  background: $color3
   font-size: 18px
-  line-height: 26px
+  font-weight: bold
+  margin: -24px
+  +horizontal-list(12px)
+  padding-left: 24px
+  width: 936px
+  margin-left: -24px
+  
+  a
+    line-height: 48px
 
 .list
   border-top: 1px solid #444
   li
-    border-bottom: 1px solid #444
-
-#kuhsaft-wrapper
-  margin: 50px auto
-  max-width: 900px
+    border-bottom: 1px solid #444

data/app/stylesheets/kuhsaft/admin/partials/_pages.sass

@@ -21,7 +21,6 @@
     
   .page-branch
     margin: 5px 0px
-    background: url(../../../images/drag-handle.png) no-repeat
     padding-left: 25px
   
     .new-child, .delete
@@ -39,4 +38,9 @@
       
   textarea
     width: 100%
-    height: 600px
+    height: 150px
+    margin-bottom: 12px
+    
+  select, select + input[type=submit]
+    float: left
+    margin-right: 20px

data/app/views/kuhsaft/admin/kuhsaft/page_part/markdowns/_markdown.html.haml

@@ -0,0 +1 @@
+= input_form.input :text, :as => :text

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

@@ -1,11 +1,22 @@
-- Kuhsaft::Page.translation_locales.each do |locale|
-  = link_to locale.to_s, link_url.call(:translation_locale => locale), :class => 'button'
-= simple_form_for @page, :url => url.call(:translation_locale => Kuhsaft::Page.current_translation_locale) do |f|
-  %p= t('kuhsaft.admin.pages.current_translation_locale', :translation_locale => Kuhsaft::Page.current_translation_locale)
-  = f.input :title
-  = f.input :slug
-  = f.input :keywords
-  = f.input :description
-  = f.input :body, :as => :text
-  = f.input :parent_id, :as => :hidden, :input_html => { :value => params[:parent_id] } if params[:parent_id].present?
-  = f.button :submit
+= simple_form_for @page, :url => url do |page|
+  = 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 :published, :collection => Kuhsaft::PublishState.all, :label_method => :human_name, :value_method => :value
+    .clear
+    - unless localized.object.page_type == 'redirect'
+      - if localized.object.published == Kuhsaft::PublishState::PUBLISHED_AT
+        = localized.input :published_at, :as => :datetime
+      = localized.input :keywords
+      = localized.input :description
+      = localized.input :locale, :as => :hidden
+      = localized.fields_for :page_parts, @localized_page.page_parts do |page_part|
+        - unless page_part.object.persisted?
+          = page_part.input :type, :as => :hidden, :input_html => { :value => page_part.object.class.to_s }
+        = render :partial => page_part.object, :locals => { :input_form => page_part }
+        = page_part.input :_destroy, :as => :boolean
+    - else
+      = localized.input :url, :as => :string
+  = page.input :parent_id, :as => :hidden, :input_html => { :value => params[:parent_id] } if params[:parent_id].present?
+  = page.button :submit