tkh_content 0.1 → 0.1.1

data/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 
 
+
+## 0.1.1
+
+* Creation of blog section
+* Page title in h1 in show view only for blog posts
+* Refactored meta_title generation
+* Added short title page attribute mostly used for menus
+* Pages act as a tree to build menu system
+* Pages are either published or draft according to published_at attribute
+* Needs a shared/menus partial or the tkh_menus gem
+* Cleaned up some locale files and added the German locale but it's not translated yet
+
+
 ## 0.1
 
 * Reverted pages show route to that one of a normal resource

data/README.md

@@ -4,7 +4,7 @@ This Rails engine puts the C in CMS. It provides the pages and the blog section.
 
 Primarily developed for Ten Thousand Hours but we are happy to share if anybody finds it useful.
 
-It's still embryonic but many improvements to come. The blog is not in yet. 
+It's still embryonic but many improvements to come. The blog is now coming bit by bit.
 
 
 
@@ -14,6 +14,7 @@ It's still embryonic but many improvements to come. The blog is not in yet.
 The following things are needed:
 
 * Ruby 1.9.2 or later
+* A shared/menus view partial or the tkh_menus gem
 
 
 ## Installation

data/app/controllers/blog_controller.rb

@@ -0,0 +1,94 @@
+class BlogController < ApplicationController
+  
+  def index
+    @posts = Page.for_blog.published.order('updated_at').offset(60).limit(30)
+    render :layout => 'blog'
+  end
+  
+  def update_data
+    
+    @count = 0
+    @pages = Array.new
+    
+    Page.all.each do |page|
+      # determine whether page contains path
+      if page.body.match /src="\/system\/photos\/.*\.jpg/
+        # extract string to be changed
+        # match_data = page.body.match /src="\/system\/photos\/.*\.jpg/
+        # # extract an image name with jpg extension in the blog/2006 section
+        # extracted_image = match_data.to_s.sub("src=\"/images/photos/", '')
+        # # find the corresponding illustration
+        # illustration = Illustration.find_by_name(extracted_image)
+        # if illustration
+        #   # change the image path
+        #   page.body = page.body.sub("/images/blog/2007/", "/system/images/illustration/#{illustration.id}/large_")
+        #   # save the page with new path
+        #   page.save
+        # end  
+        @count += 1
+        @pages << page
+        
+      end
+    end
+    
+    # @list_of_files = Array.new
+    
+    # @count = 0
+    
+    # Illustration.all.each do |illustration|
+    #   
+    #   if illustration.name == 'No name given'
+    #     
+    #     illustration.destroy
+    #     @count += 1 
+    #     
+    #   end
+    #   
+    #   # # extract an image name with jpg extension in the blog/2006 section
+    #   # extracted_image = page.body.match(/src="\/images\/blog\/2006\/.*\.jpg/).to_s.sub("src=\"/images/blog/2006/", '')
+    #   # 
+    #   # if extracted_image
+    #   #   
+    #   #    # find the corresponding illustration
+    #   #     @illustration = Illustration.find_by_image(File.basename("/Users/swamiatma/Documents/railsapps/aya/public/images/blog/2006/#{extracted_image}"))
+    #   #     
+    #   #     if @illustration
+    #   #       # change the path of the image
+    #   #       page.body = page.body.sub("/images/blog/2006/", "/system/images/illustration/#{@illustration.id}/large_")
+    #   #       # save the page with new path
+    #   #       page.save
+    #   #     
+    #   #       count += 1
+    #   #       extracted_image = nil
+    #   #     end
+    #   #   
+    #   # end
+    #  
+    # end
+    
+    # # take a blog post as an example
+    # @page = Page.find(9)
+
+    
+    # redirect_to blog_path, notice: "#{count} wp images have been detected"
+    # 
+    # count = 0
+    #     
+    # Dir["/Users/swamiatma/Documents/railsapps/aya/public/images/photos/*.*"].each do |file|
+    #   
+    #   illustration = Illustration.new
+    #   illustration.image = File.open(file)
+    #   illustration.name = "photos-#{File.basename(file)}"
+    #   illustration.save
+    #   
+    #   count += 1
+    #   
+    # end
+    # 
+    # 
+    # redirect_to illustrations_path, notice: "#{count} new illustrations should be uploaded"
+    
+    
+  end
+  
+end

data/app/controllers/pages_controller.rb

@@ -48,4 +48,25 @@ class PagesController < ApplicationController
     redirect_to pages_url, notice: t('pages.destroy.notice')
   end
   
