typus 3.1.0.rc6 → 3.1.0.rc7

data/app/views/admin/templates/{_rich_text.html.erb → _text_with_ckeditor.html.erb}

@@ -3,13 +3,13 @@
 <% end %>
 
 <%
-  custom = { :rows => @resource.typus_options_for(:form_rows), :class => "rich_text" }
+  custom = { :rows => @resource.typus_options_for(:form_rows), :class => "ckeditor" }
   options = options.merge!(custom)
 %>
 
 <input type="hidden"
        id="pageListJSON"
-       value="[<%= Page.all.map { |p| "['#{p.to_label}', '/pages/#{p.permalink}']" }.join(", ") %>]">
+       value="[<%= Page.all.map { |p| "['#{p.to_label}', '/pages/#{p.respond?(:permalink) p.permalink : p.id}']" }.join(", ") %>]">
 
 <li id="<%= attribute %>">
   <%= form.label attribute, label_text %>

data/app/views/admin/templates/_text_with_ckeditor_and_assets.html.erb

@@ -0,0 +1,24 @@
+<% content_for :javascripts do %>
+  <%= javascript_include_tag '/vendor/ckeditor/ckeditor' %>
+<% end %>
+
+<%
+  custom = { :rows => @resource.typus_options_for(:form_rows), :class => "ckeditor" }
+  options = options.merge!(custom)
+%>
+
+<%
+  input = "#{@resource.model_name.underscore.gsub("/", "_")}_#{attribute}"
+  label_text << <<-DATA
+<small>
+  #{link_to "Insert picture",
+            {:controller => "/admin/assets", :layout => 'admin/headless', :input => input},
+            {:class => "iframe", :style => "font-size: 10px; background: black; color: white; padding: 2px 5px; -moz-border-radius: 3px; -webkit-border-radius: 3px;"}}
+</small>
+  DATA
+%>
+
+<li id="<%= attribute %>">
+  <%= form.label attribute, label_text.html_safe %>
+  <%= form.text_area attribute, options %>
+</li>

data/app/views/admin/templates/_tree.html.erb

@@ -1,4 +1,6 @@
-<li id="<%= attribute %>">
-  <%= form.label label_text %>
-  <%= form.select :parent_id, values, { :include_blank => true } %>
-</li>
+<% unless values.empty? %>
+  <li id="<%= attribute %>">
+    <%= form.label label_text %>
+    <%= form.select :parent_id, values, { :include_blank => true } %>
+  </li>
+<% end %>

data/app/views/helpers/admin/resources/_actions.html.erb

@@ -0,0 +1,24 @@
+<%= form_tag :action => 'bulk' do %>
+
+  <%= block.call %>
+
+  <% if bulk_actions.any? %>
+
+    <div id="filters">
+      <ul class="predefined_filters">
+        <li>
+          <select id="bulk_action" name="batch_action">
+            <option value="" selected="selected">Bulk actions</option>
+            <% bulk_actions.each do |name, action| %>
+              <option value="<%= action %>"><%= Typus::I18n.t(name) %></option>
+            <% end %>
+          </select>
+        </li>
+
+        <li><%= submit_tag Typus::I18n.t("Apply") %></li>
+      </ul>
+    </div>
+
+  <% end %>
+
+<% end %>

data/app/views/helpers/admin/resources/_table.html.erb

@@ -0,0 +1,45 @@
+<table>
+
+  <thead>
+    <tr>
+      <% if controller.respond_to?(:bulk) %>
+        <th><%= check_box_tag "action-toggle", "", false, :class => "action-toggle" %></th>
+      <% end %>
+      <% headers.each do |header| %>
+        <th><%= header %></th>
+      <% end %>
+    </tr>
+  </thead>
+
+  <% items.each do |item| %>
+    <tr class="<%= cycle('even', 'odd') %>" id="<%= dom_id(item) %>">
+      <% if controller.respond_to?(:bulk) %>
+        <td width="16">
+          <%= check_box_tag "selected_item_ids[]", item.id, false, :class => "action-select" %>
+        </td>
+      <% end %>
+      <% table_fields_for_item(item, fields).each_with_index do |field, index| %>
+        <td>
+          <%= field %>
+          <% if index.zero? %>
+            <div class="actions">
+              <%= table_actions(model, item, association_name) %>
+            </div>
+          <% end %>
+        </td>
+      <% end %>
+    </tr>
+  <% end %>
+
+  <thead>
+    <tr>
+      <% if controller.respond_to?(:bulk) %>
+        <th><%= check_box_tag "action-toggle", "", false, :class => "action-toggle" %></th>
+      <% end %>
+      <% headers.each do |header| %>
+        <th><%= header %></th>
+      <% end %>
+    </tr>
+  </thead>
+
+</table>

data/config/routes.rb

@@ -10,7 +10,7 @@ Rails.application.routes.draw do
         get :destroy, :as => "destroy"
       end
 
-      resources :account, :only => [:new, :create, :show, :forgot_password] do
+      resources :account, :only => [:new, :create, :show] do
         collection do
           get :forgot_password
           post :send_password

data/doc/yard/handlers/configurable_attr_handler.rb

@@ -0,0 +1,38 @@
+class ConfigurableAttrHandler < YARD::Handlers::Ruby::Legacy::Base
+  handles(/^\s*configurable_attr/)
+
+  def process
+    namespace[:configurable_attributes] ||= []
+    
+    attribute = token_to_object(statement.tokens[2])
+    comments = statement.comments.join(' ') if statement.comments
+    
+    if statement.block
+    # e.g. configurable_attr :datastore do FileDataStore.new end
+      lazy_default_value = statement.block.to_s
+    else
+    # e.g. configurable_attr :fallback_mime_type, 'application/octet-stream'    
+      default_value = token_to_object(statement.tokens[5..-1])
+    end
+    namespace[:configurable_attributes] << {
+      :attribute => attribute,
+      :default_value => default_value,
+      :lazy_default_value => lazy_default_value,
+      :comments => comments
+    }
+  end
+
+  private
+
+  def token_to_object(token)
+    if token
+      if token.is_a?(YARD::Parser::Ruby::Legacy::TokenList)
+        eval(token.to_s)
+      else # is a single token
+        eval(token.text)
+      end
+    end
+  end
+
+end
+

data/doc/yard/setup.rb

@@ -0,0 +1,9 @@
+this_dir = File.dirname(__FILE__)
+
+YARD::Templates::Engine.register_template_path(this_dir + '/templates')
+Dir[this_dir + '/handlers/*.rb'].each do |file|
+  require File.expand_path(file)
+end
+YARD::Parser::SourceParser.parser_type = :ruby18
+
+DRAGONFLY_VERSION = "0.0.0"

data/doc/yard/templates/default/fulldoc/html/css/common.css

@@ -0,0 +1,109 @@
+/* Overrides for yard documentation */
+
+/* Clearfix */
+.clearfix:after {
+	content: ".";
+	display: block;
+	clear: both;
+	visibility: hidden;
+	line-height: 0;
+	height: 0;
+}
+ 
+.clearfix {
+	display: inline-block;
+}
+ 
+html[xmlns] .clearfix {
+	display: block;
+}
+ 
+* html .clearfix {
+	height: 1%;
+}
+ /************/
+
+body {
+  font-family: "PT Sans",Verdana,Arial,sans-serif;
+  font-size: 14px;
+}
+
+pre, code, .code,
+#filecontents pre.code,
+.docstring pre.code,
+.source_code pre {
+  font-family: Inconsolata,Monaco,"Courier New","DejaVu Sans Mono","Bitstream Vera Sans Mono",monospace;
+}
+
+pre.code, code {
+  background:#F5F5FF;
+  overflow-x: auto;
+}
+#filecontents pre.code {
+  margin:10px 0;
+  padding:5px 12px;
+  border-radius:5px;
+  -webkit-border-radius:5px;
+  -moz-border-radius:5px;
+  border: 1px dotted #CCC;
+}
+
+code .val {
+  color:#036A07;
+}
+code .kw {
+  color:#0000FF;
+}
+code .symbol {
+  color:#C5060B;
+}
+
+ul.main_files {
+  list-style-type:none;
+  margin:0;
+  padding:0;
+  font-size:14px;
+}
+ul.main_files li {
+  margin:0;
+  padding:0;
+}
+
+ul.main_files li a {
+  margin: 0;
+  padding:3px 12px;
+  display:block;
+  cursor:pointer;
+}
+#content ul.main_files li a:hover {
+  background-color:#F4F9E4;
+}
+/* Layout */
+#header,
+#content,
+#footer {
+  margin:0 auto;
+  width:1000px;
+}
+#header #logo {
+  float:left;
+  width:50%;
+  font-size: 32px;
+  letter-spacing: -1px;
+  margin-top: 20px;
+}
+#header #search {
+  position:static;
+  float:right;
+}
+#content .col1 {
+  float:left;
+  width: 750px;
+}
+#content .col2 {
+  float:left;
+  margin: 0 0 0 20px;
+  padding: 0 0 0 20px;
+  width: 200px;
+  border-left: 1px dotted #D5D5D5;
+}

data/doc/yard/templates/default/layout/html/layout.erb

@@ -0,0 +1,126 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+  <head>
+    <%= erb(:headers) %>
+    <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Inconsolata">
+    <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=PT+Sans">
+    <script type="text/javascript" charset="utf-8">
+      (function($){
+        // YARD automatically creates a table of contents
+        // Let's place it inside .col1, instead of #content
+        $(document).ready(function(){
+          $('#toc').prependTo($('.col1'));
+          <% if options[:file] == 'extra_docs/Index.md' %>
+            $('#toc').hide();
+          <% end %>
+        });
+      })(jQuery);
+    </script>
+  </head>
+
+  <body>
+
+    <script type="text/javascript" charset="utf-8">
+      if (window.top.frames.main) document.body.className = 'frames';
+    </script>
+
+    <div id="header" class="clearfix">
+      <%#= erb(:breadcrumb) %>
+      <div id="logo">Typus: Ruby on Rails Admin Panel (Engine) to allow trusted users edit structured content</div>
+      <%= erb(:search) %>
+    </div>
+
+    <div>
+      <iframe id="search_frame"></iframe>
+    </div>
+
+    <div id="content" class="clearfix">
+      <div class="col1">
+        <%= yieldall %>
+      </div>
+      <div class="col2">
+
+        <h2>Overview</h2>
+
+        <%
+          links = [['home', 'Home'],
+                   ['overview-supported-features', 'Supported Features'],
+                   ['overview-architectural-goals', 'Architectural Goal'],
+                   ['changelog', 'Changelog']]
+        %>
+
+        <ul class="main_files clearfix">
+          <% links.each do |file, text| %>
+            <li><%= link_file(file, text) %></li>
+          <% end %>
+        </ul>
+
+        <h2>Installation</h2>
+
+        <%
+          links = [['requirements', 'Requirements'],
+                   ['installation-instructions', 'Instructions'],
+                   ['installation-generators-and-rake-tasks', 'Generators and Rake Tasks'],
+                   ['configuration-initializers', 'Initializers'],
+                   ['configuration-resources', 'Resources'],
+                   ['configuration-resource', 'Resource'],
+                   ['configuration-roles', 'Roles'],
+                   ['customization-user-interface', 'User Interface'],
+                   ['customization-attribute-templates', 'Attribute Templates'],
+                   ['customization-selectors', 'Selectors']]
+        %>
+
+        <ul class="main_files clearfix">
+          <% links.each do |file, text| %>
+            <li><%= link_file(file, text) %></li>
+          <% end %>
+        </ul>
+
+        <h2>Recipes</h2>
+
+        <%
+          links = [['recipes-rich-text-editor', 'Adding a Rich Text Editor'],
+                   ['recipes-custom-actions', 'Custom Actions'],
+                   ['recipes-single-table-inheritance', 'Single Table Inheritance'],
+                   ['recipes-configuration-files', 'Configuration Files'],
+                   ['recipes-testing-the-plugin', 'Testing the Plugin'],
+                   ['recipes-devise-authentication', 'Devise Authentication']]
+        %>
+
+        <ul class="main_files clearfix">
+          <% links.each do |file, text| %>
+            <li><%= link_file(file, text) %></li>
+          <% end %>
+        </ul>
+
+        <h2>Additional Resources</h2>
+
+        <%
+          links = [['http://core.typuscms.com/templates/desmond.txt', 'Application Template'],
+                   ['http://demo.typuscms.com/', 'Application Demo'],
+                   ['http://rubygems.org/gems/typus', 'Gems'],
+                   ['http://github.com/typus/typus', 'Plugin Source Code'],
+                   ['http://groups.google.com/group/typus', 'Mailing List'],
+                   ['https://github.com/typus/typus/issues', 'Bug Reports'],
+                   ['https://github.com/typus/typus/contributors', 'Contributors List'],
+                   ['http://pledgie.com/campaigns/11233', 'Donate'],
+                   ['http://ruby-toolbox.com/categories/rails_admin_interfaces.html', 'Ruby Toolbox'],
+                   ['http://www.joshcrews.com/2010/03/using-heroku-to-host-your-rails-cms/', 'Using Heroku to host your Rails CMS'],
+                   ['http://github.com/typus/typus/wiki/ci-server', 'Setting up the CI server']]
+        %>
+
+        <ul class="main_files clearfix">
+          <% links.each do |url, title| %>
+            <li><%= link_url(url, title) %></li>
+          <% end %>
+        </ul>
+
+      </div>
+    </div>
+
+    <%= erb(:footer) %>
+
+  </body>
+</html>

data/doc/yard/templates/default/module/html/configuration_summary.erb

@@ -0,0 +1,31 @@
+<% configurable_attributes = object[:configurable_attributes] || [] %>
+<% if configurable_attributes.any? %>
+<h2>Configuration Summary</h2>
+<h3>Configurable attributes</h3>
+Configurable attributes for an object in general <code>object</code> can be configured either by using something like
+<pre class="code">
+  object.configure <%= hl :do %> |c|
+    c.some_configurable_attribute = <%= hl 'some value' %>
+    c.some_other_configurable_attribute = <%= hl 42 %>
+    ...
+  <%= hl :end %>
+</pre>
+or
+<pre class="code">
+  object.some_configurable_attribute = <%= hl 'some value' %>
+</pre>
+<h4>Configurable attributes for instances of <%= object %></h4>
+<ul>
+  <% configurable_attributes.each do |attribute| %>
+  <li>
+    <code><%= attribute[:attribute] %></code>
+    <% if attribute[:lazy_default_value] %>
+     - default <code><%= hl attribute[:lazy_default_value] %></code> (evaluated lazily) 
+    <% else %>
+     - default <code><%= hl attribute[:default_value] %></code>
+    <% end %>
+    <%= '- ' + attribute[:comments] if attribute[:comments] %>
+  </li>
+  <% end %>
+</ul>
+<% end %>

data/doc/yard/templates/default/module/setup.rb

@@ -0,0 +1,17 @@
+def init
+  super
+  sections.place(:configuration_summary).before(:method_summary)
+end
+
+# Highlight stuff
+def hl(code)
+  case code
+  when :do, :end then %(<span class="kw">#{code}</span>)
+  when Symbol then %(<span class="symbol">#{code.inspect}</span>)
+  when Integer then %(<span class="integer val">#{code}</span>)
+  when String then %(<span class="string val">#{code.inspect}</span>)
+  when true, false then %(<span class="kw">#{code.inspect}</span>)
+  when nil then %(<span class="nil kw">#{code.inspect}</span>)
+  else code
+  end
+end

data/lib/generators/templates/config/initializers/typus_resources.rb

@@ -9,9 +9,6 @@ Typus::Resources.setup do |config|
   # Defines form_rows.
   # config.form_rows = 15
 
-  # Defines action_after_save.
-  # config.action_after_save = "edit"
-
   # Defines minute_step.
   # config.minute_step = 5
 

data/lib/generators/templates/config/typus/README

@@ -33,7 +33,6 @@ most common settings.
       application: Application
       description: Some text to describe the model
       options:
-        action_after_save: index
         default_action_on_item: show
         end_year: 2015
         form_rows: 25

data/lib/generators/typus/controller_generator.rb

@@ -13,7 +13,7 @@ Description:
       MSG
 
       def generate_controller
-        template "controller.rb", "app/controllers/admin/#{file_name}_controller.rb"
+        template "controller.erb", "app/controllers/admin/#{file_name}_controller.rb"
       end
 
       hook_for :test_framework do |instance, generator|

data/lib/generators/typus/migration_generator.rb

@@ -66,7 +66,7 @@ Examples:
       end
 
       def generate_migration
-        migration_template "migration.rb", "db/migrate/create_#{admin_users_table_name}"
+        migration_template "migration.erb", "db/migrate/create_#{admin_users_table_name}"
       end
 
       protected

data/lib/typus/authentication/session.rb

@@ -7,18 +7,11 @@ module Typus
       include Base
 
       def authenticate
-        if session[:typus_user_id]
-          admin_user
-        else
-          # back_to = request.env['PATH_INFO'] unless [root_path].include?(request.env['PATH_INFO'])
-          # redirect_to new_session_path(:back_to => back_to)
-          redirect_to new_admin_session_path
-        end
+        session[:typus_user_id] ? admin_user : redirect_to(new_admin_session_path)
       end
 
       def deauthenticate
         session[:typus_user_id] = nil
-        ::I18n.locale = ::I18n.default_locale
         redirect_to new_admin_session_path
       end
 
@@ -41,10 +34,10 @@ module Typus
       # It works on models, so its available on the `resources_controller`.
       #++
       def check_if_user_can_perform_action_on_resources
-        if @item.is_a?(Typus.user_class)
+        if @item && @item.is_a?(Typus.user_class)
           check_if_user_can_perform_action_on_user
-        elsif admin_user.cannot?(params[:action], @resource.model_name)
-          not_allowed
+        else
+          not_allowed if admin_user.cannot?(params[:action], @resource.model_name)
         end
       end
 
@@ -52,17 +45,21 @@ module Typus
       # Action is available on: edit, update, toggle and destroy
       #++
       def check_if_user_can_perform_action_on_user
+        is_current_user = (admin_user == @item)
+        current_user_is_root = admin_user.is_root? && is_current_user
+
         case params[:action]
         when 'edit'
-          not_allowed if admin_user.is_not_root? && (admin_user != @item)
-        when 'update'
-          user_profile = (admin_user.is_root? || admin_user.is_not_root?) && (admin_user == @item) && !(@item.role == params[@object_name][:role])
-          other_user   = admin_user.is_not_root? && !(admin_user == @item)
-          not_allowed if (user_profile || other_user)
+          # Edit other items is not allowed unless current user is root
+          # and is not the current user.
+          not_allowed if admin_user.is_not_root? && !is_current_user
         when 'toggle', 'destroy'
-          root = admin_user.is_root? && (admin_user == @item)
-          user = admin_user.is_not_root?
-          not_allowed if (root || user)
+          not_allowed if admin_user.is_not_root? || current_user_is_root
+        when 'update'
+          # Admin can update himself except setting the status to false!. Other
+          # users can update their profile as the attributes (role & status)
+          # are protected.
+          not_allowed if (admin_user.is_not_root? && !is_current_user) || current_user_is_root
         end
       end
 

data/lib/typus/controller/actions.rb

@@ -1,12 +1,12 @@
-##
-# FIXME: Somehow I want to cleanup this module, for the moment has tests and
-#        works as expected, but there's a lot of duplication here.
-#
-
 module Typus
   module Controller
     module Actions
 
+      def self.included(base)
+#        base.helper_method :resource_actions
+#        base.helper_method :resources_actions
+      end
+
       protected
 
       ##
@@ -27,6 +27,7 @@ module Typus
       #       add_resource_action('Recover', {:action => 'untrash'}, {}, Proc.new {|item| item.is_trash? })
       #       super
       #     end
+      #
 
       def add_resource_action(*args)
         @resource_actions ||= []
@@ -43,6 +44,10 @@ module Typus
         @resource_actions = @resource_actions.concat([args]) unless args.empty?
       end
 
+#      def resource_actions
+#        @resource_actions ||= []
+#      end
+
       ##
       # @resources_actions is used to build a list of custom actions which will
       # be appended beside "<h2></h2>" all the actions.
@@ -71,6 +76,10 @@ module Typus
         @resources_actions = @resources_actions.concat([args]) unless args.empty?
       end
 
+#      def resources_actions
+#        @resources_actions ||= []
+#      end
+
     end
   end
 end