fullstack-cms 0.3.10 → 0.3.11

data/Gemfile.lock

@@ -53,7 +53,6 @@ GEM
     bootstrap-helpers (0.1.8)
       rails
     builder (3.0.0)
-    checkin (0.5.1)
     chosen-rails (0.9.8.3)
       railties (~> 3.0)
       thor (~> 0.14)

data/VERSION

@@ -1 +1 @@
-0.3.10
+0.3.11

data/app/controllers/admin/photos_controller.rb

@@ -29,15 +29,6 @@ class Admin::PhotosController < Admin::BaseController
   def edit
   end
   
-  def rotate
-     @photo ||= Photo.find(params[:id])
-     rotation = params[:deg].to_f
-     rotation ||= 90
-     @photo.rotate!(rotation)
-#     flash[:notice] = "The image has been rotated"
-   end
-  
-  
   def update
       @photo.attributes = params[:photo]
       @photo.save

data/app/controllers/site/base_controller.rb

@@ -0,0 +1,76 @@
+class Site::BaseController < ApplicationController
+  include Pageable
+  include Sitemap
+  include Deny
+
+  prepend_before_filter(:set_locale) if Fullstack::Cms.localized?
+
+  rescue_from ActiveRecord::RecordNotFound, :with => :render_404
+  rescue_from DeniedError, :with => :handle_unauthorized
+  rescue_from PageNotFoundError, :with => :render_404
+
+  # ===========
+  # = Helpers =
+  # ===========
+
+  helper_method :current_locale
+  helper_method :current_locale?
+  helper_method :logged_in?
+  helper_method :guest?
+
+  protected
+  def current_locale
+    I18n.locale.to_s
+  end
+
+  def current_locale?(locale)
+    current_locale == locale.to_s
+  end
+
+  def set_locale
+    I18n.locale = "#{params[:locale]}".to_sym if params[:locale]
+    render_404 if I18n.locale.nil? || !I18n.available_locales.include?(I18n.locale.to_sym)
+  end
+
+  def instantiate_resource_by_slug!(resource)
+    res = resource.find_by_slug!(params[:slug])
+    instance_variable_set("@#{resource.name.underscore}", res)
+    @object = res
+    res
+  end
+
+  alias :resource_by_slug! :instantiate_resource_by_slug!
+
+  def instantiate_resource_by_slug_and_locale!(resource)
+    res = resource.find_by_slug_and_locale!(params[:slug], current_locale)
+    instance_variable_set("@#{resource.name.underscore}", res)
+    @object = res
+    res
+  end
+
+  alias :resource_by_slug_and_locale! :instantiate_resource_by_slug_and_locale!
+
+  def render_404
+    render :file => Rails.root.join("public", "404.html"), :layout => false, :status => :not_found
+  end
+
+  def handle_unauthorized
+    if guest?
+      redirect_to new_user_session_path
+    else
+      render_404
+    end
+  end
+
+  def render_404!
+    raise PageNotFoundError.new
+  end
+
+  def guest?
+    !current_user
+  end
+
+  def logged_in?
+    current_user
+  end
+end

data/app/errors/denied_error.rb

@@ -0,0 +1,3 @@
+class DeniedError < Exception
+    
+end

data/app/helpers/i18n_helper.rb

@@ -0,0 +1,9 @@
+module I18nHelper
+
+  def site_translate(key)
+    I18n.t( key, :scope => "site", :default => "#{key}".humanize )
+  end
+
+  alias :st :site_translate
+  
+end

data/app/helpers/pages_helper.rb

@@ -1,32 +1,31 @@
 module PagesHelper
-
   def current_page
     @current_page
   end
-  
+
   def part(name, opts = {}, &block)
     if @current_page
       schema = opts.delete(:schema) || PagePart
-      
-      klass = schema.is_a?(Class)  ? schema : "#{schema.to_s.camelize}PagePart".constantize  
+
+      klass = schema.is_a?(Class)  ? schema : "#{schema.to_s.camelize}PagePart".constantize
       p = klass.where(:name => "#{name}", :page_id => @current_page.id).first
       p ||= klass.create!(:name => "#{name}", :page_id =>  @current_page.id)
-            
+
       if block_given?
         capture do
           block.call(p)
         end
       else
-        p
+      p
       end
-      
+
     end
   end
-  
+
   def page_path_for(resource_or_page)
     page = resource_or_page.is_a?(Page) ? resource_or_page : page_by_resource(resource_or_page)
     path = page.try(:path)
-    if path.blank?      
+    if path.blank?
       "#not-found"
     else
       path.gsub(/:[A-z_]+/) do |seg|
@@ -36,33 +35,29 @@ module PagesHelper
     end
 
   end
-  
+
   def page_url_for(resource_or_page)
     "#{request.protocol}#{request.host_with_port}#{page_path_for(resource_or_page)}"
   end
