lolita 3.0.7 → 3.1.0

data/public/javascripts/lolita/tab.js

@@ -13,6 +13,11 @@ $(function(){
       data:data,
       success:function(data){
         $("#content").html(data);
+      },
+      error:function(xhr, textStatus, errorThrown){
+        f = $("#flash");
+        f.html("<span style='color:red'>An Error occured, please contact support personel</span>");
+        f.slideDown("fast")
       }
     })
   }

data/public/javascripts/rails.js

@@ -1,137 +1,137 @@
-/**
- * Unobtrusive scripting adapter for jQuery
- *
- * Requires jQuery 1.4.3 or later.
- * https://github.com/rails/jquery-ujs
- */
-
-(function($) {
-	// Triggers an event on an element and returns the event result
-	function fire(obj, name, data) {
-		var event = new $.Event(name);
-		obj.trigger(event, data);
-		return event.result !== false;
-	}
-
-	// Submits "remote" forms and links with ajax
-	function handleRemote(element) {
-		var method, url, data,
-			dataType = element.attr('data-type') || ($.ajaxSettings && $.ajaxSettings.dataType);
-
-		if (element.is('form')) {
-			method = element.attr('method');
-			url = element.attr('action');
-			data = element.serializeArray();
-			// memoized value from clicked submit button
-			var button = element.data('ujs:submit-button');
-			if (button) {
-				data.push(button);
-				element.data('ujs:submit-button', null);
-			}
-		} else {
-			method = element.attr('data-method');
-			url = element.attr('href');
-			data = null;
-		}
-
-		$.ajax({
-			url: url, type: method || 'GET', data: data, dataType: dataType,
-			// stopping the "ajax:beforeSend" event will cancel the ajax request
-			beforeSend: function(xhr, settings) {
-				if (settings.dataType === undefined) {
-					xhr.setRequestHeader('accept', '*/*;q=0.5, ' + settings.accepts.script);
-				}
-				return fire(element, 'ajax:beforeSend', [xhr, settings]);
-			},
-			success: function(data, status, xhr) {
-				element.trigger('ajax:success', [data, status, xhr]);
-			},
-			complete: function(xhr, status) {
-				element.trigger('ajax:complete', [xhr, status]);
-			},
-			error: function(xhr, status, error) {
-				element.trigger('ajax:error', [xhr, status, error]);
-			}
-		});
-	}
-
-	// Handles "data-method" on links such as:
-	// <a href="/users/5" data-method="delete" rel="nofollow" data-confirm="Are you sure?">Delete</a>
-	function handleMethod(link) {
-		var href = link.attr('href'),
-			method = link.attr('data-method'),
-			csrf_token = $('meta[name=csrf-token]').attr('content'),
-			csrf_param = $('meta[name=csrf-param]').attr('content'),
-			form = $('<form method="post" action="' + href + '"></form>'),
-			metadata_input = '<input name="_method" value="' + method + '" type="hidden" />';
-
-		if (csrf_param !== undefined && csrf_token !== undefined) {
-			metadata_input += '<input name="' + csrf_param + '" value="' + csrf_token + '" type="hidden" />';
-		}
-
-		form.hide().append(metadata_input).appendTo('body');
-		form.submit();
-	}
-
-	function disableFormElements(form) {
-		form.find('input[data-disable-with]').each(function() {
-			var input = $(this);
-			input.data('ujs:enable-with', input.val())
-				.val(input.attr('data-disable-with'))
-				.attr('disabled', 'disabled');
-		});
-	}
-
-	function enableFormElements(form) {
-		form.find('input[data-disable-with]').each(function() {
-			var input = $(this);
-			input.val(input.data('ujs:enable-with')).removeAttr('disabled');
-		});
-	}
-
-	function allowAction(element) {
-		var message = element.attr('data-confirm');
-		return !message || (fire(element, 'confirm') && confirm(message));
-	}
-
-	$('a[data-confirm], a[data-method], a[data-remote]').live('click.rails', function(e) {
-		var link = $(this);
-		if (!allowAction(link)) return false;
-
-		if (link.attr('data-remote')) {
-			handleRemote(link);
-			return false;
-		} else if (link.attr('data-method')) {
-			handleMethod(link);
-			return false;
-		}
-	});
-
-	$('form').live('submit.rails', function(e) {
-		var form = $(this);
-		if (!allowAction(form)) return false;
-
-		if (form.attr('data-remote')) {
-			handleRemote(form);
-			return false;
-		} else {
-			disableFormElements(form);
-		}
-	});
-
-	$('form input[type=submit], form button[type=submit], form button:not([type])').live('click.rails', function() {
-		var button = $(this);
-		if (!allowAction(button)) return false;
-		// register the pressed submit button
-		var name = button.attr('name'), data = name ? {name:name, value:button.val()} : null;
-		button.closest('form').data('ujs:submit-button', data);
-	});
-	
-	$('form').live('ajax:beforeSend.rails', function(event) {
-		if (this == event.target) disableFormElements($(this));
-	});
-
-	$('form').live('ajax:complete.rails', function(event) {
-		if (this == event.target) enableFormElements($(this));
-	});
-})( jQuery );
+/**
+ * Unobtrusive scripting adapter for jQuery
+ *
+ * Requires jQuery 1.4.3 or later.
+ * https://github.com/rails/jquery-ujs
+ */
+
+(function($) {
+	// Triggers an event on an element and returns the event result
+	function fire(obj, name, data) {
+		var event = new $.Event(name);
+		obj.trigger(event, data);
+		return event.result !== false;
+	}
+
+	// Submits "remote" forms and links with ajax
+	function handleRemote(element) {
+		var method, url, data,
+			dataType = element.attr('data-type') || ($.ajaxSettings && $.ajaxSettings.dataType);
+
+		if (element.is('form')) {
+			method = element.attr('method');
+			url = element.attr('action');
+			data = element.serializeArray();
+			// memoized value from clicked submit button
+			var button = element.data('ujs:submit-button');
+			if (button) {
+				data.push(button);
+				element.data('ujs:submit-button', null);
+			}
+		} else {
+			method = element.attr('data-method');
+			url = element.attr('href');
+			data = null;
+		}
+
+		$.ajax({
+			url: url, type: method || 'GET', data: data, dataType: dataType,
+			// stopping the "ajax:beforeSend" event will cancel the ajax request
+			beforeSend: function(xhr, settings) {
+				if (settings.dataType === undefined) {
+					xhr.setRequestHeader('accept', '*/*;q=0.5, ' + settings.accepts.script);
+				}
+				return fire(element, 'ajax:beforeSend', [xhr, settings]);
+			},
+			success: function(data, status, xhr) {
+				element.trigger('ajax:success', [data, status, xhr]);
+			},
+			complete: function(xhr, status) {
+				element.trigger('ajax:complete', [xhr, status]);
+			},
+			error: function(xhr, status, error) {
+				element.trigger('ajax:error', [xhr, status, error]);
+			}
+		});
+	}
+
+	// Handles "data-method" on links such as:
+	// <a href="/users/5" data-method="delete" rel="nofollow" data-confirm="Are you sure?">Delete</a>
+	function handleMethod(link) {
+		var href = link.attr('href'),
+			method = link.attr('data-method'),
+			csrf_token = $('meta[name=csrf-token]').attr('content'),
+			csrf_param = $('meta[name=csrf-param]').attr('content'),
+			form = $('<form method="post" action="' + href + '"></form>'),
+			metadata_input = '<input name="_method" value="' + method + '" type="hidden" />';
+
+		if (csrf_param !== undefined && csrf_token !== undefined) {
+			metadata_input += '<input name="' + csrf_param + '" value="' + csrf_token + '" type="hidden" />';
+		}
+
+		form.hide().append(metadata_input).appendTo('body');
+		form.submit();
+	}
+
+	function disableFormElements(form) {
+		form.find('input[data-disable-with]').each(function() {
+			var input = $(this);
+			input.data('ujs:enable-with', input.val())
+				.val(input.attr('data-disable-with'))
+				.attr('disabled', 'disabled');
+		});
+	}
+
+	function enableFormElements(form) {
+		form.find('input[data-disable-with]').each(function() {
+			var input = $(this);
+			input.val(input.data('ujs:enable-with')).removeAttr('disabled');
+		});
+	}
+
+	function allowAction(element) {
+		var message = element.attr('data-confirm');
+		return !message || (fire(element, 'confirm') && confirm(message));
+	}
+
+	$('a[data-confirm], a[data-method], a[data-remote]').live('click.rails', function(e) {
+		var link = $(this);
+		if (!allowAction(link)) return false;
+
+		if (link.attr('data-remote')) {
+			handleRemote(link);
+			return false;
+		} else if (link.attr('data-method')) {
+			handleMethod(link);
+			return false;
+		}
+	});
+
+	$('form').live('submit.rails', function(e) {
+		var form = $(this);
+		if (!allowAction(form)) return false;
+
+		if (form.attr('data-remote')) {
+			handleRemote(form);
+			return false;
+		} else {
+			disableFormElements(form);
+		}
+	});
+
+	$('form input[type=submit], form button[type=submit], form button:not([type])').live('click.rails', function() {
+		var button = $(this);
+		if (!allowAction(button)) return false;
+		// register the pressed submit button
+		var name = button.attr('name'), data = name ? {name:name, value:button.val()} : null;
+		button.closest('form').data('ujs:submit-button', data);
+	});
+	
+	$('form').live('ajax:beforeSend.rails', function(event) {
+		if (this == event.target) disableFormElements($(this));
+	});
+
+	$('form').live('ajax:complete.rails', function(event) {
+		if (this == event.target) enableFormElements($(this));
+	});
+})( jQuery );

