formize 0.0.20 → 0.0.21

data/VERSION

@@ -1 +1 @@
-0.0.20
+0.0.21

data/lib/assets/javascripts/formize.js

@@ -59,30 +59,32 @@ $.datepicker.regional['zh-TW'] = { closeText: '關閉', prevText: '<上月'
 (function ($) {
     // Replaces `$(selector).live("ready", handler)` which don't work
     // It rebinds automatically after each ajax request all not-binded.
+    $.behavioursCount = 0;
     $.behaviours = [];
     $.behave = function (selector, events, handler) {
-	events = events.split(/\s+/ig);
-	for (var i = 0; i < events.length; i += 1) {
-	    event = events[i];
+        events = events.split(/\s+/ig);
+        for (var i = 0; i < events.length; i += 1) {
+            var event = events[i];
             if (event === "load") {
-		$(document).ready(function(event) {
+		var index = $.behavioursCount; $.behavioursCount += 1;
+                $.behaviours.push({selector: selector, handler: handler, index: index});
+                $(document).ready(function(event) {
                     $(selector).each(handler);
-                    $(selector).prop('alreadyBound', true);
-		});
-		$.behaviours.push({selector: selector, handler: handler});
+                    $(selector).prop('alreadyBound'+index, true);
+                });
             } else {
-		$(selector).live(event, handler);
+                $(selector).live(event, handler);
             }
-	}
+        }
     }
     // Rebinds unbound elements on each ajax request.
     $(document).ajaxComplete(function () {
         for (var behaviour in $.behaviours) {
             behaviour = $.behaviours[behaviour];
             $(behaviour.selector).each(function(index, element){
-                if ($(element).prop('alreadyBound') !== true) {
+                if ($(element).prop('alreadyBound'+behaviour.index) !== true) {
                     behaviour.handler.call($(element));
-                    $(element).prop('alreadyBound', true);
+                    $(element).prop('alreadyBound'+behaviour.index, true);
                 }
             });
         }
@@ -94,25 +96,40 @@ $.datepicker.regional['zh-TW'] = { closeText: '關閉', prevText: '&#x3c;上月'
     $.ajaxDialog = function (url, settings) {
         var frame_id = "dialog-" + $.ajaxDialogCount, width = $(document).width();
         var defaultSettings = {
-            header: "X-Return-Code"
+            header: "X-Return-Code",
+	    width: 0.6,
+	    height: 0.8
         };
         if (settings === null || settings === undefined) { settings = {}; }
         settings = $.extend({}, defaultSettings, settings);
         $.ajax(url, {
             data: {dialog: frame_id},
             success: function(data, textStatus, jqXHR) {
-                var frame = $(document.createElement('div'));
+                var frame = $(document.createElement('div')), width, height;
                 frame.attr({id: frame_id, 'class': 'dialog ajax-dialog', style: 'display:none;'});
                 $('body').append(frame);
                 frame.html(data);
                 frame.prop("dialogSettings", settings);
+		if (settings.width === 0) {
+		    width = 'auto';
+		} else if (settings.width < 1) {
+		    width = $(window).width() * settings.width;
+		} else {
+		    width = settings.width;
+		}
+		if (settings.height === 0) {
+		    height = 'auto';
+		} else if (settings.height < 1) {
+		    height = $(window).height() * settings.height;
+		} else {
+		    height = settings.height;
+		}
                 frame.dialog({
                     autoOpen: false,
                     show: 'fade',
                     modal: true,
-                    width: 'auto',
-                    // height: 'auto',
-		    height: $(window).height()*0.8
+                    width: width,
+                    height: height
                 });
                 $.ajaxDialogInitialize(frame);
                 frame.dialog("open");
@@ -142,7 +159,7 @@ $.datepicker.regional['zh-TW'] = { closeText: '關閉', prevText: '&#x3c;上月'
         $("#" + frame_id + " form").each(function (index, form) {
             $(form).attr('data-dialog', frame_id);
         });
-	
+        
     };
 
     $.submitAjaxForm = function () {
@@ -200,28 +217,28 @@ Formize.refreshDependents = function (event) {
     var element = $(this);
     var params = {};
     if (element.val() !== null && element.val() !== undefined) {
-	var dependents = element.attr('data-dependents');
-	var paramName = element.attr('data-parameter-name') || element.attr('id') || 'value';
+        var dependents = element.attr('data-dependents');
+        var paramName = element.attr('data-parameter-name') || element.attr('id') || 'value';
         params[paramName] = element.val();
         $(dependents).each(function(index, item) {
             // Replaces element
             var url = $(item).attr('data-refresh');
-	    var mode = $(item).attr('data-refresh-mode') || 'replace';
+            var mode = $(item).attr('data-refresh-mode') || 'replace';
             if (url !== null) {
                 $.ajax(url, {
                     data: params,
                     success: function(data, textStatus, response) {
-			if (mode == 'update') {
-			    $(item).html(response.responseText);
-			} else if (mode == 'update-value') {
-			    if (element.data("attribute")) {
-				$(item).val($.parseJSON(data)[element.data("attribute")]);
-			    } else {
-				$(item).val(response.responseText);
-			    }
-			} else {
+                        if (mode == 'update') {
+                            $(item).html(response.responseText);
+                        } else if (mode == 'update-value') {
+                            if (element.data("attribute")) {
+                                $(item).val($.parseJSON(data)[element.data("attribute")]);
+                            } else {
+                                $(item).val(response.responseText);
+                            }
+                        } else {
                             $(item).replaceWith(response.responseText);
-			}
+                        }
                     },
                     error: function(jqXHR, textStatus, errorThrown) {
                         alert("FAILURE (Error "+textStatus+"): "+errorThrown);
@@ -237,11 +254,11 @@ Formize.refreshDependents = function (event) {
 Formize.toggleCheckboxes =  function () {
     var checkable = $(this);
     if (checkable.prop("checked")) {
-	$(checkable.attr('data-show')).slideDown();
-	$(checkable.attr('data-hide')).slideUp();
+        $(checkable.attr('data-show')).slideDown();
+        $(checkable.attr('data-hide')).slideUp();
     } else {
-	$(checkable.attr('data-show')).slideUp();
-	$(checkable.attr('data-hide')).slideDown();
+        $(checkable.attr('data-show')).slideUp();
+        $(checkable.attr('data-hide')).slideDown();
     }
 };
 
@@ -356,17 +373,17 @@ $.behave("a[data-add-item]", "click", function() {
     return false;
 });
 
-$.behave("input[data-autocomplete]", "load", function () {
+$.behave("input[data-autocompletion]", "load", function () {
     var element = $(this);
     element.autocomplete({
-	source: element.data("autocomplete"),
-	minLength: parseInt(element.data("min-length") || 1)
+        source: element.data("autocompletion"),
+        minLength: parseInt(element.data("min-length") || 1)
     });
 });
 
 // Refresh dependents on changes
-$.behave("*[data-dependents]", "change", Formize.refreshDependents);
-$.behave("*[data-dependents]", "emulated:change", Formize.refreshDependents);
+$.behave("*[data-dependents]", "change emulated:change", Formize.refreshDependents);
+// $.behave("*[data-dependents]", "emulated:change", Formize.refreshDependents);
 // Compensate for changes made with keyboard
 $.behave("select[data-dependents]", "keypress", Formize.refreshDependents);
 

data/lib/assets/javascripts/jquery.ui.formize.js

@@ -3,30 +3,32 @@
 (function ($) {
     // Replaces `$(selector).live("ready", handler)` which don't work
     // It rebinds automatically after each ajax request all not-binded.
+    $.behavioursCount = 0;
     $.behaviours = [];
     $.behave = function (selector, events, handler) {
-	events = events.split(/\s+/ig);
-	for (var i = 0; i < events.length; i += 1) {
-	    event = events[i];
+        events = events.split(/\s+/ig);
+        for (var i = 0; i < events.length; i += 1) {
+            var event = events[i];
             if (event === "load") {
-		$(document).ready(function(event) {
+		var index = $.behavioursCount; $.behavioursCount += 1;
+                $.behaviours.push({selector: selector, handler: handler, index: index});
+                $(document).ready(function(event) {
                     $(selector).each(handler);
-                    $(selector).prop('alreadyBound', true);
-		});
-		$.behaviours.push({selector: selector, handler: handler});
+                    $(selector).prop('alreadyBound'+index, true);
+                });
             } else {
-		$(selector).live(event, handler);
+                $(selector).live(event, handler);
             }
-	}
+        }
     }
     // Rebinds unbound elements on each ajax request.
     $(document).ajaxComplete(function () {
         for (var behaviour in $.behaviours) {
             behaviour = $.behaviours[behaviour];
             $(behaviour.selector).each(function(index, element){
-                if ($(element).prop('alreadyBound') !== true) {
+                if ($(element).prop('alreadyBound'+behaviour.index) !== true) {
                     behaviour.handler.call($(element));
-                    $(element).prop('alreadyBound', true);
+                    $(element).prop('alreadyBound'+behaviour.index, true);
                 }
             });
         }
@@ -38,25 +40,40 @@
     $.ajaxDialog = function (url, settings) {
         var frame_id = "dialog-" + $.ajaxDialogCount, width = $(document).width();
         var defaultSettings = {
-            header: "X-Return-Code"
+            header: "X-Return-Code",
+	    width: 0.6,
+	    height: 0.8
         };
         if (settings === null || settings === undefined) { settings = {}; }
         settings = $.extend({}, defaultSettings, settings);
         $.ajax(url, {
             data: {dialog: frame_id},
             success: function(data, textStatus, jqXHR) {
-                var frame = $(document.createElement('div'));
+                var frame = $(document.createElement('div')), width, height;
                 frame.attr({id: frame_id, 'class': 'dialog ajax-dialog', style: 'display:none;'});
                 $('body').append(frame);
                 frame.html(data);
                 frame.prop("dialogSettings", settings);
+		if (settings.width === 0) {
+		    width = 'auto';
+		} else if (settings.width < 1) {
+		    width = $(window).width() * settings.width;
+		} else {
+		    width = settings.width;
+		}
+		if (settings.height === 0) {
+		    height = 'auto';
+		} else if (settings.height < 1) {
+		    height = $(window).height() * settings.height;
+		} else {
+		    height = settings.height;
+		}
                 frame.dialog({
                     autoOpen: false,
                     show: 'fade',
                     modal: true,
-                    width: 'auto',
-                    // height: 'auto',
-		    height: $(window).height()*0.8
+                    width: width,
+                    height: height
                 });
                 $.ajaxDialogInitialize(frame);
                 frame.dialog("open");
@@ -86,7 +103,7 @@
         $("#" + frame_id + " form").each(function (index, form) {
             $(form).attr('data-dialog', frame_id);
         });
-	
+        
     };
 
     $.submitAjaxForm = function () {
@@ -144,28 +161,28 @@ Formize.refreshDependents = function (event) {
     var element = $(this);
     var params = {};
     if (element.val() !== null && element.val() !== undefined) {
-	var dependents = element.attr('data-dependents');
-	var paramName = element.attr('data-parameter-name') || element.attr('id') || 'value';
+        var dependents = element.attr('data-dependents');
+        var paramName = element.attr('data-parameter-name') || element.attr('id') || 'value';
         params[paramName] = element.val();
         $(dependents).each(function(index, item) {
             // Replaces element
             var url = $(item).attr('data-refresh');
-	    var mode = $(item).attr('data-refresh-mode') || 'replace';
+            var mode = $(item).attr('data-refresh-mode') || 'replace';
             if (url !== null) {
                 $.ajax(url, {
                     data: params,
                     success: function(data, textStatus, response) {
-			if (mode == 'update') {
-			    $(item).html(response.responseText);
-			} else if (mode == 'update-value') {
-			    if (element.data("attribute")) {
-				$(item).val($.parseJSON(data)[element.data("attribute")]);
-			    } else {
-				$(item).val(response.responseText);
-			    }
-			} else {
+                        if (mode == 'update') {
+                            $(item).html(response.responseText);
+                        } else if (mode == 'update-value') {
+                            if (element.data("attribute")) {
+                                $(item).val($.parseJSON(data)[element.data("attribute")]);
+                            } else {
+                                $(item).val(response.responseText);
+                            }
+                        } else {
                             $(item).replaceWith(response.responseText);
-			}
+                        }
                     },
                     error: function(jqXHR, textStatus, errorThrown) {
                         alert("FAILURE (Error "+textStatus+"): "+errorThrown);
@@ -181,11 +198,11 @@ Formize.refreshDependents = function (event) {
 Formize.toggleCheckboxes =  function () {
     var checkable = $(this);
     if (checkable.prop("checked")) {
-	$(checkable.attr('data-show')).slideDown();
-	$(checkable.attr('data-hide')).slideUp();
+        $(checkable.attr('data-show')).slideDown();
+        $(checkable.attr('data-hide')).slideUp();
     } else {
-	$(checkable.attr('data-show')).slideUp();
-	$(checkable.attr('data-hide')).slideDown();
+        $(checkable.attr('data-show')).slideUp();
+        $(checkable.attr('data-hide')).slideDown();
     }
 };
 
@@ -300,17 +317,17 @@ $.behave("a[data-add-item]", "click", function() {
     return false;
 });
 
-$.behave("input[data-autocomplete]", "load", function () {
+$.behave("input[data-autocompletion]", "load", function () {
     var element = $(this);
     element.autocomplete({
-	source: element.data("autocomplete"),
-	minLength: parseInt(element.data("min-length") || 1)
+        source: element.data("autocompletion"),
+        minLength: parseInt(element.data("min-length") || 1)
     });
 });
 
 // Refresh dependents on changes
-$.behave("*[data-dependents]", "change", Formize.refreshDependents);
-$.behave("*[data-dependents]", "emulated:change", Formize.refreshDependents);
+$.behave("*[data-dependents]", "change emulated:change", Formize.refreshDependents);
+// $.behave("*[data-dependents]", "emulated:change", Formize.refreshDependents);
 // Compensate for changes made with keyboard
 $.behave("select[data-dependents]", "keypress", Formize.refreshDependents);
 

data/lib/formize/action_controller.rb

@@ -64,7 +64,7 @@ module Formize
           for column in form.model.columns
             next if column.name =~ /_count$/ or [:id, :created_at, :updated_at, :lock_version, :type, :creator_id, :updater_id].include?(column.name.to_sym)
             if column.name =~ /_id$/
-              reflections = form.model.reflections.select{ |k, x| x.primary_key_name.to_s == column.name.to_s }
+              reflections = form.model.reflections.select{ |k, x| x.send(Formize.foreign_key).to_s == column.name.to_s }
               if reflections.size == 1
                 f.field(column.name.gsub(/_id$/, ''), :choices=>:all, :source=>:foreign_class, :new=>true)
                 # elsif reflections.size > 1 # AMBIGUITY

data/lib/formize/definition/field.rb

@@ -34,7 +34,7 @@ module Formize
               @source = @options.delete(:source) # || @reflection.class_name
               @is_method = true if @options[:new]
               @method_name = self.form.unique_name + "_inf_" + @name
-              @method = @reflection.primary_key_name
+              @method = @reflection.send(Formize.foreign_key)
               unless @item_label = @options.delete(:item_label)
                 model = @reflection.class_name.constantize
                 available_methods = (model.columns_hash.keys+model.instance_methods).collect{|x| x.to_s}

data/lib/formize/generator.rb

@@ -63,7 +63,7 @@ module Formize
               # locals[df.name.to_sym] = Code.new(df.name)
             end
             if dependent.is_a?(Formize::Definition::Field) and dependent.reflection
-              event << "  #{record_name}.#{dependent.reflection.primary_key_name} = params[:selected].to_i if params[:selected]\n"
+              event << "  #{record_name}.#{dependent.reflection.send(Formize.foreign_key)} = params[:selected].to_i if params[:selected]\n"
             end
             event << "  render(:inline=>'<%=#{dependent.prototype}-%>', :locals=>#{locals.inspect})\n"
             event << "end\n"

data/lib/formize.rb

@@ -3,6 +3,18 @@ require 'formize/engine' if defined?(::Rails)
 
 # :include: ../README.rdoc
 module Formize
+  if defined?(::Rails)
+    if ::Rails.version >= "3.1"
+      def self.foreign_key
+        :foreign_key
+      end
+    else
+      def self.foreign_key
+        :primary_key_name
+      end
+    end
+  end
+
   extend ActiveSupport::Autoload
 
   def self.configure(name, value = nil) # :nodoc:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formize
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-27 00:00:00.000000000Z
+date: 2012-01-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &15013920 !ruby/object:Gem::Requirement
+  requirement: &12235800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *15013920
+  version_requirements: *12235800
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &15001720 !ruby/object:Gem::Requirement
+  requirement: &12232840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15001720
+  version_requirements: *12232840
 - !ruby/object:Gem::Dependency
   name: fastercsv
-  requirement: &14997320 !ruby/object:Gem::Requirement
+  requirement: &12229560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14997320
+  version_requirements: *12229560
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &14986600 !ruby/object:Gem::Requirement
+  requirement: &12226540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *14986600
+  version_requirements: *12226540
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &14984080 !ruby/object:Gem::Requirement
+  requirement: &12148520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14984080
+  version_requirements: *12148520
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &14982280 !ruby/object:Gem::Requirement
+  requirement: &12143760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: 2.4.2
   type: :development
   prerelease: false
-  version_requirements: *14982280
+  version_requirements: *12143760
 description: Like simple_form or formtastic, it aims to handle easily forms but taking
   in account AJAX and HTML5 on depending fields mainly.
 email: brice.texier@ekylibre.org
@@ -209,7 +209,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1168190452550627795
+      hash: 4163298408554769936
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -218,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Simple form DSL with dynamic interactions for Rails