-  
+
   def current_page_resource()
     if current_page && current_page.resourceful?
-      controller.instance_variable_get("@#{current_page.resource_type}")        
+      controller.instance_variable_get("@#{current_page.resource_type}")
     end
   end
-  
-  def home?
-    request.path == "/"
-  end
-
 
   private
+
   def page_by_resource(resource)
-     resource_type = resource.class.name.underscore
-     
-     if Fullstack::Cms.config.localize
-       locale = resource.respond_to?(:locale) ? resource.send(:locale) : I18n.locale.to_s 
-       Page.find_by_resource_type_and_locale(resource_type, locale) 
-     
-     else 
-       Page.find_by_resource_type(resource_type)
-     end
+    resource_type = resource.class.name.underscore
+
+    if Fullstack::Cms.config.localize
+      locale = resource.respond_to?(:locale) ? resource.send(:locale) : I18n.locale.to_s
+      Page.find_by_resource_type_and_locale(resource_type, locale)
+
+    else
+      Page.find_by_resource_type(resource_type)
+    end
   end
-  
+
 end

data/app/helpers/site_form_helper.rb

@@ -0,0 +1,259 @@
+module SiteFormHelper
+  
+  class SiteFormBuilder < FormtasticBootstrap::FormBuilder
+    def model_name
+      super || (object && object.class.model_name)    
+    end
+
+    def initialize(*args)
+       @target = self
+       super(*args)
+    end
+      
+    def method_missing(method, *args, &block)
+      @target.send(method, *args, &block)
+    end
+    
+    def actions(*args, &proc)
+      @target.template.form_actions(&proc)      
+    end
+    
+    def default_action
+      action(@target.object.persisted? ? :update : :create, :primary => true)
+    end
+    
+    def form_errors(options = {:wrap => true})
+      wrap = options.delete(:wrap)
+      options[:exclude] ||= [:slug]
+      f = @target
+      unless f.object.errors.empty?
+        if wrap
+          @target.template.content_tag :div, :class => "alert alert-block" do
+            @target.template.link_to "&times;", :class => "close", :data => {:dismiss => "alert"}
+            @target.template.content_tag(:h4, I18n.t('fullstack.admin.form.correct_these_errors_and_retry', :default => "Correct these errors and retry"), :class => "alert-heading")
+            f.semantic_errors *(f.object.errors.keys - (options[:exclude] || []))
+          end
+        else
+          f.semantic_errors *(f.object.errors.keys - (options[:exclude] || []))
+        end
+        
+      end
+    end
+    alias :errors :form_errors
+    
+    def action(method, options = {})
+      default_label = I18n.t("fullstack.admin_form.labels.#{method}", :default => "#{method}".humanize)
+      options[:type] ||= !!options[:primary] ? :primary : nil
+      @target.template.button((options.delete(:label) || default_label), options)
+    end
+
+
+    def resource_inputs(*args)
+      model = @target.object.class
+      options = args.extract_options!
+      
+      only_attributes = options[:only] || []
+      except_arg = options[:except] || []
+      except_attributes = except_arg + model.protected_attributes.to_a + %W(created_at updated_at slug slugs lat lng position)
+      
+      only_attributes.map! {|a| a.to_s}
+      except_attributes.map! {|a| a.to_s}
+      
+      columns = model.schema.hierarchy_field_names
+      
+      # ===============
+      # = Attachments =
+      # ===============
+    
+      attachment_definitions = (model.attachment_definitions || {}).keys
+      attachment_columns = attachment_definitions.map {|a|
+        ["#{a}_file_name", "#{a}_file_size", "#{a}_content_type", "#{a}_updated_at"]
+        }.flatten
+            
+      columns -= attachment_columns
+      columns += attachment_definitions
+
+          
+      # ================
+      # = Associations =
+      # ================
+
+      columns = columns.map {|field_name|
+         field_name.to_s.gsub(/_id$/, "").gsub(/_type$/, "")
+      }.uniq
+      
+      belongs_to_associations = model.reflect_on_all_associations(:belongs_to).select {|a|
+        !a.options[:polymorphic] && !a.options[:autosave]
+      }.map {|assoc| assoc.name.to_s}
+      
+      polymorphic_associations = model.reflect_on_all_associations(:belongs_to).select {|a|
+        a.options[:polymorphic] && !a.options[:autosave]
+      }.map {|assoc| assoc.name.to_s}
+      
+      autosave_belongs_to     = model.reflect_on_all_associations(:belongs_to).select {|a|
+        a.options[:autosave]
+      }.map {|assoc| assoc.name.to_s}.compact
+    
+      has_many_associations = model.reflect_on_all_associations(:has_many).select {|a| 
+        a.options[:autosave]
+      }.map {|assoc| assoc.name.to_s}
+      
+      
+      
+      columns -= polymorphic_associations
+      columns += has_many_associations
+      
+      
+      # ====================================
+      # = Intersect with :only and :except =
+      # ====================================
+      
+      if only_attributes.any?
+        columns = columns.select {|k| only_attributes.include?(k)}
+      elsif except_attributes.any?
+        columns = columns.delete_if {|k| except_attributes.include?(k)}
+      end
+
+
+      # =============
+      # = Rendering =
+      # =============
+      
+      buff = ""
+        
+      columns.each do |column|
+        sym = column.to_sym
+        field = model.schema.hierarchy_fields[sym]
+        is_belongs_to_associaiton = belongs_to_associations.include?(column)
+        is_has_many_association = has_many_associations.include?(column)
+        is_autosave_belongs_to = autosave_belongs_to.include?(column)
+        
+        buff << if is_belongs_to_associaiton
+          @target.input(sym, :as => :select)
+        
+        elsif is_has_many_association || is_autosave_belongs_to
+           association_inputs(sym)       
+
+         else
+           opts = {}
+           args = [sym]
+           
+           if field && field.options[:markup]
+             opts[:as] = :markup
+           
+           elsif field && field.options[:simple_markup]
+             opts[:as] = :simple_markup
+
+           elsif field && field.options[:in]
+             opts[:as] = :select
+             opts[:collection] = field.options[:in]
+           
+           elsif column == "locale"
+             opts[:as] = :select
+             opts[:collection] = I18n.available_locales.map {|locale| [I18n.t("locale_names.#{locale}", :default => "#{locale}".humanize), locale.to_s] }
+             
+           else
+             nil
+           end
+           
+           args << opts unless opts.empty?
+           
+           @target.input(*args)
+
+        end
+      end
+      
+      inputs do
+        buff.html_safe
+      end
+    
+    end
+ 
+    def resource_submit
+       @target.template.button (@target.object.persisted? ? I18n.t('fullstack.admin.update', :default => "Update") : I18n.t('fullstack.admin.create', :default => "Create")),
+        :type => :primary, 
+        :size => :large
+    end
+    
+    def actions(&block)
+      @target.template.form_actions(&block)
+    end
+
+    def admin_fields_for(*args)
+      @target.semantic_fields_for(*args) do |f|
+        yield(FormBuilderDecorator.new(f))
+      end
+    end
+    
+    def box(title, options = {})
+      options[:orientation] ||= "form-horizontal"
+    
+        @target.template.content_tag(:div, :class => ("box " << options[:orientation])) do
+          buff = ""
+          buff << @target.template.content_tag(:div, title, :class => "box-header") 
+          buff << @target.template.content_tag(:div, :class => "box-content") do
+            yield
+          end
+          buff.html_safe
+        end
+    
+    end
+
+    
+    def sort_association(association, options = {})
+       assoc_str = association.to_s
+       @target.template.render :partial => "sort", :locals => { 
+        :association => association, :f => self, :options => options }
+       
+    end
+
+    def association_inputs(association, options = {})
+      
+      assoc_str = association.to_s
+      is_singular = assoc_str.pluralize != assoc_str and assoc_str.singularize == assoc_str
+      
+      if is_singular
+        if @target.template.partial?("nested_belongs_to_#{assoc_str}_fields")
+          @target.template.render :partial => "nested_belongs_to_#{assoc_str}_fields", :locals => { 
+           :association => association, :f => self, :options => options }
+        else
+          @target.template.render :partial => "nested_belongs_to_fields", :locals => { 
+           :association => association, :f => self, :options => options }
+        end
+
+      else
+        
+        if @target.template.partial?("associated_#{assoc_str}_table")
+          @target.template.render :partial => "associated_#{assoc_str}_table", :locals => { 
+           :association => association, :f => self, :options => options }
+        else
+          @target.template.render :partial => "associated_resources_table", :locals => { 
+           :association => association, :f => self, :options => options }         
+        end
+
+      end
+ 
+    end
+
+  end # ~
+   
+  def site_form_for(record_or_name_or_array, *args)
+    
+    options = args.extract_options!
+    options[:builder] ||= SiteFormBuilder
+    options[:html] ||= {}
+    options[:html][:multipart] = true
+    
+    obj = nil
+    if record_or_name_or_array.is_a?(Array) || record_or_name_or_array.is_a?(String) || record_or_name_or_array.is_a?(Hash) || record_or_name_or_array.is_a?(Symbol)      
+      obj = record_or_name_or_array
+    else
+      obj = [:site, record_or_name_or_array]
+    end
+    
+    form_for(obj, *(args << options)) do |f|
+      yield(f)
+    end
+  end
+  
+end