data/public/stylesheets/lolita/style.css

@@ -42,7 +42,7 @@ header nav .username {margin-right: 15px;}
   padding: 5px 10px;
 }
 #main .box form .field-value { margin-top: 5px;}
-#main .box form .field-value input {
+#main .box form .field-value input, #main .box form .field-value textarea {
   border: 1px solid #cdcdcd;
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
@@ -65,6 +65,8 @@ header nav .username {margin-right: 15px;}
 /* error fields and notifications */
 .field_with_errors input,
 .field_with_errors textarea {background: #ffe6e7;}
+.inline-errors {padding-top: 3px; color:#F66; font-size: 110%;}
+.errorExplanation {color:#F66; font-size: 110%; padding:25px 25px 0; background:white;}
 
 #flash {
   position: fixed;

data/spec/builder_spec.rb

@@ -0,0 +1,42 @@
+require File.expand_path(File.dirname(__FILE__) + '/simple_spec_helper')
+
+class SimpleObject 
+  include Lolita::Builder
+end
+
+describe Lolita::Builder do
+
+  let(:object){SimpleObject.new}
+
+  describe "#build" do
+    it "should return default component information when no params passed" do
+      info=object.build
+      info.first.should == :"/simple_object"
+      info[1].should == :display
+      info.last.should have_key(:simple_object)
+    end
+
+    context "with instance builder" do
+      it "should use given one" do
+        object.builder="custom"
+        info=object.build
+        info.first.should==:"/simple_object/custom"
+        info[1].should == :display
+      end
+
+      it "should use that what #build receive" do
+        object.builder="custom"
+        info=object.build("other")
+        info.first.should == :"/simple_object/other"
+        info[1].should == :display
+      end
+    end
+
+    it "should accept empty name" do
+      info=object.build("",:list)
+      info.first.should == :"/simple_object"
+      info[1].should == :list
+    end
+
+  end
+end

data/spec/configuration/field_spec.rb

@@ -6,30 +6,32 @@ describe Lolita::Configuration::Field do
     @dbi2=Lolita::DBI::Base.new(Comment)
   end
 
+  let(:field_class){Lolita::Configuration::Field::Base}
+
   it "should create new field" do
-    Lolita::Configuration::Field.new(@dbi,:title)
+    Lolita::Configuration::Field::Base.new(@dbi,:title)
   end
 
   it "should create field when block given" do
-    field=Lolita::Configuration::Field.new(@dbi) do
+    field=field_class.new(@dbi) do
       name :title
     end
     field.name.should == :title
   end
 
   it "should create field from Hash arguments" do
-    field=Lolita::Configuration::Field.new(@dbi,:name=>:title)
+    field=field_class.new(@dbi,:name=>:title)
     field.name.should == :title
   end
   
   it "should raise error when no name specified" do
     lambda{
-      Lolita::Configuration::Field.new(@dbi)
+     field_class.new(@dbi)
     }.should raise_error Lolita::FieldNameError
   end
 
   it "should allow set field value" do
-    field=Lolita::Configuration::Field.new(@dbi) do
+    field=field_class.new(@dbi) do
       name :custom_field
       value "Field value"
     end
@@ -37,7 +39,7 @@ describe Lolita::Configuration::Field do
   end
 
   it "should allow set field value as block" do
-    field=Lolita::Configuration::Field.new(@dbi) do
+    field=field_class.new(@dbi) do
       value do |field|
         field.name.to_s.upcase
       end
@@ -54,54 +56,63 @@ describe Lolita::Configuration::Field do
   end
   
   it "should always set field title if not specified" do
-    field=Lolita::Configuration::Field.new(@dbi,:title)
+    field=field_class.new(@dbi,:title)
     field.title.size.should > 0
   end
 
   it "should raise error when field is nested in class that do not reference to field class" do
     lambda{
-      field=Lolita::Configuration::Field.new(@dbi,:title,:nested_in=>Lolita::DBI::Base.new(Address))
+      field=field_class.new(@dbi,:title,:nested_in=>Lolita::DBI::Base.new(Address))
     }.should raise_error Lolita::ReferenceError
   end
 
   it "should detect if field is nested in" do
-    field=Lolita::Configuration::Field.new(@dbi2,:body,:nested_in=>@dbi)
+    field=field_class.new(@dbi2,:body,:nested_in=>@dbi)
     field.nested?.should be_true
   end
 
   it "should detect if field is nested in given class" do
-    field=Lolita::Configuration::Field.new(@dbi2,:body,:nested_in=>@dbi)
+    field=field_class.new(@dbi2,:body,:nested_in=>@dbi)
     field.nested_in?(@dbi.klass).should be_true
   end
 
   it "should return field value" do
     post=Post.create!(:title=>"First post")
-    field=Lolita::Configuration::Field.new(@dbi,:title,:record=>post)
+    field=field_class.new(@dbi,:title,:record=>post)
     field.value.should==post.title
   end
 
-  it "should set field type when not specified" do
-    field=Lolita::Configuration::Field.add(@dbi,:title)
-    field.type.should == "string"
+  it "should detect type and create field with specified type" do
+    require "rails_app/lib/lolita/configuration/field/my_custom_collection"
+    field=Lolita::Configuration::Field.add(@dbi,:comments, :my_custom_collection)
+    field.type.should == "my_custom_collection"
+  end
+
+  it "should fallback to string type if given type is not supported" do
+    field=Lolita::Configuration::Field.add(@dbi,:is_public)
+    field.type.should == "boolean"
+  end
+
+  it "should change field type for association columns if custom type is given" do
+
   end
 
   it "should set field title when not specified" do
-    field=Lolita::Configuration::Field.new(@dbi,:title)
+    field=field_class.new(@dbi,:title)
     field.title.should == "Title"
   end
 
   it "should allow set field that is referenced in (belongs_to) any class" do
     field=Lolita::Configuration::Field.add(@dbi2,:post)
-    field.type.should == "collection"
+    field.type.should == "array"
     field.association_type.should == :one
   end
 
   it "should allow set field that references to (has_many or has_one) any class" do
     field=Lolita::Configuration::Field.add(@dbi,:comments)
-    field.type.should == "collection"
+    field.type.should == "array"
     field.association_type.should == :many
   end
 
-  
 end