lolita 3.1.5 → 3.1.6

data/public/javascripts/tinymce/utils/validate.js

@@ -0,0 +1,252 @@
+/**
+ * validate.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+/**
+	// String validation:
+
+	if (!Validator.isEmail('myemail'))
+		alert('Invalid email.');
+
+	// Form validation:
+
+	var f = document.forms['myform'];
+
+	if (!Validator.isEmail(f.myemail))
+		alert('Invalid email.');
+*/
+
+var Validator = {
+	isEmail : function(s) {
+		return this.test(s, '^[-!#$%&\'*+\\./0-9=?A-Z^_`a-z{|}~]+@[-!#$%&\'*+\\/0-9=?A-Z^_`a-z{|}~]+\.[-!#$%&\'*+\\./0-9=?A-Z^_`a-z{|}~]+$');
+	},
+
+	isAbsUrl : function(s) {
+		return this.test(s, '^(news|telnet|nttp|file|http|ftp|https)://[-A-Za-z0-9\\.]+\\/?.*$');
+	},
+
+	isSize : function(s) {
+		return this.test(s, '^[0-9.]+(%|in|cm|mm|em|ex|pt|pc|px)?$');
+	},
+
+	isId : function(s) {
+		return this.test(s, '^[A-Za-z_]([A-Za-z0-9_])*$');
+	},
+
+	isEmpty : function(s) {
+		var nl, i;
+
+		if (s.nodeName == 'SELECT' && s.selectedIndex < 1)
+			return true;
+
+		if (s.type == 'checkbox' && !s.checked)
+			return true;
+
+		if (s.type == 'radio') {
+			for (i=0, nl = s.form.elements; i<nl.length; i++) {
+				if (nl[i].type == "radio" && nl[i].name == s.name && nl[i].checked)
+					return false;
+			}
+
+			return true;
+		}
+
+		return new RegExp('^\\s*$').test(s.nodeType == 1 ? s.value : s);
+	},
+
+	isNumber : function(s, d) {
+		return !isNaN(s.nodeType == 1 ? s.value : s) && (!d || !this.test(s, '^-?[0-9]*\\.[0-9]*$'));
+	},
+
+	test : function(s, p) {
+		s = s.nodeType == 1 ? s.value : s;
+
+		return s == '' || new RegExp(p).test(s);
+	}
+};
+
+var AutoValidator = {
+	settings : {
+		id_cls : 'id',
+		int_cls : 'int',
+		url_cls : 'url',
+		number_cls : 'number',
+		email_cls : 'email',
+		size_cls : 'size',
+		required_cls : 'required',
+		invalid_cls : 'invalid',
+		min_cls : 'min',
+		max_cls : 'max'
+	},
+
+	init : function(s) {
+		var n;
+
+		for (n in s)
+			this.settings[n] = s[n];
+	},
+
+	validate : function(f) {
+		var i, nl, s = this.settings, c = 0;
+
+		nl = this.tags(f, 'label');
+		for (i=0; i<nl.length; i++) {
+			this.removeClass(nl[i], s.invalid_cls);
+			nl[i].setAttribute('aria-invalid', false);
+		}
+
+		c += this.validateElms(f, 'input');
+		c += this.validateElms(f, 'select');
+		c += this.validateElms(f, 'textarea');
+
+		return c == 3;
+	},
+
+	invalidate : function(n) {
+		this.mark(n.form, n);
+	},
+	
+	getErrorMessages : function(f) {
+		var nl, i, s = this.settings, field, msg, values, messages = [], ed = tinyMCEPopup.editor;
+		nl = this.tags(f, "label");
+		for (i=0; i<nl.length; i++) {
+			if (this.hasClass(nl[i], s.invalid_cls)) {
+				field = document.getElementById(nl[i].getAttribute("for"));
+				values = { field: nl[i].textContent };
+				if (this.hasClass(field, s.min_cls, true)) {
+					message = ed.getLang('invalid_data_min');
+					values.min = this.getNum(field, s.min_cls);
+				} else if (this.hasClass(field, s.number_cls)) {
+					message = ed.getLang('invalid_data_number');
+				} else if (this.hasClass(field, s.size_cls)) {
+					message = ed.getLang('invalid_data_size');
+				} else {
+					message = ed.getLang('invalid_data');
+				}
+				
+				message = message.replace(/{\#([^}]+)\}/g, function(a, b) {
+					return values[b] || '{#' + b + '}';
+				});
+				messages.push(message);
+			}
+		}
+		return messages;
+	},
+
+	reset : function(e) {
+		var t = ['label', 'input', 'select', 'textarea'];
+		var i, j, nl, s = this.settings;
+
+		if (e == null)
+			return;
+
+		for (i=0; i<t.length; i++) {
+			nl = this.tags(e.form ? e.form : e, t[i]);
+			for (j=0; j<nl.length; j++) {
+				this.removeClass(nl[j], s.invalid_cls);
+				nl[j].setAttribute('aria-invalid', false);
+			}
+		}
+	},
+
+	validateElms : function(f, e) {
+		var nl, i, n, s = this.settings, st = true, va = Validator, v;
+
+		nl = this.tags(f, e);
+		for (i=0; i<nl.length; i++) {
+			n = nl[i];
+
+			this.removeClass(n, s.invalid_cls);
+
+			if (this.hasClass(n, s.required_cls) && va.isEmpty(n))
+				st = this.mark(f, n);
+
+			if (this.hasClass(n, s.number_cls) && !va.isNumber(n))
+				st = this.mark(f, n);
+
+			if (this.hasClass(n, s.int_cls) && !va.isNumber(n, true))
+				st = this.mark(f, n);
+
+			if (this.hasClass(n, s.url_cls) && !va.isAbsUrl(n))
+				st = this.mark(f, n);
+
+			if (this.hasClass(n, s.email_cls) && !va.isEmail(n))
+				st = this.mark(f, n);
+
+			if (this.hasClass(n, s.size_cls) && !va.isSize(n))
+				st = this.mark(f, n);
+
+			if (this.hasClass(n, s.id_cls) && !va.isId(n))
+				st = this.mark(f, n);
+
+			if (this.hasClass(n, s.min_cls, true)) {
+				v = this.getNum(n, s.min_cls);
+
+				if (isNaN(v) || parseInt(n.value) < parseInt(v))
+					st = this.mark(f, n);
+			}
+
+			if (this.hasClass(n, s.max_cls, true)) {
+				v = this.getNum(n, s.max_cls);
+
+				if (isNaN(v) || parseInt(n.value) > parseInt(v))
+					st = this.mark(f, n);
+			}
+		}
+
+		return st;
+	},
+
+	hasClass : function(n, c, d) {
+		return new RegExp('\\b' + c + (d ? '[0-9]+' : '') + '\\b', 'g').test(n.className);
+	},
+
+	getNum : function(n, c) {
+		c = n.className.match(new RegExp('\\b' + c + '([0-9]+)\\b', 'g'))[0];
+		c = c.replace(/[^0-9]/g, '');
+
+		return c;
+	},
+
+	addClass : function(n, c, b) {
+		var o = this.removeClass(n, c);
+		n.className = b ? c + (o != '' ? (' ' + o) : '') : (o != '' ? (o + ' ') : '') + c;
+	},
+
+	removeClass : function(n, c) {
+		c = n.className.replace(new RegExp("(^|\\s+)" + c + "(\\s+|$)"), ' ');
+		return n.className = c != ' ' ? c : '';
+	},
+
+	tags : function(f, s) {
+		return f.getElementsByTagName(s);
+	},
+
+	mark : function(f, n) {
+		var s = this.settings;
+
+		this.addClass(n, s.invalid_cls);
+		n.setAttribute('aria-invalid', 'true');
+		this.markLabels(f, n, s.invalid_cls);
+
+		return false;
+	},
+
+	markLabels : function(f, n, ic) {
+		var nl, i;
+
+		nl = this.tags(f, "label");
+		for (i=0; i<nl.length; i++) {
+			if (nl[i].getAttribute("for") == n.id || nl[i].htmlFor == n.id)
+				this.addClass(nl[i], ic);
+		}
+
+		return null;
+	}
+};

