fullstack-cms 0.3.15 → 0.3.16

data/Gemfile.lock

@@ -1,45 +1,45 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.8)
-      actionpack (= 3.2.8)
+    actionmailer (3.2.9)
+      actionpack (= 3.2.9)
       mail (~> 2.4.4)
-    actionpack (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    actionpack (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
       rack (~> 1.4.0)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
+      sprockets (~> 2.2.1)
     active_record_schema (0.5.13)
       rails
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
+    activemodel (3.2.9)
+      activesupport (= 3.2.9)
       builder (~> 3.0.0)
-    activerecord (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    activerecord (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-    activesupport (3.2.8)
+    activeresource (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
+    activesupport (3.2.9)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     acts-as-taggable-on (2.3.3)
       rails (~> 3.0)
-    acts_as_indexed (0.7.8)
+    acts_as_indexed (0.8.1)
     arel (3.0.2)
-    ars-permalink (0.1.1)
+    ars-permalink (0.1.4)
       friendly_id
       rails
     auto_strip_attributes (2.0.2)
       activerecord (>= 3.0)
-    awesome_nested_set (2.1.3)
+    awesome_nested_set (2.1.5)
       activerecord (>= 3.0.0)
     aws-sdk (1.8.0)
       httparty (~> 0.7)
@@ -48,17 +48,17 @@ GEM
       uuidtools (~> 2.1)
     bcrypt-ruby (3.0.1)
     bluecloth (2.2.0)
-    bootstrap-datepicker-rails (0.6.33)
+    bootstrap-datepicker-rails (0.6.34)
       railties (>= 3.0)
     bootstrap-helpers (0.1.8)
       rails
-    builder (3.0.0)
+    builder (3.0.4)
     checkin (0.5.1)
     chosen-rails (0.9.11)
       coffee-rails (~> 3.2)
       railties (~> 3.0)
       sass-rails (~> 3.2)
-    chronic (0.6.7)
+    chronic (0.9.0)
     ckeditor (3.7.3)
       mime-types
       orm_adapter
@@ -93,7 +93,7 @@ GEM
     formtastic-bootstrap (2.0.0)
       formtastic (~> 2.2)
       formtastic-bootstrap
-    friendly_id (4.0.8)
+    friendly_id (4.0.9)
     fullstack (0.1.26)
       active_record_schema
       auto_strip_attributes
@@ -146,7 +146,7 @@ GEM
     httparty (0.9.0)
       multi_json (~> 1.0)
       multi_xml
-    i18n (0.6.0)
+    i18n (0.6.1)
     jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -156,7 +156,7 @@ GEM
     jquery-rails (2.1.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.7.4)
+    json (1.7.5)
     kaminari (0.13.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -178,7 +178,7 @@ GEM
     mobile-fu (1.1.1)
       rack-mobile-detect
       rails
-    multi_json (1.3.6)
+    multi_json (1.5.0)
     multi_xml (0.5.1)
     net-ssh (2.6.2)
     nokogiri (1.5.6)
@@ -201,17 +201,17 @@ GEM
       rack
     rack-ssl (1.3.2)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.8)
-      actionmailer (= 3.2.8)
-      actionpack (= 3.2.8)
-      activerecord (= 3.2.8)
-      activeresource (= 3.2.8)
-      activesupport (= 3.2.8)
+    rails (3.2.9)
+      actionmailer (= 3.2.9)
+      actionpack (= 3.2.9)
+      activerecord (= 3.2.9)
+      activeresource (= 3.2.9)
+      activesupport (= 3.2.9)
       bundler (~> 1.0)
-      railties (= 3.2.8)
-    rails-i18n (0.7.1)
+      railties (= 3.2.9)
+    rails-i18n (0.7.2)
       i18n (~> 0.5)
     rails-slow-assets-workaround (0.1.1)
       rails
@@ -221,14 +221,14 @@ GEM
       rails (~> 3.0)
     rails_nested_layouts (0.1.1)
       rails
-    railties (3.2.8)
-      actionpack (= 3.2.8)
-      activesupport (= 3.2.8)
+    railties (3.2.9)
+      actionpack (= 3.2.9)
+      activesupport (= 3.2.9)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (0.9.2.2)
+    rake (10.0.3)
     rambler (0.1.3)
       rails (~> 3.2)
     rdoc (3.12)
@@ -245,26 +245,27 @@ GEM
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    sprockets (2.1.3)
+    sprockets (2.2.2)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     squeel (1.0.14)
       activerecord (~> 3.0)
       activesupport (~> 3.0)
       polyamorous (~> 0.5.0)
-    thor (0.15.4)
+    thor (0.16.0)
     tilt (1.3.3)
-    treetop (1.4.10)
+    treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
+    tzinfo (0.3.35)
     uuidtools (2.1.3)
     warden (1.2.1)
       rack (>= 1.0)
-    whenever (0.7.3)
+    whenever (0.8.1)
       activesupport (>= 2.3.4)
-      chronic (~> 0.6.3)
+      chronic (>= 0.6.3)
 
 PLATFORMS
   ruby

data/VERSION

@@ -1 +1 @@
-0.3.15
+0.3.16

data/app/models/page.rb

@@ -23,10 +23,6 @@ class Page < ActiveRecord::Base
     resource_type.present?
   end
   
-  def to_label
-    name
-  end
-
   def resource_class
     if self.resourceful?
       @resource_class ||= resource_type.to_s.camelize.constantize
@@ -61,7 +57,7 @@ class Page < ActiveRecord::Base
   end
   
   def to_label
-    "#{name} - #{locale}"
+    self.respond_to?(:locale) && locale.present? ? "#{name.titleize} (#{locale})" : "#{name.titleize}"
   end
 
   has_many :page_parts

data/app/support/sitemap.rb

@@ -1,7 +1,54 @@
 module Sitemap
-    extend ActiveSupport::Concern
+  extend ActiveSupport::Concern
   
-  def render_sitemap(allowed_locales = nil)
+  def render_sitemap(options = {})
+    if Fullstack::Cms.localized?
+      render_sitemap_localized(options[:allowed_locales])
+    else
+      render_sitemap_not_localized
+    end
+  end
+  
+  def render_sitemap_not_localized
+    @pages = Page.all.sort do |p1, p2|
+      (p1.path || "").split("/").size <=> (p2.path || "").split("/").size
+    end
+      
+      erb = <<-eos
+  <?xml version="1.0" encoding="UTF-8"?>
+  <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+    <% @pages.each do |page| -%>   
+    <% if !page.resourceful? -%>  
+    <% begin -%>
+    <% loc =  polymorphic_url([:site, page.uid.split("#").last].compact)  -%>
+    <url>
+       <loc><%= loc %></loc>
+    </url>
+    <% rescue Exception => e -%>
+    <% end -%>
+    <% else -%>
+        <% page.resource_class.all.each do |resource| -%>
+    <% unless (resource.respond_to?(:published) && !resource.published?) ||
+       (resource.respond_to?(:sitemap) && !resource.sitemap?) -%>
+    <url>
+      <loc><%= page_url_for(resource) -%></loc>
+      <% if resource.respond_to?(:updated_at) -%>
+      <lastmod><%= resource.updated_at.strftime("%F")  -%></lastmod>  
+      <% end -%>      
+    </url>
+    <% end -%>
+        <% end -%>
+      <% end -%>
+    <% end -%>
+  </urlset>
+
+  eos
+      
+    render :inline => erb, :layout => false
+      
+  end
+  
+  def render_sitemap_localized(allowed_locales = nil)
        allowed_locales ||= I18n.available_locales.map(&:to_s)
     @pages = Page.where("locale IN (?)", allowed_locales).sort do |p1, p2|
       (p1.path || "").split("/").size <=> (p2.path || "").split("/").size

data/fullstack-cms.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "fullstack-cms"
-  s.version = "0.3.15"
+  s.version = "0.3.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mcasimir"]
-  s.date = "2012-12-27"
+  s.date = "2012-12-29"
   s.description = "CMS system built on fullstack"
   s.email = "maurizio.cas@gmail.com"
   s.extra_rdoc_files = [

data/lib/generators/fullstack/cms/templates/rails/app/views/site/_head.html.erb

@@ -42,8 +42,6 @@
     <% end %>
   <% end %>
   
-  <meta name="keywords" content="bed and breakfast bologna, bed and breakfast bologna ospedale maggiore, bed and breakfast bologna aereoporto, bed and breakfast bologna fiera" />
-
  <link rel="shortcut icon" href="/favicon.ico?v=2" />
   <%= stylesheet_link_tag 'site/site' %>
   <%= yield :stylesheets %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fullstack-cms
 version: !ruby/object:Gem::Version
-  version: 0.3.15
+  version: 0.3.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-27 00:00:00.000000000 Z
+date: 2012-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fullstack-admin
@@ -329,7 +329,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2985390891517279258
+      hash: -410963911146515683
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: