lolita 3.2.0.rc.6 → 3.2.0.rc.7

data/spec/configuration/field_spec.rb

@@ -85,5 +85,22 @@ describe Lolita::Configuration::Field do
     field.association.macro.should == :many
   end
 
+  it "should use detect field state matches record state" do
+    field = Lolita::Configuration::Factory::Field.add(@dbi, :title, :string, :on => :create)
+    field2 = Lolita::Configuration::Factory::Field.add(@dbi, :title, :string, :on => [:update])
+    field3 = Lolita::Configuration::Factory::Field.add(@dbi, :title, :string)
+    field4 = Lolita::Configuration::Factory::Field.add(@dbi, :title, :string, :on => Proc.new{|rec| rec.title == "title"})
+    record = @dbi.klass.new
+    field.match_state_of?(record).should be_true
+    field2.match_state_of?(record).should_not be_true
+    field3.match_state_of?(record).should be_true
+    field4.match_state_of?(record).should_not be_true
+    record2 = @dbi.klass.create!(:title => "title")
+    field.match_state_of?(record2).should_not be_true
+    field2.match_state_of?(record2).should be_true
+    field3.match_state_of?(record2).should be_true
+    field4.match_state_of?(record2).should be_true
+  end
+
 end
 

data/vendor/assets/javascripts/application_vendor_lolita.js

@@ -2,4 +2,5 @@
 //= require tinymce-jquery
 //= require modernizr_1_7_min
 //= require tinymce_config
+//= require jquery-numeric
 //= require_self

data/vendor/assets/javascripts/jquery-numeric.js

@@ -0,0 +1,280 @@
+/*
+ *
+ * Copyright (c) 2006-2011 Sam Collett (http://www.texotela.co.uk)
+ * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)
+ * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
+ * 
+ * Version 1.3.1
+ * Demo: http://www.texotela.co.uk/code/jquery/numeric/
+ *
+ */
+(function($) {
+/*
+ * Allows only valid characters to be entered into input boxes.
+ * Note: fixes value when pasting via Ctrl+V, but not when using the mouse to paste
+  *      side-effect: Ctrl+A does not work, though you can still use the mouse to select (or double-click to select all)
+ *
+ * @name     numeric
+ * @param    config      { decimal : "." , negative : true }
+ * @param    callback     A function that runs if the number is not valid (fires onblur)
+ * @author   Sam Collett (http://www.texotela.co.uk)
+ * @example  $(".numeric").numeric();
+ * @example  $(".numeric").numeric(","); // use , as separater
+ * @example  $(".numeric").numeric({ decimal : "," }); // use , as separator
+ * @example  $(".numeric").numeric({ negative : false }); // do not allow negative values
+ * @example  $(".numeric").numeric(null, callback); // use default values, pass on the 'callback' function
+ *
+ */
+$.fn.numeric = function(config, callback)
+{
+  if(typeof config === 'boolean')
+  {
+    config = { decimal: config };
+  }
+  config = config || {};
+  // if config.negative undefined, set to true (default is to allow negative numbers)
+  if(typeof config.negative == "undefined") config.negative = true;
+  // set decimal point
+  var decimal = (config.decimal === false) ? "" : config.decimal || ".";
+  // allow negatives
+  var negative = (config.negative === true) ? true : false;
+  // callback function
+  var callback = typeof callback == "function" ? callback : function(){};
+  // set data and methods
+  return this.data("numeric.decimal", decimal).data("numeric.negative", negative).data("numeric.callback", callback).keypress($.fn.numeric.keypress).keyup($.fn.numeric.keyup).blur($.fn.numeric.blur);
+}
+
+$.fn.numeric.keypress = function(e)
+{
+  // get decimal character and determine if negatives are allowed
+  var decimal = $.data(this, "numeric.decimal");
+  var negative = $.data(this, "numeric.negative");
+  // get the key that was pressed
+  var key = e.charCode ? e.charCode : e.keyCode ? e.keyCode : 0;
+  // allow enter/return key (only when in an input box)
+  if(key == 13 && this.nodeName.toLowerCase() == "input")
+  {
+    return true;
+  }
+  else if(key == 13)
+  {
+    return false;
+  }
+  var allow = false;
+  // allow Ctrl+A
+  if((e.ctrlKey && key == 97 /* firefox */) || (e.ctrlKey && key == 65) /* opera */) return true;
+  // allow Ctrl+X (cut)
+  if((e.ctrlKey && key == 120 /* firefox */) || (e.ctrlKey && key == 88) /* opera */) return true;
+  // allow Ctrl+C (copy)
+  if((e.ctrlKey && key == 99 /* firefox */) || (e.ctrlKey && key == 67) /* opera */) return true;
+  // allow Ctrl+Z (undo)
+  if((e.ctrlKey && key == 122 /* firefox */) || (e.ctrlKey && key == 90) /* opera */) return true;
+  // allow or deny Ctrl+V (paste), Shift+Ins
+  if((e.ctrlKey && key == 118 /* firefox */) || (e.ctrlKey && key == 86) /* opera */
+  || (e.shiftKey && key == 45)) return true;
+  // if a number was not pressed
+  if(key < 48 || key > 57)
+  {
+    var value = $(this).val();
+    /* '-' only allowed at start and if negative numbers allowed */
+    if(value.indexOf("-") != 0 && negative && key == 45 && (value.length == 0 || ($.fn.getSelectionStart(this)) == 0)) return true;
+    /* only one decimal separator allowed */
+    if(decimal && key == decimal.charCodeAt(0) && value.indexOf(decimal) != -1)
+    {
+      allow = false;
+    }
+    // check for other keys that have special purposes
+    if(
+      key != 8 /* backspace */ &&
+      key != 9 /* tab */ &&
+      key != 13 /* enter */ &&
+      key != 35 /* end */ &&
+      key != 36 /* home */ &&
+      key != 37 /* left */ &&
+      key != 39 /* right */ &&
+      key != 46 /* del */
+    )
+    {
+      allow = false;
+    }
+    else
+    {
+      // for detecting special keys (listed above)
+      // IE does not support 'charCode' and ignores them in keypress anyway
+      if(typeof e.charCode != "undefined")
+      {
+        // special keys have 'keyCode' and 'which' the same (e.g. backspace)
+        if(e.keyCode == e.which && e.which != 0)
+        {
+          allow = true;
+          // . and delete share the same code, don't allow . (will be set to true later if it is the decimal point)
+          if(e.which == 46) allow = false;
+        }
+        // or keyCode != 0 and 'charCode'/'which' = 0
+        else if(e.keyCode != 0 && e.charCode == 0 && e.which == 0)
+        {
+          allow = true;
+        }
+      }
+    }
+    // if key pressed is the decimal and it is not already in the field
+    if(decimal && key == decimal.charCodeAt(0))
+    {
+      if(value.indexOf(decimal) == -1)
+      {
+        allow = true;
+      }
+      else
+      {
+        allow = false;
+      }
+    }
+  }
+  else
+  {
+    allow = true;
+  }
+  return allow;
+}
+
+$.fn.numeric.keyup = function(e)
+{
+  var val = $(this).value;
+  if(val && val.length > 0)
+  {
+    // get carat (cursor) position
+    var carat = $.fn.getSelectionStart(this);
+    // get decimal character and determine if negatives are allowed
+    var decimal = $.data(this, "numeric.decimal");
+    var negative = $.data(this, "numeric.negative");
+    
+    // prepend a 0 if necessary
+    if(decimal != "")
+    {
+      // find decimal point
+      var dot = val.indexOf(decimal);
+      // if dot at start, add 0 before
+      if(dot == 0)
+      {
+        this.value = "0" + val;
+      }
+      // if dot at position 1, check if there is a - symbol before it
+      if(dot == 1 && val.charAt(0) == "-")
+      {
+        this.value = "-0" + val.substring(1);
+      }
+      val = this.value;
+    }
+    
+    // if pasted in, only allow the following characters
+    var validChars = [0,1,2,3,4,5,6,7,8,9,'-',decimal];
+    // get length of the value (to loop through)
+    var length = val.length;
+    // loop backwards (to prevent going out of bounds)
+    for(var i = length - 1; i >= 0; i--)
+    {
+      var ch = val.charAt(i);
+      // remove '-' if it is in the wrong place
+      if(i != 0 && ch == "-")
+      {
+        val = val.substring(0, i) + val.substring(i + 1);
+      }
+      // remove character if it is at the start, a '-' and negatives aren't allowed
+      else if(i == 0 && !negative && ch == "-")
+      {
+        val = val.substring(1);
+      }
+      var validChar = false;
+      // loop through validChars
+      for(var j = 0; j < validChars.length; j++)
+      {
+        // if it is valid, break out the loop
+        if(ch == validChars[j])
+        {
+          validChar = true;
+          break;
+        }
+      }
+      // if not a valid character, or a space, remove
+      if(!validChar || ch == " ")
+      {
+        val = val.substring(0, i) + val.substring(i + 1);
+      }
+    }
+    // remove extra decimal characters
+    var firstDecimal = val.indexOf(decimal);
+    if(firstDecimal > 0)
+    {
+      for(var i = length - 1; i > firstDecimal; i--)
+      {
+        var ch = val.charAt(i);
+        // remove decimal character
+        if(ch == decimal)
+        {
+          val = val.substring(0, i) + val.substring(i + 1);
+        }
+      }
+    }
+    // set the value and prevent the cursor moving to the end
+    this.value = val;
+    $.fn.setSelection(this, carat);
+  }
+}
+
+$.fn.numeric.blur = function()
+{
+  var decimal = $.data(this, "numeric.decimal");
+  var callback = $.data(this, "numeric.callback");
+  var val = this.value;
+  if(val != "")
+  {
+    var re = new RegExp("^\\d+$|\\d*" + decimal + "\\d+");
+    if(!re.exec(val))
+    {
+      callback.apply(this);
+    }
+  }
+}
+
+$.fn.removeNumeric = function()
+{
+  return this.data("numeric.decimal", null).data("numeric.negative", null).data("numeric.callback", null).unbind("keypress", $.fn.numeric.keypress).unbind("blur", $.fn.numeric.blur);
+}
+
+// Based on code from http://javascript.nwbox.com/cursor_position/ (Diego Perini <dperini@nwbox.com>)
+$.fn.getSelectionStart = function(o)
+{
+  if (o.createTextRange)
+  {
+    var r = document.selection.createRange().duplicate();
+    r.moveEnd('character', o.value.length);
+    if (r.text == '') return o.value.length;
+    return o.value.lastIndexOf(r.text);
+  } else return o.selectionStart;
+}
+
+// set the selection, o is the object (input), p is the position ([start, end] or just start)
+$.fn.setSelection = function(o, p)
+{
+  // if p is number, start and end are the same
+  if(typeof p == "number") p = [p, p];
+  // only set if p is an array of length 2
+  if(p && p.constructor == Array && p.length == 2)
+  {
+    if (o.createTextRange)
+    {
+      var r = o.createTextRange();
+      r.collapse(true);
+      r.moveStart('character', p[0]);
+      r.moveEnd('character', p[1]);
+      r.select();
+    }
+    else if(o.setSelectionRange)
+    {
+      o.focus();
+      o.setSelectionRange(p[0], p[1]);
+    }
+  }
+}
+
+})(jQuery);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolita
 version: !ruby/object:Gem::Version
-  version: 3.2.0.rc.6
+  version: 3.2.0.rc.7
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-15 00:00:00.000000000Z
+date: 2011-12-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &81650440 !ruby/object:Gem::Requirement
+  requirement: &75378760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *81650440
+  version_requirements: *75378760
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &81649550 !ruby/object:Gem::Requirement
+  requirement: &75378360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.12.4
   type: :runtime
   prerelease: false
-  version_requirements: *81649550
+  version_requirements: *75378360
 - !ruby/object:Gem::Dependency
   name: abstract
-  requirement: &81649000 !ruby/object:Gem::Requirement
+  requirement: &75377990 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *81649000
+  version_requirements: *75377990
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &81648580 !ruby/object:Gem::Requirement
+  requirement: &75377620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *81648580
+  version_requirements: *75377620
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &81648060 !ruby/object:Gem::Requirement
+  requirement: &75377200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 3.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *81648060
+  version_requirements: *75377200
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &81647160 !ruby/object:Gem::Requirement
+  requirement: &75376810 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *81647160
+  version_requirements: *75376810
 - !ruby/object:Gem::Dependency
   name: tinymce-rails
-  requirement: &81646590 !ruby/object:Gem::Requirement
+  requirement: &75376350 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *81646590
+  version_requirements: *75376350
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &81636600 !ruby/object:Gem::Requirement
+  requirement: &75375950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *81636600
+  version_requirements: *75375950
 - !ruby/object:Gem::Dependency
   name: metric_fu
-  requirement: &81636070 !ruby/object:Gem::Requirement
+  requirement: &75375560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81636070
+  version_requirements: *75375560
 - !ruby/object:Gem::Dependency
   name: fattr
-  requirement: &81635270 !ruby/object:Gem::Requirement
+  requirement: &75375150 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81635270
+  version_requirements: *75375150
 - !ruby/object:Gem::Dependency
   name: arrayfields
-  requirement: &81634880 !ruby/object:Gem::Requirement
+  requirement: &75374740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81634880
+  version_requirements: *75374740
 - !ruby/object:Gem::Dependency
   name: map
-  requirement: &81634350 !ruby/object:Gem::Requirement
+  requirement: &75374240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81634350
+  version_requirements: *75374240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &81633760 !ruby/object:Gem::Requirement
+  requirement: &75373840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *81633760
+  version_requirements: *75373840
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &81633230 !ruby/object:Gem::Requirement
+  requirement: &75373470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +164,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *81633230
+  version_requirements: *75373470
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &81632560 !ruby/object:Gem::Requirement
+  requirement: &75369950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81632560
+  version_requirements: *75369950
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &81631820 !ruby/object:Gem::Requirement
+  requirement: &75369390 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81631820
+  version_requirements: *75369390
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &81631090 !ruby/object:Gem::Requirement
+  requirement: &75368900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81631090
+  version_requirements: *75368900
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &81630440 !ruby/object:Gem::Requirement
+  requirement: &75368420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,7 +208,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81630440
+  version_requirements: *75368420
 description: ! 'Great Rails CMS, that turns your business logic into good-looking,
   fully functional workspace. '
 email: support@ithouse.lv
@@ -228,8 +228,23 @@ files:
 - Rakefile
 - VERSION
 - app/assets/images/lolita/favicon.ico
+- app/assets/images/lolita/jquery-ui/images/ui-bg_flat_0_aaaaaa_40x100.png
+- app/assets/images/lolita/jquery-ui/images/ui-bg_flat_55_fbec88_40x100.png
+- app/assets/images/lolita/jquery-ui/images/ui-bg_glass_95_fef1ec_1x400.png
+- app/assets/images/lolita/jquery-ui/images/ui-bg_highlight-soft_45_676767_1x100.png
+- app/assets/images/lolita/jquery-ui/images/ui-bg_highlight-soft_75_e3e3e3_1x100.png
+- app/assets/images/lolita/jquery-ui/images/ui-bg_highlight-soft_85_f3f3f3_1x100.png
+- app/assets/images/lolita/jquery-ui/images/ui-bg_inset-hard_100_d7d7d7_1x100.png
+- app/assets/images/lolita/jquery-ui/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
+- app/assets/images/lolita/jquery-ui/images/ui-icons_7ac1ed_256x240.png
+- app/assets/images/lolita/jquery-ui/images/ui-icons_a1a1a1_256x240.png
+- app/assets/images/lolita/jquery-ui/images/ui-icons_cd0a0a_256x240.png
+- app/assets/images/lolita/jquery-ui/images/ui-icons_d8e7f3_256x240.png
+- app/assets/images/lolita/large-ajax-loader.gif
 - app/assets/images/lolita/plus.png
 - app/assets/images/lolita/search_icon.png