+  def publish
+    page = Page.find(params[:id])
+    page.published_at = Time.now
+    page.save
+    redirect_to pages_path, notice: 'The page has been published'
+  end
+  
+  def unpublish
+    page = Page.find(params[:id])
+    page.published_at = nil
+    page.save
+    redirect_to pages_path, notice: "The page has been unpublished. It's a draft again."
+  end
+  
+  def toggle_for_blog
+    page = Page.find(params[:id])
+    page.for_blog? ? page.for_blog = false : page.for_blog = true
+    page.save
+    redirect_to pages_path notice: "The blog status of the page has been changed"
+  end
+  
 end

data/app/models/page.rb

@@ -7,19 +7,54 @@ class Page < ActiveRecord::Base
   
   belongs_to :author, class_name: 'User', foreign_key: 'author_id'
   
-  attr_accessible :body, :description, :title, :blog_post, :for_blog
+  attr_accessible :title, :short_title, :description, :body, :for_blog, :parent_id
   
   validates_presence_of :title
   validates_presence_of :description
   validates_presence_of :body
   validates_presence_of :author_id
   
-  translates :title, :description, :body
+  translates :title, :short_title, :description, :body
     
   def to_param
     title ? "#{id}-#{title.to_url}" : id
   end
 
-  scope :by_recent, :order => 'updated_at desc'
+  scope :by_recent, order('updated_at desc')
+  scope :for_blog, where('for_blog = ?', true)
+  scope :not_for_blog, where('for_blog = ?', false)
+  scope :published, where('published_at IS NOT ?', nil)
+  scope :by_recently_published, order('published_at desc')
+  # tree scopes
+  scope :orphans, where('parent_id IS ?', nil)
+  scope :with_parent_id, lambda { |id| where('parent_id = ?', id) }
+  
+  def nickname
+    short_title || title
+  end
+  
+  def orphan?
+    parent_id == nil
+  end
+  
+  def has_children?
+    Page.with_parent_id(id).count >= 1
+  end
+  
+  def children
+    Page.with_parent_id(id)
+  end
+  
+  def parent
+    Page.find(parent_id)
+  end
+  
+  def has_siblings?
+    Page.with_parent_id(parent_id).count >= 1
+  end
+  
+  def siblings
+    Page.with_parent_id(parent_id)
+  end
   
 end

data/app/views/blog/index.html.erb

@@ -0,0 +1,16 @@
+<% content_for :meta_title, 'Blog' %>
+
+<% unless @posts.blank? %>
+  <% for post in @posts %>
+    <h1><%= link_to post.title, post %></h1>
+		<p><%= link_to 'edit post', edit_page_path(post) %></p>
+		<p>
+			by <%= post.author.name %> on <%= l post.published_at, format: :default %> | <%= link_to 'Permalink.', post %>
+		</p>
+		<%= raw post.body %>
+  <% end %>
+<% end %>
+
+
+
+

data/app/views/pages/_form.html.erb

@@ -2,10 +2,12 @@
 	<%= f.error_notification %>
 	
   <div class="form-inputs">
-		<%= f.input :title %><br /><br />
-		<%= f.input :for_blog %><br /><br />
-	  <%= f.input :description, :input_html => { :rows => 5 } %><br /><br />
-		<%= f.input :body, :input_html => { :rows => 30 } %>
+		<%= f.input :title, hint: 'nice and descriptive' %><br />
+		<%= f.input :short_title, hint: 'ideally one word only, used for the menu' %><br />
+		<%= f.input :parent_id %><br />
+		<%= f.input :for_blog %><br />
+	  <%= f.input :description, :input_html => { :rows => 3 } %>
+		<%= f.input :body, :input_html => { :rows => 25 } %>
 	</div>
 	
   <div class="form-actions">

data/app/views/pages/index.html.erb

@@ -18,8 +18,17 @@
 		    <td><%= link_to page.title, page %></td>
 		    <td><%= truncate page.description, length: 55, separator: ' ...' %></td>
 				<td><%= page.author.name %></td>
