typus 0.9.28 → 0.9.29

data/generators/typus/typus_generator.rb

@@ -100,20 +100,21 @@ class TypusGenerator < Rails::Generator::Base
       [ 'public/stylesheets/admin', 
         'public/javascripts/admin', 
         'public/images/admin', 
-        'public/images/admin/fancyzoom' ].each { |f| Dir.mkdir(f) unless File.directory?(f) }
+        'public/images/admin/fancybox' ].each { |f| Dir.mkdir(f) unless File.directory?(f) }
 
       [ 'public/stylesheets/admin/screen.css', 
         'public/stylesheets/admin/reset.css', 
+        'public/stylesheets/admin/jquery.fancybox.css', 
         'public/images/admin/ui-icons.png' ].each { |f| m.file f, f }
 
-      %w( application builder controls dragdrop effects fancyzoom prototype scriptaculous slider sound ).each do |f|
+      %w( application jquery-1.3.2.min jquery.fancybox-1.2.1.min ).each do |f|
         file = "public/javascripts/admin/#{f}.js"
         m.file file, file
       end
 
-      %w( bl bm br closebox ml mr tl tm tr ).each do |image|
-        file = "public/images/admin/fancyzoom/#{image}"
-        %w( gif png ).each { |e| m.file "#{file}.#{e}", "#{file}.#{e}" }
+      %w( closebox left progress right shadow_e shadow_n shadow_ne shadow_nw shadow_s shadow_se shadow_sw shadow_w title_left title_main title_right ).each do |image|
+        file = "public/images/admin/fancybox/fancy_#{image}.png"
+        m.file file, file
       end
 
       # Migration file

data/lib/typus.rb

@@ -68,10 +68,6 @@ module Typus
       Rails.env.test? && Dir.pwd == "#{Rails.root}/vendor/plugins/typus"
     end
 
-    def plugin?
-      File.exist?("#{Rails.root}/vendor/plugins/typus")
-    end
-
     def boot!
 
       # return unless File.exists?("#{Rails.root}/config/initializers/typus.rb") || testing?
@@ -90,11 +86,6 @@ module Typus
       Typus::Configuration.config!
       Typus::Configuration.roles!
 
-      # Load translation files from the plugin or the gem.
-      unless plugin?
-        Gem.path.each { |g| I18n.load_path += Dir[File.join("#{g}/gems/typus-#{version}/config/locales/*.{rb,yml}")] }
-      end
-
       # Require the test/models on when testing.
       require File.dirname(__FILE__) + '/../test/models' if testing?
 
@@ -117,12 +108,6 @@ module Typus
       require 'vendor/paginator'
       require 'vendor/rss_parser'
 
-      # Gems.
-      begin
-        require 'Rdiscount'
-      rescue LoadError
-      end
-
       # Run controllers generator ...
       generator unless testing? || Rails.env.production?
 

data/lib/typus/active_record.rb

@@ -167,11 +167,14 @@ module Typus
     def typus_order_by
 
       fields = typus_defaults_for(:order_by)
-      return "#{table_name}.id ASC" if fields.empty?
 
-      order = fields.map do |field|
-                (field.include?('-')) ? "#{table_name}.#{field.delete('-')} DESC" : "#{table_name}.#{field} ASC"
-              end.join(', ')
+      order = if fields.empty?
+                "#{table_name}.id ASC"
+              else
+                fields.map do |field|
+                  field.include?('-') ? "#{table_name}.#{field.delete('-')} DESC" : "#{table_name}.#{field} ASC"
+                end.join(', ')
+              end
 
       return order
 
@@ -200,16 +203,7 @@ module Typus
     # We are able to define how to display dates on Typus
     def typus_date_format(attribute = :default)
       date_format = Typus::Configuration.config[name]['fields']['options']['date_formats'][attribute.to_s].to_sym rescue nil
-      date_format = :db if date_format.nil?
-      return date_format
-    end
-
-    # We are able to define which template to use to render the attribute 
-    # within the form
-    def typus_template(attribute)
-      Typus::Configuration.config[name]['fields']['options']['templates'][attribute.to_s]
-    rescue
-      nil
+      return !date_format.nil? ? date_format : :db
     end
 
     def build_conditions(params)

data/lib/typus/configuration.rb

@@ -7,12 +7,12 @@ module Typus
                       :config_folder => 'config/typus', 
                       :default_locale => :en, 
                       :email => 'admin@example.com', 
-                      :image_preview_size => 'typus', 
+                      :file_preview => :typus_preview, 
+                      :file_thumbnail => :typus_thumbnail, 
                       :recover_password => false, 
                       :relationship => 'typus_users', 
                       :root => 'admin', 
                       :ssl => false, 
-                      :templates_folder => 'admin/templates',
                       :user_class_name => 'TypusUser', 
                       :user_fk => 'typus_user_id' }
 

data/lib/typus/preview.rb

@@ -3,7 +3,8 @@ module Typus
   module InstanceMethods
 
     def typus_preview(attachment)
-      return "<img src=\"#{send(attachment).url(:typus_preview)}\" />"
+      file_preview = Typus::Configuration.options[:file_preview]
+      return "<img src=\"#{send(attachment).url(file_preview)}\" />"
     end
 
   end

data/lib/typus/reloader.rb

@@ -5,7 +5,6 @@ module Typus
     # Reload config and roles when app is running in development.
     def reload_config_et_roles
       return if Rails.env.production?
-      logger.info "=> [typus] Configuration files have been reloaded."
       Typus::Configuration.roles!
       Typus::Configuration.config!
     end

data/tasks/typus_tasks.rake

@@ -1,3 +1,5 @@
+# require 'spec/tasks/rails'
+
 namespace :typus do
 
   desc 'Install acts_as_list, acts_as_tree and paperclip.'

data/test/helpers/typus_helper_test.rb

@@ -91,14 +91,4 @@ class TypusHelperTest < ActiveSupport::TestCase
 
   end
 
-  def test_typus_message
-    output = typus_message('chunky bacon', 'yay')
-    expected = <<-HTML
-<div id="flash" class="yay">
-  <p>chunky bacon</p>
-</div>
-    HTML
-    assert_equal expected, output
-  end
-
 end

data/test/lib/active_record_test.rb

@@ -369,16 +369,6 @@ class ActiveRecordTest < ActiveSupport::TestCase
 
   end
 
-  def test_should_verify_typus_template_is_working_properly
-
-   assert_equal 'datepicker', Post.typus_template('published_at')
-   assert_equal 'datepicker', Post.typus_template(:published_at)
-
-   assert_nil Post.typus_template('created_at')
-   assert_nil Post.typus_template('unknown')
-
-  end
-
   def test_should_verify_typus_user_id
     assert Post.typus_user_id?
     assert !TypusUser.typus_user_id?

data/test/lib/configuration_test.rb

@@ -13,11 +13,12 @@ class ConfigurationTest < ActiveSupport::TestCase
     assert_equal 'vendor/plugins/typus/test/config/working', Typus::Configuration.options[:config_folder]
     assert_equal :en, Typus::Configuration.options[:default_locale]
     assert_equal 'admin@example.com', Typus::Configuration.options[:email]
+    assert_equal :typus_preview, Typus::Configuration.options[:file_preview]
+    assert_equal :typus_thumbnail, Typus::Configuration.options[:file_thumbnail]
     assert_equal false, Typus::Configuration.options[:recover_password]
     assert_equal 'typus_users', Typus::Configuration.options[:relationship]
     assert_equal 'admin', Typus::Configuration.options[:root]
     assert_equal false, Typus::Configuration.options[:ssl]
-    assert_equal 'admin/templates', Typus::Configuration.options[:templates_folder]
     assert_equal 'TypusUser', Typus::Configuration.options[:user_class_name]
     assert_equal 'typus_user_id', Typus::Configuration.options[:user_fk]
   end

data/typus.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{typus}
-  s.version = "0.9.28"
+  s.version = "0.9.29"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Francesc Esplugas"]
-  s.date = %q{2009-09-10}
+  s.date = %q{2009-09-13}
   s.description = %q{Effortless backend interface for Ruby on Rails applications. (Admin scaffold generator.)}
   s.email = %q{francesc@intraducibles.com}
   s.extra_rdoc_files = [
@@ -38,6 +38,16 @@ Gem::Specification.new do |s|
      "app/views/admin/resources/show.html.erb",
      "app/views/admin/shared/_footer.html.erb",
      "app/views/admin/shared/_pagination.html.erb",
+     "app/views/admin/templates/_boolean.html.erb",
+     "app/views/admin/templates/_date.html.erb",
+     "app/views/admin/templates/_datetime.html.erb",
+     "app/views/admin/templates/_file.html.erb",
+     "app/views/admin/templates/_password.html.erb",
+     "app/views/admin/templates/_selector.html.erb",
+     "app/views/admin/templates/_string.html.erb",
+     "app/views/admin/templates/_text.html.erb",
+     "app/views/admin/templates/_time.html.erb",
+     "app/views/admin/templates/_tiny_mce.html.erb",
      "app/views/layouts/admin.html.erb",
      "app/views/layouts/typus.html.erb",
      "app/views/typus/dashboard.html.erb",
@@ -60,35 +70,26 @@ Gem::Specification.new do |s|
      "generators/typus/templates/config/typus/typus.yml",
      "generators/typus/templates/config/typus/typus_roles.yml",
      "generators/typus/templates/db/create_typus_users.rb",
-     "generators/typus/templates/public/images/admin/fancyzoom/bl.gif",
-     "generators/typus/templates/public/images/admin/fancyzoom/bl.png",
-     "generators/typus/templates/public/images/admin/fancyzoom/bm.gif",
-     "generators/typus/templates/public/images/admin/fancyzoom/bm.png",
-     "generators/typus/templates/public/images/admin/fancyzoom/br.gif",
-     "generators/typus/templates/public/images/admin/fancyzoom/br.png",
-     "generators/typus/templates/public/images/admin/fancyzoom/closebox.gif",
-     "generators/typus/templates/public/images/admin/fancyzoom/closebox.png",
-     "generators/typus/templates/public/images/admin/fancyzoom/ml.gif",
-     "generators/typus/templates/public/images/admin/fancyzoom/ml.png",
-     "generators/typus/templates/public/images/admin/fancyzoom/mr.gif",
-     "generators/typus/templates/public/images/admin/fancyzoom/mr.png",
-     "generators/typus/templates/public/images/admin/fancyzoom/tl.gif",
-     "generators/typus/templates/public/images/admin/fancyzoom/tl.png",
-     "generators/typus/templates/public/images/admin/fancyzoom/tm.gif",
-     "generators/typus/templates/public/images/admin/fancyzoom/tm.png",
-     "generators/typus/templates/public/images/admin/fancyzoom/tr.gif",
-     "generators/typus/templates/public/images/admin/fancyzoom/tr.png",
+     "generators/typus/templates/public/images/admin/fancybox/fancy_closebox.png",
+     "generators/typus/templates/public/images/admin/fancybox/fancy_left.png",
+     "generators/typus/templates/public/images/admin/fancybox/fancy_progress.png",
+     "generators/typus/templates/public/images/admin/fancybox/fancy_right.png",
+     "generators/typus/templates/public/images/admin/fancybox/fancy_shadow_e.png",
+     "generators/typus/templates/public/images/admin/fancybox/fancy_shadow_n.png",
+     "generators/typus/templates/public/images/admin/fancybox/fancy_shadow_ne.png",
+     "generators/typus/templates/public/images/admin/fancybox/fancy_shadow_nw.png",
+     "generators/typus/templates/public/images/admin/fancybox/fancy_shadow_s.png",
+     "generators/typus/templates/public/images/admin/fancybox/fancy_shadow_se.png",
+     "generators/typus/templates/public/images/admin/fancybox/fancy_shadow_sw.png",
+     "generators/typus/templates/public/images/admin/fancybox/fancy_shadow_w.png",
+     "generators/typus/templates/public/images/admin/fancybox/fancy_title_left.png",
+     "generators/typus/templates/public/images/admin/fancybox/fancy_title_main.png",
+     "generators/typus/templates/public/images/admin/fancybox/fancy_title_right.png",
      "generators/typus/templates/public/images/admin/ui-icons.png",
      "generators/typus/templates/public/javascripts/admin/application.js",
-     "generators/typus/templates/public/javascripts/admin/builder.js",
-     "generators/typus/templates/public/javascripts/admin/controls.js",
-     "generators/typus/templates/public/javascripts/admin/dragdrop.js",
-     "generators/typus/templates/public/javascripts/admin/effects.js",
-     "generators/typus/templates/public/javascripts/admin/fancyzoom.js",
-     "generators/typus/templates/public/javascripts/admin/prototype.js",
-     "generators/typus/templates/public/javascripts/admin/scriptaculous.js",
-     "generators/typus/templates/public/javascripts/admin/slider.js",
-     "generators/typus/templates/public/javascripts/admin/sound.js",
+     "generators/typus/templates/public/javascripts/admin/jquery-1.3.2.min.js",
+     "generators/typus/templates/public/javascripts/admin/jquery.fancybox-1.2.1.min.js",
+     "generators/typus/templates/public/stylesheets/admin/jquery.fancybox.css",
      "generators/typus/templates/public/stylesheets/admin/reset.css",
      "generators/typus/templates/public/stylesheets/admin/screen.css",
      "generators/typus/typus_generator.rb",
@@ -106,7 +107,6 @@ Gem::Specification.new do |s|
      "lib/typus/format.rb",
      "lib/typus/generator.rb",
      "lib/typus/hash.rb",
-     "lib/typus/locale.rb",
      "lib/typus/object.rb",
      "lib/typus/preferences.rb",
      "lib/typus/preview.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: typus
 version: !ruby/object:Gem::Version 
-  version: 0.9.28
+  version: 0.9.29
 platform: ruby
 authors: 
 - Francesc Esplugas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-10 00:00:00 +02:00
+date: 2009-09-13 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -44,6 +44,16 @@ files:
 - app/views/admin/resources/show.html.erb
 - app/views/admin/shared/_footer.html.erb
 - app/views/admin/shared/_pagination.html.erb
+- app/views/admin/templates/_boolean.html.erb
+- app/views/admin/templates/_date.html.erb
+- app/views/admin/templates/_datetime.html.erb
+- app/views/admin/templates/_file.html.erb
+- app/views/admin/templates/_password.html.erb
+- app/views/admin/templates/_selector.html.erb
+- app/views/admin/templates/_string.html.erb
+- app/views/admin/templates/_text.html.erb
+- app/views/admin/templates/_time.html.erb
+- app/views/admin/templates/_tiny_mce.html.erb
 - app/views/layouts/admin.html.erb
 - app/views/layouts/typus.html.erb
 - app/views/typus/dashboard.html.erb
@@ -66,35 +76,26 @@ files:
 - generators/typus/templates/config/typus/typus.yml
 - generators/typus/templates/config/typus/typus_roles.yml
 - generators/typus/templates/db/create_typus_users.rb
-- generators/typus/templates/public/images/admin/fancyzoom/bl.gif
-- generators/typus/templates/public/images/admin/fancyzoom/bl.png
-- generators/typus/templates/public/images/admin/fancyzoom/bm.gif
-- generators/typus/templates/public/images/admin/fancyzoom/bm.png
-- generators/typus/templates/public/images/admin/fancyzoom/br.gif
-- generators/typus/templates/public/images/admin/fancyzoom/br.png
-- generators/typus/templates/public/images/admin/fancyzoom/closebox.gif
-- generators/typus/templates/public/images/admin/fancyzoom/closebox.png
-- generators/typus/templates/public/images/admin/fancyzoom/ml.gif
-- generators/typus/templates/public/images/admin/fancyzoom/ml.png
-- generators/typus/templates/public/images/admin/fancyzoom/mr.gif
-- generators/typus/templates/public/images/admin/fancyzoom/mr.png
-- generators/typus/templates/public/images/admin/fancyzoom/tl.gif
-- generators/typus/templates/public/images/admin/fancyzoom/tl.png
-- generators/typus/templates/public/images/admin/fancyzoom/tm.gif
-- generators/typus/templates/public/images/admin/fancyzoom/tm.png
-- generators/typus/templates/public/images/admin/fancyzoom/tr.gif
-- generators/typus/templates/public/images/admin/fancyzoom/tr.png
+- generators/typus/templates/public/images/admin/fancybox/fancy_closebox.png
+- generators/typus/templates/public/images/admin/fancybox/fancy_left.png
+- generators/typus/templates/public/images/admin/fancybox/fancy_progress.png
+- generators/typus/templates/public/images/admin/fancybox/fancy_right.png
+- generators/typus/templates/public/images/admin/fancybox/fancy_shadow_e.png
+- generators/typus/templates/public/images/admin/fancybox/fancy_shadow_n.png
+- generators/typus/templates/public/images/admin/fancybox/fancy_shadow_ne.png
+- generators/typus/templates/public/images/admin/fancybox/fancy_shadow_nw.png
+- generators/typus/templates/public/images/admin/fancybox/fancy_shadow_s.png
+- generators/typus/templates/public/images/admin/fancybox/fancy_shadow_se.png
+- generators/typus/templates/public/images/admin/fancybox/fancy_shadow_sw.png
+- generators/typus/templates/public/images/admin/fancybox/fancy_shadow_w.png
+- generators/typus/templates/public/images/admin/fancybox/fancy_title_left.png
+- generators/typus/templates/public/images/admin/fancybox/fancy_title_main.png
+- generators/typus/templates/public/images/admin/fancybox/fancy_title_right.png
 - generators/typus/templates/public/images/admin/ui-icons.png
 - generators/typus/templates/public/javascripts/admin/application.js
-- generators/typus/templates/public/javascripts/admin/builder.js
-- generators/typus/templates/public/javascripts/admin/controls.js
-- generators/typus/templates/public/javascripts/admin/dragdrop.js
-- generators/typus/templates/public/javascripts/admin/effects.js
-- generators/typus/templates/public/javascripts/admin/fancyzoom.js
-- generators/typus/templates/public/javascripts/admin/prototype.js
-- generators/typus/templates/public/javascripts/admin/scriptaculous.js
-- generators/typus/templates/public/javascripts/admin/slider.js
-- generators/typus/templates/public/javascripts/admin/sound.js
+- generators/typus/templates/public/javascripts/admin/jquery-1.3.2.min.js
+- generators/typus/templates/public/javascripts/admin/jquery.fancybox-1.2.1.min.js
+- generators/typus/templates/public/stylesheets/admin/jquery.fancybox.css
 - generators/typus/templates/public/stylesheets/admin/reset.css
 - generators/typus/templates/public/stylesheets/admin/screen.css
 - generators/typus/typus_generator.rb
@@ -112,7 +113,6 @@ files:
 - lib/typus/format.rb
 - lib/typus/generator.rb
 - lib/typus/hash.rb
-- lib/typus/locale.rb
 - lib/typus/object.rb
 - lib/typus/preferences.rb
 - lib/typus/preview.rb

data/generators/typus/templates/public/javascripts/admin/builder.js

@@ -1,136 +0,0 @@
-// script.aculo.us builder.js v1.8.2, Tue Nov 18 18:30:58 +0100 2008
-
-// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-//
-// script.aculo.us is freely distributable under the terms of an MIT-style license.
-// For details, see the script.aculo.us web site: http://script.aculo.us/
-
-var Builder = {
-  NODEMAP: {
-    AREA: 'map',
-    CAPTION: 'table',
-    COL: 'table',
-    COLGROUP: 'table',
-    LEGEND: 'fieldset',
-    OPTGROUP: 'select',
-    OPTION: 'select',
-    PARAM: 'object',
-    TBODY: 'table',
-    TD: 'table',
-    TFOOT: 'table',
-    TH: 'table',
-    THEAD: 'table',
-    TR: 'table'
-  },
-  // note: For Firefox < 1.5, OPTION and OPTGROUP tags are currently broken,
-  //       due to a Firefox bug
-  node: function(elementName) {
-    elementName = elementName.toUpperCase();
-
-    // try innerHTML approach
-    var parentTag = this.NODEMAP[elementName] || 'div';
-    var parentElement = document.createElement(parentTag);
-    try { // prevent IE "feature": http://dev.rubyonrails.org/ticket/2707
-      parentElement.innerHTML = "<" + elementName + "></" + elementName + ">";
-    } catch(e) {}
-    var element = parentElement.firstChild || null;
-
-    // see if browser added wrapping tags
-    if(element && (element.tagName.toUpperCase() != elementName))
-      element = element.getElementsByTagName(elementName)[0];
-
-    // fallback to createElement approach
-    if(!element) element = document.createElement(elementName);
-
-    // abort if nothing could be created
-    if(!element) return;
-
-    // attributes (or text)
-    if(arguments[1])
-      if(this._isStringOrNumber(arguments[1]) ||
-        (arguments[1] instanceof Array) ||
-        arguments[1].tagName) {
-          this._children(element, arguments[1]);
-        } else {
-          var attrs = this._attributes(arguments[1]);
-          if(attrs.length) {
-            try { // prevent IE "feature": http://dev.rubyonrails.org/ticket/2707
-              parentElement.innerHTML = "<" +elementName + " " +
-                attrs + "></" + elementName + ">";
-            } catch(e) {}
-            element = parentElement.firstChild || null;
-            // workaround firefox 1.0.X bug
-            if(!element) {
-              element = document.createElement(elementName);
-              for(attr in arguments[1])
-                element[attr == 'class' ? 'className' : attr] = arguments[1][attr];
-            }
-            if(element.tagName.toUpperCase() != elementName)
-              element = parentElement.getElementsByTagName(elementName)[0];
-          }
-        }
-
-    // text, or array of children
-    if(arguments[2])
-      this._children(element, arguments[2]);
-
-     return $(element);
-  },
-  _text: function(text) {
-     return document.createTextNode(text);
-  },
-
-  ATTR_MAP: {
-    'className': 'class',
-    'htmlFor': 'for'
-  },
-
-  _attributes: function(attributes) {
-    var attrs = [];
-    for(attribute in attributes)
-      attrs.push((attribute in this.ATTR_MAP ? this.ATTR_MAP[attribute] : attribute) +
-          '="' + attributes[attribute].toString().escapeHTML().gsub(/"/,'&quot;') + '"');
-    return attrs.join(" ");
-  },
-  _children: function(element, children) {
-    if(children.tagName) {
-      element.appendChild(children);
-      return;
-    }
-    if(typeof children=='object') { // array can hold nodes and text
-      children.flatten().each( function(e) {
-        if(typeof e=='object')
-          element.appendChild(e);
-        else
-          if(Builder._isStringOrNumber(e))
-            element.appendChild(Builder._text(e));
-      });
-    } else
-      if(Builder._isStringOrNumber(children))
-        element.appendChild(Builder._text(children));
-  },
-  _isStringOrNumber: function(param) {
-    return(typeof param=='string' || typeof param=='number');
-  },
-  build: function(html) {
-    var element = this.node('div');
-    $(element).update(html.strip());
-    return element.down();
-  },
-  dump: function(scope) {
-    if(typeof scope != 'object' && typeof scope != 'function') scope = window; //global scope
-
-    var tags = ("A ABBR ACRONYM ADDRESS APPLET AREA B BASE BASEFONT BDO BIG BLOCKQUOTE BODY " +
-      "BR BUTTON CAPTION CENTER CITE CODE COL COLGROUP DD DEL DFN DIR DIV DL DT EM FIELDSET " +
-      "FONT FORM FRAME FRAMESET H1 H2 H3 H4 H5 H6 HEAD HR HTML I IFRAME IMG INPUT INS ISINDEX "+
-      "KBD LABEL LEGEND LI LINK MAP MENU META NOFRAMES NOSCRIPT OBJECT OL OPTGROUP OPTION P "+
-      "PARAM PRE Q S SAMP SCRIPT SELECT SMALL SPAN STRIKE STRONG STYLE SUB SUP TABLE TBODY TD "+
-      "TEXTAREA TFOOT TH THEAD TITLE TR TT U UL VAR").split(/\s+/);
-
-    tags.each( function(tag){
-      scope[tag] = function() {
-        return Builder.node.apply(Builder, [tag].concat($A(arguments)));
-      };
-    });
-  }
-};