typus 3.1.2 → 3.1.3

data/CHANGELOG

@@ -1,5 +1,28 @@
 = 3.2.0 (unreleased)
 
+= 3.1.3 (unreleased)
+
+ * [CHANGED] Added `Typus.chosen` so we can disable "Chosen". This will
+   be in Typus until "Chosen" supports remote data calls.
+
+ * [NEW] This is not really new ... I've taken back the autocomplete
+   feature which will be used eventually by "Chosen" once they support
+   remote calls.
+
+ * [CHANGED] Typus::Resources.minute_step is now nil by default.
+
+ * [CHANGED] Date and DateTime selectors should not set current date by default.
+
+ * [CHANGED] Generator now stores model configuration in a file with the
+   name of the model, not the plural.
+
+ * [CHANGED] Generators can be run without setting up a database.
+
+ * [CHANGED] We do not longer hide search boxes on Chosen. Apparently
+   it has been fixed: https://github.com/harvesthq/chosen/commit/d4c7005b5c
+
+ * [FIXED] Detaching a Paperclip was not working.
+
 = 3.1.2
 
  * [CHANGED] Images, links and belongs_to associations do not have links

data/Gemfile

@@ -42,18 +42,18 @@ gem "jquery-rails"
 gem "ckeditor-rails", "0.0.2"
 
 # Alternative authentication
-gem "devise", "~> 1.4.3"
+gem "devise", "~> 1.4.7"
 
 # Asset Management with Dragonfly
-gem "dragonfly", "~> 0.9"
+gem "dragonfly", "~> 0.9.8"
 gem "rack-cache", :require => "rack/cache"
 
 # Asset Management with Paperclip
-gem "paperclip", "~> 2.3.16"
+gem "paperclip", "~> 2.4.2"
 
 # MongoDB
-gem "mongoid", "~> 2.1"
-gem "bson_ext", "~> 1.3"
+gem "mongoid", "~> 2.3.0"
+gem "bson_ext", "~> 1.4.0"
 
 group :test do
   gem "shoulda-context", "~> 1.0.0.beta1"

data/README.md

@@ -1,7 +1,9 @@
 # Typus: Admin Panel for Ruby on Rails applications
 