-				<td><%= page.for_blog? ? '✓' : 'X' %></td>
-				<td><%= page.published_at ? '✓ ' + l( page.published_at.to_date, format: :long) : 'X' %></td>
+				<td>
+					<%= page.for_blog? ? "<span class=\"label label-success\">✓</span>".html_safe : "<span class=\"label label-important\">X</span>".html_safe %>
+					<%= link_to 'toggle', toggle_for_blog_page_path(page), class: 'btn btn-mini', method: :post %>
+				</td>
+				<td>
+					<% if page.published_at %>
+						<span class="label label-success">✓</span> <%= link_to 'unpublish', unpublish_page_path(page), class: 'btn btn-mini', method: :post %>
+					<% else %>
+					  <span class="label label-important">X</span> <%= link_to 'publish', publish_page_path(page), class: 'btn btn-mini btn-primary', method: :post %>
+					<% end -%>
+				</td>
 		    <td><%= link_to t('edit'), edit_page_path(page), class: 'btn btn-mini' %>
 					<%= link_to t('delete'), page, method: :delete, data: { confirm: t('are_you_sure') }, class: 'btn btn-mini btn-danger' %></td>
 		  </tr>

data/app/views/pages/show.html.erb

@@ -1,6 +1,9 @@
-<% @meta_title = @page.title %>
-<% @meta_description = @page.description %>
+<% content_for :meta_title, @page.title %>
+<% content_for :meta_description, @page.description %>
 
-<h1><%= @page.title %></h1>
+<%= content_tag(:h1, @page.title) if @page.for_blog? %>
 
-<%= raw @page.body %>
+<%= raw @page.body %>
+
+<%# partial in tkh_menus gem or has to be added in host app %>
+<%= render './shared/menus' %>

data/config/routes.rb

@@ -1,5 +1,12 @@
 Rails.application.routes.draw do
   scope "(:locale)", locale: /#{I18n.available_locales.join("|")}/ do
-    resources :pages
+    resources :pages do
+      member do
+        post :publish
+        post :unpublish
+        post :toggle_for_blog
+      end
+    end
+    match 'blog' => 'blog#index'
   end
 end

data/lib/generators/tkh_content/create_or_update_locales/templates/de.yml

@@ -0,0 +1,30 @@
+de:
+  
+  are_you_sure: 'are you sure?'
+  delete: 'delete'
+  edit: 'edit'
+  pages: 'pages'
+  sections: 'sections'
+  
+  activerecord: 
+    attributes:
+      pages:
+        title: "titre"
+        short_title: 'titre raccourci'
+        description: "description"
+        body: "texte principal"
+        for_the_blog: 'pour le blog'
+  
+  pages:
+    author: 'author'
+    create_new: 'create new page'
+    published: 'published?'
+    
+    create:
+      notice: 'The page was successfully created.'
+      warning: 'There was a problem saving the page'
+    update:
+      notice: 'The page was successfully updated.'
+      warning: 'There was a problem saving the page'
+    destroy:
+      notice: 'The page was deleted'

data/lib/generators/tkh_content/create_or_update_locales/templates/en.yml

@@ -1,18 +1,4 @@
-# Sample localization file for English. Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
-
 en:
-  date:
-    formats:
-      simple_date: "%B %d"
-  time:
-    formats:
-      informal: "at %H:%M"
-      default: "%a. %b. %d, '%y at %H:%M"
-      just_time: "%I:%M %p"
-      long: "%A %d %B %Y at %H:%M"
-  # custom sections - the obove is provided by rails
-  language_name: English
   
   are_you_sure: 'are you sure?'
   delete: 'delete'
@@ -33,5 +19,3 @@ en:
       warning: 'There was a problem saving the page'
     destroy:
       notice: 'The page was deleted'
-  
-  

data/lib/generators/tkh_content/create_or_update_locales/templates/es.yml

@@ -1,5 +1,4 @@
 es:
-  language_name: "Español"
   
   are_you_sure: '¿estás seguro?'
   delete: 'borrar'
@@ -11,9 +10,10 @@ es:
     attributes:
       pages:
         title: "título"
+        short_title: 'título breve'
         description: "descripción"
         body: "parte principal"
-        para el blog: 'contraseña'
+        for_the_blog: 'contraseña'
 
   pages:
     author: 'autor'

data/lib/generators/tkh_content/create_or_update_locales/templates/fr.yml

@@ -1,184 +1,4 @@
 fr:
-  date:
-    formats:
-      short: "%e %b"
-      long: "%e %B %Y"
-      only_day: "%e"
-      simple_date: "%d %B"
-    day_names: [dimanche, lundi, mardi, mercredi, jeudi, vendredi, samedi]
-    abbr_day_names: [dim, lun, mar, mer, jeu, ven, sam]
-    month_names: [~, janvier, février, mars, avril, mai, juin, juillet, août, septembre, octobre, novembre, décembre]
-    abbr_month_names: [~, jan., fév., mar., avr., mai, juin, juil., août, sept., oct., nov., déc.]
-    order:
-      - :day
-      - :month
-      - :year
-  time:
-    formats:
-      informal: "à %H:%M"
-      default: "%a. %d %b %Y à %H:%M"
-      short: "%d %b %H:%M"
-      long: "%A %d %B %Y à %H:%M"
-      just_time: "%H:%M"
-      
-    am: 'am'
-    pm: 'pm'
-
-  datetime:
-    distance_in_words:
-      half_a_minute: "une demi-minute"
-      less_than_x_seconds:
-        zero: "moins d'une seconde"
-        one: "moins d'une seconde"
-        other: "moins de %{count} secondes"
-      x_seconds:
-        one: "1 seconde"
-        other: "%{count} secondes"
-      less_than_x_minutes:
-        zero: "moins d'une minute"
-        one: "moins d'une minute"
-        other: "moins de %{count} minutes"
-      x_minutes:
-        one: "1 minute"
-        other: "%{count} minutes"
-      about_x_hours:
-        one: "environ une heure"
-        other: "environ %{count} heures"
-      x_days:
-        one: "1 jour"
-        other: "%{count} jours"
-      about_x_months:
-        one: "environ un mois"
-        other: "environ %{count} mois"
-      x_months:
-        one: "1 mois"
-        other: "%{count} mois"
-      about_x_years:
-        one: "environ un an"
-        other: "environ %{count} ans"
-      over_x_years:
-        one: "plus d'un an"
-        other: "plus de %{count} ans"
-      almost_x_years:
-        one: "presqu'un an"
-        other: "presque %{count} ans"
-    prompts:
-      year: "Année"
-      month: "Mois"
-      day: "Jour"
-      hour: "Heure"
-      minute: "Minute"
-      second: "Seconde"
-
-  number:
-    format:
-      separator: ","
-      delimiter: " "
-      precision: 3
-      significant: false
-      strip_insignificant_zeros: false
-    currency:
-      format:
-        format: "%n %u"
-        unit: "€"
-        separator: ","
-        delimiter: " "
-        precision: 2
-        significant: false
-        strip_insignificant_zeros: false
-    percentage:
-      format:
-        delimiter: ""
-    precision:
-      format:
-        delimiter: ""
-    human:
-      format:
-        delimiter: ""
-        precision: 2
-        significant: true
-        strip_insignificant_zeros: true
-      storage_units:
-        format: "%n %u"
-        units:
-          byte:
-            one: "octet"
-            other: "octets"
-          kb: "ko"
-          mb: "Mo"
-          gb: "Go"
-          tb: "To"
-      decimal_units:
-        format: "%n %u"
-        units:
-          unit: ""
-          thousand: "millier"
-          million: "million"
-          billion: "milliard"
-          trillion: "billion"
-          quadrillion: "million de milliards"
-
-  support:
-    array:
-      words_connector: ", "
-      two_words_connector: " et "
-      last_word_connector: " et "
-    select:
-      prompt: "Veuillez sélectionner"
-
-  helpers:
-    select:
-      prompt: "Veuillez sélectionner"
-    submit:
-      create: "Créer un %{model}"
-      update: "Modifier ce %{model}"
-      submit: "Enregistrer ce %{model}"
-
-  attributes:
-    created_at: "Créé le"
-    updated_at: "Modifié le"
-
-  errors:
-    format: "Le %{attribute} %{message}"
-    messages: &errors_messages
-      inclusion: "n'est pas inclus(e) dans la liste"
-      exclusion: "n'est pas disponible"
-      invalid: "n'est pas valide"
-      confirmation: "ne concorde pas avec la confirmation"
-      accepted: "doit être accepté(e)"
-      empty: "doit être rempli(e)"
-      blank: "doit être rempli(e)"
-      too_long: "est trop long (pas plus de %{count} caractères)"
-      too_short: "est trop court (au moins %{count} caractères)"
-      wrong_length: "ne fait pas la bonne longueur (doit comporter %{count} caractères)"
-      not_a_number: "n'est pas un nombre"
-      not_an_integer: "doit être un nombre entier"
-      greater_than: "doit être supérieur à %{count}"
-      greater_than_or_equal_to: "doit être supérieur ou égal à %{count}"
-      equal_to: "doit être égal à %{count}"
-      less_than: "doit être inférieur à %{count}"
-      less_than_or_equal_to: "doit être inférieur ou égal à %{count}"
-      odd: "doit être impair"
-      even: "doit être pair"
-    template: &errors_template
-      header:
-        one: "Impossible d'enregistrer ce %{model} : 1 erreur"
-        other: "Impossible d'enregistrer ce %{model} : %{count} erreurs"
-      body: "Veuillez vérifier les champs suivants : "
-
-  activerecord:
-    errors:
-      messages:
-        taken: "n'est pas disponible"
-        record_invalid: "La validation a échoué : %{errors}"
-        <<: *errors_messages
-      template:
-        <<: *errors_template
-      full_messages:
-        format: "%{attribute} %{message}"
-  
-  # custom sections - the obove is provided by rails
-  language_name: Français
   
   are_you_sure: 'êtes vous sûr ?'
   delete: 'supprimer'
