fullstack-cms 0.1.5 → 0.1.6

data/TODO.md

@@ -2,24 +2,6 @@
 
 ## Page parts with schema
 
-usage:
-  <%= part "marketing-1",   :schema => "text-with-title" %>
-  <%= part "marketing-2",   :schema => "text-with-title" %>
-  <%= part "announcement",  :schema => "announcement"    %>
-  
-class AnnouncementPagePart < PagePart
-  field :claim, :string
-  field :link, :link
-end
+# ordinamento degli input in base all'ordine dei field
 
-class TextPagePart < PagePart
-  field :text, :text, :markup => true
-end
-
-class TextWithTitlePagePart < PagePart
-  field :title, :string
-  field :text, :text, :markup => true
-end
-
-# Update e Creatore di ogni cosa
 

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/app/helpers/menus_helper.rb

@@ -1,7 +1,11 @@
 module MenusHelper
   
+  def find_or_create_menu(uid)
+    Menu.find_or_create_by_uid(uid, :name => "#{uid}".gsub("-", "_").humanize)
+  end
+  
   def nav_items_for(uid)
-    menu = Menu.find_or_create_by_uid(uid, :name => "#{uid}".humanize)
+    menu = find_or_create_menu(uid)
     html = ""
 
     menu.links.each do |link|
@@ -15,8 +19,7 @@ module MenusHelper
     html.html_safe
   end
   
-  def menu(uid, options = nil, &block)
-    content_tag(name, content_or_options_with_block = nil, options = nil, escape = true, &block)
+  def render_menu(uid, options = nil, &block)
     content_tag :ul, nav_items_for(uid, &block), options, false
   end  
   
@@ -30,7 +33,11 @@ module MenusHelper
       klass_name, id = url.gsub("content://", "").split("#")
       klass = klass_name.constantize
       resource = klass.find(id)
-      page_path_for(resource)
+      if resource
+        page_path_for(resource)
+      else
+        "#"    
+      end
       
     else
       url

data/app/helpers/pages_helper.rb

@@ -4,21 +4,34 @@ module PagesHelper
     @current_page
   end
   
-  def page_part(name)
+  def part(name, opts = {}, &block)
     if @current_page
-      part = @current_page.page_parts.find_or_create_by_name_and_page_id("#{name}", @current_page)
-      part.try(:content).try(:html_safe)
+      schema = opts.delete(:schema) || PagePart
+
+      klass = schema.is_a?(Class)  ? schema : "#{schema.to_s.camelize}PagePart".constantize  
+      p = klass.find_or_create_by_name_and_page_id("#{name}", @current_page)
+      
+      if block_given?
+        block.call(p)
+      else
+        p
+      end
+      
     end
   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)
     path = page.try(:path)
-    
-    path.gsub(/:[A-z_]+/) do |seg|
-      meth = seg.gsub(/^:/, "")
-      resource_or_page.send(meth)
+    if path.blank?
+      "#"
+    else
+      path.gsub(/:[A-z_]+/) do |seg|
+        meth = seg.gsub(/^:/, "")
+        resource_or_page.send(meth)
+      end
     end
+
   end
   
   def page_url_for(resource_or_page)

data/app/helpers/settings_helper.rb

@@ -1,7 +1,20 @@
 module SettingsHelper
 
-  def get_setting(key, value = nil)
-    Setting.global("#{key}") || value
+  # eg.
+  # setting("blog/per_page", 20, :kind => :integer) 
+  def get_setting(namespaced_key, *args)
+    namespace_separator = "/"
+    
+    opts = args.extract_options!
+    value = args.first
+    namespaced_key = namespaced_key.to_s
+    group, key =  namespaced_key.include?(namespace_separator) ? namespaced_key.split(namespace_separator) : [nil, namespaced_key]
+    
+    Setting.global("#{key}", :autocreate => (opts[:autocreate].nil? ? true : opts[:autocreate]), :kind => opts[:kind], :default => value, :group => group)
   end
+  
+  alias :setting :get_setting
+  
+end
+
 
-end

data/app/models/attachment.rb

@@ -0,0 +1,18 @@
+class Attachment < ActiveRecord::Base
+  field :name, :string
+  alias_attribute :title, :name
+  
+  field :description, :text
+  has_attached :file
+  
+  # validates_attachment :file, :presence => true,
+  #   :size => { :in => 0..1000.megabytes }
+  
+  belongs_to :attachable, :polymorphic => true
+  attr_accessible :name, :description, :file, :attachable, :attachable_id, :attachable_type, :title
+end
+
+
+
+
+

data/app/models/page.rb

@@ -22,8 +22,8 @@ class Page < ActiveRecord::Base
   def to_label
     name
   end
-    
-  has_many :attachments, :as => :attachable
+
   has_many :page_parts
+  accepts_nested_attributes_for :page_parts
 
 end

data/app/models/pageable.rb

@@ -10,12 +10,27 @@ module Pageable
      
      this_controller_name = "#{self.name.underscore}".gsub("_controller", "")
      uid = "#{this_controller_name}##{name}"
+     parent_uid  = if parent_opt = options.delete(:parent)
+     parent_opt = parent_opt.to_s
+       if parent_opt.include?("#")
+         parent_opt
+       else
+         "#{this_controller_name}##{parent_opt}"
+       end
+     end
+     
      i18n_scope  = "pages.#{self.name.underscore.split('/').last}##{name}"
-     parent      = 
      title       = options.delete(:title) || I18n.t("#{i18n_scope}.title", :default => "#{name}".humanize)   
 
      if Page.table_exists?
+       
        page = Page.find_or_create_by_uid(uid, :title => title, :name => name)
+       if parent_uid
+         parent = Page.find_by_uid(parent_uid.to_s)
+         #raise [parent_uid.to_s, parent].inspect
+         page.move_to_child_of(parent) unless page.parent == parent
+       end
+       
      end
 
      map(name, path, options = {}, &block)

data/app/models/photo.rb

@@ -0,0 +1,23 @@
+class Photo < ActiveRecord::Base
+
+  validates_attachment :image, :presence => true,
+    :size => { :in => 0..2.megabytes }
+
+  has_attached :image, :styles => {
+    :large  =>  ["800x600", :jpeg],
+    :thumb  =>  ["100x100", :jpeg]
+  }
+
+  validates_presence_of :photographable
+  belongs_to :photographable, :polymorphic => :true
+  delegate :url, :file_name, :to => :image
+  
+  field :caption, :text
+  
+  def owner
+    photographable.owner if photographable && photographable.respond_to?(:owner)
+  end
+
+  timestamps
+
+end

data/app/models/setting.rb

@@ -8,7 +8,8 @@ class Setting < ActiveRecord::Base
   index :key
   
   field :kind
-  
+  field :group
+    
   field :integer_value, :integer
   field :float_value, :float
   field :text_value, :text
@@ -18,7 +19,6 @@ class Setting < ActiveRecord::Base
   has_attached :file_value
   
   
-  
   def self.kinds
           [ :string,
             :integer,
@@ -44,10 +44,15 @@ class Setting < ActiveRecord::Base
 
   # eg. Setting.global("site-name")
 
-  def self.global(key)
-    s = self.find_by_key_and_settable_id(key.to_s, nil)
+  def self.global(key, opts = {})
+    autocreate = opts.delete(:autocreate)
+    kind = opts.delete(:kind) || :string
+    default = opts.delete(:default)
+    group = opts.delete(:group) || "global"
+    
+    s = autocreate ? self.find_or_create_by_key_and_settable_id(key.to_s, nil, :kind => kind, :"#{kind}_value" => default, :group => group) : self.find_by_key_and_settable_id(key.to_s, nil)
     if s
-      s.value
+      s.value || default
     end
   end
 

data/app/models/text.rb

@@ -0,0 +1,6 @@
+class Text < ActiveRecord::Base
+  include Content
+  field :text, :text, :markup => true
+  has_many :attachments, :as => :attachable
+  accepts_nested_attributes_for :attachments
+end

data/app/models/text_page_part.rb

@@ -0,0 +1,3 @@
+class TextPagePart < PagePart
+  field :text, :text, :markup => true
+end

data/app/models/text_with_title_page_part.rb

@@ -0,0 +1,4 @@
+class TextWithTitlePagePart < PagePart
+  field :title, :string
+  field :text, :text, :markup => true
+end

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

@@ -1,7 +1,7 @@
 <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.home? ? "home" : "file"), :style => "line-height: 36px; padding-left:#{20 * level}px" %>