-**Typus** is a control panel for [Ruby on Rails][rails] applications to allow
-trusted users edit structured content.
+[![Build Status](https://secure.travis-ci.org/typus/typus.png)](http://travis-ci.org/typus/typus)
+
+**Typus** is a control panel for [Ruby on Rails][rails] applications to
+allow trusted users edit structured content.
 
 It’s not a CMS with a full working system but it provides a part of the
 system: authentication, permissions and basic look and feel for your
@@ -42,7 +44,7 @@ and go to <http://0.0.0.0:3000/admin>.
 
 ## Testing
 
-To test clone the git repo and run the following commands:
+To test, clone the repo and run the following commands:
 
     $ git clone git://github.com/typus/typus.git
     $ bundle install --path vendor/bundle
@@ -56,15 +58,13 @@ user to be able to run tests.
 ## Links
 
 - [Documentation](http://docs.typuscmf.com/)
-- [Issues](https://github.com/typus/typus/issues)
-- [Source Code][typus] and [RubyGems][typus_gem]
+- [RubyGems][typus_gem]
 - [Mailing List](http://groups.google.com/group/typus)
 - [Contributors List](http://github.com/typus/typus/contributors)
-- [Travis Builds](http://travis-ci.org/#!/typus/typus)
 
 ## License
 
-Typus is released under the MIT license.
+**Typus** is released under the MIT license.
 
 [typus]: http://github.com/typus/typus
 [typus_demo]: http://demo.typuscmf.com/
@@ -72,4 +72,4 @@ Typus is released under the MIT license.
 [typus_gem]: http://rubygems.org/gems/typus
 [paperclip]: http://rubygems.org/gems/paperclip
 [dragonfly]: http://rubygems.org/gems/dragonfly
-[rails]: http://rubyonrails.org/
+[rails]: http://rubyonrails.org/

data/app/assets/javascripts/typus/application.js

@@ -5,4 +5,4 @@
 //= require js/jquery.formalize.min
 //= require typus/jquery.application
 //= require typus/custom
-//= require chosen.jquery.min
+//= require chosen.jquery

data/app/assets/javascripts/typus/jquery.application.js

@@ -2,7 +2,7 @@ $(document).ready(function() {
 
     $("#quicksearch").searchField();
 
-    $(".resource :input", document.myForm).bind("change", function() { setConfirmUnload(true); });
+    $(".resource :input", document.myForm).bind("change", function() { Typus.setConfirmUnload(true); });
 
     $("a.fancybox").fancybox({
         'titlePosition': 'over',
@@ -11,27 +11,11 @@ $(document).ready(function() {
         'scrolling': false,
     });
 
-    $(".iframe").fancybox({
-        'width': 720,
-        'height': '90%',
-        'autoScale': false,
-        'transitionIn': 'none',
-        'transitionOut': 'none',
-        'type': 'iframe',
-        'centerOnScroll': true,
-        'scrolling': false,
-        onClosed: function() {
-            if (Typus.parent_location_reload) {
-                parent.location.reload(true);
-            } else {
-                var attribute = Typus.resource_attribute;
-                var text = Typus.resource_to_label;
-                var value = Typus.resource_id;
-                $(attribute).append(new Option(text, value, true, true));
-                $(".chzn-select").trigger("liszt:updated");
-            }
-        },
-    });
+    $(".iframe").fancybox(Typus.fancyboxDefaults);
+
+    $(".iframe_with_page_reload").fancybox(
+        $.extend(Typus.fancyboxDefaults, { onClosed: Typus.reloadParent })
+    );
 
     // This method is used by Typus::Controller::Bulk
     $(".action-toggle").click(function() {
@@ -40,16 +24,29 @@ $(document).ready(function() {
         $('.action-toggle').each(function() { this.checked = status; });
     });
 
-    $(".chzn-select").chosen();
-
 });
 
-Typus = {}
+var Typus = {};
+
+Typus.fancyboxDefaults = {
+    'width': 720,
+    'height': '90%',
+    'autoScale': false,
+    'transitionIn': 'none',
+    'transitionOut': 'none',
+    'type': 'iframe',
+    'centerOnScroll': true,
+    'scrolling': false,
+};
+
+Typus.setConfirmUnload = function(on) {
+    window.onbeforeunload = (on) ? Typus.unloadMessage : null;
+}
 
-function setConfirmUnload(on) {
-    window.onbeforeunload = (on) ? unloadMessage : null;
+Typus.reloadParent = function() {
+    if (Typus.parent_location_reload) parent.location.reload(true);
 }
 
-function unloadMessage() {
+Typus.unloadMessage = function () {
     return "You have entered new data on this page. If you navigate away from this page without first saving your data, the changes will be lost.";
 }

data/app/controllers/admin/resources_controller.rb

@@ -190,7 +190,7 @@ class Admin::ResourcesController < Admin::BaseController
   end
 
   def set_eager_loading
-    if (eager_loading = @resource.reflect_on_all_associations(:belongs_to).reject { |i| i.options[:polymorphic] }.map { |i| i.name }).any?
+    if (eager_loading = @resource.reflect_on_all_associations(:belongs_to).reject { |i| i.options[:polymorphic] }.map(&:name)).any?
       @resource = @resource.includes(eager_loading)
     end
   end

data/app/helpers/admin/resources/data_types/belongs_to_helper.rb

@@ -25,9 +25,11 @@ module Admin::Resources::DataTypes::BelongsToHelper
       related.order(related.typus_order_by).map { |p| [p.to_label, p.id] }
     end
 
+    attribute_id = "#{@resource.name.underscore}_#{attribute}_id"
+
     render "admin/templates/belongs_to",
            :attribute => attribute,
-           :attribute_id => "#{@resource.table_name}_#{attribute}",
+           :attribute_id => attribute_id,
            :form => form,
            :related_fk => related_fk,
            :related => related,

data/app/helpers/admin/resources/data_types/dragonfly_helper.rb

@@ -5,7 +5,7 @@ module Admin::Resources::DataTypes::DragonflyHelper
   end
 
   def link_to_detach_attribute_for_dragonfly(attribute)
-    validators = @item.class.validators.delete_if { |i| i.class != ActiveModel::Validations::PresenceValidator }.map { |i| i.attributes }.flatten.map { |i| i.to_s }
+    validators = @item.class.validators.delete_if { |i| i.class != ActiveModel::Validations::PresenceValidator }.map(&:attributes).flatten.map(&:to_s)
     attachment = @item.send(attribute)
 
     if attachment.present? && !validators.include?(attribute) && attachment

data/app/helpers/admin/resources/data_types/has_and_belongs_to_many_helper.rb

@@ -1,7 +1,7 @@
 module Admin::Resources::DataTypes::HasAndBelongsToManyHelper
 
   def table_has_and_belongs_to_many_field(attribute, item)
-    item.send(attribute).map { |i| i.to_label }.join(", ")
+    item.send(attribute).map(&:to_label).join(", ")
   end
 
   alias_method :table_has_many_field, :table_has_and_belongs_to_many_field
@@ -22,9 +22,9 @@ module Admin::Resources::DataTypes::HasAndBelongsToManyHelper
     locals = { :attribute => attribute,
                :attribute_id => "#{model}_#{attribute}",
                :related_klass => klass,
-               :related_items => klass.all,
+               :related_items => @item.send(attribute),
                :related_ids => "#{model}[#{resource_ids}][]",
-               :values => @item.send(attribute),
+               :values => klass,
                :form => form,
                :label_text => label_text.html_safe,
                :html_options => html_options }

data/app/helpers/admin/resources/data_types/has_many_helper.rb

@@ -37,12 +37,12 @@ module Admin::Resources::DataTypes::HasManyHelper
                           :action => "new",
                           :_popup => true }
 
-      link_to Typus::I18n.t("Add New"), default_options.merge(options), { :class => "iframe" }
+      link_to Typus::I18n.t("Add New"), default_options.merge(options), { :class => "iframe_with_page_reload" }
     end
   end
 
   def set_has_many_resource_actions
-    @resource_actions = [["Edit", { :action => "edit", :_popup => true }, { :class => 'iframe' }],
+    @resource_actions = [["Edit", { :action => "edit", :_popup => true }, { :class => 'iframe_with_page_reload' }],
                          ["Trash", { :action => "destroy" }, { :confirm => "Trash?" } ]]
   end
 

data/app/helpers/admin/resources/data_types/has_one_helper.rb

@@ -24,7 +24,7 @@ module Admin::Resources::DataTypes::HasOneHelper
                           :action => "new",
                           :_popup => true }
 
-      link_to Typus::I18n.t("Add New"), default_options.merge(options), { :class => "iframe" }
+      link_to Typus::I18n.t("Add New"), default_options.merge(options), { :class => "iframe_with_page_reload" }
     end
   end
 

data/app/helpers/admin/resources/data_types/paperclip_helper.rb

@@ -6,14 +6,14 @@ module Admin::Resources::DataTypes::PaperclipHelper
   end
 
   def link_to_detach_attribute_for_paperclip(attribute)
-    validators = @item.class.validators.delete_if { |i| i.class != ActiveModel::Validations::PresenceValidator }.map { |i| i.attributes }.flatten.map { |i| i.to_s }
+    validators = @item.class.validators.delete_if { |i| i.class != ActiveModel::Validations::PresenceValidator }.map(&:attributes).flatten.map(&:to_s)
     attachment = @item.send(attribute)
 
     if attachment.exists? && !validators.include?("#{attribute}_file_name") && attachment
       attribute_i18n = @item.class.human_attribute_name(attribute)
       label_text = <<-HTML
 #{attribute_i18n}
-<small>#{link_to Typus::I18n.t("Remove"), { :action => 'update', :id => @item.id, :attribute => attribute, :_continue => true }, :confirm => Typus::I18n.t("Are you sure?")}</small>
+<small>#{link_to Typus::I18n.t("Remove"), { :action => 'update', :id => @item.id, :_nullify => attribute, :_continue => true }, :confirm => Typus::I18n.t("Are you sure?")}</small>
       HTML
       label_text.html_safe
     end

data/app/helpers/admin/resources/form_helper.rb

@@ -66,7 +66,7 @@ module Admin::Resources::FormHelper
 
   def save_options_for_headless_mode
     return unless headless_mode?
-    { "_continue" => "Save and continue editing" }
+    { "_continue" => "Save" }
   end
 
   def save_options_for_user_class

data/app/helpers/admin/resources/table_helper.rb

@@ -21,7 +21,7 @@ module Admin::Resources::TableHelper
         association = model.reflect_on_association(key.to_sym)
         order_by = association ? association.foreign_key : key
 
-        if (model.model_fields.map(&:first).map { |i| i.to_s }.include?(key) || model.reflect_on_all_associations(:belongs_to).map(&:name).include?(key.to_sym))
+        if (model.model_fields.map(&:first).map(&:to_s).include?(key) || model.reflect_on_all_associations(:belongs_to).map(&:name).include?(key.to_sym))
           sort_order = case params[:sort_order]
                        when 'asc' then ['desc', '↓']
                        when 'desc' then ['asc', '↑']
@@ -50,7 +50,7 @@ module Admin::Resources::TableHelper
     resource_actions.map do |body, url, options, proc|
       next if proc && proc.respond_to?(:call) && proc.call(item) == false
       { :message => Typus::I18n.t(body),
-        :url => { :controller => "/admin/#{model.to_resource}", :id => item.id }.merge(params.dup.cleanup.merge(url)),
+        :url => params.dup.cleanup.merge({ :controller => "/admin/#{model.to_resource}", :id => item.id }).merge(url),
         :options => options }
     end
   end

data/app/views/admin/dashboard/styles.html.erb

@@ -1,4 +1,4 @@
-<% content_for :sidebar do %>
+<div class="grid_2">
 
   <h2>Header (h2) <small>Small <a href="#">link</a></small></h2>
 
@@ -26,124 +26,128 @@
     <li>Lorem incididunt</li>
   </ul>
 
-<% end %>
+</div>
 
-<h2>Header (h2) <small>Small <a href="#">link</a></small></h2>
+<div class="grid_10">
 
-<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat
-non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+  <h2>Header (h2) <small>Small <a href="#">link</a></small></h2>
 
-<blockquote>
   <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
   tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
   quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-  consequat.</p>
-
-  <p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum
-  dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
-  proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
-</blockquote>
-
-<pre>
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat
-non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-</pre>
-
-<p>
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-consequat.
-</p>
-
-<p><a href="#">Link to self</a></p>
-
-<h3>Header (h3)</h3>
-
-<p>
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-consequat.
-</p>
-
-<h2>Boxes</h2>
-
-<div class="box">
+  consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+  cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat
+  non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+
+  <blockquote>
+    <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+    tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+    quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+    consequat.</p>
+
+    <p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum
+    dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+    proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+  </blockquote>
+
+  <pre>
+  Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+  tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+  quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+  consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+  cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat
+  non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+  </pre>
+
   <p>
   Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
   tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
   quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
   consequat.
   </p>
-</div>
 
-<div class="box">
-  <h3>Header (h3)</h3>
-  <ul>
-    <li>Lorem ipsum dolor sit amet</li>
-    <li>Duis aute irure dolor in reprehenderit in voluptate</li>
-    <li>Laboris nisi ut aliquip ex ea commodo</li>
-  </ul>
-</div>
+  <p><a href="#">Link to self</a></p>
 
-<div class="box">
   <h3>Header (h3)</h3>
+
   <p>
   Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
   tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
   quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
   consequat.
   </p>
-  <ul>
-    <li>Lorem ipsum dolor sit amet</li>
-    <li>Duis aute irure dolor in reprehenderit in voluptate</li>
-    <li>Laboris nisi ut aliquip ex ea commodo</li>
-  </ul>
-</div>
 
-<p>
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-consequat.
-</p>
+  <h2>Boxes</h2>
+
+  <div class="box">
+    <p>
+    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+    tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+    quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+    consequat.
+    </p>
+  </div>
+
+  <div class="box">
+    <h3>Header (h3)</h3>
+    <ul>
+      <li>Lorem ipsum dolor sit amet</li>
+      <li>Duis aute irure dolor in reprehenderit in voluptate</li>
+      <li>Laboris nisi ut aliquip ex ea commodo</li>
+    </ul>
+  </div>
+
+  <div class="box">
+    <h3>Header (h3)</h3>
+    <p>
+    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+    tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+    quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+    consequat.
+    </p>
+    <ul>
+      <li>Lorem ipsum dolor sit amet</li>
+      <li>Duis aute irure dolor in reprehenderit in voluptate</li>
+      <li>Laboris nisi ut aliquip ex ea commodo</li>
+    </ul>
+  </div>
 
-<h2>Error Messages (h2)</h2>
+  <p>
+  Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+  tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+  quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+  consequat.
+  </p>
 
-<div id="flash" class="notice">
-  <strong>Hey!</strong> Sample ui-state-highlight style.
-</div>
+  <h2>Error Messages (h2)</h2>
 
-<div id="flash" class="alert">
-  <strong>Alert:</strong> Sample ui-state-error style.
-</div>
+  <div id="flash" class="notice">
+    <strong>Hey!</strong> Sample ui-state-highlight style.
+  </div>
 
-<h2>Filters (h2)</h2>
+  <div id="flash" class="alert">
+    <strong>Alert:</strong> Sample ui-state-error style.
+  </div>
 
-<h3>Filters with a list inside (h3)</h3>
+  <h2>Filters (h2)</h2>
 
-<div class="filters">
-  <ul>
-    <li>Filter</li>
-    <li>Filter</li>
-  </ul>
-</div>
+  <h3>Filters with a list inside (h3)</h3>
 
-<h3>Filters with a paragraph inside (h3)</h3>
+  <div class="filters">
+    <ul>
+      <li>Filter</li>
+      <li>Filter</li>
+    </ul>
+  </div>
 
-<div class="filters">
-  <p>This is a paragraph.</p>
-</div>
+  <h3>Filters with a paragraph inside (h3)</h3>
 
-<h2>Forms (h2)</h2>
+  <div class="filters">
+    <p>This is a paragraph.</p>
+  </div>
 
-<p>This is how a form looks like.</p>
+  <h2>Forms (h2)</h2>
+
+  <p>This is how a form looks like.</p>
+
+</div>