+- app/assets/images/lolita/small-ajax-loader.gif
+- app/assets/images/lolita/trash-small.png
 - app/assets/javascripts/lolita/application.js
 - app/assets/javascripts/lolita/base64.js
 - app/assets/javascripts/lolita/main.js
@@ -238,6 +253,7 @@ files:
 - app/assets/stylesheets/lolita/PIE.htc
 - app/assets/stylesheets/lolita/application.css
 - app/assets/stylesheets/lolita/default.css.erb
+- app/assets/stylesheets/lolita/jquery-ui-1.8.16.lolita.css.erb
 - app/assets/stylesheets/lolita/style.css.erb
 - app/controllers/lolita/field_data_controller.rb
 - app/controllers/lolita/info_controller.rb
@@ -260,9 +276,10 @@ files:
 - app/views/components/lolita/configuration/field/_label.html.erb
 - app/views/components/lolita/configuration/field/_object.html.erb
 - app/views/components/lolita/configuration/field/array/_display.html.erb
+- app/views/components/lolita/configuration/field/array/autocomplete/_display.html.haml
+- app/views/components/lolita/configuration/field/array/autocomplete/_input.html.haml
+- app/views/components/lolita/configuration/field/array/checkbox/_display.html.haml
 - app/views/components/lolita/configuration/field/array/filter/_display.html.erb
-- app/views/components/lolita/configuration/field/array/habtm/_display.html.haml
-- app/views/components/lolita/configuration/field/array/habtm_autocomplete/_display.html.haml
 - app/views/components/lolita/configuration/field/array/polymorphic/_display.html.haml
 - app/views/components/lolita/configuration/field/array/polymorphic/_options_for_select.html.haml
 - app/views/components/lolita/configuration/field/array/select/_display.html.erb
@@ -302,6 +319,7 @@ files:
 - app/views/components/lolita/shared/_flash.html.erb
 - app/views/components/lolita/shared/_header.html.erb
 - app/views/components/lolita/shared/_right_sidebar.html.erb
+- app/views/components/lolita/shared/_save_button.html.erb
 - app/views/kaminari/lolita/_first_page.html.erb
 - app/views/kaminari/lolita/_gap.html.erb
 - app/views/kaminari/lolita/_last_page.html.erb
@@ -389,7 +407,6 @@ files:
 - lib/lolita/system_configuration/base.rb
 - lib/lolita/test/matchers.rb
 - lolita.gemspec
-- lolita.gemspec.orig
 - spec/adapter_helper.rb
 - spec/builder_spec.rb
 - spec/configuration/base_spec.rb
@@ -502,7 +519,7 @@ files:
 - spec/support/factories/tag.rb
 - spec/support/formatter_spec.rb
 - vendor/assets/javascripts/application_vendor_lolita.js
-- vendor/assets/javascripts/jquery-ui-1.8.13.min.js
+- vendor/assets/javascripts/jquery-numeric.js
 - vendor/assets/javascripts/modernizr_1_7_min.js
 - vendor/assets/javascripts/tinymce/themes/advanced/skins/cirkuit/content.css
 - vendor/assets/javascripts/tinymce/themes/advanced/skins/cirkuit/dialog.css
@@ -536,7 +553,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -688556255
+      hash: 367958319
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: