admin_data 1.1.15 → 1.1.16

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    admin_data (1.1.15)
+    admin_data (1.1.16)
       will_paginate (>= 3.0.0)
 
 GEM

data/README.md

@@ -1,12 +1,25 @@
 # admin_data
 
+## Rails 3.0.x
+
 If you are using Rails 3.0.x then use
 
     gem 'admin_data', '= 1.1.14'
 
+## Rails 3.1.x
+
 If you are using Rails 3.1.x then use
 
-    gem 'admin_data', '>= 1.1.15'
+    gem 'admin_data', '>= 1.1.16'
+
+Also add following lines to config/application.rb just below the line that says <tt>config.assets.enabled = true</tt> .
+
+    config.assets.precompile += ['admin_data.css', 'admin_data.js']
+
+Before deploying the code to production execute
+
+    bundle exec rake assets:precompile
+
 
 Live demo is available at http://admin-data-demo.heroku.com/admin_data (read only version)
 

data/app/assets/javascripts/admin_data.js

@@ -0,0 +1,18 @@
+//= require ./vendor/jquery-1.4.2.js
+//= require ./vendor/jquery-ui-1.7.2.custom.min.js
+//= require ./vendor/jquery_form
+//= require ./vendor/log
+//= require ./vendor/rails
+//= require ./misc/drop_down_change
+//= require ./misc/quick_search_input_focus
+//= require ./advance_search/global_ajax_setting
+//= require ./misc/js_util
+//= require ./analytics/report
+//= require ./advance_search/advance_search
+//= require ./advance_search/advance_search_structure
+//= require ./advance_search/ajaxify_advance_search
+//= require ./advance_search/act_on_result
+//= require ./advance_search/build_first_row
+//= require ./advance_search/event_bindings
+//= require ./advance_search/trigger_submit_on_domready
+//= require ./advance_search/sortby

data/app/assets/stylesheets/{base.css → admin_data.css}

@@ -1,3 +1,11 @@
+/*
+ * This is a manifest file that'll automatically include all the stylesheets available in this directory
+ * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
+ * the top of the compiled file, but it's generally better to create a new file per style scope.
+ *= require_self
+ *= require_tree ./vendor
+*/
+
 * {
   margin: 0;
   padding:0

data/app/views/layouts/admin_data.html.erb

@@ -6,36 +6,8 @@
       <%= @page_title.blank? ? 'admin_data' : "#{@page_title} - admin_data" %>
     </title>
 
-    <%= stylesheet_link_tag('vendor/jquery-ui-1.7.2.custom.css') %>
-
-    <%= stylesheet_link_tag('base') %>
-
-    <%= javascript_include_tag('vendor/jquery-1.4.2.js', 'vendor/jquery-ui-1.7.2.custom.min.js') %>
-
-    <%= javascript_include_tag('vendor/jquery_form') %>
-
-    <%= javascript_include_tag('vendor/log',
-                                               'vendor/rails',
-                                               'misc/drop_down_change',
-                                               'misc/quick_search_input_focus',
-                                               'advance_search/global_ajax_setting',
-                                               'misc/js_util') %>
-
-    <% if params[:action] == 'advance_search' %>
-      <%= javascript_include_tag(
-                                                 'advance_search/advance_search',
-                                                 'advance_search/advance_search_structure',
-                                                 'advance_search/ajaxify_advance_search',
-                                                 'advance_search/act_on_result',
-                                                 'advance_search/build_first_row',
-                                                 'advance_search/event_bindings',
-                                                 'advance_search/trigger_submit_on_domready',
-                                                 'advance_search/sortby'
-                                                ) %>
-    <% elsif params[:controller] == 'admin_data/analytics' %>
-      <%= javascript_include_tag('analytics/report') %>
-    <% end %>
-
+    <%= stylesheet_link_tag('admin_data') %>
+    <%= javascript_include_tag('admin_data') %>
     <%= csrf_meta_tag %>
 
   </head>

data/app/views/layouts/search.html.erb

@@ -6,36 +6,8 @@
       <%= @page_title.blank? ? 'admin_data' : "#{@page_title} - admin_data" %>
     </title>
 
-    <%= stylesheet_link_tag('vendor/jquery-ui-1.7.2.custom.css') %>
-
-    <%= stylesheet_link_tag('base') %>
-
-    <%= javascript_include_tag('vendor/jquery-1.4.2.js', 'vendor/jquery-ui-1.7.2.custom.min.js') %>
-
-    <%= javascript_include_tag('vendor/jquery_form') %>
-
-    <%= javascript_include_tag('vendor/log',
-                                               'vendor/rails',
-                                               'misc/drop_down_change',
-                                               'misc/quick_search_input_focus',
-                                               'advance_search/global_ajax_setting',
-                                               'misc/js_util') %>
-
-    <% if params[:action] == 'advance_search' %>
-      <%= javascript_include_tag(
-                                                 'advance_search/advance_search',
-                                                 'advance_search/advance_search_structure',
-                                                 'advance_search/ajaxify_advance_search',
-                                                 'advance_search/act_on_result',
-                                                 'advance_search/build_first_row',
-                                                 'advance_search/event_bindings',
-                                                 'advance_search/trigger_submit_on_domready',
-                                                 'advance_search/sortby'
-                                                ) %>
-    <% elsif params[:controller] == 'admin_data/analytics' %>
-      <%= javascript_include_tag('analytics/report') %>
-    <% end %>
-
+    <%= stylesheet_link_tag('admin_data') %>
+    <%= javascript_include_tag('admin_data') %>
     <%= csrf_meta_tag %>
 
   </head>

data/lib/admin_data/version.rb

@@ -1,3 +1,3 @@
 module AdminData
-  VERSION = '1.1.15'
+  VERSION = '1.1.16'
 end

metadata

@@ -2,7 +2,7 @@
 name: admin_data
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.15
+  version: 1.1.16
 platform: ruby
 authors: 
 - Neeraj Singh
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-17 00:00:00 -04:00
+date: 2011-11-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,6 +47,7 @@ files:
 - app/assets/images/sort_by_asc.jpg
 - app/assets/images/sort_by_desc.jpg
 - app/assets/images/sort_by_nothing.jpg
+- app/assets/javascripts/admin_data.js
 - app/assets/javascripts/advance_search/act_on_result.js
 - app/assets/javascripts/advance_search/advance_search.js
 - app/assets/javascripts/advance_search/advance_search_structure.js
@@ -60,20 +61,13 @@ files:
 - app/assets/javascripts/misc/drop_down_change.js
 - app/assets/javascripts/misc/js_util.js
 - app/assets/javascripts/misc/quick_search_input_focus.js
-- app/assets/javascripts/test/act_on_result.js
-- app/assets/javascripts/test/advance_search.js
-- app/assets/javascripts/test/ajaxify_advance_search.js
-- app/assets/javascripts/test/build_first_row.js
-- app/assets/javascripts/test/event_bindings.js
-- app/assets/javascripts/vendor/jack.js
 - app/assets/javascripts/vendor/jquery-1.4.2.js
 - app/assets/javascripts/vendor/jquery-ui-1.7.2.custom.min.js
 - app/assets/javascripts/vendor/jquery.ba-isjquery.js
 - app/assets/javascripts/vendor/jquery_form.js
 - app/assets/javascripts/vendor/log.js
-- app/assets/javascripts/vendor/qunit.js
 - app/assets/javascripts/vendor/rails.js
-- app/assets/stylesheets/base.css
+- app/assets/stylesheets/admin_data.css
 - app/assets/stylesheets/vendor/jquery-ui-1.7.2.custom.css
 - app/controllers/admin_data/analytics_controller.rb
 - app/controllers/admin_data/application_controller.rb
@@ -222,7 +216,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3555869678715374085
+      hash: -199132812590787471
       segments: 
       - 0
       version: "0"
@@ -231,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3555869678715374085
+      hash: -199132812590787471
       segments: 
       - 0
       version: "0"

data/app/assets/javascripts/test/act_on_result.js

@@ -1,120 +0,0 @@
-module('act_on_result', {
-	teardown: function() {
-		$('#advance_search_delete_all').remove();
-		$('#advance_search_destroy_all').remove();
-		$('#results').remove();
-		$('#advance_search_form').remove();
-	},
-	setup: function() {
-		$(document.body).append($('<a />', {
-			href: '#',
-			id: 'advance_search_delete_all'
-		}));
-
-		$(document.body).append($('<a />', {
-			href: '#',
-			id: 'advance_search_destroy_all'
-		}));
-
-		$(document.body).append($('<div />', {
-			id: 'results'
-		}));
-
-		$(document.body).append($('<div />', {
-			id: 'advance_search_form'
-		}));
-	}
-});
-
-test('invoking success callback', function() {
-	expect(1);
-	AdminData.actOnResult.successCallback({
-		success: 'hello world'
-	});
-	equals('hello world', $('#results').text(), '#results should have text hello world');
-});
-
-test('live clicking #advance_search_delete_all with cancel action', function() {
-	expect(0);
-	jack(function() {
-		jack.expect('AdminData.jsUtil.confirm').once().mock(function() {
-			return false;
-		});
-		//TODO ensure that the value passed to action is delete
-		jack.expect('AdminData.actOnResult.action').exactly('0 time');
-		$('#advance_search_delete_all').trigger('click');
-	});
-});
-
-test('live clicking #advance_search_delete_all', function() {
-	expect(0);
-	var args;
-
-	jack(function() {
-		jack.expect('AdminData.jsUtil.confirm').once().mock(function() {
-			return true;
-		});
-		jack.expect('AdminData.actOnResult.action').once().mock(function(action_type) {
-			args = action_type;
-			return {};
-		});
-		$('#advance_search_delete_all').trigger('click');
-	});
-  equals('delete', args, 'action_type should be delete');
-
-});
-
-test('live clicking #advance_search_destroy_all with cancel action', function() {
-	expect(0);
-	jack(function() {
-		jack.expect('AdminData.jsUtil.confirm').once().mock(function() {
-			return false;
-		});
-		jack.expect('AdminData.actOnResult.action').exactly('0 time');
-		$('#advance_search_destroy_all').trigger('click');
-	});
-});
-
-test('live clicking #advance_search_destroy_all', function() {
-	expect(0);
-	var args;
-
-	jack(function() {
-		jack.expect('AdminData.jsUtil.confirm').once().mock(function() {
-			return true;
-		});
-		jack.expect('AdminData.actOnResult.action').once().mock(function(action_type) {
-			args = action_type;
-			return {};
-		});
-		$('#advance_search_destroy_all').trigger('click');
-	});
-	equals('destroy', args, 'action_type should be destroy');
-});
-
-test('actOnResultAJAX', function() {
-	expect(5);
-	$('#advance_search_form').attr('action', 'http://localhost:3000');
-	$('#advance_search_form').data('admin_data_form_array', [{
-		name: 'foo',
-		value: 'i_am_foo'
-	}]);
-
-	var ajaxArgs;
-
-	jack(function() {
-		jack.expect('$.ajax').once().mock(function(args) {
-			ajaxArgs = args;
-		});
-		AdminData.actOnResult.action('delete');
-	});
-
-	equals('post', ajaxArgs.type, 'ajax arguments should have type as post');
-	equals('json', ajaxArgs.dataType, 'ajax arguments should have json as dataType');
-	equals('http://localhost:3000', ajaxArgs.url, 'ajax arguments should have valid url');
-	var data = ajaxArgs.data;
-	ok(data, 'ajax arguments should have value for key data');
-	equals('foo=i_am_foo&admin_data_advance_search_action_type=delete', data, 'data should have parameterized value');
-
-});
-

data/app/assets/javascripts/test/advance_search.js

@@ -1,80 +0,0 @@
-module('advance_search');
-
-test('buildFirstRow', function() {
-	expect(2);
-	$('#advance_search_table').html('');
-	AdminData.advanceSearch.buildFirstRow();
-	var $a = $('#advance_search_table').find('a');
-	ok($a.hasClass('add_row_link'), 'first row should have anchor element with class remove_row');
-	ok('+', $a.text(), 'first row should have anchor element with text +');
-});
-
-
-test("buildCol1", function() {
-	expect(3);
-
-	var $td = AdminData.advanceSearch.buildCol1();
-	ok($.isjQuery($td), "buildCol1 should return an instance of jQuery");
-
-	var className = $td.find('select').attr('className');
-	equals('col1', className, 'buildCol1 should have select with class col1');
-
-	var countOfOptions = $td.find('select option').length;
-	equals(12, countOfOptions, 'buildCol1 should have select with 12 options');
-});
-
-test("buildCol2", function() {
-	expect(3);
-
-	var $td = AdminData.advanceSearch.buildCol2();
-	ok($.isjQuery($td), "buildCol2 should return an instance of jQuery");
-
-	ok($td.find('select').hasClass('col2'), 'buildCol2 should have class col2');
-	ok($td.find('select').hasClass('disabled'), 'buildCol2 should have class disabled');
-});
-
-test("buildCol3", function() {
-	expect(3);
-
-	var $td = AdminData.advanceSearch.buildCol3();
-	ok($.isjQuery($td), "buildCol3 should return an instance of jQuery");
-
-	ok($td.find('input').hasClass('col3'), 'buildCol3 should have input element with class col3');
-	ok($td.find('input').attr('disabled'), 'buildCol3 should have input element with attribute disabled');
-});
-
-test("buildCol4", function() {
-	expect(3);
-
-	var $td = AdminData.advanceSearch.buildCol4();
-	ok($.isjQuery($td), "buildCol4 should return an instance of jQuery");
-
-	var a = $td.find('a');
-	ok(a.hasClass('remove_row'), 'buildCol4 should have anchor element with class remove_row');
-	equals('x', a.text(), 'buildCol4 should have anchor element with text x');
-});
-
-test("buildRow", function() {
-	expect(8);
-	jack(function() {
-		jack.expect("AdminData.jsUtil.randomNumber").exactly("1 time").mock(function() {
-			return 100;
-		});
-
-		var $tr = AdminData.advanceSearch.buildRow();
-		ok($.isjQuery($tr), "buildCol4 should return an instance of jQuery");
-
-		equals(4, $tr.find('td').length, 'buildRow should have 4 td elements');
-
-		ok($tr.find('select.col1').attr('name'), 'buildRow should have select.col1 with attribute name');
-		ok($tr.find('select.col2').attr('name'), 'buildRow should have select.col1 with attribute name');
-		ok($tr.find('input.col3').attr('name'), 'buildRow should have input.col1 with attribute name');
-
-		equals('adv_search[100_row][col1]', $tr.find('select.col1').attr('name'), 'select.col1 should have right name');
-		equals('adv_search[100_row][col2]', $tr.find('select.col2').attr('name'), 'select.col2 should have right name');
-		equals('adv_search[100_row][col3]', $tr.find('input.col3').attr('name'), 'input.col3 should have right name');
-
-	});
-
-});
-

data/app/assets/javascripts/test/ajaxify_advance_search.js

@@ -1,29 +0,0 @@
-module('ajaxify advance search', {
-	teardown: function() {
-		$('#results').remove();
-		$('#advance_search_form').remove();
-	},
-	setup: function() {
-		$(document.body).append($('<div />', {
-			id: 'results'
-		}));
-		$(document.body).append($('<div />', {
-			id: 'advance_search_form'
-		}));
-	}
-});
-
-test('successCallback', function() {
-	expect(1);
-	AdminData.ajaxifyAdvanceSearch.successCallback('hello world');
-	equals('hello world', $('#results').text(), '#results should have text hello world');
-});
-
-test('beforeSubmitCallback', function() {
-	expect(1);
-	AdminData.ajaxifyAdvanceSearch.beforeSubmitCallback(['1', '2'], null);
-
-	var $results = $('#results');
-	equals('searching...', $('#results').text(), '#results should have text searching');
-});
-