typus 3.1.0.rc3 → 3.1.0.rc4

data/Rakefile

@@ -3,7 +3,7 @@ Bundler::GemHelper.install_tasks
 
 require 'rubygems'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 task :default => :test
 

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

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

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

@@ -0,0 +1,12 @@
+<%
+  unless @item.new_record?
+    label_text << " <small>"
+    label_text << link_to(Typus::I18n.t("Preview"), send("#{@item.class.model_name.downcase}_path",@item.to_param), :target => "_blank")
+    label_text << "</small>"
+  end
+%>
+
+<li id="<%= attribute %>">
+  <%= form.label attribute, raw(label_text) %>
+  <%= form.text_field attribute, options %>
+</li>

data/lib/typus.rb

@@ -26,8 +26,12 @@ module Typus
     autoload :ActsAs, "typus/controller/acts_as"
     autoload :Associations, "typus/controller/associations"
     autoload :Autocomplete, "typus/controller/autocomplete"
+    autoload :FeaturedImage, "typus/controller/featured_image"
     autoload :Filters, "typus/controller/filters"
     autoload :Format, "typus/controller/format"
+    autoload :Headless, "typus/controller/headless"
+    autoload :Multisite, "typus/controller/multisite"
+    autoload :Trash, "typus/controller/trash"
   end
 
   module Authentication

data/lib/typus/controller/featured_image.rb

@@ -0,0 +1,24 @@
+module Typus
+  module Controller
+    module FeaturedImage
+
+      def set_featured_image
+        attachment = Attachment.find(params[:id])
+
+        item = params[:resource].constantize.unscoped.find(params[:resource_id])
+        item.set_featured_image(attachment.id)
+
+        options = { :controller => params[:resource].tableize, :action => 'edit', :id => item.id }
+        redirect_to options, :notice => Typus::I18n.t("Featured image set")
+      end
+
+      def remove_featured_image
+        item = @resource.unscoped.find(params[:id])
+        item.try(:remove_featured_image)
+        options = { :action => 'edit', :id => item.id }
+        redirect_to options, :notice => Typus::I18n.t("Featured image removed")
+      end
+
+    end
+  end
+end

data/lib/typus/controller/headless.rb

@@ -0,0 +1,28 @@
+module Typus
+  module Controller
+    module Headless
+
+      def self.included(base)
+        base.before_filter :set_resources_action_for_headless_on_index, :only => [:index]
+        base.before_filter :set_resources_action_for_headless, :only => [:new, :create, :edit, :show]
+        base.layout :set_headless_layout
+      end
+
+      def set_resources_action_for_headless_on_index
+        add_resources_action("Add new", {:action => "new"}, {})
+      end
+      private :set_resources_action_for_headless_on_index
+
+      def set_resources_action_for_headless
+        add_resources_action("Back to list", {:action => 'index', :id => nil}, {})
+      end
+      private :set_resources_action_for_headless
+
+      def set_headless_layout
+        params[:layout] || "admin/base"
+      end
+      private :set_headless_layout
+
+    end
+  end
+end

data/lib/typus/controller/multisite.rb

@@ -0,0 +1,12 @@
+module Typus
+  module Controller
+    module Multisite
+
+      def set_context
+        @resource = admin_user.site.send(@object_name.pluralize)
+      end
+      private :set_context
+
+    end
+  end
+end

data/lib/typus/controller/trash.rb

@@ -0,0 +1,54 @@
+module Typus
+  module Controller
+    module Trash
+
+      def self.included(base)
+        base.before_filter :set_predefined_filter_for_trash, :only => [:index, :trash]
+      end
+
+      def set_predefined_filter_for_trash
+        add_predefined_filter("Trash", "trash", "deleted")
+      end
+      private :set_predefined_filter_for_trash
+
+      def trash
+        set_deleted
+
+        get_objects
+
+        respond_to do |format|
+          format.html do
+            # Actions by resource.
+            add_resource_action('Restore', {:action => 'restore'}, {:confirm => Typus::I18n.t("Restore %{resource}?", :resource => @resource.model_name.human)})
+            add_resource_action('Delete Permanently', {:action => 'wipe'}, {:confirm => Typus::I18n.t("Delete Permanently %{resource}?", :resource => @resource.model_name.human)})
+            # Generate and render.
+            generate_html
+            render 'index'
+          end
+          @resource.typus_export_formats.each { |f| format.send(f) { send("generate_#{f}") } }
+        end
+      end
+
+      def restore
+        set_deleted
+        @resource.find(params[:id]).restore
+        redirect_to :back, :notice => Typus::I18n.t("%{resource} recovered from trash.", :resource => @resource.name)
+      rescue ActiveRecord::RecordNotFound
+        redirect_to :back, :notice => Typus::I18n.t("%{resource} can't be recovered from trash.", :resource => @resource.name)
+      end
+
+      def wipe
+        set_deleted
+        item = @resource.find(params[:id])
+        item.disable_trash { item.destroy }
+        redirect_to :back, :notice => Typus::I18n.t("%{resource} has been successfully removed from trash.", :resource => @resource.name)
+      end
+
+      def set_deleted
+        @resource = @resource.deleted
+      end
+      private :set_deleted
+
+    end
+  end
+end

data/lib/typus/version.rb

@@ -1,3 +1,3 @@
 module Typus
-  VERSION = "3.1.0.rc3"
+  VERSION = "3.1.0.rc4"
 end

metadata

@@ -2,7 +2,7 @@
 name: typus
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 3.1.0.rc3
+  version: 3.1.0.rc4
 platform: ruby
 authors: 
 - Francesc Esplugas
@@ -242,8 +242,10 @@ files:
 - app/views/admin/templates/_profile_sidebar.html.erb
 - app/views/admin/templates/_relate_form.html.erb
 - app/views/admin/templates/_relate_form_with_autocomplete.html.erb
+- app/views/admin/templates/_rich_text.html.erb
 - app/views/admin/templates/_selector.html.erb
 - app/views/admin/templates/_string.html.erb
+- app/views/admin/templates/_string_with_preview.html.erb
 - app/views/admin/templates/_text.html.erb
 - app/views/admin/templates/_time.html.erb
 - app/views/admin/templates/_tree.html.erb
@@ -307,8 +309,12 @@ files:
 - lib/typus/controller/acts_as.rb
 - lib/typus/controller/associations.rb
 - lib/typus/controller/autocomplete.rb
+- lib/typus/controller/featured_image.rb
 - lib/typus/controller/filters.rb
 - lib/typus/controller/format.rb
+- lib/typus/controller/headless.rb
+- lib/typus/controller/multisite.rb
+- lib/typus/controller/trash.rb
 - lib/typus/engine.rb
 - lib/typus/i18n.rb
 - lib/typus/orm/active_record.rb