data/public/javascripts/tinymce_config.js

@@ -0,0 +1,15 @@
+function load_tinymce(){
+	$("textarea[data-simple!=true]").tinymce({
+		script_url: "/javascripts/tinymce/tiny_mce.js",
+		theme: "advanced",
+		skin: "cirkuit",
+		mode: "textareas",
+		theme_advanced_buttons1 : "bold,italic,underline,|,justifyleft,justifycenter,justifyright,|,formatselect,|,link,unlink,image,code",
+		theme_advanced_buttons2 : "",
+		theme_advanced_buttons3 : "",
+		theme_advanced_toolbar_location: "top",
+		theme_advanced_toolbar_align: "left",
+		// theme_advanced_statusbar_location : "bottom",
+		theme_advanced_resizing: true
+	});
+}

data/spec/configuration/column_spec.rb

@@ -1,10 +1,12 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Lolita::Configuration::Column do
-  let(:column){Lolita::Configuration::Column.new(:col1)}
+  let(:dbi){Lolita::DBI::Base.new(Post)}
+  let(:column){Lolita::Configuration::Column.new(dbi,:col1)}
+  
   
   it "should create new column with Hash attributes" do
-    column=Lolita::Configuration::Column.new(:name=>"col1",:title=>"Col1",:type=>String)
+    column=Lolita::Configuration::Column.new(dbi,:name=>"col1",:title=>"Col1",:type=>String)
     column.name.should == "col1"
   end
 
@@ -14,12 +16,12 @@ describe Lolita::Configuration::Column do
       title "Col one"
       type String
     }
-    column=Lolita::Configuration::Column.new &p
+    column=Lolita::Configuration::Column.new dbi,&p
     column.type.should == String
   end
 
   it "should create new column with block given" do
-    column=Lolita::Configuration::Column.new do
+    column=Lolita::Configuration::Column.new(dbi) do
       name "col1"
       title "Col one"
       type String
@@ -28,27 +30,57 @@ describe Lolita::Configuration::Column do
   end
 
   it "should create new column when String or Symbol is given" do
-    column=Lolita::Configuration::Column.new(:col1)
+    column=Lolita::Configuration::Column.new(dbi,:col1)
     column.name.should == "col1"
-    column=Lolita::Configuration::Column.new("col2")
+    column=Lolita::Configuration::Column.new(dbi,"col2")
     column.name.should == "col2"
   end
   
   it "should raise error when no name is provided for column" do
     lambda{
-      Lolita::Configuration::Column.new do
+      Lolita::Configuration::Column.new(dbi) do
         title "Col one"
       end
     }.should raise_error(ArgumentError, "Column must have name.")
   end
 
-  it "should allow to add formatter" do
+  it "should allow to add formatter with block" do
     column.formatter do|value|
       "value #{value}"
     end
     column.formatter.with("1").should == "value 1"
   end
 
+  it "should allow to add formatter as attribute" do
+    column.type :float
+    column.formatter = "%.3f"
+    column.formatter.with(44.88).should == "44.880"
+  end
+
+  it "should allow to add formatter as attribute with Lolita::Support instance" do
+    column.formatter = Lolita::Support::Formatter.new("%s")
+    column.formatter.is_a?(Lolita::Support::Formatter::Rails).should be_false
+    column.formatter = "%s"
+    column.formatter.is_a?(Lolita::Support::Formatter::Rails).should be_true
+  end
+
+  it "should allow to add formatter as block with Lolita::Support instance" do
+    column=Lolita::Configuration::Column.new(dbi) do
+      name "col1"
+      title "Col one"
+      type String
+      formatter Lolita::Support::Formatter.new("%s")
+    end
+    column.formatter.is_a?(Lolita::Support::Formatter::Rails).should be_false
+    column=Lolita::Configuration::Column.new(dbi) do
+      name "col1"
+      title "Col one"
+      type String
+      formatter "%s"
+    end    
+    column.formatter.is_a?(Lolita::Support::Formatter::Rails).should be_true
+  end
+
   it "should make default formater not defined" do
     column.formatter.with(1).should == 1
   end

data/spec/configuration/columns_spec.rb

@@ -26,7 +26,7 @@ describe Lolita::Configuration::Columns do
   it "should make Lolita::Configuration::Column for each element " do
     columns=Lolita::Configuration::Columns.new(@list)
     columns<<{:name=>"col1"}
-    columns<<Lolita::Configuration::Column.new(:name=>"col2")
+    columns<<Lolita::Configuration::Column.new(@dbi,:name=>"col2")
     columns.first.class.should == Lolita::Configuration::Column
   end
 

data/spec/support/formatter_spec.rb

@@ -35,8 +35,8 @@ describe Lolita::Support::Formatter do
     end
 
     it "should convert received value to string and call #unpack" do
-      formatter=klass.new('C')
-      formatter.with("\100").should == [64]
+      formatter=klass.new("%.3f")
+      formatter.with(44.88).should == "44.880"
     end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: lolita
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.1.5
+  version: 3.1.6
 platform: ruby
 authors: 
 - ITHouse (Latvia) and Arturs Meisters
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-20 00:00:00 +03:00
+date: 2011-05-19 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,9 +73,9 @@ dependencies:
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.2.0
+        version: 2.6.0
   type: :development
   prerelease: false
   version_requirements: *id006
@@ -84,9 +84,9 @@ dependencies:
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.6.0
   type: :development
   prerelease: false
   version_requirements: *id007
@@ -241,7 +241,9 @@ files:
 - app/views/lolita/rest/form.html.erb
 - app/views/lolita/rest/index.html.erb
 - author
+- config/locales/default/lv.yml
 - config/locales/en.yml
+- config/locales/lv.yml
 - db/seed.rb
 - features/create_page.feature
 - features/step_definitions/lolita_steps.rb
@@ -305,7 +307,8 @@ files:
 - lib/lolita/test/matchers.rb
 - lolita.gemspec
 - public/images/lolita/plus.png
-- public/javascripts/jquery-1.5.1.min.js
+- public/javascripts/jquery-1.6.min.js
+- public/javascripts/jquery-ui-1.8.13.min.js
 - public/javascripts/lolita/main.js
 - public/javascripts/lolita/tab.js
 - public/javascripts/modernizr-1.7.min.js
@@ -360,6 +363,11 @@ files:
 - public/javascripts/tinymce/themes/advanced/source_editor.htm
 - public/javascripts/tinymce/tiny_mce.js
 - public/javascripts/tinymce/tiny_mce_popup.js
+- public/javascripts/tinymce/utils/editable_selects.js
+- public/javascripts/tinymce/utils/form_utils.js
+- public/javascripts/tinymce/utils/mctabs.js
+- public/javascripts/tinymce/utils/validate.js
+- public/javascripts/tinymce_config.js
 - public/stylesheets/lolita/default.css
 - public/stylesheets/lolita/style.css
 - spec/adapter_helper.rb
@@ -486,7 +494,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 884824061
+      hash: 354459983
       segments: 
       - 0
       version: "0"