@@ -190,9 +10,10 @@ fr:
     attributes:
       pages:
         title: "titre"
+        short_title: 'titre raccourci'
         description: "description"
         body: "texte principal"
-        para el blog: 'pour le blog'
+        for_the_blog: 'pour le blog'
   
   pages:
     author: 'auteur'
@@ -201,9 +22,9 @@ fr:
     
     create:
       notice: 'La page a été créée.'
-      warning: "Il y'a eu un problem et la page n'a pas été sauvegardée"
+      warning: "Il y'a eu un probleme et la page n'a pas été sauvegardée"
     update:
       notice: 'Les changements de cette page ont été sauvegardés'
-      warning: "Il y'a eu un problem et les changements de cette page n'ont pas été sauvegardés"
+      warning: "Il y'a eu un probleme et les changements de cette page n'ont pas été sauvegardés"
     destroy:
       notice: 'La page a été supprimée'

data/lib/generators/tkh_content/create_or_update_migrations/create_or_update_migrations_generator.rb

@@ -20,6 +20,7 @@ module TkhContent
         migration_template "create_pages.rb", "db/migrate/create_pages.rb"
         migration_template "add_author_to_pages.rb", "db/migrate/add_author_to_pages.rb"
         migration_template "add_parent_id_to_pages.rb", "db/migrate/add_parent_id_to_pages.rb"
+        migration_template "add_short_title_to_pages.rb", "db/migrate/add_short_title_to_pages.rb"
       end
  
     end

data/lib/generators/tkh_content/create_or_update_migrations/templates/add_short_title_to_pages.rb

@@ -0,0 +1,6 @@
+class AddShortTitleToPages < ActiveRecord::Migration
+  def change
+    add_column :pages, :short_title, :string
+    add_column :page_translations, :short_title, :string
+  end
+end

data/lib/tkh_content.rb

@@ -1,4 +1,5 @@
 require "tkh_content/version"
+require 'bootstrap-sass'
 require 'simple_form'
 require 'stringex'
 require 'globalize3'

data/lib/tkh_content/version.rb

@@ -1,3 +1,3 @@
 module TkhContent
-  VERSION = "0.1"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tkh_content
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-13 00:00:00.000000000 Z
+date: 2012-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -43,6 +43,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: bootstrap-sass
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: simple_form
   requirement: !ruby/object:Gem::Requirement
@@ -98,8 +114,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- app/controllers/blog_controller.rb
 - app/controllers/pages_controller.rb
 - app/models/page.rb
+- app/views/blog/index.html.erb
 - app/views/pages/_form.html.erb
 - app/views/pages/edit.html.erb
 - app/views/pages/index.html.erb
@@ -110,12 +128,14 @@ files:
 - lib/generators/tkh_content/create_or_update_files/create_or_update_files_generator.rb
 - lib/generators/tkh_content/create_or_update_files/templates/blog.html.erb
 - lib/generators/tkh_content/create_or_update_locales/create_or_update_locales_generator.rb
+- lib/generators/tkh_content/create_or_update_locales/templates/de.yml
 - lib/generators/tkh_content/create_or_update_locales/templates/en.yml
 - lib/generators/tkh_content/create_or_update_locales/templates/es.yml
 - lib/generators/tkh_content/create_or_update_locales/templates/fr.yml
 - lib/generators/tkh_content/create_or_update_migrations/create_or_update_migrations_generator.rb
 - lib/generators/tkh_content/create_or_update_migrations/templates/add_author_to_pages.rb
 - lib/generators/tkh_content/create_or_update_migrations/templates/add_parent_id_to_pages.rb
+- lib/generators/tkh_content/create_or_update_migrations/templates/add_short_title_to_pages.rb
 - lib/generators/tkh_content/create_or_update_migrations/templates/create_pages.rb
 - lib/tasks/tkh_content_tasks.rake
 - lib/tkh_content/version.rb
@@ -168,7 +188,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3666386950165349341
+      hash: -2576848684436899421
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -177,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3666386950165349341
+      hash: -2576848684436899421
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23