data/app/inputs/simple_date_select_input.rb

@@ -0,0 +1,16 @@
+class SimpleDateSelectInput < FormtasticBootstrap::Inputs::DateSelectInput
+
+  include Formtastic::Inputs::Base
+  include FormtasticBootstrap::Inputs::Base::Labelling
+  include FormtasticBootstrap::Inputs::Base::Wrapping
+  include FormtasticBootstrap::Inputs::Base::Errors
+  include FormtasticBootstrap::Inputs::Base::Hints
+  
+  def to_html
+    generic_input_wrapping do      
+       builder.date_select(method, {:start_year => 100.years.ago.year, :include_blank => true}, {:class => "datetime-selector"})
+    end
+  end
+  
+end
+

data/app/models/photo.rb

@@ -5,7 +5,7 @@ class Photo < ActiveRecord::Base
   validates_attachment :image, :presence => true,
     :size => { :in => 0..2.megabytes }
 
-  has_attached :image, :processors => [:auto_orient, :rotator]
+  has_attached :image, :processors => [:auto_orient, :thumbnail]
   
   acts_as_taggable
 

data/app/support/deny.rb

@@ -0,0 +1,41 @@
+module Deny
+  extend ActiveSupport::Concern
+
+  # es.
+  # 
+  # deny! :if => user.logged_in?
+  # deny! :if => -> { ... }
+  # deny!
+  #
+  # before_filter :deny! :if => :guest?
+  #
+  # def guest?
+  #   !current_user
+  # end
+  
+  def deny!(options = {})
+    negate = false
+    expr = options.has_key?(:if)
+      options.delete(:if)
+    elsif options.has_key?(:unless)
+      negate = true
+      options.delete(:unless)
+    else
+      true
+    end
+
+    condition = if expr.is_a?(Proc)
+      expr.arity != 0 ? expr.call(self) : expr.call
+    else
+      expr
+    end
+    condition = negate ? !condition : condition
+  
+    if condition
+      raise DeniedError.new
+    end
+ 
+    false
+  end
+
+end

data/app/support/enum.rb

@@ -0,0 +1,49 @@
+class Enum
+
+  class Term
+    def initialize(scope, term)
+      @term = term
+      @scope = scope
+    end
+    
+    def id
+      @term
+    end
+    
+    def to_label
+      I18n.t(@term, :scope => @scope, :default => @term.to_s.humanize)
+    end
+  end
+
+  attr_reader :terms
+  
+  def initialize(scope, *keys)
+    @keys  = [keys].flatten
+    @keys_to_terms = {}
+    @terms = @keys.map do |key|
+      t = Term.new(scope, key.to_s)
+      @keys_to_terms[key.to_s] = t
+      t
+    end
+  end
+  
+  def keys
+    @keys
+  end
+
+  def to_a
+    keys
+  end
+  
+  
+  def get_term(key)
+    @keys_to_terms[key.to_s]
+  end
+  
+  def to_options
+    terms.map {|t| 
+      [t.to_label,t.id]
+    }
+  end
+  
+end

data/app/support/page_not_found_error.rb

@@ -0,0 +1,3 @@
+class PageNotFoundError < Exception
+  
+end

data/app/{models → support}/pageable.rb

@@ -1,37 +1,6 @@
 module Pageable
   extend ActiveSupport::Concern
 
-  def page_to_sitemap_entries(controller, page)
-    
-    path = nil
-    options = {}
-    entries = []
-    
-    if page.resourceful?
-      page.resource_class.find_each do |object|
-        path = Rails.application.routes.url_helpers.url_for({ :only_path => true, :controller => controller, :action => page.name }.merge(page.resource_params(object)))
-        options[:updated_at] =  object.updated_at if object.respond_to?(:updated_at)
-        entries << {:path => path, :options => options}
-      end    
-    else
-       path = Rails.application.routes.url_helpers.url_for( :only_path => true, :controller => controller, :action => page.name)
-       entries << {:path => path, :options => {}}
-    end
-    
-    entries
-    
-  end
-  module_function :page_to_sitemap_entries
-
-  def controller_sitemap_entries(controller)
-    entries = []
-    Pageable.controller_pages(controller).map do |name, page|
-      entries += page_to_sitemap_entries(controller, page) 
-    end
-    entries    
-  end
-  module_function :controller_sitemap_entries
-
   #
   # Pageable.controller_pages("site/site")
   #

data/app/support/publisher.rb

@@ -0,0 +1,7 @@
+module Publisher
+  extend ActiveSupport::Concern
+
+  def trigger(*args)
+    ActiveSupport::Notifications.instrument(*args)
+  end  
+end

data/app/support/sitemap.rb

@@ -0,0 +1,42 @@
+module Site
+  module Sitemap
+    extend ActiveSupport::Concern
+  
+  def render_sitemap(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
+    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, page.locale].compact)  -%>
+  <url>
+     <loc><%= loc %></loc>
+  </url>
+  <% rescue Exception => e -%>
+  <% end -%>
+  <% else -%>
+      <% page.resource_class.where(:locale => page.locale).each do |resource| -%>
+  <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 -%>
+</urlset>
+
+eos
+    
+    render :inline => erb, :layout => false
+  end
+  
+  end
+end

data/app/support/subscriber.rb

@@ -0,0 +1,24 @@
+class Subscriber
+  
+  class Event
+    def initialize(hash)
+      hash.each do |k,v|
+        self.instance_variable_set("@#{k}", v)  ## create and initialize an instance variable for this key/value pair
+        self.class.send(:define_method, k, proc{self.instance_variable_get("@#{k}")})  ## create the getter that returns the instance variable
+        self.class.send(:define_method, "#{k}=", proc{|v| self.instance_variable_set("@#{k}", v)})  ## create the setter that sets the instance variable
+      end
+    end
+  end
+    
+  class << self
+    def on(*events, &block)
+      instance = @instance ||= self.new
+      events.each do |event|
+        ActiveSupport::Notifications.subscribe( event ) do |name, start, finish, id, payload|
+          instance.instance_exec(Event.new(payload), &block)
+        end
+      end
+    end
+  end
+  
+end

data/app/views/admin/photos/_photo.html.erb

@@ -2,12 +2,10 @@
     <div class="thumbnail">
       <%= image_tag photo.url(:thumb), :style => "height: 141px" %>
       <div class="thumbnail-toolbar">
-        <%= btn '<i class="icon-repeat"></i>'.html_safe, rotate_admin_photo_path(photo, :deg => 90), :remote => true, :method => :post %>
-        <%= btn '<i class="icon-zoom-in"></i>'.html_safe, photo.url, :rel => "facebox", :'data-tip' => t('fullstack.admin.preview', :default => "Preview") %>
-        
+        <%= btn '<i class="icon-zoom-in"></i>'.html_safe, photo.url, :rel => "facebox", :'data-tip' => t('fullstack.admin.preview', :default => "Preview") %>        
         <%= btn '<i class="icon-edit"></i>'.html_safe, edit_admin_photo_path(photo), :'data-target' => '#edit-photo-modal', :'data-toggle' => 'modal', :"data-tip" => t('fullstack.admin.edit', :default => "Edit") %>
         <%= btn '', admin_photo_path(photo), :remote => true, :method => :delete, :confirm => t('fullstack.admin.are_you_sure', :default => "Are you sure?"), :icon => :trash, :type => :danger, :icon_color => :white, :'data-tip' => t('fullstack.admin.delete', :default => "Delete") %>
-      </div>      
+      </div>
     </div>
   </li>
 

data/config/locales/it.yml

@@ -8,17 +8,24 @@ it:
       commons: "Tutte le lingue"
       empty: "Vuoto"
       this_page_is_linked_to_a_resource: "Questa pagina è collegata ad una risorsa. Il titolo e la descrizione della pagina saranno gli stessi della risorsa collegata"
+      rotate_left: "Ruota a sinistra"
+      rotate_right: "Ruota a destra"
+      pages:
+        home: Homepage
+        text: Testo
+        contacts: Contatti
+        blog: Blog
+        post: Post
+
     admin:
       groups:
         global: "Generale"
         contacts: "Contatti"
-    pages:
-      home: Homepage
-      text: Testo
-      contacts: Contatti
-      blog: Blog
-      post: Post
-
+        settings: "Configurazione"
+        contacts: "Contatti"
+      resources:
+        posts: "Post"
+        contacts: "Contatti"
 
   helpers:
     label:
@@ -26,4 +33,4 @@ it:
       site_description: "Descrizione del sito"
       site_slogan: "Slogan"
       site_title: "Titolo del sito"
-      value: "Valore"
+      value: "Valore"

data/config/routes.rb

@@ -12,7 +12,6 @@ Rails.application.routes.draw do
     resources :photos, :except => [:new, :index, :show, :create] do
       get  "search", :on => :collection
       post "create", :format => :js, :on => :collection
-      post "rotate", :format => :js, :on => :member
     end
     
   end

data/fullstack-cms.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "fullstack-cms"
-  s.version = "0.3.10"
+  s.version = "0.3.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mcasimir"]
-  s.date = "2012-11-22"
+  s.date = "2012-12-07"
   s.description = "CMS system built on fullstack"
   s.email = "maurizio.cas@gmail.com"
   s.extra_rdoc_files = [
@@ -29,12 +29,17 @@ Gem::Specification.new do |s|
     "app/controllers/admin/settings_controller.rb",
     "app/controllers/admin/tags_controller.rb",
     "app/controllers/admin/users_controller.rb",
+    "app/controllers/site/base_controller.rb",
+    "app/errors/denied_error.rb",
+    "app/helpers/i18n_helper.rb",
     "app/helpers/markdown_helper.rb",
     "app/helpers/menus_helper.rb",
     "app/helpers/mobile_helper.rb",
     "app/helpers/pages_helper.rb",
     "app/helpers/photos_helper.rb",
     "app/helpers/settings_helper.rb",
+    "app/helpers/site_form_helper.rb",
+    "app/inputs/simple_date_select_input.rb",
     "app/models/.gitkeep",
     "app/models/attachment.rb",
     "app/models/link.rb",
@@ -44,7 +49,6 @@ Gem::Specification.new do |s|
     "app/models/nestable.rb",
     "app/models/page.rb",
     "app/models/page_part.rb",
-    "app/models/pageable.rb",
     "app/models/photo.rb",
     "app/models/redirect.rb",
     "app/models/setting.rb",
@@ -52,6 +56,13 @@ Gem::Specification.new do |s|
     "app/models/text_page_part.rb",
     "app/models/text_with_title_page_part.rb",
     "app/models/uid.rb",
+    "app/support/deny.rb",
+    "app/support/enum.rb",
+    "app/support/page_not_found_error.rb",
+    "app/support/pageable.rb",
+    "app/support/publisher.rb",
+    "app/support/sitemap.rb",
+    "app/support/subscriber.rb",
     "app/views/admin/base/_fields.html.erb",
     "app/views/admin/base/_form.html.erb",
     "app/views/admin/base/_simple_form.html.erb",
@@ -121,10 +132,7 @@ Gem::Specification.new do |s|
     "lib/generators/fullstack/cms/templates/rails/config/fullstack.rb",
     "lib/generators/fullstack/cms/templates/rails/config/initializers/ckeditor_controller.rb",
     "lib/generators/fullstack/cms/templates/rails/config/initializers/devise_controller.rb",
-    "lib/generators/fullstack/cms/templates/rails/config/initializers/devise_mailer.rb",
-    "lib/generators/fullstack/cms/templates/rails/config/initializers/sitemap.rb",
     "lib/generators/fullstack/cms/templates/rails/config/schedule.rb",
-    "lib/generators/fullstack/cms/templates/rails/config/sitemap.rb.tt",
     "lib/generators/fullstack/cms/templates/rails/config/styles.yml",
     "lib/generators/fullstack/cms/templates/rails/lib/support/content.rb",
     "lib/generators/fullstack/cms/templates/rails/lib/support/timestamped_content.rb",
@@ -132,10 +140,13 @@ Gem::Specification.new do |s|
     "lib/generators/fullstack/cms/templates/rails/public/422.html",
     "lib/generators/fullstack/cms/templates/rails/public/500.html",
     "lib/generators/fullstack/cms/templates/rails/public/admin/drag-handle.png",
+    "lib/generators/fullstack/cms/templates/rails/public/admin/rotate-left.png",
+    "lib/generators/fullstack/cms/templates/rails/public/admin/rotate-right.png",
     "lib/generators/fullstack/cms/templates/rails/public/apple-touch-icon.png",
     "lib/generators/fullstack/cms/templates/rails/public/crossdomain.xml",
     "lib/generators/fullstack/cms/templates/rails/public/favicon.ico",
     "lib/generators/fullstack/cms/templates/rails/public/img/.gitignore",
+    "lib/generators/fullstack/cms/templates/rails/public/img/glyphicons-halflings-white.png",
     "lib/generators/fullstack/cms/templates/rails/public/img/glyphicons-halflings.png",
     "lib/generators/fullstack/cms/templates/rails/public/js/modernizr-2.5.3.min.js",
     "lib/generators/fullstack/cms/templates/rails/public/robots.txt"

data/lib/generators/fullstack/cms/install_generator.rb

@@ -50,8 +50,11 @@ eos
         if !localize
           route '''
     constraints(:host => /^#{Regexp.escape(Settings.app.domain)}/) do
-      root :to => redirect("http://www.#{Settings.app.domain}")
-      match \'/*path\', :to => redirect {|params| "http://www.#{Settings.app.domain}/#{params[:path]}"}
+       root :to => redirect("http://www.#{Settings.app.domain}")
+       match "/*path", :to => redirect {|params, request| 
+         query_part = request.query_string.present? ? "?#{request.query_string}" : ""  
+         "http://www.#{Settings.app.domain}/#{params[:path]}#{query_part}"
+       }
     end
 
     # namespace :site, :path => "/" do
@@ -86,19 +89,16 @@ eos
 
 }            
           end 
+        else  
 
 
         end
       end
       
       def home_page_helper
-        append_to_file "app/controllers/application_controller.rb", :after => "protect_from_forgery" do
+        append_to_file "app/helpers/application_helper.rb", :after => "ApplicationHelper" do
 %q{
-
-  helper_method :home_page?
-  
-  protected
-  
+ 
   def home_page?
     self.class == Site::SiteController && action_name == "home"
   end

data/lib/generators/fullstack/cms/templates/rails/app/controllers/site/site_controller.rb

@@ -1,8 +1,4 @@
-class Site::SiteController < ApplicationController
-  include Pageable
-  rescue_from ActiveRecord::RecordNotFound, :with => :render_404
-  authorize :scope => "site", :resourceful => false
-  prepend_before_filter(:set_locale) if Fullstack::Cms.localized?
+class Site::SiteController < Site::BaseController
     
   # =========
   # = Pages =
@@ -11,50 +7,9 @@ class Site::SiteController < ApplicationController
   page :home, "/" do
   end
   
-  # ===========
-  # = Helpers =
-  # ===========
-  
-  helper_method :current_locale
-  helper_method :home_page?
-  
-  protected
-  
-  def current_locale
-    I18n.locale.to_s
-  end
-  
-  # ===================
-  # = Private Methods =
-  # ===================
-  
-  private
-  
-  def set_locale
-    I18n.locale = "#{params[:locale]}".to_sym if params[:locale]
-    render_404 if I18n.locale.nil? || !I18n.available_locales.include?(I18n.locale.to_sym)      
-  end
-  
-  def instantiate_resource_by_slug!(resource)
-    res = resource.find_by_slug!(params[:slug])
-    instance_variable_set("@#{resource.name.underscore}", res)
-    @object = res
-    res
-  end
-  
-  alias :resource_by_slug! :instantiate_resource_by_slug!
-  
-  def instantiate_resource_by_slug_and_locale!(resource)
-    res = resource.find_by_slug_and_locale!(params[:slug], current_locale)
-    instance_variable_set("@#{resource.name.underscore}", res)
-    @object = res
-    res
+  caches_action(:sitemap, :expires_in => 3.hours)  
+  def sitemap
+    render_sitemap
   end
 
-  alias :resource_by_slug_and_locale! :instantiate_resource_by_slug_and_locale!
-  
-  def render_404
-    render :file => Rails.root.join("public", "404.html"), :layout => false, :status => :not_found
-  end
-  
 end

data/lib/generators/fullstack/cms/templates/rails/config/fullstack.rb

@@ -5,18 +5,27 @@ Fullstack::Cms.configure do |config|
   # =============
   
   config.resources do |admin|
-    admin.group :website do |g|
+    # admin.group :website do |g|
+      # g.icon= "globe"
+      # g.resource :texts
+    # end
+
+    # admin.group :blog do |g|
+      # g.icon= "book"
+      # g.resource :posts
+    # end
+
+    # admin.group :contacts do |g|
+      # g.icon= "user"
+      # g.resource :contacts
+    # end
+    
+    admin.group :settings do |g|
+      g.icon= "wrench"
       g.resource :pages
       g.resource :menus
       g.resource :settings
     end
-
-    admin.group :contents do |g|
-    end
-
-    admin.group :users do |g|
-      g.resource :users
-    end  
   end
 
   # =============
@@ -30,19 +39,21 @@ Fullstack::Cms.configure do |config|
   # =========
   
   config.menu(:main)
-  config.menu(:social)
+  # config.menu(:social)
   
   # ============
   # = Settings =
   # ============
-  
   config.setting(:google_analytics_code, :localized => false)  
+  
   config.setting(:title)
   config.setting(:slogan)
   config.setting(:description, :kind => :text)
-    
-  config.setting(:address,  :kind => :text,  :group => :contacts)
-  config.setting(:phone,    :group => :contacts)
-  config.setting(:email,    :group => :contacts)
-    
+  config.setting(:keywords)
+
+  config.setting(:address,            :kind => :text,  :group => :contacts)
+  config.setting(:phone,              :group => :contacts)
+  config.setting(:email,              :group => :contacts)
+  config.setting(:notifies_recipient, :group => :contacts)
+  
 end

data/lib/generators/fullstack/cms/templates/rails/config/initializers/ckeditor_controller.rb

@@ -1,3 +1,3 @@
 Ckeditor::ApplicationController.class_eval do
-  authorize :scope => "admin"
+  before_filter :authenticate_administrator!
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fullstack-cms
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-22 00:00:00.000000000 Z
+date: 2012-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fullstack-admin
@@ -191,12 +191,17 @@ files:
 - app/controllers/admin/settings_controller.rb
 - app/controllers/admin/tags_controller.rb
 - app/controllers/admin/users_controller.rb
+- app/controllers/site/base_controller.rb
+- app/errors/denied_error.rb
+- app/helpers/i18n_helper.rb
 - app/helpers/markdown_helper.rb
 - app/helpers/menus_helper.rb
 - app/helpers/mobile_helper.rb
 - app/helpers/pages_helper.rb
 - app/helpers/photos_helper.rb
 - app/helpers/settings_helper.rb
+- app/helpers/site_form_helper.rb
+- app/inputs/simple_date_select_input.rb
 - app/models/.gitkeep
 - app/models/attachment.rb
 - app/models/link.rb
@@ -206,7 +211,6 @@ files:
 - app/models/nestable.rb
 - app/models/page.rb
 - app/models/page_part.rb
-- app/models/pageable.rb
 - app/models/photo.rb
 - app/models/redirect.rb
 - app/models/setting.rb
@@ -214,6 +218,13 @@ files:
 - app/models/text_page_part.rb
 - app/models/text_with_title_page_part.rb
 - app/models/uid.rb
+- app/support/deny.rb
+- app/support/enum.rb
+- app/support/page_not_found_error.rb
+- app/support/pageable.rb
+- app/support/publisher.rb
+- app/support/sitemap.rb
+- app/support/subscriber.rb
 - app/views/admin/base/_fields.html.erb
 - app/views/admin/base/_form.html.erb
 - app/views/admin/base/_simple_form.html.erb
@@ -283,10 +294,7 @@ files:
 - lib/generators/fullstack/cms/templates/rails/config/fullstack.rb
 - lib/generators/fullstack/cms/templates/rails/config/initializers/ckeditor_controller.rb
 - lib/generators/fullstack/cms/templates/rails/config/initializers/devise_controller.rb
-- lib/generators/fullstack/cms/templates/rails/config/initializers/devise_mailer.rb
-- lib/generators/fullstack/cms/templates/rails/config/initializers/sitemap.rb
 - lib/generators/fullstack/cms/templates/rails/config/schedule.rb
-- lib/generators/fullstack/cms/templates/rails/config/sitemap.rb.tt
 - lib/generators/fullstack/cms/templates/rails/config/styles.yml
 - lib/generators/fullstack/cms/templates/rails/lib/support/content.rb
 - lib/generators/fullstack/cms/templates/rails/lib/support/timestamped_content.rb
@@ -294,10 +302,13 @@ files:
 - lib/generators/fullstack/cms/templates/rails/public/422.html
 - lib/generators/fullstack/cms/templates/rails/public/500.html
 - lib/generators/fullstack/cms/templates/rails/public/admin/drag-handle.png
+- lib/generators/fullstack/cms/templates/rails/public/admin/rotate-left.png
+- lib/generators/fullstack/cms/templates/rails/public/admin/rotate-right.png
 - lib/generators/fullstack/cms/templates/rails/public/apple-touch-icon.png
 - lib/generators/fullstack/cms/templates/rails/public/crossdomain.xml
 - lib/generators/fullstack/cms/templates/rails/public/favicon.ico
 - lib/generators/fullstack/cms/templates/rails/public/img/.gitignore
+- lib/generators/fullstack/cms/templates/rails/public/img/glyphicons-halflings-white.png
 - lib/generators/fullstack/cms/templates/rails/public/img/glyphicons-halflings.png
 - lib/generators/fullstack/cms/templates/rails/public/js/modernizr-2.5.3.min.js
 - lib/generators/fullstack/cms/templates/rails/public/robots.txt
@@ -316,7 +327,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 635953353485388565
+      hash: 4011575220836530722
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/generators/fullstack/cms/templates/rails/config/initializers/devise_mailer.rb

@@ -1 +0,0 @@
-Devise::Mailer.layout "email"

data/lib/generators/fullstack/cms/templates/rails/config/initializers/sitemap.rb

@@ -1,10 +0,0 @@
-if Rails.env.development?
-  
-  # Set save path to a git-ignored destination for development environment
-  # comment these lines to use the default `Rails.root/public` instead
-  
-  Sitemap.configure do |config|
-    config.save_path = Rails.root.join("tmp")
-  end
-  
-end

data/lib/generators/fullstack/cms/templates/rails/config/sitemap.rb.tt

@@ -1,28 +0,0 @@
-Sitemap::Generator.instance.load :host => "www.#{Settings.app.domain}" do
-
-  path :home
-  
-  # Sample path:
-  #   path :faq
-  # The specified path must exist in your routes file (usually specified through :as).
-
-  # Sample path with params:
-  #   path :faq, :params => { :format => "html", :filter => "recent" }
-  # Depending on the route, the resolved url could be http://mywebsite.com/frequent-questions.html?filter=recent.
-
-  # Sample resource:
-  #   resources :articles
-
-  # Sample resource with custom objects:
-  #   resources :articles, :objects => proc { Article.published }
-
-  # Sample resource with search options:
-  #   resources :articles, :priority => 0.8, :change_frequency => "monthly"
-
-  # Sample resource with block options:
-  #   resources :activities,
-  #             :skip_index => true,
-  #             :updated_at => proc { |activity| activity.published_at.strftime("%Y-%m-%d") }
-  #             :params => { :subdomain => proc { |activity| activity.location } }
-
-end