typus 3.0.6 → 3.0.7

data/app/helpers/admin/search_helper.rb

@@ -6,7 +6,7 @@ module Admin
       if (typus_search = resource.typus_defaults_for(:search)) && typus_search.any?
 
         hidden_filters = params.dup
-        rejections = %w(controller action locale utf8 sort_order order_by search)
+        rejections = %w(controller action locale utf8 sort_order order_by search page)
         hidden_filters.delete_if { |k, v| rejections.include?(k) }
 
         render "admin/helpers/search/search", :hidden_filters => hidden_filters

data/app/helpers/admin/sidebar_helper.rb

@@ -6,8 +6,7 @@ module Admin
       resources = ActiveSupport::OrderedHash.new
       app_name = @resource.typus_application
 
-      Typus.application(app_name).sort {|a,b| a.typus_constantize.model_name.human <=> b.typus_constantize.model_name.human}.each do |resource|
-        next unless admin_user.resources.include?(resource)
+      admin_user.application(app_name).sort {|a,b| a.typus_constantize.model_name.human <=> b.typus_constantize.model_name.human}.each do |resource|
         klass = resource.typus_constantize
 
         resources[resource] = default_actions(klass)

data/app/helpers/admin/table_helper.rb

@@ -56,9 +56,9 @@ module Admin
         if admin_user.can?(url[:action], model.name)
           link_to Typus::I18n.t(body),
                   params.dup.cleanup.merge(url).merge(:controller => model.to_resource, :id => item.id),
-                  options.merge(:target => "_parent")
+                  options
         end
-      end.compact.join(" / ").html_safe
+      end.join(" / ").html_safe
     end
 
     def table_belongs_to_field(attribute, item)
@@ -100,7 +100,7 @@ module Admin
     end
 
     def table_file_field(attribute, item)
-      typus_file_preview(item, attribute)
+      typus_file_preview(item, attribute, { :height => 60, :width => 60})
     end
 
     def table_tree_field(attribute, item)
@@ -150,7 +150,12 @@ module Admin
 
     def table_transversal_field(attribute, item)
       field_1, field_2 = attribute.split(".")
-      item.send(field_1).send(field_2)
+
+      if related_item = item.send(field_1)
+        related_item.send(field_2)
+      else
+        "—".html_safe
+      end
     end
 
   end

data/app/views/admin/helpers/_file_preview.html.erb

@@ -1,3 +1,3 @@
 <%= link_to preview, :class => "fancybox" do %>
-  <%= image_tag thumb, :alt => preview %>
+  <%= image_tag thumb, options.merge(:alt => preview) %>
 <% end %>

data/app/views/admin/helpers/base/_apps.html.erb

@@ -0,0 +1,23 @@
+<ul>
+
+  <% dashboard = 'active' if params[:controller].include?('dashboard') %>
+
+  <li><%= link_to Typus::I18n.t("Dashboard"), admin_dashboard_path, :class => dashboard %></li>
+
+  <% admin_user.applications.each do |application| %>
+
+    <%
+      apps = admin_user.application(application)
+      klass = (@resource && apps.include?(@resource.model_name)) ? 'active' : nil
+    %>
+
+    <%
+      url = { :controller => apps.first.tableize }
+      html_options = { :class => klass }
+    %>
+
+    <li><%= link_to Typus::I18n.t(application), url, html_options %></li>
+
+  <% end %>
+
+</ul>

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

@@ -1,3 +1,3 @@
 <div id="flash" class="notice">
-  <%= link_to Typus::I18n.t("Cancel adding a new %{resource}?", :resource => @resource.model_name.human.downcase), params[:back_to] %>
+  <%= link_to body, url %>
 </div>

data/app/views/admin/resources/show.html.erb

@@ -14,33 +14,10 @@
 <%= render 'show' %>
 
 <dl>
-<%- @fields.each do |key, value| -%>
-  <dt><%=h @resource.human_attribute_name(key) %></dt>
-  <%-
-    raw_data = @item.send(key)
-    data = case value
-           when :boolean
-             @resource.typus_boolean(key).invert[raw_data.to_s]
-           when :belongs_to
-             if raw_data
-               link_to raw_data.to_label, { :controller => raw_data.class.to_resource,
-                                            :action => raw_data.class.typus_options_for(:default_action_on_item),
-                                            :id => raw_data }
-             end
-           when :file
-             typus_file_preview(@item, key)
-           when :selector
-             @item.mapping(key)
-           when :datetime
-             if raw_data
-               I18n.localize(raw_data, :format => @resource.typus_date_format(key))
-             end
-           else
-             raw_data
-           end
-  -%>
-  <dd><%= data.present? ? data : "&mdash;".html_safe %></dd>
-<%- end -%>
+  <% build_display(@item, @fields).each do |attribute, type| %>
+    <dt><%= attribute %></dt>
+    <dd><%= type %></dd>
+  <% end %>
 </dl>
 
 <%= raw typus_relationships %>

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

@@ -0,0 +1,11 @@
+<li id="<%= attribute %>">
+  <%= form.label related_fk, raw("#{label_text} <small>#{message}</small>") %>
+  <%= form.hidden_field related_fk %>
+  <input data-autocomplete="<%= "/admin/#{related.to_resource}/autocomplete" %>"
+         id="autocomplete"
+         id_element="#<%= "#{@item.class.model_name.downcase}_#{related_fk}" %>"
+         name="autocomplete"
+         size="30"
+         type="text"
+         value="<%= @item.send(attribute).try(:to_label) %>" />
+</li>

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

@@ -1,7 +1,7 @@
 <div class="box_relationships" id="<%= association_name %>">
 
   <h2>
-    <%= association_name.humanize.pluralize %>
+    <%= association_name.titleize.humanize.pluralize %>
     <small><%= add_new %></small>
   </h2>
 

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

@@ -1,14 +1,14 @@
-<div class="box_relationships" id="<%= model_to_relate_as_resource %>">
+<div class="box_relationships" id="<%= association_name %>">
 
   <h2>
-    <%= model_to_relate.model_name.human %>
+    <%= association_name.humanize %>
     <small><%= add_new %></small>
   </h2>
 
   <% if @items.any? -%>
     <%= table %>
   <% else %>
-    <p><%= Typus::I18n.t("No %{resources} found.", :resources => model_to_relate.model_name.human.downcase) %></p>
+    <p><%= Typus::I18n.t("No %{resources} found.", :resources => association_name.humanize.downcase) %></p>
   <% end %>
 
 </div>

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

@@ -1,5 +1,5 @@
 <%= form_tag :action => :relate, :id => @item.id do %>
   <%= hidden_field :related, :model, :value => model_to_relate %>
   <%= hidden_field :related, :association_name, :value => association_name %>
-  <p><%= select :related, :id, items_to_relate.map { |f| [f.to_label, f.id] }.sort_by { |e| e.first } %> &nbsp; <%= submit_tag Typus::I18n.t("Add"), :class => "button" %></p>
+  <p><%= select :related, :id, items_to_relate.map { |f| [f.to_label, f.id] } %> &nbsp; <%= submit_tag Typus::I18n.t("Add"), :class => "button" %></p>
 <% end %>

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

@@ -0,0 +1,24 @@
+<%= form_tag :action => :relate, :id => @item.id do %>
+
+  <fieldset class="inputs">
+
+    <%= hidden_field :related, :id %>
+    <%= hidden_field :related, :model, :value => model_to_relate %>
+    <%= hidden_field :related, :association_name, :value => association_name %>
+
+    <ol>
+      <li>
+        <input data-autocomplete="<%= "/admin/#{model_to_relate.to_resource}/autocomplete" %>"
+               id="autocomplete"
+               id_element="<%= "##{association_name} #related_id" %>"
+               name="autocomplete"
+               size="30"
+               type="text"
+               value="" />
+        <%= submit_tag Typus::I18n.t("Add"), :class => "button" %>
+      </li>
+    </ol>
+
+  </fieldset>
+
+<% end %>

data/app/views/layouts/admin/base.html.erb

@@ -10,17 +10,23 @@
 
   <title><%= Typus.admin_title %> &mdash; <%= yield :title %></title>
 
-  <%= stylesheet_link_tag "/admin/stylesheets/screen",
-                          "/admin/stylesheets/application",
-                          "/admin/vendor/fancybox/jquery.fancybox-1.3.4.css" %>
+  <%= stylesheet_link_tag "/vendor/typus/stylesheets/reset",
+                          "/vendor/jquery-ui-1.8.9.custom/css/ui-lightness/jquery-ui-1.8.9.custom.css",
+                          "/vendor/jquery.fancybox-1.3.4/fancybox/jquery.fancybox-1.3.4.css",
+                          "/vendor/typus/stylesheets/screen",
+                          "/vendor/typus/stylesheets/application" %>
+
   <%= yield :stylesheets -%>
 
-  <%= javascript_include_tag "/admin/javascripts/jquery-1.4.4.min.js",
-                             "/admin/javascripts/jquery.searchField.js",
-                             "/admin/javascripts/jquery.rails.js",
-                             "/admin/vendor/fancybox/jquery.fancybox-1.3.4.pack.js",
-                             "/admin/javascripts/jquery.application.js",
-                             "/admin/javascripts/application" %>
+  <%= javascript_include_tag "/vendor/jquery-ui-1.8.9.custom/js/jquery-1.4.4.min.js",
+                             "/vendor/jquery-ui-1.8.9.custom/js/jquery-ui-1.8.9.custom.min.js",
+                             "/vendor/jquery.fancybox-1.3.4/fancybox/jquery.fancybox-1.3.4.pack.js",
+                             "/vendor/typus/javascripts/jquery.searchField.js",
+                             "/vendor/typus/javascripts/jquery.rails.js",
+                             "/vendor/typus/javascripts/jquery.rails.autocomplete.js",
+                             "/vendor/typus/javascripts/jquery.application.js",
+                             "/vendor/typus/javascripts/application" %>
+
   <%= yield :javascripts -%>
 
   <%= csrf_meta_tag %>

data/app/views/layouts/admin/headless.html.erb

@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+
+<html lang="<%= I18n.locale %>">
+
+<head>
+
+  <meta charset="utf-8" />
+  <meta name="apple-mobile-web-app-capable" content="yes" />
+  <meta name="generator" content="Typus <%= Typus::VERSION %>" />
+
+  <title><%= Typus.admin_title %> &mdash; <%= yield :title %></title>
+
+  <%= stylesheet_link_tag "/vendor/typus/stylesheets/reset",
+                          "/vendor/jquery-ui-1.8.9.custom/css/ui-lightness/jquery-ui-1.8.9.custom.css",
+                          "/vendor/jquery.fancybox-1.3.4/fancybox/jquery.fancybox-1.3.4.css",
+                          "/vendor/typus/stylesheets/screen",
+                          "/vendor/typus/stylesheets/application" %>
+
+  <%= yield :stylesheets -%>
+
+  <%= javascript_include_tag "/vendor/jquery-ui-1.8.9.custom/js/jquery-1.4.4.min.js",
+                             "/vendor/jquery-ui-1.8.9.custom/js/jquery-ui-1.8.9.custom.min.js",
+                             "/vendor/jquery.fancybox-1.3.4/fancybox/jquery.fancybox-1.3.4.pack.js",
+                             "/vendor/typus/javascripts/jquery.searchField.js",
+                             "/vendor/typus/javascripts/jquery.rails.js",
+                             "/vendor/typus/javascripts/jquery.rails.autocomplete.js",
+                             "/vendor/typus/javascripts/jquery.application.js",
+                             "/vendor/typus/javascripts/application" %>
+
+  <%= yield :javascripts -%>
+
+  <%= csrf_meta_tag %>
+
+</head>
+
+<body>
+
+  <div id="content" class="headless">
+    <%= yield :layout %>
+  </div>
+
+</body>
+
+</html>

data/app/views/layouts/admin/session.html.erb

@@ -10,8 +10,9 @@
 
   <title><%= Typus.admin_title %> &mdash; <%= yield :title %></title>
 
-  <%= stylesheet_link_tag "/admin/stylesheets/screen",
-                          "/admin/stylesheets/application" %>
+  <%= stylesheet_link_tag "/vendor/typus/stylesheets/reset",
+                          "/vendor/typus/stylesheets/screen",
+                          "/vendor/typus/stylesheets/application" %>
 
   <%= csrf_meta_tag %>
 

data/doc/hudson_setup.md

@@ -0,0 +1,19 @@
+# Hudson Setup
+
+These are the build steps in Hudson:
+
+    rake test:all
+
+It builds the following branches:
+
+    master
+    3-0-stable
+
+Max # of builds to keep:
+
+    20
+
+Options Set:
+
+    ✓ Discard Old Builds:
+    ✓ Trigger builds remotely (e.g., from scripts)

data/lib/generators/typus/assets_generator.rb

@@ -1,7 +1,5 @@
 module Typus
-
   module Generators
-
     class AssetsGenerator < Rails::Generators::Base
 
       source_root File.expand_path("../../templates", __FILE__)
@@ -17,7 +15,5 @@ Description:
       end
 
     end
-
   end
-
 end

data/lib/generators/typus/config_generator.rb

@@ -0,0 +1,107 @@
+module Typus
+  module Generators
+    class ConfigGenerator < Rails::Generators::Base
+
+      source_root File.expand_path("../../templates", __FILE__)
+
+      class_option :admin_title, :default => Rails.root.basename
+
+      desc <<-MSG
+Description:
+  Creates configuration files and stores them in `config/typus`.
+
+      MSG
+
+      def generate_config
+        copy_file "config/typus/README"
+        if (@configuration = generate_yaml_files)[:base].present?
+          %w(application.yml application_roles.yml).each do |file|
+            template "config/typus/#{file}", "config/typus/#{timestamp}_#{file}"
+          end
+        end
+      end
+
+      protected
+
+      def timestamp
+        Time.zone.now.to_s(:number)
+      end
+
+      def configuration
+        @configuration
+      end
+
+      def generate_yaml_files
+        Typus.reload!
+
+        configuration = { :base => "", :roles => "" }
+
+        Typus.application_models.sort { |x,y| x <=> y }.each do |model|
+
+          next if Typus.models.include?(model)
+
+          klass = model.constantize
+
+          # Detect all relationships except polymorphic belongs_to using reflection.
+          relationships = [ :belongs_to, :has_and_belongs_to_many, :has_many, :has_one ].map do |relationship|
+                            klass.reflect_on_all_associations(relationship).reject { |i| i.options[:polymorphic] }.map { |i| i.name.to_s }
+                          end.flatten.sort
+
+          ##
+          # Model fields for:
+          #
+          # - Default
+          # - Form
+          #
+
+          rejections = %w( ^id$
+                           created_at created_on updated_at updated_on deleted_at
+                           salt crypted_password
+                           password_salt persistence_token single_access_token perishable_token
+                           _type$ type
+                           _file_size$ )
+
+          default_rejections = (rejections + %w( password password_confirmation )).join("|")
+          form_rejections = (rejections + %w( position )).join("|")
+
+          fields = klass.columns.map(&:name)
+          default = fields.reject { |f| f.match(default_rejections) }
+          form = fields.reject { |f| f.match(form_rejections) }
+
+          # Model defaults.
+          order_by = "position" if default.include?("position")
+          filters = "created_at" if fields.include?("created_at")
+          search = ( %w(name title) & default ).join(", ")
+
+          # We want attributes of belongs_to relationships to be shown in our
+          # field collections if those are not polymorphic.
+          [ default, form ].each do |fields|
+            fields << klass.reflect_on_all_associations(:belongs_to).reject { |i| i.options[:polymorphic] }.map { |i| i.name.to_s }
+            fields.flatten!
+          end
+
+          configuration[:base] << <<-RAW
+#{klass}:
+  fields:
+    default: #{default.join(", ")}
+    form: #{form.join(", ")}
+  order_by: #{order_by}
+  relationships: #{relationships.join(", ")}
+  filters: #{filters}
+  search: #{search}
+  application: #{options[:admin_title]}
+
+          RAW
+
+          configuration[:roles] << <<-RAW
+  #{klass}: create, read, update, delete
+          RAW
+
+        end
+
+        configuration
+      end
+
+    end
+  end
+end