typus 3.1.7 → 3.1.8

data/CHANGELOG.md

@@ -4,6 +4,21 @@ CHANGELOG
 3.1.8 (unreleased)
 ------------------
 
+ * [CHANGED] CSV generation is now performed in memory so we play nice
+   with Heroku.
+
+ * [CHANGED] We now can export XML, CSV and JSON without restriction. If
+   fields are not defined for a format, defaults will be used.
+
+ * [CHANGED] Updated Kaminari to `0.13.0` so we are now Rails `3.2.0`
+   compatible.
+
+ * [CHANGED] We now also load configuration files from "lib/<plugin>/config"
+   as this is marked as deprecated in Rails 3.2.0.
+
+ * [CHANGED] Updated Gems for the dummy application. This fixes deprecation
+   warnings and keeps the plugin up to date.
+
 Changes: <https://github.com/fesplugas/typus/compare/v3.1.7...master>
 
 

data/Gemfile

@@ -8,8 +8,8 @@ gemspec
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
-  gem 'sass-rails',   '~> 3.1.5'
-  gem 'coffee-rails', '~> 3.1.1'
+  gem 'sass-rails',   '~> 3.2.3'
+  gem 'coffee-rails', '~> 3.2.1'
   gem 'uglifier', '>= 1.0.3'
 end
 
@@ -31,29 +31,29 @@ end
 # And this stuff needed for the demo application.
 gem "acts_as_list"
 gem "acts_as_tree"
-gem "factory_girl_rails", "~> 1.4.0"
+gem "factory_girl_rails", "~> 1.6.0"
 gem "rails-permalink", "~> 1.0.0"
-gem "rails-trash", "~> 1.1.2"
+gem "rails-trash", "~> 2.0.0"
 
 # For some reason I also need to define the `jquery-rails` gem here.
 gem "jquery-rails"
 
 # Rich Text Editor
-gem "ckeditor-rails", "0.0.2"
+gem "ckeditor-rails", "~> 0.0.3"
 
 # Alternative authentication
-gem "devise", "~> 1.5.2"
+gem "devise", "~> 2.0.0"
 
 # Asset Management with Dragonfly
-gem "dragonfly", "~> 0.9.8"
+gem "dragonfly", "~> 0.9.10"
 gem "rack-cache", :require => "rack/cache"
 
 # Asset Management with Paperclip
-gem "paperclip", "~> 2.4.5"
+gem "paperclip", "~> 2.5.2"
 
 # MongoDB
-gem "mongoid", "~> 2.3.4"
-gem "bson_ext", "~> 1.5.1"
+gem "mongoid", "~> 2.4.3"
+gem "bson_ext", "~> 1.5.2"
 
 group :test do
   gem "shoulda-context", "~> 1.0.0"

data/README.md

@@ -23,7 +23,7 @@ You can try a demo [here][typus_demo].
 - Internationalized interface ([See available translations][typus_locales])
 - Customizable and extensible templates.
 - Integrated [paperclip][paperclip] and [dragonfly][dragonfly] attachments viewer.
-- Works with `Rails 3.1.X`.
+- Works with `Rails 3.1.X` and `Rails 3.2.X`.
 
 ## Installing
 

data/app/controllers/admin/account_controller.rb

@@ -2,9 +2,7 @@ class Admin::AccountController < Admin::BaseController
 
   layout 'admin/session'
 
-  skip_before_filter :reload_config_and_roles
-  skip_before_filter :authenticate
-  skip_before_filter :set_locale
+  skip_before_filter :reload_config_and_roles, :authenticate, :set_locale
 
   before_filter :sign_in?, :except => [:forgot_password, :send_password, :show]
   before_filter :new?, :only => [:forgot_password, :send_password]

data/app/controllers/admin/base_controller.rb

@@ -2,12 +2,9 @@ class Admin::BaseController < ActionController::Base
 
   include Typus::Authentication::const_get(Typus.authentication.to_s.classify)
 
-  before_filter :reload_config_and_roles
-  before_filter :authenticate
-  before_filter :set_locale
+  before_filter :reload_config_and_roles, :authenticate, :set_locale
 
-  helper_method :admin_user
-  helper_method :current_role
+  helper_method :admin_user, :current_role
 
   protected
 

data/app/controllers/admin/resources_controller.rb

@@ -27,7 +27,9 @@ class Admin::ResourcesController < Admin::BaseController
         generate_html
       end
 
-      %w(json xml csv).each { |f| format.send(f) { send("generate_#{f}") } }
+      format.csv { generate_csv }
+      format.json { export(:json) }
+      format.xml { export(:xml) }
     end
   end
 
@@ -198,12 +200,12 @@ class Admin::ResourcesController < Admin::BaseController
   def redirect_on_success
     path = params.dup.cleanup
 
-    options = if params[:_save]
-      { :action => nil, :id => nil }
-    elsif params[:_addanother]
+    options = if params[:_addanother]
       { :action => 'new', :id => nil }
     elsif params[:_continue]
       { :action => 'edit', :id => @item.id }
+    else
+      { :action => nil, :id => nil }
     end
 
     message = params[:action].eql?('create') ? "%{model} successfully created." : "%{model} successfully updated."

data/app/controllers/admin/session_controller.rb

@@ -1,7 +1,6 @@
 class Admin::SessionController < Admin::BaseController
 
-  skip_before_filter :reload_config_and_roles
-  skip_before_filter :authenticate
+  skip_before_filter :reload_config_and_roles, :authenticate
 
   before_filter :create_an_account?, :only => [:new, :create]
 

data/lib/typus.rb

@@ -229,13 +229,15 @@ module Typus
     def model_configuration_files
       app = Typus.root.join("**", "*.yml")
       plugins = Rails.root.join("vendor", "plugins", "*", "config", "typus", "**", "*.yml")
-      Dir[app, plugins].reject { |f| f.match(/_roles.yml/) }.sort
+      lib = Rails.root.join("lib", "*", "config", "typus", "**", "*.yml")
+      Dir[app, plugins, lib].reject { |f| f.match(/_roles.yml/) }.sort
     end
 
     def role_configuration_files
       app = Typus.root.join("**", "*_roles.yml")
       plugins = Rails.root.join("vendor", "plugins", "*", "config", "typus", "**", "*_roles.yml")
-      Dir[app, plugins].sort
+      lib = Rails.root.join("lib", "*", "config", "typus", "**", "*_roles.yml")
+      Dir[app, plugins, lib].sort
     end
 
     def reload!

data/lib/typus/controller/format.rb

@@ -19,44 +19,29 @@ module Typus
       #       to be able to process large amounts of data.
       #++
       def generate_csv
-        if can_export?(:csv)
-          fields = @resource.typus_fields_for(:csv)
-
-          filename = Rails.root.join("tmp", "export-#{@resource.to_resource}-#{Time.zone.now.to_s(:number)}.csv")
-
-          options = { :conditions => @conditions, :batch_size => 1000 }
-
-          ::CSV.open(filename, 'w') do |csv|
-            csv << fields.keys.map { |k| @resource.human_attribute_name(k) }
-            @resource.find_in_batches(options) do |records|
-              records.each do |record|
-                csv << fields.map do |key, value|
-                         case value
-                         when :transversal
-                           a, b = key.split(".")
-                           record.send(a).send(b)
-                         when :belongs_to
-                           record.send(key).try(:to_label)
-                         else
-                           record.send(key)
-                         end
+        fields = @resource.typus_fields_for(:csv)
+        options = { :conditions => @conditions, :batch_size => 1000 }
+
+        data = ::CSV.generate do |csv|
+          csv << fields.keys.map { |k| @resource.human_attribute_name(k) }
+          @resource.find_in_batches(options) do |records|
+            records.each do |record|
+              csv << fields.map do |key, value|
+                       case value
+                       when :transversal
+                         a, b = key.split(".")
+                         record.send(a).send(b)
+                       when :belongs_to
+                         record.send(key).try(:to_label)
+                       else
+                         record.send(key)
                        end
-              end
+                     end
             end
           end
-
-          send_file filename
-        else
-          not_allowed
         end
-      end
 
-      def generate_json
-        export(:json)
-      end
-
-      def generate_xml
-        can_export?(:xml) ? export(:xml) : not_allowed
+        send_data data, :filename => "export-#{@resource.to_resource}-#{Time.zone.now.to_s(:number)}.csv"
       end
 
       def export(format)
@@ -69,10 +54,6 @@ module Typus
         render format => @items.send("to_#{format}", :methods => methods, :except => except)
       end
 
-      def can_export?(format)
-        @resource.typus_options_for(:export).extract_settings.include?(format.to_s)
-      end
-
     end
   end
 end

data/lib/typus/controller/trash.rb

@@ -31,7 +31,9 @@ module Typus
             render 'index'
           end
 
-          %w(json xml csv).each { |f| format.send(f) { send("generate_#{f}") } }
+          format.csv { generate_csv }
+          format.json { export(:json) }
+          format.xml { export(:xml) }
         end
       end
 

data/lib/typus/version.rb

@@ -1,3 +1,3 @@
 module Typus
-  VERSION = "3.1.7"
+  VERSION = "3.1.8"
 end

data/typus.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "bcrypt-ruby", "~> 3.0.0"
   s.add_dependency "jquery-rails"
-  s.add_dependency "kaminari", "~> 0.12.4"
+  s.add_dependency "kaminari", "~> 0.13.0"
   s.add_dependency "rails", ">= 3.1.3"
 
   # Development dependencies are defined in the `Gemfile`.

data/vendor/assets/chosen/chosen.css

@@ -23,29 +23,32 @@
 
 /* @group Single Chosen */
 .chzn-container-single .chzn-single {
-  background-color: #fff;
-  background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #eeeeee), color-stop(0.5, white));
-  background-image: -webkit-linear-gradient(center bottom, #eeeeee 0%, white 50%);
-  background-image: -moz-linear-gradient(center bottom, #eeeeee 0%, white 50%);
-  background-image: -o-linear-gradient(top, #eeeeee 0%,#ffffff 50%);
-  background-image: -ms-linear-gradient(top, #eeeeee 0%,#ffffff 50%);
+  background-color: #ffffff;
+  background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #f4f4f4), color-stop(0.48, #eeeeee), color-stop(0.5, #f6f6f6), color-stop(0.8, #ffffff));
+  background-image: -webkit-linear-gradient(center bottom, #f4f4f4 0%, #eeeeee 48%, #f6f6f6 50%, #ffffff 80%);
+  background-image: -moz-linear-gradient(center bottom, #f4f4f4 0%, #eeeeee 48%, #f6f6f6 50%, #ffffff 80%);
+  background-image: -o-linear-gradient(top, #f4f4f4 0%, #eeeeee 48%, #f6f6f6 50%, #ffffff 80%);
+  background-image: -ms-linear-gradient(top, #f4f4f4 0%, #eeeeee 48%, #f6f6f6 50%, #ffffff 80%);
   filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eeeeee', endColorstr='#ffffff',GradientType=0 );
-  background-image: linear-gradient(top, #eeeeee 0%,#ffffff 50%);
-  -webkit-border-radius: 4px;
-  -moz-border-radius   : 4px;
-  border-radius        : 4px;
+  background-image: linear-gradient(top, #f4f4f4 0%, #eeeeee 48%, #f6f6f6 50%, #ffffff 80%);
+  -webkit-border-radius: 5px;
+  -moz-border-radius   : 5px;
+  border-radius        : 5px;
   -moz-background-clip   : padding;
   -webkit-background-clip: padding-box;
   background-clip        : padding-box;
-  border: 1px solid #aaa;
+  border: 1px solid #aaaaaa;
+  -webkit-box-shadow: 0 0 3px #ffffff inset, 0 1px 1px rgba(0,0,0,0.1);
+  -moz-box-shadow   : 0 0 3px #ffffff inset, 0 1px 1px rgba(0,0,0,0.1);
+  box-shadow        : 0 0 3px #ffffff inset, 0 1px 1px rgba(0,0,0,0.1);
   display: block;
   overflow: hidden;
   white-space: nowrap;
   position: relative;
-  height: 26px;
-  line-height: 26px;
+  height: 23px;
+  line-height: 23px;
   padding: 0 0 0 8px;
-  color: #444;
+  color: #444444;
   text-decoration: none;
 }
 .chzn-container-single .chzn-single span {
@@ -61,7 +64,7 @@
   display: block;
   position: absolute;
   right: 26px;
-  top: 8px;
+  top: 6px;
   width: 12px;
   height: 13px;
   font-size: 1px;
@@ -71,21 +74,6 @@
   background-position: right -11px;
 }
 .chzn-container-single .chzn-single div {
-  -webkit-border-radius: 0 4px 4px 0;
-  -moz-border-radius   : 0 4px 4px 0;
-  border-radius        : 0 4px 4px 0;
-  -moz-background-clip   : padding;
-  -webkit-background-clip: padding-box;
-  background-clip        : padding-box;
-  background: #ccc;
-  background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #ccc), color-stop(0.6, #eee));
-  background-image: -webkit-linear-gradient(center bottom, #ccc 0%, #eee 60%);
-  background-image: -moz-linear-gradient(center bottom, #ccc 0%, #eee 60%);
-  background-image: -o-linear-gradient(bottom, #ccc 0%, #eee 60%);
-  background-image: -ms-linear-gradient(top, #cccccc 0%,#eeeeee 60%);
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#cccccc', endColorstr='#eeeeee',GradientType=0 );
-  background-image: linear-gradient(top, #cccccc 0%,#eeeeee 60%);
-  border-left: 1px solid #aaa;
   position: absolute;
   right: 0;
   top: 0;
@@ -94,7 +82,7 @@
   width: 18px;
 }
 .chzn-container-single .chzn-single div b {
-  background: url('chosen-sprite.png') no-repeat 0 1px;
+  background: url('chosen-sprite.png') no-repeat 0 0;
   display: block;
   width: 100%;
   height: 100%;
@@ -104,6 +92,7 @@
   position: relative;
   margin: 0;
   white-space: nowrap;
+  z-index: 1010;
 }
 .chzn-container-single .chzn-search input {
   background: #fff url('chosen-sprite.png') no-repeat 100% -22px;
@@ -112,7 +101,6 @@
   background: url('chosen-sprite.png') no-repeat 100% -22px, -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%);
   background: url('chosen-sprite.png') no-repeat 100% -22px, -o-linear-gradient(bottom, white 85%, #eeeeee 99%);
   background: url('chosen-sprite.png') no-repeat 100% -22px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
-  background: url('chosen-sprite.png') no-repeat 100% -22px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
   background: url('chosen-sprite.png') no-repeat 100% -22px, linear-gradient(top, #ffffff 85%,#eeeeee 99%);
   margin: 1px 0;
   padding: 4px 20px 4px 5px;
@@ -143,9 +131,9 @@
   background-image: -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%);
   background-image: -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%);
   background-image: -o-linear-gradient(bottom, white 85%, #eeeeee 99%);
-  background-image: -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
+  background-image: -ms-linear-gradient(top, #ffffff 85%, #eeeeee 99%);
   filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#eeeeee',GradientType=0 );
-  background-image: linear-gradient(top, #ffffff 85%,#eeeeee 99%);
+  background-image: linear-gradient(top, #ffffff 85%, #eeeeee 99%);
   border: 1px solid #aaa;
   margin: 0;
   padding: 0;
@@ -168,6 +156,9 @@
   color: #666;
   background: transparent !important;
   border: 0 !important;
+  font-family: sans-serif;
+  font-size: 100%;
+  height: 15px;
   padding: 5px;
   margin: 1px 0;
   outline: 0;
@@ -187,17 +178,20 @@
   -webkit-background-clip: padding-box;
   background-clip        : padding-box;
   background-color: #e4e4e4;
-  background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #e4e4e4), color-stop(0.7, #eeeeee));
-  background-image: -webkit-linear-gradient(center bottom, #e4e4e4 0%, #eeeeee 70%);
-  background-image: -moz-linear-gradient(center bottom, #e4e4e4 0%, #eeeeee 70%);
-  background-image: -o-linear-gradient(bottom, #e4e4e4 0%, #eeeeee 70%);
-  background-image: -ms-linear-gradient(top, #e4e4e4 0%,#eeeeee 70%);
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e4e4e4', endColorstr='#eeeeee',GradientType=0 );
-  background-image: linear-gradient(top, #e4e4e4 0%,#eeeeee 70%);
+  background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #eeeeee), color-stop(0.48, #e8e8e8), color-stop(0.5, #f0f0f0), color-stop(0.8, #f4f4f4));
+  background-image: -webkit-linear-gradient(center bottom, #eeeeee 0%, #e8e8e8 48%, #f0f0f0 50%, #f4f4f4 80%);
+  background-image: -moz-linear-gradient(center bottom, #eeeeee 0%, #e8e8e8 48%, #f0f0f0 50%, #f4f4f4 80%);
+  background-image: -o-linear-gradient(top, #eeeeee 0%, #e8e8e8 48%, #f0f0f0 50%, #f4f4f4 80%);
+  background-image: -ms-linear-gradient(top, #eeeeee 0%, #e8e8e8 48%, #f0f0f0 50%, #f4f4f4 80%);
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eeeeee', endColorstr='#f4f4f4',GradientType=0 );
+  background-image: linear-gradient(top, #eeeeee 0%, #e8e8e8 48%, #f0f0f0 50%, #f4f4f4 80%);
+  -webkit-box-shadow: 0 0 2px #ffffff inset, 0 1px 0 rgba(0,0,0,0.05);
+  -moz-box-shadow   : 0 0 2px #ffffff inset, 0 1px 0 rgba(0,0,0,0.05);
+  box-shadow        : 0 0 2px #ffffff inset, 0 1px 0 rgba(0,0,0,0.05);
   color: #333;
-  border: 1px solid #b4b4b4;
+  border: 1px solid #aaaaaa;
   line-height: 13px;
-  padding: 3px 19px 3px 6px;
+  padding: 3px 20px 3px 5px;
   margin: 3px 0 3px 5px;
   position: relative;
 }
@@ -228,7 +222,7 @@
 /* @group Results */
 .chzn-container .chzn-results {
   margin: 0 4px 4px 0;
-  max-height: 190px;
+  max-height: 240px;
   padding: 0 0 0 4px;
   position: relative;
   overflow-x: hidden;
@@ -240,8 +234,8 @@
 }
 .chzn-container .chzn-results li {
   display: none;
-  line-height: 80%;
-  padding: 7px 7px 8px;
+  line-height: 15px;
+  padding: 5px 6px;
   margin: 0;
   list-style: none;
 }
@@ -250,7 +244,14 @@
   display: list-item;
 }
 .chzn-container .chzn-results .highlighted {
-  background: #3875d7;
+  background-color: #3875d7;
+  background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0.1, #2a62bc), color-stop(0.8, #3875d7));
+  background-image: -webkit-linear-gradient(center bottom, #2a62bc 10%, #3875d7 80%);
+  background-image: -moz-linear-gradient(center bottom, #2a62bc 10%, #3875d7 80%);
+  background-image: -o-linear-gradient(bottom, #2a62bc 10%, #3875d7 80%);
+  background-image: -ms-linear-gradient(top, #2a62bc 10%, #3875d7 80%);
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#2a62bc', endColorstr='#3875d7',GradientType=0 );
+  background-image: linear-gradient(top, #2a62bc 10%, #3875d7 80%);
   color: #fff;
 }
 .chzn-container .chzn-results li em {
@@ -270,11 +271,34 @@
   font-weight: bold;
 }
 .chzn-container .chzn-results .group-option {
-  padding-left: 20px;
+  padding-left: 15px;
 }
 .chzn-container-multi .chzn-drop .result-selected {
   display: none;
 }
+.chzn-container .chzn-results-scroll {
+  background: white;
+  margin: 0px 4px;
+  position: absolute;
+  text-align: center;
+  width: 321px; /* This should by dynamic with js */
+  z-index: 1;
+}
+.chzn-container .chzn-results-scroll span {
+  display: inline-block;
+  height: 17px;
+  text-indent: -5000px;
+  width: 9px;
+}
+.chzn-container .chzn-results-scroll-down {
+  bottom: 0;
+}
+.chzn-container .chzn-results-scroll-down span {
+  background: url('chosen-sprite.png') no-repeat -4px -3px;
+}
+.chzn-container .chzn-results-scroll-up span {
+  background: url('chosen-sprite.png') no-repeat -22px -3px;
+}
 /* @end */
 
 /* @group Active  */
@@ -292,13 +316,13 @@
   -o-box-shadow     : 0 1px 0 #fff inset;
   box-shadow        : 0 1px 0 #fff inset;
   background-color: #eee;
-  background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, white), color-stop(0.5, #eeeeee));
-  background-image: -webkit-linear-gradient(center bottom, white 0%, #eeeeee 50%);
-  background-image: -moz-linear-gradient(center bottom, white 0%, #eeeeee 50%);
-  background-image: -o-linear-gradient(bottom, white 0%, #eeeeee 50%);
-  background-image: -ms-linear-gradient(top, #ffffff 0%,#eeeeee 50%);
+  background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0.2, white), color-stop(0.8, #eeeeee));
+  background-image: -webkit-linear-gradient(center bottom, white 20%, #eeeeee 80%);
+  background-image: -moz-linear-gradient(center bottom, white 20%, #eeeeee 80%);
+  background-image: -o-linear-gradient(bottom, white 20%, #eeeeee 80%);
+  background-image: -ms-linear-gradient(top, #ffffff 20%,#eeeeee 80%);
   filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#eeeeee',GradientType=0 );
-  background-image: linear-gradient(top, #ffffff 0%,#eeeeee 50%);
+  background-image: linear-gradient(top, #ffffff 20%,#eeeeee 80%);
   -webkit-border-bottom-left-radius : 0;
   -webkit-border-bottom-right-radius: 0;
   -moz-border-radius-bottomleft : 0;
@@ -341,16 +365,15 @@
 .chzn-rtl { direction:rtl;text-align: right; }
 .chzn-rtl .chzn-single { padding-left: 0; padding-right: 8px; }
 .chzn-rtl .chzn-single span { margin-left: 26px; margin-right: 0; }
-.chzn-rtl .chzn-single div { 
-  left: 0; right: auto; 
-  border-left: none; border-right: 1px solid #aaaaaa;
-  -webkit-border-radius: 4px 0 0 4px;
-  -moz-border-radius   : 4px 0 0 4px;
-  border-radius        : 4px 0 0 4px; 
+
+.chzn-rtl .chzn-single div { left: 3px; right: auto; }
+.chzn-rtl .chzn-single abbr {
+  left: 26px;
+  right: auto;
 }
 .chzn-rtl .chzn-choices li { float: right; }
-.chzn-rtl .chzn-choices .search-choice { padding: 3px 6px 3px 19px; margin: 3px 5px 3px 0; }
-.chzn-rtl .chzn-choices .search-choice .search-choice-close { left: 5px; right: auto; background-position: right top;}
+.chzn-rtl .chzn-choices .search-choice { padding: 3px 5px 3px 19px; margin: 3px 5px 3px 0; }
+.chzn-rtl .chzn-choices .search-choice .search-choice-close { left: 4px; right: auto; background-position: right top;}
 .chzn-rtl.chzn-container-single .chzn-results { margin-left: 4px; margin-right: 0; padding-left: 0; padding-right: 4px; }
 .chzn-rtl .chzn-results .group-option { padding-left: 0; padding-right: 20px; }
 .chzn-rtl.chzn-container-active .chzn-single-with-drop div { border-right: none; }
@@ -361,8 +384,7 @@
   background: url('chosen-sprite.png') no-repeat -38px -22px, -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%);
   background: url('chosen-sprite.png') no-repeat -38px -22px, -o-linear-gradient(bottom, white 85%, #eeeeee 99%);
   background: url('chosen-sprite.png') no-repeat -38px -22px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
-  background: url('chosen-sprite.png') no-repeat -38px -22px, -ms-linear-gradient(top, #ffffff 85%,#eeeeee 99%);
   background: url('chosen-sprite.png') no-repeat -38px -22px, linear-gradient(top, #ffffff 85%,#eeeeee 99%);
   padding: 4px 5px 4px 20px;
 }
-/* @end */
+/* @end */

data/vendor/assets/chosen/chosen.jquery.js

@@ -1,7 +1,7 @@
 // Chosen, a Select Box Enhancer for jQuery and Protoype
 // by Patrick Filler for Harvest, http://getharvest.com
 // 
-// Version 0.9.5
+// Version 0.9.6
 // Full source at https://github.com/harvesthq/chosen
 // Copyright (c) 2011 Harvest http://getharvest.com
 
@@ -113,7 +113,7 @@
       this.results_showing = false;
       this.result_highlighted = null;
       this.result_single_selected = null;
-      this.allow_single_deselect = (this.options.allow_single_deselect != null) && this.form_field.options[0].text === "" ? this.options.allow_single_deselect : false;
+      this.allow_single_deselect = (this.options.allow_single_deselect != null) && (this.form_field.options[0] != null) && this.form_field.options[0].text === "" ? this.options.allow_single_deselect : false;
       this.disable_search_threshold = this.options.disable_search_threshold || 0;
       this.choices = 0;
       return this.results_none_found = this.options.no_results_text || "No results match";
@@ -199,9 +199,9 @@
           break;
         case 27:
           if (this.results_showing) {
-            return this.results_hide();
+            this.results_hide();
           }
-          break;
+          return true;
         case 9:
         case 38:
         case 40:
@@ -247,7 +247,7 @@
   $ = jQuery;
   $.fn.extend({
     chosen: function(options) {
-      if ($.browser === "msie" && ($.browser.version === "6.0" || $.browser.version === "7.0")) {
+      if ($.browser.msie && ($.browser.version === "6.0" || $.browser.version === "7.0")) {
         return this;
       }
       return $(this).each(function(input_field) {
@@ -288,9 +288,6 @@
       this.form_field_jq.hide().after(container_div);
       this.container = $('#' + this.container_id);
       this.container.addClass("chzn-container-" + (this.is_multiple ? "multi" : "single"));
-      if (!this.is_multiple && this.form_field.options.length <= this.disable_search_threshold) {
-        this.container.addClass("chzn-container-single-nosearch");
-      }
       this.dropdown = this.container.find('div.chzn-drop').first();
       dd_top = this.container.height();
       dd_width = this.f_width - get_side_border_padding(this.dropdown);
@@ -314,7 +311,10 @@
         });
       }
       this.results_build();
-      return this.set_tab_index();
+      this.set_tab_index();
+      return this.form_field_jq.trigger("liszt:ready", {
+        chosen: this
+      });
     };
     Chosen.prototype.register_observers = function() {
       this.container.mousedown(__bind(function(evt) {
@@ -357,20 +357,24 @@
         return this.search_field.focus(__bind(function(evt) {
           return this.input_focus(evt);
         }, this));
+      } else {
+        return this.container.click(__bind(function(evt) {
+          return evt.preventDefault();
+        }, this));
       }
     };
     Chosen.prototype.search_field_disabled = function() {
-      this.is_disabled = this.form_field_jq.attr('disabled');
+      this.is_disabled = this.form_field_jq[0].disabled;
       if (this.is_disabled) {
         this.container.addClass('chzn-disabled');
-        this.search_field.attr('disabled', true);
+        this.search_field[0].disabled = true;
         if (!this.is_multiple) {
           this.selected_item.unbind("focus", this.activate_action);
         }
         return this.close_field();
       } else {
         this.container.removeClass('chzn-disabled');
-        this.search_field.attr('disabled', false);
+        this.search_field[0].disabled = false;
         if (!this.is_multiple) {
           return this.selected_item.bind("focus", this.activate_action);
         }
@@ -390,7 +394,7 @@
             }
             $(document).click(this.click_test_action);
             this.results_show();
-          } else if (!this.is_multiple && evt && ($(evt.target) === this.selected_item || $(evt.target).parents("a.chzn-single").length)) {
+          } else if (!this.is_multiple && evt && (($(evt.target)[0] === this.selected_item[0]) || $(evt.target).parents("a.chzn-single").length)) {
             evt.preventDefault();
             this.results_toggle();
           }
@@ -442,8 +446,7 @@
       }
     };
     Chosen.prototype.results_build = function() {
-      var content, data, startTime, _i, _len, _ref;
-      startTime = new Date();
+      var content, data, _i, _len, _ref;
       this.parsing = true;
       this.results_data = root.SelectParser.select_to_array(this.form_field);
       if (this.is_multiple && this.choices > 0) {
@@ -451,6 +454,11 @@
         this.choices = 0;
       } else if (!this.is_multiple) {
         this.selected_item.find("span").text(this.default_text);
+        if (this.form_field.options.length <= this.disable_search_threshold) {
+          this.container.addClass("chzn-container-single-nosearch");
+        } else {
+          this.container.removeClass("chzn-container-single-nosearch");
+        }
       }
       content = '';
       _ref = this.results_data;
@@ -465,7 +473,7 @@
           } else if (data.selected && !this.is_multiple) {
             this.selected_item.find("span").text(data.text);
             if (this.allow_single_deselect) {
-              this.selected_item.find("span").first().after("<abbr class=\"search-choice-close\"></abbr>");
+              this.single_deselect_control_build();
             }
           }
         }
@@ -644,7 +652,7 @@
         } else {
           this.selected_item.find("span").first().text(item.text);
           if (this.allow_single_deselect) {
-            this.selected_item.find("span").first().after("<abbr class=\"search-choice-close\"></abbr>");
+            this.single_deselect_control_build();
           }
         }
         if (!(evt.metaKey && this.is_multiple)) {
@@ -673,9 +681,13 @@
       this.form_field_jq.trigger("change");
       return this.search_field_scale();
     };
+    Chosen.prototype.single_deselect_control_build = function() {
+      if (this.allow_single_deselect && this.selected_item.find("abbr").length < 1) {
+        return this.selected_item.find("span").first().after("<abbr class=\"search-choice-close\"></abbr>");
+      }
+    };
     Chosen.prototype.winnow_results = function() {
-      var found, option, part, parts, regex, result_id, results, searchText, startTime, startpos, text, zregex, _i, _j, _len, _len2, _ref;
-      startTime = new Date();
+      var found, option, part, parts, regex, result, result_id, results, searchText, startpos, text, zregex, _i, _j, _len, _len2, _ref;
       this.no_results_clear();
       results = 0;
       searchText = this.search_field.val() === this.default_text ? "" : $('<div/>').text($.trim(this.search_field.val())).html();
@@ -686,10 +698,11 @@
         option = _ref[_i];
         if (!option.disabled && !option.empty) {
           if (option.group) {
-            $('#' + option.dom_id).hide();
+            $('#' + option.dom_id).css('display', 'none');
           } else if (!(this.is_multiple && option.selected)) {
             found = false;
             result_id = option.dom_id;
+            result = $("#" + result_id);
             if (regex.test(option.html)) {
               found = true;
               results += 1;
@@ -713,18 +726,16 @@
               } else {
                 text = option.html;
               }
-              if ($("#" + result_id).html !== text) {
-                $("#" + result_id).html(text);
-              }
-              this.result_activate($("#" + result_id));
+              result.html(text);
+              this.result_activate(result);
               if (option.group_array_index != null) {
-                $("#" + this.results_data[option.group_array_index].dom_id).show();
+                $("#" + this.results_data[option.group_array_index].dom_id).css('display', 'list-item');
               }
             } else {
               if (this.result_highlight && result_id === this.result_highlight.attr('id')) {
                 this.result_clear_highlight();
               }
-              this.result_deactivate($("#" + result_id));
+              this.result_deactivate(result);
             }
           }
         }
@@ -743,7 +754,7 @@
       for (_i = 0, _len = lis.length; _i < _len; _i++) {
         li = lis[_i];
         li = $(li);
-        _results.push(li.hasClass("group-result") ? li.show() : !this.is_multiple || !li.hasClass("result-selected") ? this.result_activate(li) : void 0);
+        _results.push(li.hasClass("group-result") ? li.css('display', 'auto') : !this.is_multiple || !li.hasClass("result-selected") ? this.result_activate(li) : void 0);
       }
       return _results;
     };
@@ -826,6 +837,9 @@
           this.backstroke_length = this.search_field.val().length;
           break;
         case 9:
+          if (this.results_showing && !this.is_multiple) {
+            this.result_select(evt);
+          }
           this.mouse_on_container = false;
           break;
         case 13:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typus
 version: !ruby/object:Gem::Version
-  version: 3.1.7
+  version: 3.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-25 00:00:00.000000000 Z
+date: 2012-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &70093502726560 !ruby/object:Gem::Requirement
+  requirement: &70159863686960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70093502726560
+  version_requirements: *70159863686960
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70093502724380 !ruby/object:Gem::Requirement
+  requirement: &70159863684320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +32,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70093502724380
+  version_requirements: *70159863684320
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70093502721740 !ruby/object:Gem::Requirement
+  requirement: &70159863683580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.4
+        version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *70093502721740
+  version_requirements: *70159863683580
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70093502737120 !ruby/object:Gem::Requirement
+  requirement: &70159863682840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70093502737120
+  version_requirements: *70159863682840
 description: Ruby on Rails Admin Panel (Engine) to allow trusted users edit structured
   content.
 email:
@@ -333,7 +333,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3514957204800588845
+      hash: -1439892809651849873
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -342,10 +342,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3514957204800588845
+      hash: -1439892809651849873
 requirements: []
 rubyforge_project: typus
-rubygems_version: 1.8.15
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Effortless backend interface for Ruby on Rails applications. (Admin scaffold