fullstack-cms 0.2.4 → 0.2.5

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

data/app/helpers/menus_helper.rb

@@ -1,16 +1,20 @@
 module MenusHelper
   
-  def find_or_create_menu(uid)
-    Menu.find_or_create_by_uid(uid, :name => "#{uid}".gsub("-", "_").humanize)
+  def find_or_create_menu(uid, locale = nil)
+    if locale
+      Menu.find_or_create_by_uid_and_locale(uid, locale.to_s, :name => "#{uid}".gsub("-", "_").humanize)
+    else
+      Menu.find_or_create_by_uid(uid, :name => "#{uid}".gsub("-", "_").humanize)         
+    end
   end
   
-  def nav_items_for(uid)
-    menu = find_or_create_menu(uid)
+  def nav_items_for(uid,  locale = nil)
+    menu = find_or_create_menu(uid, locale)
     html = ""
 
     menu.links.each do |link|
       unless block_given?
-        html << nav_item(link.label, link_url(link))      
+        html << nav_item(link.label, link_url(link), :rel => link.nofollow ? "nofollow" : nil)      
       else
         html << yield(link)  
       end
@@ -25,25 +29,7 @@ module MenusHelper
   
   
   def link_url(link)
-    url = link.url
-    if url.blank?
-      "#" 
-        
-    elsif url.starts_with?("content://")
-      klass_name, id = url.gsub("content://", "").split("#")
-      klass = klass_name.constantize
-      resource = klass.find(id)
-      if resource
-        page_path_for(resource)
-      else
-        "#"    
-      end
-      
-    else
-      url
-          
-    end
-
+    link.url.present? ? CGI::escape(link.url) : (link.linked ? page_path_for(link.linked) : "#")
   end
   
   

data/app/helpers/pages_helper.rb

@@ -23,7 +23,7 @@ module PagesHelper
   end
   
   def page_path_for(resource_or_page)
-    page = resource_or_page.is_a?(Page) ? resource_or_page : Page.find_by_resource_type(resource_or_page.class.name.underscore)
+    page = resource_or_page.is_a?(Page) ? resource_or_page : page_by_resource(resource_or_page)
     path = page.try(:path)
     if path.blank?      
       "#not-found"
@@ -50,4 +50,18 @@ module PagesHelper
     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
+  end
+  
 end

data/app/models/linkable.rb

@@ -1,6 +1,6 @@
 class Linkable
   
-  AJAX_COMBOBOX_MIN = 5
+  AJAX_COMBOBOX_MIN = 100
   
   class << self
     

data/app/models/menu.rb

@@ -1,9 +1,9 @@
 class Menu < ActiveRecord::Base
-
-  field :uid, :string
-  field :name, :string
+  include Uid
+  include Localized if Fullstack::Cms.config.localize
   
-  attr_accessible :uid, :name, :links_attributes
+  field :name, :string
+
   has_many :links, :as => :link_owner, :dependent => :delete_all, :order=>'position ASC'
   accepts_nested_attributes_for :links, :allow_destroy => true
     
@@ -11,7 +11,6 @@ class Menu < ActiveRecord::Base
   validates_presence_of :uid
   
   timestamps
-  
 end
 
 

data/app/models/page.rb

@@ -1,20 +1,14 @@
 class Page < ActiveRecord::Base
   include Content
   include Nestable
+  include Localized if Fullstack::Cms.config.localize
+  include Uid
   
-  if Fullstack::Cms.config.localize_pages
-    
-    include Localized
-    index [:uid, :locale]
-    
-  end
-  
-  validates_presence_of :uid, :name
+  validates_presence_of :name
 
   field :name
   field :uid
   field :scope
-  index :uid, :unique => true
   
   field :path
   field :resource_type

data/app/models/pageable.rb

@@ -48,7 +48,11 @@ module Pageable
   module ClassMethods
    def page(name, path, options = {}, &block)
      
-     page_definition_options = options.clone
+     # =================
+     # = Parse options =
+     # =================
+     
+     localize = options.delete(:localize) == false ? false : Fullstack::Cms.config.localize 
      
      this_controller_name = "#{self.name.underscore}".gsub("_controller", "")
      uid = "#{this_controller_name}##{name}"
@@ -66,37 +70,32 @@ module Pageable
      i18n_scope  = "pages.#{self.name.underscore.split('/').last}##{name}"
      title       = options.delete(:title) || I18n.t("#{i18n_scope}.title", :default => "#{name}".humanize)   
 
+     # ======================
+     # = Create page record =
+     # ======================
+
      if Page.table_exists?
-       
-       page = unless Fullstack::Cms.config.localize_pages
-         Page.find_or_create_by_uid(uid, :title => title, :name => name)
+       if localize
+         I18n.available_locales.each do |locale|
+           _page!(uid,  _localize_path(path, locale), name, title, parent_uid, resource_type, locale.to_s)
+         end
        else
-         Page.find_or_create_by_uid_and_locale(uid, I18n.locale || Fullstack::Cms.config.default_locale, :title => title, :name => name)         
-       end 
-  
-       if parent_uid
-         parent = unless Fullstack::Cms.config.localize_pages
-           Page.find_by_uid(parent_uid)
-         else
-           Page.find_by_uid_and_locale(parent_uid, I18n.locale || Fullstack::Cms.config.default_locale)         
-         end 
-       
-         page.move_to_child_of(parent) unless page.parent == parent
-       end
-       
-       if resource_type
-         page.update_attribute(:resource_type, resource_type) unless page.resource_type == resource_type
+         _page!(uid, path, name, title, parent_uid, resource_type)
        end
-       
-       if page.path != path
-         page.update_attribute(:path, path)
+     end 
+     
+      # ===================
+      # = Map page routes =
+      # ===================
+
+     if localize
+       I18n.available_locales.each do |locale|
+           map(name, _localize_path(path, locale), options.reverse_merge({:locale => locale.to_s, :as => "#{name}_#{locale}"}), &block)
        end
-       
+     else
+       map(name, path, options, &block)
      end
 
-     map(name, path, options = {}, &block)
-     @pages ||= ActiveSupport::HashWithIndifferentAccess.new
-     @pages[name] = page
    end
    
    def page_names
@@ -107,6 +106,58 @@ module Pageable
      @pages ||= ActiveSupport::HashWithIndifferentAccess.new
    end
    
+   
+   private
+   
+   def _localize_path(path, locale)
+     path_segments = path.split("/")
+     
+     path_segments.reject!(&:blank?)
+     path_segments.map! {|s|
+       if s =~ /^:/
+         s
+       else
+         I18n.t(s, :scope => "routing", :default => s, :locale => locale)
+       end
+     }
+     
+     path_segments.unshift(locale.to_s)
+     "/" + path_segments.join("/")
+   end
+   
+   
+   def _page!(uid, path, name, title, parent_uid, resource_type, locale = nil)
+       # puts "_page!(#{[uid, path, name, title, parent_uid, resource_type, locale].map(&:inspect).join(",")})"
+       
+       _page = if locale.nil?
+         Page.find_or_create_by_uid(uid, :title => title, :name => name)       
+       else
+         Page.find_or_create_by_uid_and_locale(uid, locale.to_s, :title => title, :name => name)                  
+       end
+  
+       if parent_uid
+         parent = if locale.nil?
+           Page.find_by_uid(parent_uid)
+         else
+           Page.find_by_uid_and_locale(parent_uid, locale.to_s)         
+         end 
+       
+         _page.move_to_child_of(parent) unless _page.parent == parent
+       end
+       
+       if resource_type
+         _page.update_attribute(:resource_type, resource_type) unless _page.resource_type == resource_type
+       end
+
+       if _page.path != path
+         _page.update_attribute(:path, path)
+       end
+         
+       @pages ||= ActiveSupport::HashWithIndifferentAccess.new
+       @pages[name] = _page
+
+   end
+       
  end
 
  def load_current_page

data/app/models/uid.rb

@@ -0,0 +1,22 @@
+module Uid
+  extend ActiveSupport::Concern
+  
+  included do
+      
+    field :uid, :string
+    validates_presence_of :uid
+    
+    unless Fullstack::Cms.config.localize
+      
+      index :uid, :unique => true    
+      scope :uid, lambda {|uid| where(:uid => uid).first}
+    
+    else
+
+      index [:uid, :locale], :unique => true
+      scope :uid, lambda {|uid| where(:uid => uid, :locale => (I18n.locale || Fullstack::Cms::config.default_locale).to_s).first}      
+    
+    end
+  end
+  
+end

data/app/views/admin/linkables/fields.js.coffee

@@ -6,8 +6,4 @@ $("#<%= @target %>").find("select[data-remote]").each ->
     data
 <% else %>
 $("select:not([data-remote]):not(.datetime-selector)").chosen()
-<% end %>
-
-# localize messages and labels
-# get rid of the black screen after window closing
-# double add problem
+<% end %>

data/app/views/admin/links/_associated_fields.html.erb

@@ -22,7 +22,7 @@
     <div class="linked-id-field-placeholder" id="linked_id_field_placeholder_<%= @linked_id_field_placeholder_uid = 1 + (@linked_id_field_placeholder_uid || 0)
  %>" data-current-id="<%= f.object.linked_id %>" data-current-type="<%= f.object.linked_type %>">
     </div>
-    <%= f.input :url, :label => false, :input_html => {:style => "display: none", :class => "linked-url-field"}  %>
+    <%= f.input :url, :label => false, :input_html => {:style => ("display: none" if f.object.persisted?), :class => "linked-url-field"}  %>
 <% end %>
 
 
@@ -65,9 +65,11 @@
          $(".linked-fields").each ->
            linked_fields = $(@)
            update_linked_fields(linked_fields)
-           linked_fields.find(".linked-type-field").live "change", ->
-             update_linked_fields(linked_fields)
-                      
+
+         $(".linked-type-field").live "change", ->
+           update_linked_fields($(@).closest(".linked-fields"))
+         
+
       <% end %>
   <% end %>
   <% end -%>

data/app/views/admin/pages/_collection.html.erb

@@ -1,7 +1,17 @@
-<ul class="nav">
-  <% Page.roots.each do |root| %>
-  <% Page.each_with_level(root.self_and_descendants) do |page, level| %>
-  <%= nav_item page.name, edit_admin_page_path(page), :icon => (page.root? ? "home" : "file"), :style => "line-height: 36px; padding-left:#{20 * level}px" %>
+<%= tabs do |t| %>
+  <% I18n.available_locales.each do |locale| %>
+    <%= t.pane t("locale_names.#{locale}", :default => "#{locale}".humanize) do %>
+  
+  
+      <ul class="nav">
+        <% Page.where(:locale => "#{locale}").roots.each do |root| %>
+        <% Page.each_with_level(root.self_and_descendants) do |page, level| %>
+        <%= nav_item page.name, edit_admin_page_path(page), :icon => (page.root? ? "home" : "file"), :style => "line-height: 36px; padding-left:#{20 * level}px" %>
+        <% end %>
+      <% end %>
+      </ul>
+  
+  
+    <% end %>
   <% end %>
 <% end %>
-</ul>

data/fullstack-cms.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "fullstack-cms"
-  s.version = "0.2.4"
+  s.version = "0.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mcasimir"]
-  s.date = "2012-09-01"
+  s.date = "2012-09-03"
   s.description = "CMS system built on fullstack"
   s.email = "maurizio.cas@gmail.com"
   s.extra_rdoc_files = [
@@ -51,6 +51,7 @@ Gem::Specification.new do |s|
     "app/models/text.rb",
     "app/models/text_page_part.rb",
     "app/models/text_with_title_page_part.rb",
+    "app/models/uid.rb",
     "app/views/admin/base/_fields.html.erb",
     "app/views/admin/base/_form.html.erb",
     "app/views/admin/base/_simple_form.html.erb",

data/lib/fullstack/cms/configuration.rb

@@ -7,7 +7,8 @@ module Fullstack
       @config ||= OpenStruct.new
       @config.resources ||= []
       @config.linkables ||= []
-      @config.localize_pages = @config.localize_pages.nil? ? true :  @config.localize_pages
+      @config.localize = @config.localize.nil? ? true :  @config.localize
+      @config.localize_routes = @config.localize_routes.nil? ? true :  @config.localize_routes
       @config.default_locale ||= "#{I18n.default_locale}" || "en"
       @config
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fullstack-cms
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-01 00:00:00.000000000 Z
+date: 2012-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fullstack-admin
@@ -245,6 +245,7 @@ files:
 - app/models/text.rb
 - app/models/text_page_part.rb
 - app/models/text_with_title_page_part.rb
+- app/models/uid.rb
 - app/views/admin/base/_fields.html.erb
 - app/views/admin/base/_form.html.erb
 - app/views/admin/base/_simple_form.html.erb
@@ -329,7 +330,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3826717670645353415
+      hash: 293567694538273846
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: