bc-htmlful 0.0.1 → 0.0.5

data/README

@@ -9,3 +9,5 @@ include the javascript file in your layout:
 
 = javascript_include_tag "dynamic_fields"
 
+
+rake htmlful:update:javascripts

data/Rakefile

@@ -8,7 +8,7 @@ end
 
 require 'rake/testtask'
 require 'rake/rdoctask'
-require 'rcov/rcovtask'
+#require 'rcov/rcovtask'
 
 Jeweler::Tasks.new do |s|
   s.name = "bc-htmlful"

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.5

data/bc-htmlful.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bc-htmlful}
-  s.version = "0.0.1"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Duarte Henriques", "Vasco Andrade e Silva"]
-  s.date = %q{2010-02-15}
+  s.date = %q{2010-02-26}
   s.description = %q{Form dynamic fields}
   s.email = %q{info@byclosure.com}
   s.extra_rdoc_files = [
@@ -21,12 +21,13 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "bc-htmlful.gemspec",
-     "javascripts/dynamic_fields.js",
-     "javascripts/dynamic_fields.prototype.js",
+     "javascripts/dynamic-fields.js",
+     "javascripts/dynamic-fields.prototype.js",
      "lib/htmlful.rb",
      "lib/htmlful/dynamic_fields.rb",
      "rails/init.rb",
-     "stylesheets/dynamic_fields.sass"
+     "stylesheets/dynamic_fields.sass",
+     "tasks/htmlful.rake"
   ]
   s.homepage = %q{http://github.com/Byclosure/}
   s.rdoc_options = ["--charset=UTF-8"]

data/javascripts/dynamic-fields.js

@@ -0,0 +1,82 @@
+$(function() {
+  $('input[type="hidden"]').addClass('hide');
+  // buttons UI
+  $('.create_element').addClass('ui-state-default ui-corner-all').hover(function() {
+    $(this).addClass("ui-state-hover");
+  }, function() {
+    $(this).removeClass("ui-state-hover");
+  }).mousedown(function() {
+    $(this).addClass("ui-state-active");
+  }).mouseup(function() {
+    $(this).removeClass("ui-state-active");
+  });
+  // make sure something is submitted even if no option is selected
+  $('li.select select[multiple="multiple"]').each(function() {
+    $(this).parent().append($('<input type="hidden" />').attr({name: this.name}));
+  });
+  // allow users to clear multi-select without requiring them to ctrl-click
+  $('a.clear_multi_select').click(function(event) {
+    if (event.which != 3) {
+      $(this).parents('li').prev().find('select').val(null);
+      return false;
+    }
+    return true;
+  });
+  // allow removal of documents in forms
+  $('.delete_document').click(function(event) {
+    if (event.which != 3) {
+      var classNames = this.className.split(/\s+/);
+      var index = $.inArray('delete_document', classNames);
+      var name = classNames[index+1] + '[delete_' + classNames[index+2] + ']';
+      $(this).parent().prev().append($('<input type="hidden" />').attr({name: name}).val(1));
+      $(this).parent().hide('blind');
+      return false;
+    }
+    return true;
+  });
+  // dynamic fields
+  $('.remove_fieldset').live('click', function(event) {
+    if (event.which != 3) {
+      $(this).parent().prev().find('input[type=hidden]').val(1);
+      $($(this).closest('fieldset')).hide('blind');
+      return false;
+    }
+    return true;
+  });
+  $('form div.new_nested_element').each(function() {
+    var create_button = $(this).children('a.create_element');
+    var remove_button = $(this).children('a.remove_element').remove();
+    var fragment = $($(this).find('fieldset')[0]).remove();
+    var remove_button_function = function(event) {
+      if (event.which != 3) {
+        $($(this).closest('fieldset')).hide('blind', {}, 1000, function(){$(this).remove();});
+        return false;
+      }
+      return true;
+    }
+    create_button.click(function(event) {
+      var new_fragment = fragment.clone().hide();
+      
+      var new_remove_button = remove_button.clone();
+      new_remove_button.click(remove_button_function);
+      
+      var nested_inputs = $(this).parent().children('div.nested_inputs');
+      nested_inputs.append(new_fragment);
+
+      // this is a necessary hack for rails http://groups.google.com.au/group/formtastic/browse_thread/thread/9358a13bd26a6108
+      var unique_id = new Date().getTime();
+      new_fragment.find('input,select,textarea').each(function() {
+        this.id = this.id && this.id.replace(/NEW_RECORD/, unique_id);
+        this.name = this.name && this.name.replace(/NEW_RECORD/, unique_id);
+      });
+      new_fragment.find('label').each(function() {
+        this.htmlFor = this.htmlFor && this.htmlFor.replace(/NEW_RECORD/, unique_id);
+      });
+      
+      $($(this).closest('form')).trigger('element-added', new_fragment);
+      new_fragment.append(new_remove_button);
+      new_fragment.show('blind');
+      return false;
+    });
+  });
+});

data/javascripts/{dynamic_fields.prototype.js → dynamic-fields.prototype.js}

@@ -1,31 +1,38 @@
-// TODO: finish conversion from jquery
+// WARNING: not up-to-date
 document.observe('click', function(event) {
   if (element = event.findElement('.remove_fieldset')) {
-    element.up().previous().select('input[type=hidden]').value = 1;
-    element.up('fieldset').hide();
-    event.stop();
+    // IE is not recognizing left click, but it's OK because it handles right clicks itself
+    if (Prototype.Browser.IE || event.isLeftClick()) {
+      element.up().previous().down('input[type=hidden]').value = 1;
+      element.up('fieldset').hide();
+      event.stop();
+    }
   }
 });
+
 $$('form div.new_nested_element').each(function(element) {
   var create_button = element.down('a.create_element');
   var remove_button = element.down('a.remove_element').remove();
   var fragment = element.down('fieldset').remove();
   var remove_button_function = function(event) {
-    this.up('fieldset').remove();
-    event.stop(); 
+    // IE is not recognizing left click, but it's OK because it handles right clicks itself
+    if (Prototype.Browser.IE || event.isLeftClick()) {
+      this.up('fieldset').remove();
+      event.stop(); 
+    }
   }
   create_button.observe('click', function(event) {
     var new_fragment = fragment.cloneNode(true);
-    
+  
     var new_remove_button = remove_button.cloneNode(true);
     new_remove_button.observe('click', remove_button_function);
-    
-    var nested_inputs = create_button.parent().children('div.nested_inputs');
+  
+    var nested_inputs = create_button.up().down('div.nested_inputs');
     nested_inputs.insert(new_fragment);
-    
+  
     // this is a necessary hack for rails http://groups.google.com.au/group/formtastic/browse_thread/thread/9358a13bd26a6108
     var unique_id = new Date().getTime();
-    new_fragment.select('input').each(function(e) {
+    new_fragment.select('input,select,textarea').each(function(e) {
       e.id = e.id && e.id.gsub(/NEW_RECORD/, unique_id);
       e.name = e.name && e.name.gsub(/NEW_RECORD/, unique_id);
     });

data/lib/htmlful/dynamic_fields.rb

@@ -1,13 +1,14 @@
 module Htmlful
   module DynamicFields
     def _dynamic_fields(form, resource, relationship_name, block1, block2)
+      relationship_i18n_name = resource.class.human_attribute_name(relationship_name).to_s
       form.inputs :title => relationship_name do
         unless resource.send(relationship_name).empty?
           form.semantic_fields_for(relationship_name) do |sub_form|
             sub_form.inputs do
               block1.call(sub_form)
               concat sub_form.input(:_delete, :as => :hidden, :wrapper_html => {:class => 'remove'}, :input_html => {:class => "checkbox_remove"})
-              concat content_tag(:li, link_to(t(:remove_nested_element, :resource_name => t(resource.class.name)), '#', :class => "remove_fieldset"))
+              concat content_tag(:li, link_to(t(:remove_nested_element, :resource_name => relationship_i18n_name), '#', :class => "remove_fieldset"))
             end
           end
         end
@@ -19,7 +20,6 @@ module Htmlful
               end
             end
           }
-          relationship_i18n_name = resource.class.human_attribute_name(relationship_name).to_s
           concat link_to(t(:remove_nested_element, :resource_name => relationship_i18n_name), '#', :class => "remove_element")
           concat link_to(t(:create_nested_element, :resource_name => relationship_i18n_name), "#", :class => "create_element")
         }
@@ -63,7 +63,7 @@ module Htmlful
     def show_dynamic_fields(form, resource, relationship_name, *attributes)
       form.inputs :title => relationship_name do
         if resource.send(relationship_name).empty?
-          concat t(:no_resource_name_plural, :resource_name_plural => resource.class.human_name(:count => 2).mb_chars.downcase)
+          concat t(:no_resource_name_plural, :resource_name_plural => resource.class.human_attribute_name(relationship_name, :count => 2).mb_chars.downcase)
         else
           form.semantic_fields_for(relationship_name) do |sub_form|
             sub_form.inputs do
@@ -76,6 +76,27 @@ module Htmlful
       end
     end
 
+    # TODO: use concat and usage will be nicer
+    def show_attribute_outside_form(resource, attribute, options=nil, &block)
+      if is_date(resource, attribute)
+        resource.send(attribute) # TODO: add the controversial abbr method here, or just use title
+      elsif is_document(resource, attribute)
+        if is_document_empty?(resource, attribute)
+          t(:no_document)
+        else
+          if is_image(resource, attribute)
+            image_style = (options.nil? || options[:image_style].nil?)? :thumb : options[:image_style]
+            image_tag(resource.send(attribute).url(image_style))
+          else
+            link_to(resource.send("#{attribute}_file_name"), resource.send(attribute).url)
+          end
+        end
+      else
+        yield
+      end
+    end
+
+    # inside of a form
     def show_attribute(form, resource, attribute)
       if is_date(resource, attribute)
         form.input(attribute, :as => :string, :wrapper_html => {:class => 'datepick'}, :input_html => {:disabled => true})
@@ -101,7 +122,7 @@ module Htmlful
 
     def show_subcollection(form, resource, association)
       collection = resource.send(association)
-      resource_name_plural = resource.class.reflect_on_association(association.to_sym).klass.human_name(:count => 2)
+      resource_name_plural = localized_attribute_string(resource, association.to_sym)#resource.class.reflect_on_association(association.to_sym).klass.human_name(:count => 2)
       content_tag(:label, resource_name_plural) +
       if collection.empty?
         content_tag(:p, I18n.t(:no_resource_name_plural, :resource_name_plural => resource_name_plural.mb_chars.downcase))
@@ -111,8 +132,58 @@ module Htmlful
           }, :class => "sub-collection")
       end
     end
+    
+    def multi_select_input(form, association, options={})
+      form.input(association, options) + content_tag(:li, content_tag(:div, link_to(t(:clear_selected), "#", :class => "clear_multi_select"), :class => "clear_multi_select"))
+    end
+    
+    def form_inputs(form, *attributes)
+      options = attributes.extract_options!
+      resource = form.object
+      returning("") do |html|
+        attributes.each do |attribute|
+          html << form.input(attribute)
+          if is_document(resource, attribute)
+            unless is_document_empty?(resource, attribute)
+              html << "<li>"
+              if is_image(resource, attribute)
+                image_style = (options.nil? || options[:image_style].nil?)? :thumb : options[:image_style]
+                html << image_tag(form.object.send(attribute).url(image_style))
+              else
+                html << link_to(sub_object.send("#{attribute}_file_name"), resource.send(attribute).url)
+              end
+              html << content_tag(:br)
+              html << content_tag(:a, t(:delete_resource, :resource => resource.class.human_attribute_name(attribute)), :href => "#", :class => "delete_document #{resource.class.name.underscore} #{attribute}")
+              html << "</li>"
+            end
+          end
+        end
+      end
+    end
 
     protected
+    
+    ## copied and adapted from formtastic
+    def localized_attribute_string(resource, attr_name)
+      model_name = resource.class.name.underscore
+      action_name = template.params[:action].to_s rescue ''
+      attribute_name = attr_name.to_s
+
+      i18n_scopes = ['{{model}}.{{action}}.{{attribute}}', '{{model}}.{{attribute}}', '{{attribute}}']
+      defaults = i18n_scopes.collect do |i18n_scope|
+        i18n_path = i18n_scope.dup
+        i18n_path.gsub!('{{action}}', action_name)
+        i18n_path.gsub!('{{model}}', model_name)
+        i18n_path.gsub!('{{attribute}}', attribute_name)
+        i18n_path.gsub!('..', '.')
+        i18n_path.to_sym
+      end
+      defaults << ''
+
+      i18n_value = ::I18n.t(defaults.shift, :default => defaults, :scope => "formtastic.labels")
+      i18n_value.blank? ? nil : i18n_value
+    end
+    
     def is_date(resource, attribute)
       col = resource.column_for_attribute(attribute)
       col && col.type == :date

data/lib/htmlful.rb

@@ -0,0 +1 @@
+require "#{File.dirname(__FILE__)}/htmlful/dynamic_fields"

data/rails/init.rb

@@ -0,0 +1 @@
+puts "Please run rake htmlful:update:javascript, with an appropriate FRAMEWORK env variable" unless File.exist?("#{Rails.root}/public/javascripts/dynamic-fields.js")

data/tasks/htmlful.rake

@@ -0,0 +1,12 @@
+namespace :htmlful do
+  namespace :update do
+    desc "Update htmlful javascript from the gem source. Use FRAMEWORK=prototype for prototype version"
+    task :javascript do
+      if ENV["FRAMEWORK"] == "prototype"
+        `cp #{File.basedir(__FILE__)}/../javascripts/dynamic-fields.prototype.js #{Rails.root}/public/javascripts/dynamic-fields.js`
+      else
+        `cp #{File.basedir(__FILE__)}/../javascripts/dynamic-fields.js #{Rails.root}/public/javascripts`
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bc-htmlful
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.5
 platform: ruby
 authors: 
 - Duarte Henriques
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-15 00:00:00 +00:00
+date: 2010-02-26 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -28,12 +28,13 @@ files:
 - Rakefile
 - VERSION
 - bc-htmlful.gemspec
-- javascripts/dynamic_fields.js
-- javascripts/dynamic_fields.prototype.js
+- javascripts/dynamic-fields.js
+- javascripts/dynamic-fields.prototype.js
 - lib/htmlful.rb
 - lib/htmlful/dynamic_fields.rb
 - rails/init.rb
 - stylesheets/dynamic_fields.sass
+- tasks/htmlful.rake
 has_rdoc: true
 homepage: http://github.com/Byclosure/
 licenses: []

data/javascripts/dynamic_fields.js

@@ -1,56 +0,0 @@
-$('input[type="hidden"]').addClass('hide');
-// buttons UI
-$('.create_element').addClass('ui-state-default ui-corner-all').hover(function() {
-  $(this).addClass("ui-state-hover");
-}, function() {
-  $(this).removeClass("ui-state-hover");
-}).mousedown(function() {
-  $(this).addClass("ui-state-active");
-}).mouseup(function() {
-  $(this).removeClass("ui-state-active");
-});
-
-$('.remove_fieldset').live('click', function(event) {
-  if (event.which != 3) {
-    $(this).parent().prev().find('input[type=hidden]').val(1);
-    $($(this).closest('fieldset')).hide('blind');
-    return false;
-  }
-  return true;
-});
-$('form div.new_nested_element').each(function() {
-  var create_button = $(this).children('a.create_element');
-  var remove_button = $(this).children('a.remove_element').remove();
-  var fragment = $($(this).find('fieldset')[0]).remove();
-  var remove_button_function = function(event) {
-    if (event.which != 3) {
-      $($(this).closest('fieldset')).hide('blind', {}, 1000, function(){$(this).remove();});
-      return false;
-    }
-    return true;
-  }
-  create_button.click(function(event) {
-    var new_fragment = fragment.clone().hide();
-    
-    var new_remove_button = remove_button.clone();
-    new_remove_button.click(remove_button_function);
-    
-    var nested_inputs = $(this).parent().children('div.nested_inputs');
-    nested_inputs.append(new_fragment);
-
-    // this is a necessary hack for rails http://groups.google.com.au/group/formtastic/browse_thread/thread/9358a13bd26a6108
-    var unique_id = new Date().getTime();
-    new_fragment.find('input').each(function() {
-      this.id = this.id && this.id.replace(/NEW_RECORD/, unique_id);
-      this.name = this.name && this.name.replace(/NEW_RECORD/, unique_id);
-    });
-    new_fragment.find('label').each(function() {
-      this.htmlFor = this.htmlFor && this.htmlFor.replace(/NEW_RECORD/, unique_id);
-    });
-    
-    $($(this).closest('form')).trigger('element-added', new_fragment);
-    new_fragment.append(new_remove_button);
-    new_fragment.show('blind');
-    return false;
-  });
-});