+  <%= 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>

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

@@ -1,9 +1,9 @@
-<%= tabs do |t| %>
-  <%= t.pane _("Info") do %>
-  <%= admin_form_for [:"admin", current_resource], :html => {:multipart => true, :"data-type" => :script}, :remote => true do |f| -%>
-
-      <%= f.errors %>
+<%= admin_form_for [:"admin", current_resource], :html => {:multipart => true} do |f| -%>
+  <%= f.errors %>
   
+  <%= tabs do |t| %>
+    <%= t.pane t('fullstack.admin.info', :default => "Info")  do %>
+      
       <%= f.inputs do %>
         <%= f.input :name %>
         <% if !@page.resourceful? %>
@@ -11,29 +11,37 @@
           <%= f.input :description, :as => :text %>
         <% end %>
       <% end -%>
-  
-      <%= nav :class => "pills" do %>  
-      <%= nav_item _("Advanced settings"), 
-        "#advanced_settings", 
-        :data => {:toggle => "collapse", :target => "#advanced_settings"}, 
-        :icon => "cog"
-        %>      
+      
+      <%= nav :class => "pills" do %>        
+        <%= nav_item t('fullstack.cms.advanced_settings', :default => "Advanced settings"), 
+          "#advanced_settings", 
+          :data => {:toggle => "collapse", :target => "#advanced_settings"}, 
+          :icon => "cog"
+          %>      
       <% end %>
+      
       <div class="collapse" id="advanced_settings">
         <%= f.inputs do %>
           <%= f.input :path, :input_html => {:readonly => true}  %>
           <%= f.input :uid, :input_html => {:readonly => true} %>
         <% end %>
       </div>
-
-
-      <%= form_actions do %>
-      <%= button (current_resource.persisted? ? t('fullstack.admin.update', :default => "Update") : t('fullstack.admin.create', :default => "Create")), :type => :primary, :size => :large %>
-      <% end %>
+      
   
-
-    <% end -%>
+    <% end %>
+    
+    <% current_resource.page_parts.each do |p| %>
+        <%= t.pane t(p.name, :scope => 'fullstack.cms.parts', :default => p.name.try(:humanize)) do  %>
+          <%= f.admin_fields_for :parts, p do |f| %>
+          <%= f.resource_inputs :except => [:page_id, :name] %>
+          <% end %>
+        <% end %>
+    <% end %>
     
   <% end %>
-  <%= render :partial => "admin/page_parts/tabs", :locals => {:page => current_resource, :tabs => t} %>
-<% end %>
+
+  <%= f.actions do %>
+    <%= f.resource_submit %>
+  <% end %>
+  
+<% end %>

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

@@ -0,0 +1,27 @@
+<% if Setting.any? %>
+
+<% 
+
+  @groups = {}
+  
+  @settings.each {|s|
+    @groups[s.group] ||= []
+    @groups[s.group] << s
+  }
+
+  nil
+ %>
+
+<%= tabs do |t| %>
+
+    <% @groups.each do |g,settings| %>
+      <%= t.pane t(g, :scope => "fullstack.admin.groups", :default => g.to_s.humanize) do %>
+      <% settings.each do |stg| %>
+            <p><%= link_to t(stg.key, :scope => "helpers.label", :default => stg.key.to_s.humanize), [:edit, :admin, stg] %></p>
+        <% end %>
+      <% end %>
+    <% end %>
+
+<% end %>
+
+<% end %>

data/app/views/admin/users/_form.html.erb

@@ -4,7 +4,7 @@
   <%= f.inputs do %>
     <%= f.input :email %>
   <% end %>
-  
+
   <% if current_resource.persisted? %>
   <%= link_to t('fullstack.admin.edit', :default => "Edit") + " " + t('helpers.label.password', :default => "password"), 
               "javascript:void(0);",
@@ -21,6 +21,14 @@
     <% end %>
   </div>
   
+  <div style="margin-bottom: 18px;">
+    
+  </div>
+
+  <% if current_resource.persisted? %>
+  <%= f.resource_inputs :except => %W(email password encrypted_password confirmation_token confirmed_at confirmation_sent_at unconfirmed_email remember_created_at sign_in_count current_sign_in_at last_sign_in_at current_sign_in_ip last_sign_in_ip reset_password_token reset_password_sent_at) %>  
+  <% end %>
+  
   
   <%= f.actions do %>
     <%= f.resource_submit %>

data/config/locales/formats.en.yml

@@ -0,0 +1,9 @@
+en:
+  date:
+    formats:
+        pubdate: "%e %b, %Y"
+  time:
+    formats:
+        pubdate: "%e %b, %Y"
+
+

data/config/locales/formats.it.yml

@@ -0,0 +1,9 @@
+it:
+  date:
+    formats:
+        pubdate: "%e %b, %Y"
+  time:
+    formats:
+        pubdate: "%e %b, %Y"
+
+

data/config/locales/it.yml

@@ -1,9 +1,11 @@
 it:
   fullstack:
     cms:
-      links:
-        links: "Link"
-        choose_a_page_by_title: "Scegli una pagina"
-        insert_by_hand: "Inserimento manuale"
-        add_link: "Aggiungi link"
-        link_a_page: "Collega una pagina"
+      advanced_settings: "Impostazioni avanzate"
+      # links:
+      #   links: "Link"
+      #   choose_a_page_by_title: "Scegli una pagina"
+      #   insert_by_hand: "Inserimento manuale"
+      #   add_link: "Aggiungi link"
+      #   link_a_page: "Collega una pagina"
+      # 

data/fullstack-cms.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "fullstack-cms"
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mcasimir"]
@@ -33,21 +33,27 @@ Gem::Specification.new do |s|
     "app/helpers/pages_helper.rb",
     "app/helpers/settings_helper.rb",
     "app/models/.gitkeep",
+    "app/models/attachment.rb",
     "app/models/link.rb",
     "app/models/menu.rb",
     "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",
-    "app/views/admin/page_parts/_tabs.html.erb",
-    "app/views/admin/page_parts/destroy.js.coffee",
+    "app/models/text.rb",
+    "app/models/text_page_part.rb",
+    "app/models/text_with_title_page_part.rb",
     "app/views/admin/pages/_collection.html.erb",
     "app/views/admin/pages/_form.html.erb",
+    "app/views/admin/settings/_collection.html.erb",
     "app/views/admin/settings/_form.html.erb",
     "app/views/admin/users/_form.html.erb",
     "config/locales/en.yml",
+    "config/locales/formats.en.yml",
+    "config/locales/formats.it.yml",
     "config/locales/it.yml",
     "config/routes.rb",
     "fullstack-cms.gemspec",
@@ -77,6 +83,7 @@ Gem::Specification.new do |s|
     "lib/generators/fullstack/cms/templates/rails/app/views/site/site/home.html.erb",
     "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/fullstack.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",

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

@@ -42,33 +42,28 @@ eos
         end
       end
       
-      def english_localizations
-        generate "fullstack:cms:locale en"
-      end
-      
       def routes_rb
         
-        route "# mount_controller 'site/site'"
-
         route '''
+  # namespace :site, :path => "/" do
+  #   mount_controller "site" 
+  # end
+  
+        '''
 
+        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]}"}
   end
-        
+     
         '''
       end
       
       def install_migrations
-        generate "migration:from link menu page_part page redirect setting"
+        generate "migration:from link menu page_part page redirect setting attachment photo text_page_part text_with_title_page_part"
       end
       
- 
-        end
-      end
-      
-      
       protected
       
       def migration_timestamp

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

@@ -1,12 +1 @@
-<h1 class="page-header">Homepage</h1>
-
-<div class="row">
-  <div class="span4">
-    <div class="well">
-      <%= page_part("Column") %>
-    </div>
-  </div>
-  <div class="span8">
-      <%= page_part("Body") %>
-  </div>
-</div>
+<h1 class="page-header">Homepage</h1>

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

@@ -0,0 +1,20 @@
+Fullstack::Admin.resources do |admin|
+    
+  admin.group :website do |g|
+    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
+
+Fullstack::Cms.configure do |config|
+  config.linkables = %w(pages)
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fullstack-cms
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -211,21 +211,27 @@ files:
 - app/helpers/pages_helper.rb
 - app/helpers/settings_helper.rb
 - app/models/.gitkeep
+- app/models/attachment.rb
 - app/models/link.rb
 - app/models/menu.rb
 - 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
-- app/views/admin/page_parts/_tabs.html.erb
-- app/views/admin/page_parts/destroy.js.coffee
+- app/models/text.rb
+- app/models/text_page_part.rb
+- app/models/text_with_title_page_part.rb
 - app/views/admin/pages/_collection.html.erb
 - app/views/admin/pages/_form.html.erb
+- app/views/admin/settings/_collection.html.erb
 - app/views/admin/settings/_form.html.erb
 - app/views/admin/users/_form.html.erb
 - config/locales/en.yml
+- config/locales/formats.en.yml
+- config/locales/formats.it.yml
 - config/locales/it.yml
 - config/routes.rb
 - fullstack-cms.gemspec
@@ -255,6 +261,7 @@ files:
 - lib/generators/fullstack/cms/templates/rails/app/views/site/site/home.html.erb
 - 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/fullstack.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
@@ -286,7 +293,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1053948701747284460
+      hash: -744864392680158351
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/app/views/admin/page_parts/_tabs.html.erb

@@ -1,21 +0,0 @@
-<% page.page_parts.each do |part| %>
-    <%= tabs.pane(part.name) do %>
-    
-          <%= admin_form_for [:"admin", page, part], :html => {:multipart => true}, :remote => true, :'data-type' => "js" do |f| -%>
-
-          <%= f.errors %>
-        
-            <%= f.inputs do %>
-            <%= f.input :content, :label => false, :input_html => { :class => "markup-ckeditor", :id => "page_part_#{part.id}_content" } %>
-            <% end -%>
-  
-            <%= f.actions do %>
-              <%= button (current_resource.persisted? ? _("Update") : _("Create")), 
-                          :type => :primary, :size => :large %>
-              <%= link_to _("Delete"), [:admin, page, part], :data => {:method => "delete", :remote => true, :confirm => _("Are you sure?") }, :class => "btn btn-large btn-danger" %>
-            <% end %>
-            
-        <% end -%>  
-        
-    <% end %>
-<% end %>

data/app/views/admin/page_parts/destroy.js.coffee

@@ -1,12 +0,0 @@
-<% if instance_variable_get("@#{controller_name.singularize}").destroyed? %>
-$(".nav-tabs li.active, .tab-pane.active").fadeOut 'fast', -> 
-  $(@).remove()
-  $(".tabs").show()
-  
-$("a[data-toggle='tab']").first().click()
-
-notify_notice('<%=j t("flash.success.delete")  %>')
-<% else %>
-notify_error('<%=j t("flash.error.delete")  %>')
-<% end %>
-