vendor/gems/authlogic-2.0.14/.specification vendor/gems/authlogic-2.0.14/CHANGELOG.rdoc vendor/gems/authlogic-2.0.14/MIT-LICENSE vendor/gems/authlogic-2.0.14/Manifest.txt vendor/gems/authlogic-2.0.14/README.rdoc vendor/gems/authlogic-2.0.14/Rakefile vendor/gems/authlogic-2.0.14/generators/session/session_generator.rb vendor/gems/authlogic-2.0.14/generators/session/templates/session.rb vendor/gems/authlogic-2.0.14/init.rb vendor/gems/authlogic-2.0.14/lib/authlogic.rb vendor/gems/authlogic-2.0.14/lib/authlogic/acts_as_authentic/base.rb vendor/gems/authlogic-2.0.14/lib/authlogic/acts_as_authentic/email.rb vendor/gems/authlogic-2.0.14/lib/authlogic/acts_as_authentic/logged_in_status.rb vendor/gems/authlogic-2.0.14/lib/authlogic/acts_as_authentic/login.rb vendor/gems/authlogic-2.0.14/lib/authlogic/acts_as_authentic/magic_columns.rb vendor/gems/authlogic-2.0.14/lib/authlogic/acts_as_authentic/password.rb vendor/gems/authlogic-2.0.14/lib/authlogic/acts_as_authentic/perishable_token.rb vendor/gems/authlogic-2.0.14/lib/authlogic/acts_as_authentic/persistence_token.rb vendor/gems/authlogic-2.0.14/lib/authlogic/acts_as_authentic/restful_authentication.rb vendor/gems/authlogic-2.0.14/lib/authlogic/acts_as_authentic/session_maintenance.rb vendor/gems/authlogic-2.0.14/lib/authlogic/acts_as_authentic/single_access_token.rb vendor/gems/authlogic-2.0.14/lib/authlogic/acts_as_authentic/validations_scope.rb vendor/gems/authlogic-2.0.14/lib/authlogic/authenticates_many/association.rb vendor/gems/authlogic-2.0.14/lib/authlogic/authenticates_many/base.rb vendor/gems/authlogic-2.0.14/lib/authlogic/controller_adapters/abstract_adapter.rb vendor/gems/authlogic-2.0.14/lib/authlogic/controller_adapters/merb_adapter.rb vendor/gems/authlogic-2.0.14/lib/authlogic/controller_adapters/rails_adapter.rb vendor/gems/authlogic-2.0.14/lib/authlogic/crypto_providers/aes256.rb vendor/gems/authlogic-2.0.14/lib/authlogic/crypto_providers/bcrypt.rb vendor/gems/authlogic-2.0.14/lib/authlogic/crypto_providers/md5.rb vendor/gems/authlogic-2.0.14/lib/authlogic/crypto_providers/sha1.rb vendor/gems/authlogic-2.0.14/lib/authlogic/crypto_providers/sha512.rb vendor/gems/authlogic-2.0.14/lib/authlogic/i18n.rb vendor/gems/authlogic-2.0.14/lib/authlogic/random.rb vendor/gems/authlogic-2.0.14/lib/authlogic/regex.rb vendor/gems/authlogic-2.0.14/lib/authlogic/session/activation.rb vendor/gems/authlogic-2.0.14/lib/authlogic/session/active_record_trickery.rb vendor/gems/authlogic-2.0.14/lib/authlogic/session/base.rb vendor/gems/authlogic-2.0.14/lib/authlogic/session/brute_force_protection.rb vendor/gems/authlogic-2.0.14/lib/authlogic/session/callbacks.rb vendor/gems/authlogic-2.0.14/lib/authlogic/session/cookies.rb vendor/gems/authlogic-2.0.14/lib/authlogic/session/existence.rb vendor/gems/authlogic-2.0.14/lib/authlogic/session/foundation.rb vendor/gems/authlogic-2.0.14/lib/authlogic/session/http_auth.rb vendor/gems/authlogic-2.0.14/lib/authlogic/session/id.rb vendor/gems/authlogic-2.0.14/lib/authlogic/session/klass.rb vendor/gems/authlogic-2.0.14/lib/authlogic/session/magic_columns.rb vendor/gems/authlogic-2.0.14/lib/authlogic/session/magic_states.rb vendor/gems/authlogic-2.0.14/lib/authlogic/session/params.rb vendor/gems/authlogic-2.0.14/lib/authlogic/session/password.rb vendor/gems/authlogic-2.0.14/lib/authlogic/session/perishable_token.rb vendor/gems/authlogic-2.0.14/lib/authlogic/session/persistence.rb vendor/gems/authlogic-2.0.14/lib/authlogic/session/priority_record.rb vendor/gems/authlogic-2.0.14/lib/authlogic/session/scopes.rb vendor/gems/authlogic-2.0.14/lib/authlogic/session/session.rb vendor/gems/authlogic-2.0.14/lib/authlogic/session/timeout.rb vendor/gems/authlogic-2.0.14/lib/authlogic/session/unauthorized_record.rb vendor/gems/authlogic-2.0.14/lib/authlogic/session/validation.rb vendor/gems/authlogic-2.0.14/lib/authlogic/test_case.rb vendor/gems/authlogic-2.0.14/lib/authlogic/test_case/mock_controller.rb vendor/gems/authlogic-2.0.14/lib/authlogic/test_case/mock_cookie_jar.rb vendor/gems/authlogic-2.0.14/lib/authlogic/test_case/mock_logger.rb vendor/gems/authlogic-2.0.14/lib/authlogic/test_case/mock_request.rb vendor/gems/authlogic-2.0.14/lib/authlogic/test_case/rails_request_adapter.rb vendor/gems/authlogic-2.0.14/lib/authlogic/version.rb vendor/gems/authlogic-2.0.14/rails/init.rb vendor/gems/authlogic-2.0.14/shoulda_macros/authlogic.rb vendor/gems/authlogic-2.0.14/test/acts_as_authentic_test/base_test.rb vendor/gems/authlogic-2.0.14/test/acts_as_authentic_test/email_test.rb vendor/gems/authlogic-2.0.14/test/acts_as_authentic_test/logged_in_status_test.rb vendor/gems/authlogic-2.0.14/test/acts_as_authentic_test/login_test.rb vendor/gems/authlogic-2.0.14/test/acts_as_authentic_test/magic_columns_test.rb vendor/gems/authlogic-2.0.14/test/acts_as_authentic_test/password_test.rb vendor/gems/authlogic-2.0.14/test/acts_as_authentic_test/perishable_token_test.rb vendor/gems/authlogic-2.0.14/test/acts_as_authentic_test/persistence_token_test.rb vendor/gems/authlogic-2.0.14/test/acts_as_authentic_test/restful_authentication_test.rb vendor/gems/authlogic-2.0.14/test/acts_as_authentic_test/session_maintenance_test.rb vendor/gems/authlogic-2.0.14/test/acts_as_authentic_test/single_access_test.rb vendor/gems/authlogic-2.0.14/test/authenticates_many_test.rb vendor/gems/authlogic-2.0.14/test/crypto_provider_test/aes256_test.rb vendor/gems/authlogic-2.0.14/test/crypto_provider_test/bcrypt_test.rb vendor/gems/authlogic-2.0.14/test/crypto_provider_test/sha1_test.rb vendor/gems/authlogic-2.0.14/test/crypto_provider_test/sha512_test.rb vendor/gems/authlogic-2.0.14/test/fixtures/companies.yml vendor/gems/authlogic-2.0.14/test/fixtures/employees.yml vendor/gems/authlogic-2.0.14/test/fixtures/projects.yml vendor/gems/authlogic-2.0.14/test/fixtures/users.yml vendor/gems/authlogic-2.0.14/test/libs/affiliate.rb vendor/gems/authlogic-2.0.14/test/libs/company.rb vendor/gems/authlogic-2.0.14/test/libs/employee.rb vendor/gems/authlogic-2.0.14/test/libs/employee_session.rb vendor/gems/authlogic-2.0.14/test/libs/ldaper.rb vendor/gems/authlogic-2.0.14/test/libs/ordered_hash.rb vendor/gems/authlogic-2.0.14/test/libs/project.rb vendor/gems/authlogic-2.0.14/test/libs/user.rb vendor/gems/authlogic-2.0.14/test/libs/user_session.rb vendor/gems/authlogic-2.0.14/test/random_test.rb vendor/gems/authlogic-2.0.14/test/session_test/activation_test.rb vendor/gems/authlogic-2.0.14/test/session_test/active_record_trickery_test.rb vendor/gems/authlogic-2.0.14/test/session_test/brute_force_protection_test.rb vendor/gems/authlogic-2.0.14/test/session_test/callbacks_test.rb vendor/gems/authlogic-2.0.14/test/session_test/cookies_test.rb vendor/gems/authlogic-2.0.14/test/session_test/credentials_test.rb vendor/gems/authlogic-2.0.14/test/session_test/existence_test.rb vendor/gems/authlogic-2.0.14/test/session_test/http_auth_test.rb vendor/gems/authlogic-2.0.14/test/session_test/id_test.rb vendor/gems/authlogic-2.0.14/test/session_test/klass_test.rb vendor/gems/authlogic-2.0.14/test/session_test/magic_columns_test.rb vendor/gems/authlogic-2.0.14/test/session_test/magic_states_test.rb vendor/gems/authlogic-2.0.14/test/session_test/params_test.rb vendor/gems/authlogic-2.0.14/test/session_test/password_test.rb vendor/gems/authlogic-2.0.14/test/session_test/perishability_test.rb vendor/gems/authlogic-2.0.14/test/session_test/persistence_test.rb vendor/gems/authlogic-2.0.14/test/session_test/scopes_test.rb vendor/gems/authlogic-2.0.14/test/session_test/session_test.rb vendor/gems/authlogic-2.0.14/test/session_test/timeout_test.rb vendor/gems/authlogic-2.0.14/test/session_test/unauthorized_record_test.rb vendor/gems/authlogic-2.0.14/test/session_test/validation_test.rb vendor/gems/authlogic-2.0.14/test/test_helper.rb vendor/gems/binarylogic-searchlogic-2.0.1/.gitignore vendor/gems/binarylogic-searchlogic-2.0.1/.specification vendor/gems/binarylogic-searchlogic-2.0.1/CHANGELOG.rdoc vendor/gems/binarylogic-searchlogic-2.0.1/LICENSE vendor/gems/binarylogic-searchlogic-2.0.1/README.rdoc vendor/gems/binarylogic-searchlogic-2.0.1/Rakefile vendor/gems/binarylogic-searchlogic-2.0.1/VERSION.yml vendor/gems/binarylogic-searchlogic-2.0.1/init.rb vendor/gems/binarylogic-searchlogic-2.0.1/lib/searchlogic.rb vendor/gems/binarylogic-searchlogic-2.0.1/lib/searchlogic/core_ext/object.rb vendor/gems/binarylogic-searchlogic-2.0.1/lib/searchlogic/core_ext/proc.rb vendor/gems/binarylogic-searchlogic-2.0.1/lib/searchlogic/named_scopes/associations.rb vendor/gems/binarylogic-searchlogic-2.0.1/lib/searchlogic/named_scopes/conditions.rb vendor/gems/binarylogic-searchlogic-2.0.1/lib/searchlogic/named_scopes/ordering.rb vendor/gems/binarylogic-searchlogic-2.0.1/lib/searchlogic/rails_helpers.rb vendor/gems/binarylogic-searchlogic-2.0.1/lib/searchlogic/search.rb vendor/gems/binarylogic-searchlogic-2.0.1/rails/init.rb vendor/gems/binarylogic-searchlogic-2.0.1/searchlogic.gemspec vendor/gems/binarylogic-searchlogic-2.0.1/spec/core_ext/object_spec.rb vendor/gems/binarylogic-searchlogic-2.0.1/spec/core_ext/proc_spec.rb vendor/gems/binarylogic-searchlogic-2.0.1/spec/named_scopes/associations_spec.rb vendor/gems/binarylogic-searchlogic-2.0.1/spec/named_scopes/conditions_spec.rb vendor/gems/binarylogic-searchlogic-2.0.1/spec/named_scopes/ordering_spec.rb vendor/gems/binarylogic-searchlogic-2.0.1/spec/search_spec.rb vendor/gems/binarylogic-searchlogic-2.0.1/spec/spec_helper.rb vendor/plugins/active_scaffold/lib/bridges/tiny_mce/bridge.rb vendor/plugins/active_scaffold/lib/bridges/tiny_mce/lib/tiny_mce_bridge.rb @@ -5,7 +5,7 @@ require File.join(File.dirname(__FILE__), 'boot') Rails::Initializer.run do |config| config.gem 'configatron' config.gem 'authlogic' - config.gem 'searchlogic' + config.gem 'binarylogic-searchlogic', :lib => 'searchlogic' config.gem 'relevance-log_buddy', :lib => 'log_buddy', :source => 'http://gems.github.com' config/environment.rb @@ -1,430 +1,430 @@ -if (typeof Prototype == 'undefined') -{ - warning = "ActiveScaffold Error: Prototype could not be found. Please make sure that your application's layout includes prototype.js (e.g. <%= javascript_include_tag :defaults %>) *before* it includes active_scaffold.js (e.g. <%= active_scaffold_includes %>)."; - alert(warning); -} -if (Prototype.Version.substring(0, 3) != '1.6') -{ - warning = "ActiveScaffold Error: Prototype version 1.6.x is required. Please update prototype.js (rake rails:update:javascripts)."; - alert(warning); -} - -/* - * Simple utility methods - */ - -var ActiveScaffold = { - records_for: function(tbody_id) { - var rows = []; - var child = $(tbody_id).down('.record'); - while (child) { - rows.push(child); - child = child.next('.record'); - } - return rows; - }, - stripe: function(tbody_id) { - var even = false; - var rows = this.records_for(tbody_id); - for (var i = 0; i < rows.length; i++) { - var child = rows[i]; - //Make sure to skip rows that are create or edit rows or messages - if (child.tagName != 'SCRIPT' - && !child.hasClassName("create") - && !child.hasClassName("update") - && !child.hasClassName("inline-adapter") - && !child.hasClassName("active-scaffold-calculations")) { - - if (even) child.addClassName("even-record"); - else child.removeClassName("even-record"); - - even = !even; - } - } - }, - hide_empty_message: function(tbody, empty_message_id) { - if (this.records_for(tbody).length != 0) { - $(empty_message_id).hide(); - } - }, - reload_if_empty: function(tbody, url) { - var content_container_id = tbody.replace('tbody', 'content'); - if (this.records_for(tbody).length == 0) { - new Ajax.Updater($(content_container_id), url, { - method: 'get', - asynchronous: true, - evalScripts: true - }); - } - }, - removeSortClasses: function(scaffold_id) { - $$('#' + scaffold_id + ' td.sorted').each(function(element) { - element.removeClassName("sorted"); - }); - $$('#' + scaffold_id + ' th.sorted').each(function(element) { - element.removeClassName("sorted"); - element.removeClassName("asc"); - element.removeClassName("desc"); - }); - }, - decrement_record_count: function(scaffold_id) { - // decrement the last record count, firsts record count are in nested lists - count = $$('#' + scaffold_id + ' span.active-scaffold-records').last(); - count.innerHTML = parseInt(count.innerHTML) - 1; - }, - increment_record_count: function(scaffold_id) { - // increment the last record count, firsts record count are in nested lists - count = $$('#' + scaffold_id + ' span.active-scaffold-records').last(); - count.innerHTML = parseInt(count.innerHTML) + 1; - }, - - server_error_response: '', - report_500_response: function(active_scaffold_id) { - messages_container = $(active_scaffold_id).down('td.messages-container'); - new Insertion.Top(messages_container, this.server_error_response); - } -} - -/* - * DHTML history tie-in - */ -function addActiveScaffoldPageToHistory(url, active_scaffold_id) { - if (typeof dhtmlHistory == 'undefined') return; // it may not be loaded - - var array = url.split('?'); - var qs = new Querystring(array[1]); - var sort = qs.get('sort') - var dir = qs.get('sort_direction') - var page = qs.get('page') - if (sort || dir || page) dhtmlHistory.add(active_scaffold_id+":"+page+":"+sort+":"+dir, url); -} - -/* - * Add-ons/Patches to Prototype - */ - -/* patch to support replacing TR/TD/TBODY in Internet Explorer, courtesy of http://dev.rubyonrails.org/ticket/4273 */ -Element.replace = function(element, html) { - element = $(element); - if (element.outerHTML) { - try { - element.outerHTML = html.stripScripts(); - } catch (e) { - var tn = element.tagName; - if(tn=='TBODY' || tn=='TR' || tn=='TD') - { - var tempDiv = document.createElement("div"); - tempDiv.innerHTML = '<table id="tempTable" style="display: none">' + html.stripScripts() + '</table>'; - element.parentNode.replaceChild(tempDiv.getElementsByTagName(tn).item(0), element); - } - else throw e; - } - } else { - var range = element.ownerDocument.createRange(); - /* patch to fix <form> replaces in Firefox. see http://dev.rubyonrails.org/ticket/8010 */ - range.selectNodeContents(element.parentNode); - element.parentNode.replaceChild(range.createContextualFragment(html.stripScripts()), element); - } - setTimeout(function() {html.evalScripts()}, 10); - return element; -}; - -/* - * URL modification support. Incomplete functionality. - */ -Object.extend(String.prototype, { - append_params: function(params) { - url = this; - if (url.indexOf('?') == -1) url += '?'; - else if (url.lastIndexOf('&') != url.length) url += '&'; - - url += $H(params).collect(function(item) { - return item.key + '=' + item.value; - }).join('&'); - - return url; - } -}); - -/* - * Prototype's implementation was throwing an error instead of false - */ -Element.Methods.Simulated = { - hasAttribute: function(element, attribute) { - var t = Element._attributeTranslations; - attribute = (t.names && t.names[attribute]) || attribute; - // Return false if we get an error here - try { - return $(element).getAttributeNode(attribute).specified; - } catch (e) { - return false; - } - } -}; - -/** - * A set of links. As a set, they can be controlled such that only one is "open" at a time, etc. - */ -ActiveScaffold.Actions = new Object(); -ActiveScaffold.Actions.Abstract = function(){} -ActiveScaffold.Actions.Abstract.prototype = { - initialize: function(links, target, loading_indicator, options) { - this.target = $(target); - this.loading_indicator = $(loading_indicator); - this.options = options; - this.links = links.collect(function(link) { - return this.instantiate_link(link); - }.bind(this)); - }, - - instantiate_link: function(link) { - throw 'unimplemented' - } -} - -/** - * A DataStructures::ActionLink, represented in JavaScript. - * Concerned with AJAX-enabling a link and adapting the result for insertion into the table. - */ -ActiveScaffold.ActionLink = new Object(); -ActiveScaffold.ActionLink.Abstract = function(){} -ActiveScaffold.ActionLink.Abstract.prototype = { - initialize: function(a, target, loading_indicator) { - this.tag = $(a); - this.url = this.tag.href; - this.method = 'get'; - if(this.url.match('_method=delete')){ - this.method = 'delete'; - } else if(this.url.match('_method=post')){ - this.method = 'post'; - } - this.target = target; - this.loading_indicator = loading_indicator; - this.hide_target = false; - this.position = this.tag.getAttribute('position'); - this.page_link = this.tag.getAttribute('page_link'); - - this.onclick = this.tag.onclick; - this.tag.onclick = null; - this.tag.observe('click', function(event) { - this.open(); - Event.stop(event); - }.bind(this)); - - this.tag.action_link = this; - }, - - open: function() { - if (this.is_disabled()) return; - - if (this.tag.hasAttribute( "dhtml_confirm")) { - if (this.onclick) this.onclick(); - return; - } else { - if (this.onclick && !this.onclick()) return;//e.g. confirmation messages - this.open_action(); - } - }, - - open_action: function() { - if (this.position) this.disable(); - - if (this.page_link) { - window.location = this.url; - } else { - if (this.loading_indicator) this.loading_indicator.style.visibility = 'visible'; - new Ajax.Request(this.url, { - asynchronous: true, - evalScripts: true, - method: this.method, - onSuccess: function(request) { - if (this.position) { - this.insert(request.responseText); - if (this.hide_target) this.target.hide(); - } else { - request.evalResponse(); - } - }.bind(this), - - onFailure: function(request) { - ActiveScaffold.report_500_response(this.scaffold_id()); - if (this.position) this.enable() - }.bind(this), - - onComplete: function(request) { - if (this.loading_indicator) this.loading_indicator.style.visibility = 'hidden'; - }.bind(this) - }); - } - }, - - insert: function(content) { - throw 'unimplemented' - }, - - close: function() { - this.enable(); - this.adapter.remove(); - if (this.hide_target) this.target.show(); - }, - - register_cancel_hooks: function() { - // anything in the insert with a class of cancel gets the closer method, and a reference to this object for good measure - var self = this; - this.adapter.select('.cancel').each(function(elem) { - elem.observe('click', this.close_handler.bind(this)); - elem.link = self; - }.bind(this)) - }, - - reload: function() { - this.close(); - this.open(); - }, - - get_new_adapter_id: function() { - var id = 'adapter_'; - var i = 0; - while ($(id + i)) i++; - return id + i; - }, - - enable: function() { - return this.tag.removeClassName('disabled'); - }, - - disable: function() { - return this.tag.addClassName('disabled'); - }, - - is_disabled: function() { - return this.tag.hasClassName('disabled'); - }, - - scaffold_id: function() { - return this.tag.up('div.active-scaffold').id; - } -} - -/** - * Concrete classes for record actions - */ -ActiveScaffold.Actions.Record = Class.create(); -ActiveScaffold.Actions.Record.prototype = Object.extend(new ActiveScaffold.Actions.Abstract(), { - instantiate_link: function(link) { - var l = new ActiveScaffold.ActionLink.Record(link, this.target, this.loading_indicator); - l.refresh_url = this.options.refresh_url; - if (l.position) l.url = l.url.append_params({adapter: '_list_inline_adapter'}); - l.set = this; - return l; - } -}); - -ActiveScaffold.ActionLink.Record = Class.create(); -ActiveScaffold.ActionLink.Record.prototype = Object.extend(new ActiveScaffold.ActionLink.Abstract(), { - close_previous_adapter: function() { - this.set.links.each(function(item) { - if (item.url != this.url && item.is_disabled() && item.adapter) item.close(); - }.bind(this)); - }, - - insert: function(content) { - this.close_previous_adapter(); - - if (this.position == 'replace') { - this.position = 'after'; - this.hide_target = true; - } - - if (this.position == 'after') { - new Insertion.After(this.target, content); - this.adapter = this.target.next(); - } - else if (this.position == 'before') { - new Insertion.Before(this.target, content); - this.adapter = this.target.previous(); - } - else { - return false; - } - - this.adapter.down('a.inline-adapter-close').observe('click', this.close_handler.bind(this)); - this.register_cancel_hooks(); - - new Effect.Highlight(this.adapter.down('td')); - }, - - close_handler: function(event) { - this.close_with_refresh(); - if (event) Event.stop(event); - }, - - /* it might simplify things to just override the close function. then the Record and Table links could share more code ... wouldn't need custom close_handler functions, for instance */ - close_with_refresh: function() { - new Ajax.Request(this.refresh_url, { - asynchronous: true, - evalScripts: true, - method: this.method, - onSuccess: function(request) { - Element.replace(this.target, request.responseText); - var new_target = $(this.target.id); - if (this.target.hasClassName('even-record')) new_target.addClassName('even-record'); - this.target = new_target; - this.close(); - }.bind(this), - - onFailure: function(request) { - ActiveScaffold.report_500_response(this.scaffold_id()); - } - }); - }, - - enable: function() { - this.set.links.each(function(item) { - if (item.url != this.url) return; - item.tag.removeClassName('disabled'); - }.bind(this)); - }, - - disable: function() { - this.set.links.each(function(item) { - if (item.url != this.url) return; - item.tag.addClassName('disabled'); - }.bind(this)); - } -}); - -/** - * Concrete classes for table actions - */ -ActiveScaffold.Actions.Table = Class.create(); -ActiveScaffold.Actions.Table.prototype = Object.extend(new ActiveScaffold.Actions.Abstract(), { - instantiate_link: function(link) { - var l = new ActiveScaffold.ActionLink.Table(link, this.target, this.loading_indicator); - if (l.position) l.url = l.url.append_params({adapter: '_list_inline_adapter'}); - return l; - } -}); - -ActiveScaffold.ActionLink.Table = Class.create(); -ActiveScaffold.ActionLink.Table.prototype = Object.extend(new ActiveScaffold.ActionLink.Abstract(), { - insert: function(content) { - if (this.position == 'top') { - new Insertion.Top(this.target, content); - this.adapter = this.target.immediateDescendants().first(); - } - else { - throw 'Unknown position "' + this.position + '"' - } - - this.adapter.down('a.inline-adapter-close').observe('click', this.close_handler.bind(this)); - this.register_cancel_hooks(); - - new Effect.Highlight(this.adapter.down('td')); - }, - - close_handler: function(event) { - this.close(); - if (event) Event.stop(event); - } -}); +if (typeof Prototype == 'undefined') +{ + warning = "ActiveScaffold Error: Prototype could not be found. Please make sure that your application's layout includes prototype.js (e.g. <%= javascript_include_tag :defaults %>) *before* it includes active_scaffold.js (e.g. <%= active_scaffold_includes %>)."; + alert(warning); +} +if (Prototype.Version.substring(0, 3) != '1.6') +{ + warning = "ActiveScaffold Error: Prototype version 1.6.x is required. Please update prototype.js (rake rails:update:javascripts)."; + alert(warning); +} + +/* + * Simple utility methods + */ + +var ActiveScaffold = { + records_for: function(tbody_id) { + var rows = []; + var child = $(tbody_id).down('.record'); + while (child) { + rows.push(child); + child = child.next('.record'); + } + return rows; + }, + stripe: function(tbody_id) { + var even = false; + var rows = this.records_for(tbody_id); + for (var i = 0; i < rows.length; i++) { + var child = rows[i]; + //Make sure to skip rows that are create or edit rows or messages + if (child.tagName != 'SCRIPT' + && !child.hasClassName("create") + && !child.hasClassName("update") + && !child.hasClassName("inline-adapter") + && !child.hasClassName("active-scaffold-calculations")) { + + if (even) child.addClassName("even-record"); + else child.removeClassName("even-record"); + + even = !even; + } + } + }, + hide_empty_message: function(tbody, empty_message_id) { + if (this.records_for(tbody).length != 0) { + $(empty_message_id).hide(); + } + }, + reload_if_empty: function(tbody, url) { + var content_container_id = tbody.replace('tbody', 'content'); + if (this.records_for(tbody).length == 0) { + new Ajax.Updater($(content_container_id), url, { + method: 'get', + asynchronous: true, + evalScripts: true + }); + } + }, + removeSortClasses: function(scaffold_id) { + $$('#' + scaffold_id + ' td.sorted').each(function(element) { + element.removeClassName("sorted"); + }); + $$('#' + scaffold_id + ' th.sorted').each(function(element) { + element.removeClassName("sorted"); + element.removeClassName("asc"); + element.removeClassName("desc"); + }); + }, + decrement_record_count: function(scaffold_id) { + // decrement the last record count, firsts record count are in nested lists + count = $$('#' + scaffold_id + ' span.active-scaffold-records').last(); + count.innerHTML = parseInt(count.innerHTML) - 1; + }, + increment_record_count: function(scaffold_id) { + // increment the last record count, firsts record count are in nested lists + count = $$('#' + scaffold_id + ' span.active-scaffold-records').last(); + count.innerHTML = parseInt(count.innerHTML) + 1; + }, + + server_error_response: '', + report_500_response: function(active_scaffold_id) { + messages_container = $(active_scaffold_id).down('td.messages-container'); + new Insertion.Top(messages_container, this.server_error_response); + } +} + +/* + * DHTML history tie-in + */ +function addActiveScaffoldPageToHistory(url, active_scaffold_id) { + if (typeof dhtmlHistory == 'undefined') return; // it may not be loaded + + var array = url.split('?'); + var qs = new Querystring(array[1]); + var sort = qs.get('sort') + var dir = qs.get('sort_direction') + var page = qs.get('page') + if (sort || dir || page) dhtmlHistory.add(active_scaffold_id+":"+page+":"+sort+":"+dir, url); +} + +/* + * Add-ons/Patches to Prototype + */ + +/* patch to support replacing TR/TD/TBODY in Internet Explorer, courtesy of http://dev.rubyonrails.org/ticket/4273 */ +Element.replace = function(element, html) { + element = $(element); + if (element.outerHTML) { + try { + element.outerHTML = html.stripScripts(); + } catch (e) { + var tn = element.tagName; + if(tn=='TBODY' || tn=='TR' || tn=='TD') + { + var tempDiv = document.createElement("div"); + tempDiv.innerHTML = '<table id="tempTable" style="display: none">' + html.stripScripts() + '</table>'; + element.parentNode.replaceChild(tempDiv.getElementsByTagName(tn).item(0), element); + } + else throw e; + } + } else { + var range = element.ownerDocument.createRange(); + /* patch to fix <form> replaces in Firefox. see http://dev.rubyonrails.org/ticket/8010 */ + range.selectNodeContents(element.parentNode); + element.parentNode.replaceChild(range.createContextualFragment(html.stripScripts()), element); + } + setTimeout(function() {html.evalScripts()}, 10); + return element; +}; + +/* + * URL modification support. Incomplete functionality. + */ +Object.extend(String.prototype, { + append_params: function(params) { + url = this; + if (url.indexOf('?') == -1) url += '?'; + else if (url.lastIndexOf('&') != url.length) url += '&'; + + url += $H(params).collect(function(item) { + return item.key + '=' + item.value; + }).join('&'); + + return url; + } +}); + +/* + * Prototype's implementation was throwing an error instead of false + */ +Element.Methods.Simulated = { + hasAttribute: function(element, attribute) { + var t = Element._attributeTranslations; + attribute = (t.names && t.names[attribute]) || attribute; + // Return false if we get an error here + try { + return $(element).getAttributeNode(attribute).specified; + } catch (e) { + return false; + } + } +}; + +/** + * A set of links. As a set, they can be controlled such that only one is "open" at a time, etc. + */ +ActiveScaffold.Actions = new Object(); +ActiveScaffold.Actions.Abstract = function(){} +ActiveScaffold.Actions.Abstract.prototype = { + initialize: function(links, target, loading_indicator, options) { + this.target = $(target); + this.loading_indicator = $(loading_indicator); + this.options = options; + this.links = links.collect(function(link) { + return this.instantiate_link(link); + }.bind(this)); + }, + + instantiate_link: function(link) { + throw 'unimplemented' + } +} + +/** + * A DataStructures::ActionLink, represented in JavaScript. + * Concerned with AJAX-enabling a link and adapting the result for insertion into the table. + */ +ActiveScaffold.ActionLink = new Object(); +ActiveScaffold.ActionLink.Abstract = function(){} +ActiveScaffold.ActionLink.Abstract.prototype = { + initialize: function(a, target, loading_indicator) { + this.tag = $(a); + this.url = this.tag.href; + this.method = 'get'; + if(this.url.match('_method=delete')){ + this.method = 'delete'; + } else if(this.url.match('_method=post')){ + this.method = 'post'; + } + this.target = target; + this.loading_indicator = loading_indicator; + this.hide_target = false; + this.position = this.tag.getAttribute('position'); + this.page_link = this.tag.getAttribute('page_link'); + + this.onclick = this.tag.onclick; + this.tag.onclick = null; + this.tag.observe('click', function(event) { + this.open(); + Event.stop(event); + }.bind(this)); + + this.tag.action_link = this; + }, + + open: function() { + if (this.is_disabled()) return; + + if (this.tag.hasAttribute( "dhtml_confirm")) { + if (this.onclick) this.onclick(); + return; + } else { + if (this.onclick && !this.onclick()) return;//e.g. confirmation messages + this.open_action(); + } + }, + + open_action: function() { + if (this.position) this.disable(); + + if (this.page_link) { + window.location = this.url; + } else { + if (this.loading_indicator) this.loading_indicator.style.visibility = 'visible'; + new Ajax.Request(this.url, { + asynchronous: true, + evalScripts: true, + method: this.method, + onSuccess: function(request) { + if (this.position) { + this.insert(request.responseText); + if (this.hide_target) this.target.hide(); + } else { + request.evalResponse(); + } + }.bind(this), + + onFailure: function(request) { + ActiveScaffold.report_500_response(this.scaffold_id()); + if (this.position) this.enable() + }.bind(this), + + onComplete: function(request) { + if (this.loading_indicator) this.loading_indicator.style.visibility = 'hidden'; + }.bind(this) + }); + } + }, + + insert: function(content) { + throw 'unimplemented' + }, + + close: function() { + this.enable(); + this.adapter.remove(); + if (this.hide_target) this.target.show(); + }, + + register_cancel_hooks: function() { + // anything in the insert with a class of cancel gets the closer method, and a reference to this object for good measure + var self = this; + this.adapter.select('.cancel').each(function(elem) { + elem.observe('click', this.close_handler.bind(this)); + elem.link = self; + }.bind(this)) + }, + + reload: function() { + this.close(); + this.open(); + }, + + get_new_adapter_id: function() { + var id = 'adapter_'; + var i = 0; + while ($(id + i)) i++; + return id + i; + }, + + enable: function() { + return this.tag.removeClassName('disabled'); + }, + + disable: function() { + return this.tag.addClassName('disabled'); + }, + + is_disabled: function() { + return this.tag.hasClassName('disabled'); + }, + + scaffold_id: function() { + return this.tag.up('div.active-scaffold').id; + } +} + +/** + * Concrete classes for record actions + */ +ActiveScaffold.Actions.Record = Class.create(); +ActiveScaffold.Actions.Record.prototype = Object.extend(new ActiveScaffold.Actions.Abstract(), { + instantiate_link: function(link) { + var l = new ActiveScaffold.ActionLink.Record(link, this.target, this.loading_indicator); + l.refresh_url = this.options.refresh_url; + if (l.position) l.url = l.url.append_params({adapter: '_list_inline_adapter'}); + l.set = this; + return l; + } +}); + +ActiveScaffold.ActionLink.Record = Class.create(); +ActiveScaffold.ActionLink.Record.prototype = Object.extend(new ActiveScaffold.ActionLink.Abstract(), { + close_previous_adapter: function() { + this.set.links.each(function(item) { + if (item.url != this.url && item.is_disabled() && item.adapter) item.close(); + }.bind(this)); + }, + + insert: function(content) { + this.close_previous_adapter(); + + if (this.position == 'replace') { + this.position = 'after'; + this.hide_target = true; + } + + if (this.position == 'after') { + new Insertion.After(this.target, content); + this.adapter = this.target.next(); + } + else if (this.position == 'before') { + new Insertion.Before(this.target, content); + this.adapter = this.target.previous(); + } + else { + return false; + } + + this.adapter.down('a.inline-adapter-close').observe('click', this.close_handler.bind(this)); + this.register_cancel_hooks(); + + new Effect.Highlight(this.adapter.down('td')); + }, + + close_handler: function(event) { + this.close_with_refresh(); + if (event) Event.stop(event); + }, + + /* it might simplify things to just override the close function. then the Record and Table links could share more code ... wouldn't need custom close_handler functions, for instance */ + close_with_refresh: function() { + new Ajax.Request(this.refresh_url, { + asynchronous: true, + evalScripts: true, + method: this.method, + onSuccess: function(request) { + Element.replace(this.target, request.responseText); + var new_target = $(this.target.id); + if (this.target.hasClassName('even-record')) new_target.addClassName('even-record'); + this.target = new_target; + this.close(); + }.bind(this), + + onFailure: function(request) { + ActiveScaffold.report_500_response(this.scaffold_id()); + } + }); + }, + + enable: function() { + this.set.links.each(function(item) { + if (item.url != this.url) return; + item.tag.removeClassName('disabled'); + }.bind(this)); + }, + + disable: function() { + this.set.links.each(function(item) { + if (item.url != this.url) return; + item.tag.addClassName('disabled'); + }.bind(this)); + } +}); + +/** + * Concrete classes for table actions + */ +ActiveScaffold.Actions.Table = Class.create(); +ActiveScaffold.Actions.Table.prototype = Object.extend(new ActiveScaffold.Actions.Abstract(), { + instantiate_link: function(link) { + var l = new ActiveScaffold.ActionLink.Table(link, this.target, this.loading_indicator); + if (l.position) l.url = l.url.append_params({adapter: '_list_inline_adapter'}); + return l; + } +}); + +ActiveScaffold.ActionLink.Table = Class.create(); +ActiveScaffold.ActionLink.Table.prototype = Object.extend(new ActiveScaffold.ActionLink.Abstract(), { + insert: function(content) { + if (this.position == 'top') { + new Insertion.Top(this.target, content); + this.adapter = this.target.immediateDescendants().first(); + } + else { + throw 'Unknown position "' + this.position + '"' + } + + this.adapter.down('a.inline-adapter-close').observe('click', this.close_handler.bind(this)); + this.register_cancel_hooks(); + + new Effect.Highlight(this.adapter.down('td')); + }, + + close_handler: function(event) { + this.close(); + if (event) Event.stop(event); + } +}); public/javascripts/active_scaffold/default/active_scaffold.js @@ -25,4 +25,7 @@ Rails 2.2.*: Active Scaffold rails-2.2 Rails 2.1.*: Active Scaffold rails-2.1 Rails < 2.1: Active Scaffold 1-1-stable (no guarantees) +Since Rails 2.3, render_component plugin is needed for nested and embbeded scaffolds. It works with rails-2.3 branch from ewildgoose repository: +script/plugin install git://github.com/ewildgoose/render_component.git -r rails-2.3 + Released under the MIT license (included) vendor/plugins/active_scaffold/README @@ -1,430 +1,430 @@ -if (typeof Prototype == 'undefined') -{ - warning = "ActiveScaffold Error: Prototype could not be found. Please make sure that your application's layout includes prototype.js (e.g. <%= javascript_include_tag :defaults %>) *before* it includes active_scaffold.js (e.g. <%= active_scaffold_includes %>)."; - alert(warning); -} -if (Prototype.Version.substring(0, 3) != '1.6') -{ - warning = "ActiveScaffold Error: Prototype version 1.6.x is required. Please update prototype.js (rake rails:update:javascripts)."; - alert(warning); -} - -/* - * Simple utility methods - */ - -var ActiveScaffold = { - records_for: function(tbody_id) { - var rows = []; - var child = $(tbody_id).down('.record'); - while (child) { - rows.push(child); - child = child.next('.record'); - } - return rows; - }, - stripe: function(tbody_id) { - var even = false; - var rows = this.records_for(tbody_id); - for (var i = 0; i < rows.length; i++) { - var child = rows[i]; - //Make sure to skip rows that are create or edit rows or messages - if (child.tagName != 'SCRIPT' - && !child.hasClassName("create") - && !child.hasClassName("update") - && !child.hasClassName("inline-adapter") - && !child.hasClassName("active-scaffold-calculations")) { - - if (even) child.addClassName("even-record"); - else child.removeClassName("even-record"); - - even = !even; - } - } - }, - hide_empty_message: function(tbody, empty_message_id) { - if (this.records_for(tbody).length != 0) { - $(empty_message_id).hide(); - } - }, - reload_if_empty: function(tbody, url) { - var content_container_id = tbody.replace('tbody', 'content'); - if (this.records_for(tbody).length == 0) { - new Ajax.Updater($(content_container_id), url, { - method: 'get', - asynchronous: true, - evalScripts: true - }); - } - }, - removeSortClasses: function(scaffold_id) { - $$('#' + scaffold_id + ' td.sorted').each(function(element) { - element.removeClassName("sorted"); - }); - $$('#' + scaffold_id + ' th.sorted').each(function(element) { - element.removeClassName("sorted"); - element.removeClassName("asc"); - element.removeClassName("desc"); - }); - }, - decrement_record_count: function(scaffold_id) { - // decrement the last record count, firsts record count are in nested lists - count = $$('#' + scaffold_id + ' span.active-scaffold-records').last(); - count.innerHTML = parseInt(count.innerHTML) - 1; - }, - increment_record_count: function(scaffold_id) { - // increment the last record count, firsts record count are in nested lists - count = $$('#' + scaffold_id + ' span.active-scaffold-records').last(); - count.innerHTML = parseInt(count.innerHTML) + 1; - }, - - server_error_response: '', - report_500_response: function(active_scaffold_id) { - messages_container = $(active_scaffold_id).down('td.messages-container'); - new Insertion.Top(messages_container, this.server_error_response); - } -} - -/* - * DHTML history tie-in - */ -function addActiveScaffoldPageToHistory(url, active_scaffold_id) { - if (typeof dhtmlHistory == 'undefined') return; // it may not be loaded - - var array = url.split('?'); - var qs = new Querystring(array[1]); - var sort = qs.get('sort') - var dir = qs.get('sort_direction') - var page = qs.get('page') - if (sort || dir || page) dhtmlHistory.add(active_scaffold_id+":"+page+":"+sort+":"+dir, url); -} - -/* - * Add-ons/Patches to Prototype - */ - -/* patch to support replacing TR/TD/TBODY in Internet Explorer, courtesy of http://dev.rubyonrails.org/ticket/4273 */ -Element.replace = function(element, html) { - element = $(element); - if (element.outerHTML) { - try { - element.outerHTML = html.stripScripts(); - } catch (e) { - var tn = element.tagName; - if(tn=='TBODY' || tn=='TR' || tn=='TD') - { - var tempDiv = document.createElement("div"); - tempDiv.innerHTML = '<table id="tempTable" style="display: none">' + html.stripScripts() + '</table>'; - element.parentNode.replaceChild(tempDiv.getElementsByTagName(tn).item(0), element); - } - else throw e; - } - } else { - var range = element.ownerDocument.createRange(); - /* patch to fix <form> replaces in Firefox. see http://dev.rubyonrails.org/ticket/8010 */ - range.selectNodeContents(element.parentNode); - element.parentNode.replaceChild(range.createContextualFragment(html.stripScripts()), element); - } - setTimeout(function() {html.evalScripts()}, 10); - return element; -}; - -/* - * URL modification support. Incomplete functionality. - */ -Object.extend(String.prototype, { - append_params: function(params) { - url = this; - if (url.indexOf('?') == -1) url += '?'; - else if (url.lastIndexOf('&') != url.length) url += '&'; - - url += $H(params).collect(function(item) { - return item.key + '=' + item.value; - }).join('&'); - - return url; - } -}); - -/* - * Prototype's implementation was throwing an error instead of false - */ -Element.Methods.Simulated = { - hasAttribute: function(element, attribute) { - var t = Element._attributeTranslations; - attribute = (t.names && t.names[attribute]) || attribute; - // Return false if we get an error here - try { - return $(element).getAttributeNode(attribute).specified; - } catch (e) { - return false; - } - } -}; - -/** - * A set of links. As a set, they can be controlled such that only one is "open" at a time, etc. - */ -ActiveScaffold.Actions = new Object(); -ActiveScaffold.Actions.Abstract = function(){} -ActiveScaffold.Actions.Abstract.prototype = { - initialize: function(links, target, loading_indicator, options) { - this.target = $(target); - this.loading_indicator = $(loading_indicator); - this.options = options; - this.links = links.collect(function(link) { - return this.instantiate_link(link); - }.bind(this)); - }, - - instantiate_link: function(link) { - throw 'unimplemented' - } -} - -/** - * A DataStructures::ActionLink, represented in JavaScript. - * Concerned with AJAX-enabling a link and adapting the result for insertion into the table. - */ -ActiveScaffold.ActionLink = new Object(); -ActiveScaffold.ActionLink.Abstract = function(){} -ActiveScaffold.ActionLink.Abstract.prototype = { - initialize: function(a, target, loading_indicator) { - this.tag = $(a); - this.url = this.tag.href; - this.method = 'get'; - if(this.url.match('_method=delete')){ - this.method = 'delete'; - } else if(this.url.match('_method=post')){ - this.method = 'post'; - } - this.target = target; - this.loading_indicator = loading_indicator; - this.hide_target = false; - this.position = this.tag.getAttribute('position'); - this.page_link = this.tag.getAttribute('page_link'); - - this.onclick = this.tag.onclick; - this.tag.onclick = null; - this.tag.observe('click', function(event) { - this.open(); - Event.stop(event); - }.bind(this)); - - this.tag.action_link = this; - }, - - open: function() { - if (this.is_disabled()) return; - - if (this.tag.hasAttribute( "dhtml_confirm")) { - if (this.onclick) this.onclick(); - return; - } else { - if (this.onclick && !this.onclick()) return;//e.g. confirmation messages - this.open_action(); - } - }, - - open_action: function() { - if (this.position) this.disable(); - - if (this.page_link) { - window.location = this.url; - } else { - if (this.loading_indicator) this.loading_indicator.style.visibility = 'visible'; - new Ajax.Request(this.url, { - asynchronous: true, - evalScripts: true, - method: this.method, - onSuccess: function(request) { - if (this.position) { - this.insert(request.responseText); - if (this.hide_target) this.target.hide(); - } else { - request.evalResponse(); - } - }.bind(this), - - onFailure: function(request) { - ActiveScaffold.report_500_response(this.scaffold_id()); - if (this.position) this.enable() - }.bind(this), - - onComplete: function(request) { - if (this.loading_indicator) this.loading_indicator.style.visibility = 'hidden'; - }.bind(this) - }); - } - }, - - insert: function(content) { - throw 'unimplemented' - }, - - close: function() { - this.enable(); - this.adapter.remove(); - if (this.hide_target) this.target.show(); - }, - - register_cancel_hooks: function() { - // anything in the insert with a class of cancel gets the closer method, and a reference to this object for good measure - var self = this; - this.adapter.select('.cancel').each(function(elem) { - elem.observe('click', this.close_handler.bind(this)); - elem.link = self; - }.bind(this)) - }, - - reload: function() { - this.close(); - this.open(); - }, - - get_new_adapter_id: function() { - var id = 'adapter_'; - var i = 0; - while ($(id + i)) i++; - return id + i; - }, - - enable: function() { - return this.tag.removeClassName('disabled'); - }, - - disable: function() { - return this.tag.addClassName('disabled'); - }, - - is_disabled: function() { - return this.tag.hasClassName('disabled'); - }, - - scaffold_id: function() { - return this.tag.up('div.active-scaffold').id; - } -} - -/** - * Concrete classes for record actions - */ -ActiveScaffold.Actions.Record = Class.create(); -ActiveScaffold.Actions.Record.prototype = Object.extend(new ActiveScaffold.Actions.Abstract(), { - instantiate_link: function(link) { - var l = new ActiveScaffold.ActionLink.Record(link, this.target, this.loading_indicator); - l.refresh_url = this.options.refresh_url; - if (l.position) l.url = l.url.append_params({adapter: '_list_inline_adapter'}); - l.set = this; - return l; - } -}); - -ActiveScaffold.ActionLink.Record = Class.create(); -ActiveScaffold.ActionLink.Record.prototype = Object.extend(new ActiveScaffold.ActionLink.Abstract(), { - close_previous_adapter: function() { - this.set.links.each(function(item) { - if (item.url != this.url && item.is_disabled() && item.adapter) item.close(); - }.bind(this)); - }, - - insert: function(content) { - this.close_previous_adapter(); - - if (this.position == 'replace') { - this.position = 'after'; - this.hide_target = true; - } - - if (this.position == 'after') { - new Insertion.After(this.target, content); - this.adapter = this.target.next(); - } - else if (this.position == 'before') { - new Insertion.Before(this.target, content); - this.adapter = this.target.previous(); - } - else { - return false; - } - - this.adapter.down('a.inline-adapter-close').observe('click', this.close_handler.bind(this)); - this.register_cancel_hooks(); - - new Effect.Highlight(this.adapter.down('td')); - }, - - close_handler: function(event) { - this.close_with_refresh(); - if (event) Event.stop(event); - }, - - /* it might simplify things to just override the close function. then the Record and Table links could share more code ... wouldn't need custom close_handler functions, for instance */ - close_with_refresh: function() { - new Ajax.Request(this.refresh_url, { - asynchronous: true, - evalScripts: true, - method: this.method, - onSuccess: function(request) { - Element.replace(this.target, request.responseText); - var new_target = $(this.target.id); - if (this.target.hasClassName('even-record')) new_target.addClassName('even-record'); - this.target = new_target; - this.close(); - }.bind(this), - - onFailure: function(request) { - ActiveScaffold.report_500_response(this.scaffold_id()); - } - }); - }, - - enable: function() { - this.set.links.each(function(item) { - if (item.url != this.url) return; - item.tag.removeClassName('disabled'); - }.bind(this)); - }, - - disable: function() { - this.set.links.each(function(item) { - if (item.url != this.url) return; - item.tag.addClassName('disabled'); - }.bind(this)); - } -}); - -/** - * Concrete classes for table actions - */ -ActiveScaffold.Actions.Table = Class.create(); -ActiveScaffold.Actions.Table.prototype = Object.extend(new ActiveScaffold.Actions.Abstract(), { - instantiate_link: function(link) { - var l = new ActiveScaffold.ActionLink.Table(link, this.target, this.loading_indicator); - if (l.position) l.url = l.url.append_params({adapter: '_list_inline_adapter'}); - return l; - } -}); - -ActiveScaffold.ActionLink.Table = Class.create(); -ActiveScaffold.ActionLink.Table.prototype = Object.extend(new ActiveScaffold.ActionLink.Abstract(), { - insert: function(content) { - if (this.position == 'top') { - new Insertion.Top(this.target, content); - this.adapter = this.target.immediateDescendants().first(); - } - else { - throw 'Unknown position "' + this.position + '"' - } - - this.adapter.down('a.inline-adapter-close').observe('click', this.close_handler.bind(this)); - this.register_cancel_hooks(); - - new Effect.Highlight(this.adapter.down('td')); - }, - - close_handler: function(event) { - this.close(); - if (event) Event.stop(event); - } -}); +if (typeof Prototype == 'undefined') +{ + warning = "ActiveScaffold Error: Prototype could not be found. Please make sure that your application's layout includes prototype.js (e.g. <%= javascript_include_tag :defaults %>) *before* it includes active_scaffold.js (e.g. <%= active_scaffold_includes %>)."; + alert(warning); +} +if (Prototype.Version.substring(0, 3) != '1.6') +{ + warning = "ActiveScaffold Error: Prototype version 1.6.x is required. Please update prototype.js (rake rails:update:javascripts)."; + alert(warning); +} + +/* + * Simple utility methods + */ + +var ActiveScaffold = { + records_for: function(tbody_id) { + var rows = []; + var child = $(tbody_id).down('.record'); + while (child) { + rows.push(child); + child = child.next('.record'); + } + return rows; + }, + stripe: function(tbody_id) { + var even = false; + var rows = this.records_for(tbody_id); + for (var i = 0; i < rows.length; i++) { + var child = rows[i]; + //Make sure to skip rows that are create or edit rows or messages + if (child.tagName != 'SCRIPT' + && !child.hasClassName("create") + && !child.hasClassName("update") + && !child.hasClassName("inline-adapter") + && !child.hasClassName("active-scaffold-calculations")) { + + if (even) child.addClassName("even-record"); + else child.removeClassName("even-record"); + + even = !even; + } + } + }, + hide_empty_message: function(tbody, empty_message_id) { + if (this.records_for(tbody).length != 0) { + $(empty_message_id).hide(); + } + }, + reload_if_empty: function(tbody, url) { + var content_container_id = tbody.replace('tbody', 'content'); + if (this.records_for(tbody).length == 0) { + new Ajax.Updater($(content_container_id), url, { + method: 'get', + asynchronous: true, + evalScripts: true + }); + } + }, + removeSortClasses: function(scaffold_id) { + $$('#' + scaffold_id + ' td.sorted').each(function(element) { + element.removeClassName("sorted"); + }); + $$('#' + scaffold_id + ' th.sorted').each(function(element) { + element.removeClassName("sorted"); + element.removeClassName("asc"); + element.removeClassName("desc"); + }); + }, + decrement_record_count: function(scaffold_id) { + // decrement the last record count, firsts record count are in nested lists + count = $$('#' + scaffold_id + ' span.active-scaffold-records').last(); + count.innerHTML = parseInt(count.innerHTML) - 1; + }, + increment_record_count: function(scaffold_id) { + // increment the last record count, firsts record count are in nested lists + count = $$('#' + scaffold_id + ' span.active-scaffold-records').last(); + count.innerHTML = parseInt(count.innerHTML) + 1; + }, + + server_error_response: '', + report_500_response: function(active_scaffold_id) { + messages_container = $(active_scaffold_id).down('td.messages-container'); + new Insertion.Top(messages_container, this.server_error_response); + } +} + +/* + * DHTML history tie-in + */ +function addActiveScaffoldPageToHistory(url, active_scaffold_id) { + if (typeof dhtmlHistory == 'undefined') return; // it may not be loaded + + var array = url.split('?'); + var qs = new Querystring(array[1]); + var sort = qs.get('sort') + var dir = qs.get('sort_direction') + var page = qs.get('page') + if (sort || dir || page) dhtmlHistory.add(active_scaffold_id+":"+page+":"+sort+":"+dir, url); +} + +/* + * Add-ons/Patches to Prototype + */ + +/* patch to support replacing TR/TD/TBODY in Internet Explorer, courtesy of http://dev.rubyonrails.org/ticket/4273 */ +Element.replace = function(element, html) { + element = $(element); + if (element.outerHTML) { + try { + element.outerHTML = html.stripScripts(); + } catch (e) { + var tn = element.tagName; + if(tn=='TBODY' || tn=='TR' || tn=='TD') + { + var tempDiv = document.createElement("div"); + tempDiv.innerHTML = '<table id="tempTable" style="display: none">' + html.stripScripts() + '</table>'; + element.parentNode.replaceChild(tempDiv.getElementsByTagName(tn).item(0), element); + } + else throw e; + } + } else { + var range = element.ownerDocument.createRange(); + /* patch to fix <form> replaces in Firefox. see http://dev.rubyonrails.org/ticket/8010 */ + range.selectNodeContents(element.parentNode); + element.parentNode.replaceChild(range.createContextualFragment(html.stripScripts()), element); + } + setTimeout(function() {html.evalScripts()}, 10); + return element; +}; + +/* + * URL modification support. Incomplete functionality. + */ +Object.extend(String.prototype, { + append_params: function(params) { + url = this; + if (url.indexOf('?') == -1) url += '?'; + else if (url.lastIndexOf('&') != url.length) url += '&'; + + url += $H(params).collect(function(item) { + return item.key + '=' + item.value; + }).join('&'); + + return url; + } +}); + +/* + * Prototype's implementation was throwing an error instead of false + */ +Element.Methods.Simulated = { + hasAttribute: function(element, attribute) { + var t = Element._attributeTranslations; + attribute = (t.names && t.names[attribute]) || attribute; + // Return false if we get an error here + try { + return $(element).getAttributeNode(attribute).specified; + } catch (e) { + return false; + } + } +}; + +/** + * A set of links. As a set, they can be controlled such that only one is "open" at a time, etc. + */ +ActiveScaffold.Actions = new Object(); +ActiveScaffold.Actions.Abstract = function(){} +ActiveScaffold.Actions.Abstract.prototype = { + initialize: function(links, target, loading_indicator, options) { + this.target = $(target); + this.loading_indicator = $(loading_indicator); + this.options = options; + this.links = links.collect(function(link) { + return this.instantiate_link(link); + }.bind(this)); + }, + + instantiate_link: function(link) { + throw 'unimplemented' + } +} + +/** + * A DataStructures::ActionLink, represented in JavaScript. + * Concerned with AJAX-enabling a link and adapting the result for insertion into the table. + */ +ActiveScaffold.ActionLink = new Object(); +ActiveScaffold.ActionLink.Abstract = function(){} +ActiveScaffold.ActionLink.Abstract.prototype = { + initialize: function(a, target, loading_indicator) { + this.tag = $(a); + this.url = this.tag.href; + this.method = 'get'; + if(this.url.match('_method=delete')){ + this.method = 'delete'; + } else if(this.url.match('_method=post')){ + this.method = 'post'; + } + this.target = target; + this.loading_indicator = loading_indicator; + this.hide_target = false; + this.position = this.tag.getAttribute('position'); + this.page_link = this.tag.getAttribute('page_link'); + + this.onclick = this.tag.onclick; + this.tag.onclick = null; + this.tag.observe('click', function(event) { + this.open(); + Event.stop(event); + }.bind(this)); + + this.tag.action_link = this; + }, + + open: function() { + if (this.is_disabled()) return; + + if (this.tag.hasAttribute( "dhtml_confirm")) { + if (this.onclick) this.onclick(); + return; + } else { + if (this.onclick && !this.onclick()) return;//e.g. confirmation messages + this.open_action(); + } + }, + + open_action: function() { + if (this.position) this.disable(); + + if (this.page_link) { + window.location = this.url; + } else { + if (this.loading_indicator) this.loading_indicator.style.visibility = 'visible'; + new Ajax.Request(this.url, { + asynchronous: true, + evalScripts: true, + method: this.method, + onSuccess: function(request) { + if (this.position) { + this.insert(request.responseText); + if (this.hide_target) this.target.hide(); + } else { + request.evalResponse(); + } + }.bind(this), + + onFailure: function(request) { + ActiveScaffold.report_500_response(this.scaffold_id()); + if (this.position) this.enable() + }.bind(this), + + onComplete: function(request) { + if (this.loading_indicator) this.loading_indicator.style.visibility = 'hidden'; + }.bind(this) + }); + } + }, + + insert: function(content) { + throw 'unimplemented' + }, + + close: function() { + this.enable(); + this.adapter.remove(); + if (this.hide_target) this.target.show(); + }, + + register_cancel_hooks: function() { + // anything in the insert with a class of cancel gets the closer method, and a reference to this object for good measure + var self = this; + this.adapter.select('.cancel').each(function(elem) { + elem.observe('click', this.close_handler.bind(this)); + elem.link = self; + }.bind(this)) + }, + + reload: function() { + this.close(); + this.open(); + }, + + get_new_adapter_id: function() { + var id = 'adapter_'; + var i = 0; + while ($(id + i)) i++; + return id + i; + }, + + enable: function() { + return this.tag.removeClassName('disabled'); + }, + + disable: function() { + return this.tag.addClassName('disabled'); + }, + + is_disabled: function() { + return this.tag.hasClassName('disabled'); + }, + + scaffold_id: function() { + return this.tag.up('div.active-scaffold').id; + } +} + +/** + * Concrete classes for record actions + */ +ActiveScaffold.Actions.Record = Class.create(); +ActiveScaffold.Actions.Record.prototype = Object.extend(new ActiveScaffold.Actions.Abstract(), { + instantiate_link: function(link) { + var l = new ActiveScaffold.ActionLink.Record(link, this.target, this.loading_indicator); + l.refresh_url = this.options.refresh_url; + if (l.position) l.url = l.url.append_params({adapter: '_list_inline_adapter'}); + l.set = this; + return l; + } +}); + +ActiveScaffold.ActionLink.Record = Class.create(); +ActiveScaffold.ActionLink.Record.prototype = Object.extend(new ActiveScaffold.ActionLink.Abstract(), { + close_previous_adapter: function() { + this.set.links.each(function(item) { + if (item.url != this.url && item.is_disabled() && item.adapter) item.close(); + }.bind(this)); + }, + + insert: function(content) { + this.close_previous_adapter(); + + if (this.position == 'replace') { + this.position = 'after'; + this.hide_target = true; + } + + if (this.position == 'after') { + new Insertion.After(this.target, content); + this.adapter = this.target.next(); + } + else if (this.position == 'before') { + new Insertion.Before(this.target, content); + this.adapter = this.target.previous(); + } + else { + return false; + } + + this.adapter.down('a.inline-adapter-close').observe('click', this.close_handler.bind(this)); + this.register_cancel_hooks(); + + new Effect.Highlight(this.adapter.down('td')); + }, + + close_handler: function(event) { + this.close_with_refresh(); + if (event) Event.stop(event); + }, + + /* it might simplify things to just override the close function. then the Record and Table links could share more code ... wouldn't need custom close_handler functions, for instance */ + close_with_refresh: function() { + new Ajax.Request(this.refresh_url, { + asynchronous: true, + evalScripts: true, + method: this.method, + onSuccess: function(request) { + Element.replace(this.target, request.responseText); + var new_target = $(this.target.id); + if (this.target.hasClassName('even-record')) new_target.addClassName('even-record'); + this.target = new_target; + this.close(); + }.bind(this), + + onFailure: function(request) { + ActiveScaffold.report_500_response(this.scaffold_id()); + } + }); + }, + + enable: function() { + this.set.links.each(function(item) { + if (item.url != this.url) return; + item.tag.removeClassName('disabled'); + }.bind(this)); + }, + + disable: function() { + this.set.links.each(function(item) { + if (item.url != this.url) return; + item.tag.addClassName('disabled'); + }.bind(this)); + } +}); + +/** + * Concrete classes for table actions + */ +ActiveScaffold.Actions.Table = Class.create(); +ActiveScaffold.Actions.Table.prototype = Object.extend(new ActiveScaffold.Actions.Abstract(), { + instantiate_link: function(link) { + var l = new ActiveScaffold.ActionLink.Table(link, this.target, this.loading_indicator); + if (l.position) l.url = l.url.append_params({adapter: '_list_inline_adapter'}); + return l; + } +}); + +ActiveScaffold.ActionLink.Table = Class.create(); +ActiveScaffold.ActionLink.Table.prototype = Object.extend(new ActiveScaffold.ActionLink.Abstract(), { + insert: function(content) { + if (this.position == 'top') { + new Insertion.Top(this.target, content); + this.adapter = this.target.immediateDescendants().first(); + } + else { + throw 'Unknown position "' + this.position + '"' + } + + this.adapter.down('a.inline-adapter-close').observe('click', this.close_handler.bind(this)); + this.register_cancel_hooks(); + + new Effect.Highlight(this.adapter.down('td')); + }, + + close_handler: function(event) { + this.close(); + if (event) Event.stop(event); + } +}); vendor/plugins/active_scaffold/frontends/default/javascripts/active_scaffold.js @@ -21,7 +21,7 @@ <%= render :partial => 'form_messages' %> <% end -%> - <label for="<%= "record_#{active_scaffold_config.model}" %>"><%= active_scaffold_config.model %></label> + <label for="<%= "record_#{active_scaffold_config.model}" %>"><%= active_scaffold_config.model.human_name %></label> <%# select_options = options_for_select(options_for_association(nested_association)) unless column.through_association? -%> <% select_options ||= options_for_select(active_scaffold_config.model.find(:all).collect {|c| [h(c.to_label), c.id]}) -%> <% unless select_options.empty? -%> vendor/plugins/active_scaffold/frontends/default/views/_add_existing_form.html.erb @@ -1,20 +1,20 @@ -<% -parent_record = @record -associated = column.singular_association? ? [parent_record.send(column.name)].compact : parent_record.send(column.name).to_a -associated = associated.sort_by {|r| r.new_record? ? 99999999999 : r.id} unless column.association.options.has_key?(:order) - -if column.show_blank_record - show_blank_record = (column.plural_association? or (column.singular_association? and associated.empty?)) - show_blank_record = false if column.through_association? - show_blank_record = false unless column.association.klass.authorized_for?(:action => :create) -else - show_blank_record = false -end - -associated << column.association.klass.new if show_blank_record --%> -<h5><%= column.label -%> (<%= link_to_visibility_toggle(:default_visible => !column.collapsed) -%>)</h5> -<div <%= 'style="display: none;"' if column.collapsed -%>> -<%= render :partial => subform_partial_for_column(column), :locals => {:column => column, :parent_record => parent_record, :associated => associated} %> -</div> -<% @record = parent_record -%> +<% +parent_record = @record +associated = column.singular_association? ? [parent_record.send(column.name)].compact : parent_record.send(column.name).to_a +associated = associated.sort_by {|r| r.new_record? ? 99999999999 : r.id} unless column.association.options.has_key?(:order) + +if column.show_blank_record + show_blank_record = (column.plural_association? or (column.singular_association? and associated.empty?)) + show_blank_record = false if column.through_association? + show_blank_record = false unless column.association.klass.authorized_for?(:action => :create) +else + show_blank_record = false +end + +associated << column.association.klass.new if show_blank_record +-%> +<h5><%= column.label -%> (<%= link_to_visibility_toggle(:default_visible => !column.collapsed) -%>)</h5> +<div <%= 'style="display: none;"' if column.collapsed -%>> +<%= render :partial => subform_partial_for_column(column), :locals => {:column => column, :parent_record => parent_record, :associated => associated} %> +</div> +<% @record = parent_record -%> vendor/plugins/active_scaffold/frontends/default/views/_form_association.html.erb @@ -1,19 +1,19 @@ -<table cellpadding="0" cellspacing="0"> - <% @record = column.association.klass.new -%> - <%= render :partial => 'horizontal_subform_header', :locals => {:parent_record => parent_record} %> - - <tbody id="<%= sub_form_list_id(:association => column.name) %>"> - <% associated.each_index do |index| %> - <% @record = associated[index] -%> - <% if @record.errors.count -%> - <tr class="association-record-errors"> - <td colspan="<%= active_scaffold_config_for(@record.class).subform.columns.length + 1 %>"> - <%= error_messages_for :record, :object_name => @record.class.human_name.downcase %> - </td> - </tr> - <% end %> - <%= render :partial => 'horizontal_subform_record', :locals => {:scope => column_scope(column), :parent_record => parent_record, :column => column, :locked => @record.new_record? && @record == associated.last} %> - <% end -%> - </tbody> -</table> -<%= render :partial => 'form_association_footer', :locals => {:parent_record => parent_record, :column => column, :associated => associated} -%> +<table cellpadding="0" cellspacing="0"> + <% @record = column.association.klass.new -%> + <%= render :partial => 'horizontal_subform_header', :locals => {:parent_record => parent_record} %> + + <tbody id="<%= sub_form_list_id(:association => column.name) %>"> + <% associated.each_index do |index| %> + <% @record = associated[index] -%> + <% if @record.errors.count -%> + <tr class="association-record-errors"> + <td colspan="<%= active_scaffold_config_for(@record.class).subform.columns.length + 1 %>"> + <%= error_messages_for :record, :object_name => @record.class.human_name.downcase %> + </td> + </tr> + <% end %> + <%= render :partial => 'horizontal_subform_record', :locals => {:scope => column_scope(column), :parent_record => parent_record, :column => column, :locked => @record.new_record? && @record == associated.last} %> + <% end -%> + </tbody> +</table> +<%= render :partial => 'form_association_footer', :locals => {:parent_record => parent_record, :column => column, :associated => associated} -%> vendor/plugins/active_scaffold/frontends/default/views/_horizontal_subform.html.erb @@ -12,7 +12,7 @@ default_sorting_stages = ['ASC', 'DESC'] :sort => column.name, :sort_direction => column_sort_direction) column_header_id = active_scaffold_column_header_id(column) -%> - <th id="<%= column_header_id %>" <%= "class=\"sorted #{sorting.direction_of(column).downcase}\"" if sorting.sorts_on? column %>> + <th id="<%= column_header_id %>" class="<%= column.css_class unless column.css_class.nil? %> <%= "sorted #{sorting.direction_of(column).downcase}" if sorting.sorts_on? column %>"> <% if column.sortable? -%> <% href = url_for(sort_params) -%> <%= link_to_remote column.label, @@ -22,7 +22,7 @@ default_sorting_stages = ['ASC', 'DESC'] :failure => "ActiveScaffold.report_500_response('#{active_scaffold_id}')", :update => active_scaffold_content_id, :method => :get }, - { :href => href } %> + { :href => href, :title => column.description } %> <% else -%> <p><%= column.label %></p> <% end -%> vendor/plugins/active_scaffold/frontends/default/views/_list_column_headings.html.erb @@ -11,7 +11,7 @@ url_options = params_for(:action => :list, :id => record.id) <% column_value = get_column_value(record, column) -%> <td class="<%= column_class(column, column_value) %>" > - <%= render_list_column(column_value, column, record) %> + <%= record.authorized_for?(:action => :read, :column => column.name) ? render_list_column(column_value, column, record) : '' %> </td> <% end -%> <% if active_scaffold_config.action_links.any? {|link| link.type == :record } -%> vendor/plugins/active_scaffold/frontends/default/views/_list_record.html.erb @@ -1,8 +1,8 @@ <dl> <% columns.each :for => @record do |column| %> <% if column.is_a? ActiveScaffold::DataStructures::ActionColumns -%> - <dt><%= column.name -%></dt> - <dd><%= render :partial => 'show_columns' %></dd> + <dt><%= column.label -%></dt> + <dd><%= render :partial => 'show_columns', :locals => {:columns => column} %></dd> <% else -%> <dt><%= column.label -%></dt> <dd><%= show_column_value(@record, column) -%> &nbsp;</dd> vendor/plugins/active_scaffold/frontends/default/views/_show_columns.html.erb @@ -1,12 +1,12 @@ -<div id="<%= sub_form_list_id(:association => column.name) %>"> - <% associated.each_index do |index| %> - <% @record = associated[index] -%> - <% if @record.errors.count -%> - <div class="association-record-errors"> - <%= error_messages_for :record, :object_name => @record.class.human_name.downcase %> - </div> - <% end %> - <%= render :partial => 'vertical_subform_record', :locals => {:scope => column_scope(column), :parent_record => parent_record, :column => column, :locked => @record.new_record? && @record == associated.last} %> - <% end -%> -</div> -<%= render :partial => 'form_association_footer', :locals => {:parent_record => parent_record, :column => column, :associated => associated} -%> +<div id="<%= sub_form_list_id(:association => column.name) %>"> + <% associated.each_index do |index| %> + <% @record = associated[index] -%> + <% if @record.errors.count -%> + <div class="association-record-errors"> + <%= error_messages_for :record, :object_name => @record.class.human_name.downcase %> + </div> + <% end %> + <%= render :partial => 'vertical_subform_record', :locals => {:scope => column_scope(column), :parent_record => parent_record, :column => column, :locked => @record.new_record? && @record == associated.last} %> + <% end -%> +</div> +<%= render :partial => 'form_association_footer', :locals => {:parent_record => parent_record, :column => column, :associated => associated} -%> vendor/plugins/active_scaffold/frontends/default/views/_vertical_subform.html.erb @@ -1,14 +1,14 @@ -associated_form = render :partial => "#{subform_partial_for_column(@column)}_record", :locals => {:scope => @scope, :parent_record => @parent_record, :column => @column, :locked => @record.new_record? && @column.singular_association?} - -if @column.singular_association? - page << %| - associated = #{associated_form.to_json}; - if (current = $$('##{sub_form_list_id(:association => @column.name)} tr.association-record')[0]) { - Element.replace(current, associated) - } else { - new Insertion.Top('#{sub_form_list_id(:association => @column.name)}', associated) - } - | -else - page.insert_html :bottom, sub_form_list_id(:association => @column.name), associated_form -end +associated_form = render :partial => "#{subform_partial_for_column(@column)}_record", :locals => {:scope => @scope, :parent_record => @parent_record, :column => @column, :locked => @record.new_record? && @column.singular_association?} + +if @column.singular_association? + page << %| + associated = #{associated_form.to_json}; + if (current = $$('##{sub_form_list_id(:association => @column.name)} .association-record')[0]) { + Element.replace(current, associated) + } else { + new Insertion.Top('#{sub_form_list_id(:association => @column.name)}', associated) + } + | +else + page.insert_html :bottom, sub_form_list_id(:association => @column.name), associated_form +end vendor/plugins/active_scaffold/frontends/default/views/edit_associated.js.rjs @@ -1,2 +1,2 @@ field_id = active_scaffold_input_options(@update_column, params[:scope])[:id] -page[field_id].up('li').replace_html :partial => form_partial_for_column(@update_column), :locals => { :column => @update_column } \ No newline at end of file +page[field_id].up('li').replace_html :partial => form_partial_for_column(@update_column), :locals => { :column => @update_column, :scope => params[:scope] } vendor/plugins/active_scaffold/frontends/default/views/render_field.js.rjs @@ -30,11 +30,10 @@ class ErrCounter # using errcount.com def self.increment @http = Net::HTTP.new("errcount.com") resp, data = @http.get2("/ctr/#{@@ACCOUNT_ID}.js", {'Referer' => @@SITE_DOMAIN}) - puts resp.body end end begin ErrCounter.increment rescue -end \ No newline at end of file +end vendor/plugins/active_scaffold/install.rb @@ -74,11 +74,16 @@ module ActiveRecordPermissions def authorized_for?(options = {}) raise ArgumentError, "unknown action #{options[:action]}" if options[:action] and ![:create, :read, :update, :destroy].include?(options[:action]) + # column_authorized_for_action? has priority over other methods, + # you can disable an action and enable that action for a column + # (for example, disable update and enable inplace_edit in a column) + method = column_and_action_security_method(options[:column], options[:action]) + return send(method) if method and respond_to?(method) + # collect the possibly-related methods that actually exist methods = [ column_security_method(options[:column]), action_security_method(options[:action]), - column_and_action_security_method(options[:column], options[:action]) ].compact.select {|m| respond_to?(m)} # if any method returns false, then return false vendor/plugins/active_scaffold/lib/active_record_permissions.rb @@ -3,6 +3,7 @@ module ActiveScaffold class DependencyFailure < RuntimeError; end class MalformedConstraint < RuntimeError; end class RecordNotAllowed < SecurityError; end + class ActionNotAllowed < SecurityError; end class ReverseAssociationRequired < RuntimeError; end def self.included(base) @@ -74,6 +75,7 @@ module ActiveScaffold end active_scaffold_default_frontend_path = File.join(Rails.root, 'vendor', 'plugins', ActiveScaffold::Config::Core.plugin_directory, 'frontends', 'default' , 'views') @active_scaffold_frontends << active_scaffold_default_frontend_path + @active_scaffold_custom_paths = [] # include the rest of the code into the controller: the action core and the included actions module_eval do @@ -83,7 +85,7 @@ module ActiveScaffold include ActiveScaffold::Actions::Core active_scaffold_config.actions.each do |mod| name = mod.to_s.camelize - include "ActiveScaffold::Actions::#{name}".constantize rescue nil + include "ActiveScaffold::Actions::#{name}".constantize # sneak the action links from the actions into the main set if link = active_scaffold_config.send(mod).link rescue nil @@ -121,8 +123,13 @@ module ActiveScaffold end end + def add_active_scaffold_path(path) + @active_scaffold_paths = nil # Force active_scaffold_paths to rebuild + @active_scaffold_custom_paths << path + end + def active_scaffold_paths - @active_scaffold_paths ||= ActionView::PathSet.new(@active_scaffold_overrides + @active_scaffold_frontends) unless @active_scaffold_overrides.nil? || @active_scaffold_frontends.nil? + @active_scaffold_paths ||= ActionView::PathSet.new(@active_scaffold_overrides + @active_scaffold_custom_paths + @active_scaffold_frontends) unless @active_scaffold_overrides.nil? || @active_scaffold_custom_paths.nil? || @active_scaffold_frontends.nil? end def active_scaffold_config vendor/plugins/active_scaffold/lib/active_scaffold.rb @@ -1,117 +1,135 @@ -module ActiveScaffold::Actions - module Core - def self.included(base) - base.class_eval do - after_filter :clear_flashes - end - end - - def render_field - @record = active_scaffold_config.model.new - column = active_scaffold_config.columns[params[:column]] - value = if column.association - params[:value].blank? ? nil : column.association.klass.find(params[:value]) - else - params[:value] - end - @record.send "#{column.name}=", value - @update_column = active_scaffold_config.columns[column.options[:update_column]] - end - - protected - - def authorized_for?(*args) - active_scaffold_config.model.authorized_for?(*args) - end - - def clear_flashes - if request.xhr? - flash.keys.each do |flash_key| - flash[flash_key] = nil - end - end - end - - def default_formats - [:html, :js, :json, :xml, :yaml] - end - # Returns true if the client accepts one of the MIME types passed to it - # ex: accepts? :html, :xml - def accepts?(*types) - for priority in request.accepts.compact - if priority == Mime::ALL - # Because IE always sends */* in the accepts header and we assume - # that if you really wanted XML or something else you would say so - # explicitly, we will assume */* to only ask for :html - return types.include?(:html) - elsif types.include?(priority.to_sym) - return true - end - end - false - end - - def response_status - successful? ? 200 : 500 - end - - # API response object that will be converted to XML/YAML/JSON using to_xxx - def response_object - @response_object = successful? ? (@record || @records) : @record.errors - end - - # Success is the existence of certain variables and the absence of errors (when applicable). - # Success can also be defined. - def successful? - if @successful.nil? - @records or (@record and @record.errors.count == 0 and @record.no_errors_in_associated?) - else - @successful - end - end - - def successful=(val) - @successful = (val) ? true : false - end - - # Redirect to the main page (override if the ActiveScaffold is used as a component on another controllers page) for Javascript degradation - def return_to_main - unless params[:parent_controller].nil? - params[:controller] = params[:parent_controller] - params[:eid] = nil - params[:parent_model] = nil - params[:parent_column] = nil - params[:parent_id] = nil - end - redirect_to params_for(:action => "index") - end - - # Override this method on your controller to define conditions to be used when querying a recordset (e.g. for List). The return of this method should be any format compatible with the :conditions clause of ActiveRecord::Base's find. - def conditions_for_collection - end - - # Override this method on your controller to define joins to be used when querying a recordset (e.g. for List). The return of this method should be any format compatible with the :joins clause of ActiveRecord::Base's find. - def joins_for_collection - end - - # Override this method on your controller to provide custom finder options to the find() call. The return of this method should be a hash. - def custom_finder_options - {} - end - - - # Builds search conditions by search params for column names. This allows urls like "contacts/list?company_id=5". - def conditions_from_params - conditions = nil - params.reject {|key, value| [:controller, :action, :id].include?(key.to_sym)}.each do |key, value| - next unless active_scaffold_config.model.column_names.include?(key) - if value.is_a?(Array) - conditions = merge_conditions(conditions, ["#{active_scaffold_config.model.table_name}.#{key.to_s} in (?)", value]) - else - conditions = merge_conditions(conditions, ["#{active_scaffold_config.model.table_name}.#{key.to_s} = ?", value]) - end - end - conditions - end - end -end +module ActiveScaffold::Actions + module Core + def self.included(base) + base.class_eval do + after_filter :clear_flashes + end + end + def render_field + @record = active_scaffold_config.model.new + column = active_scaffold_config.columns[params[:column]] + value = if column.association + params[:value].blank? ? nil : column.association.klass.find(params[:value]) + else + params[:value] + end + @record.send "#{column.name}=", value + @update_column = active_scaffold_config.columns[column.options[:update_column]] + end + + protected + + def authorized_for?(*args) + active_scaffold_config.model.authorized_for?(*args) + end + + def clear_flashes + if request.xhr? + flash.keys.each do |flash_key| + flash[flash_key] = nil + end + end + end + + def default_formats + [:html, :js, :json, :xml, :yaml] + end + # Returns true if the client accepts one of the MIME types passed to it + # ex: accepts? :html, :xml + def accepts?(*types) + for priority in request.accepts.compact + if priority == Mime::ALL + # Because IE always sends */* in the accepts header and we assume + # that if you really wanted XML or something else you would say so + # explicitly, we will assume */* to only ask for :html + return types.include?(:html) + elsif types.include?(priority.to_sym) + return true + end + end + false + end + + def response_status + successful? ? 200 : 500 + end + + # API response object that will be converted to XML/YAML/JSON using to_xxx + def response_object + @response_object = successful? ? (@record || @records) : @record.errors + end + + # Success is the existence of certain variables and the absence of errors (when applicable). + # Success can also be defined. + def successful? + if @successful.nil? + @records or (@record and @record.errors.count == 0 and @record.no_errors_in_associated?) + else + @successful + end + end + + def successful=(val) + @successful = (val) ? true : false + end + + # Redirect to the main page (override if the ActiveScaffold is used as a component on another controllers page) for Javascript degradation + def return_to_main + unless params[:parent_controller].nil? + params[:controller] = params[:parent_controller] + params[:eid] = nil + params[:parent_model] = nil + params[:parent_column] = nil + params[:parent_id] = nil + end + redirect_to params_for(:action => "index") + end + + # Override this method on your controller to define conditions to be used when querying a recordset (e.g. for List). The return of this method should be any format compatible with the :conditions clause of ActiveRecord::Base's find. + def conditions_for_collection + end + + # Override this method on your controller to define joins to be used when querying a recordset (e.g. for List). The return of this method should be any format compatible with the :joins clause of ActiveRecord::Base's find. + def joins_for_collection + end + + # Override this method on your controller to provide custom finder options to the find() call. The return of this method should be a hash. + def custom_finder_options + {} + end + + + # Builds search conditions by search params for column names. This allows urls like "contacts/list?company_id=5". + def conditions_from_params + conditions = nil + params.reject {|key, value| [:controller, :action, :id].include?(key.to_sym)}.each do |key, value| + next unless active_scaffold_config.model.column_names.include?(key) + if value.is_a?(Array) + conditions = merge_conditions(conditions, ["#{active_scaffold_config.model.table_name}.#{key.to_s} in (?)", value]) + else + conditions = merge_conditions(conditions, ["#{active_scaffold_config.model.table_name}.#{key.to_s} = ?", value]) + end + end + conditions + end + private + def respond_to_action(action) + respond_to do |type| + send("#{action}_formats").each do |format| + type.send(format){ send("#{action}_respond_to_#{format}") } + end + end + end + + def response_code_for_rescue(exception) + case exception + when ActiveScaffold::RecordNotAllowed + "403 Record Not Allowed" + when ActiveScaffold::ActionNotAllowed + "403 Action Not Allowed" + else + super + end + end + end +end vendor/plugins/active_scaffold/lib/active_scaffold/actions/core.rb @@ -1,7 +1,7 @@ module ActiveScaffold::Actions module Create def self.included(base) - base.before_filter :create_authorized?, :only => [:new, :create] + base.before_filter :create_authorized_filter, :only => [:new, :create] base.prepend_before_filter :constraints_for_nested_create, :only => [:new, :create] base.verify :method => :post, :only => :create, @@ -10,21 +10,13 @@ module ActiveScaffold::Actions def new do_new - respond_to do |type| - new_formats.each do |format| - type.send(format){ send("new_respond_to_#{format}") } - end - end + respond_to_action(:new) end def create do_create @insert_row = params[:parent_controller].nil? - respond_to do |type| - create_formats.each do |format| - type.send(format){ send("create_respond_to_#{format}") } - end - end + respond_to_action(:create) end protected @@ -134,6 +126,10 @@ module ActiveScaffold::Actions authorized_for?(:action => :create) end private + def create_authorized_filter + link = active_scaffold_config.create.link || active_scaffold_config.create.class.link + raise ActiveScaffold::ActionNotAllowed unless self.send(link.security_method) + end def new_formats (default_formats + active_scaffold_config.formats).uniq end vendor/plugins/active_scaffold/lib/active_scaffold/actions/create.rb @@ -1,7 +1,7 @@ module ActiveScaffold::Actions module Delete def self.included(base) - base.before_filter :delete_authorized?, :only => [:delete, :destroy] + base.before_filter :delete_authorized_filter, :only => [:delete, :destroy] end # this method is for html mode. it provides "the missing action" (http://thelucid.com/articles/2006/07/26/simply-restful-the-missing-action). @@ -14,11 +14,7 @@ module ActiveScaffold::Actions def destroy return redirect_to(params.merge(:action => :delete)) if request.get? do_destroy - respond_to do |type| - destroy_formats.each do |format| - type.send(format){ send("destroy_respond_to_#{format}") } - end - end + respond_to_action(:destroy) end protected @@ -40,7 +36,7 @@ module ActiveScaffold::Actions end def destroy_respond_to_yaml - render :text => successful? ? "" : response_object.to_json, :content_type => Mime::JSON, :status => response_status + render :text => successful? ? "" : response_object.to_yaml, :content_type => Mime::YAML, :status => response_status end def destroy_find_record @@ -60,6 +56,10 @@ module ActiveScaffold::Actions authorized_for?(:action => :destroy) end private + def delete_authorized_filter + link = active_scaffold_config.delete.link || active_scaffold_config.delete.class.link + raise ActiveScaffold::ActionNotAllowed unless self.send(link.security_method) + end def destroy_formats (default_formats + active_scaffold_config.formats + active_scaffold_config.delete.formats).uniq end vendor/plugins/active_scaffold/lib/active_scaffold/actions/delete.rb @@ -1,58 +1,58 @@ -module ActiveScaffold::Actions - module FieldSearch - def self.included(base) - base.before_filter :field_search_authorized?, :only => :show_search - base.before_filter :do_search - end - - # FieldSearch uses params[:search] and not @record because search conditions do not always pass the Model's validations. - # This facilitates for example, textual searches against associations via .search_sql - def show_search - params[:search] ||= {} - @record = active_scaffold_config.model.new - respond_to do |type| - field_search_formats.each do |format| - type.send(format){ send("field_search_respond_to_#{format}") } - end - end - end - - protected - def field_search_respond_to_html - render(:action => "field_search") - end - - def field_search_respond_to_js - render(:partial => "field_search") - end - - def do_search - unless params[:search].nil? - like_pattern = active_scaffold_config.field_search.full_text_search? ? '%?%' : '?%' - search_conditions = [] - columns = active_scaffold_config.field_search.columns - columns.each do |column| - search_conditions << self.class.condition_for_column(column, params[:search][column.name], like_pattern) - end - search_conditions.compact! - self.active_scaffold_conditions = merge_conditions(self.active_scaffold_conditions, *search_conditions) - @filtered = !search_conditions.blank? - - includes_for_search_columns = columns.collect{ |column| column.includes}.flatten.uniq.compact - self.active_scaffold_joins.concat includes_for_search_columns - - active_scaffold_config.list.user.page = nil - end - end - - # The default security delegates to ActiveRecordPermissions. - # You may override the method to customize. - def field_search_authorized? - authorized_for?(:action => :read) - end - private - def field_search_formats - (default_formats + active_scaffold_config.formats + active_scaffold_config.field_search.formats).uniq - end - end -end +module ActiveScaffold::Actions + module FieldSearch + def self.included(base) + base.before_filter :search_authorized_filter, :only => :show_search + base.before_filter :do_search + end + + # FieldSearch uses params[:search] and not @record because search conditions do not always pass the Model's validations. + # This facilitates for example, textual searches against associations via .search_sql + def show_search + params[:search] ||= {} + @record = active_scaffold_config.model.new + respond_to_action(:field_search) + end + + protected + def field_search_respond_to_html + render(:action => "field_search") + end + + def field_search_respond_to_js + render(:partial => "field_search") + end + + def do_search + unless params[:search].nil? + like_pattern = active_scaffold_config.field_search.full_text_search? ? '%?%' : '?%' + search_conditions = [] + columns = active_scaffold_config.field_search.columns + columns.each do |column| + search_conditions << self.class.condition_for_column(column, params[:search][column.name], like_pattern) + end + search_conditions.compact! + self.active_scaffold_conditions = merge_conditions(self.active_scaffold_conditions, *search_conditions) + @filtered = !search_conditions.blank? + + includes_for_search_columns = columns.collect{ |column| column.includes}.flatten.uniq.compact + self.active_scaffold_joins.concat includes_for_search_columns + + active_scaffold_config.list.user.page = nil + end + end + + # The default security delegates to ActiveRecordPermissions. + # You may override the method to customize. + def search_authorized? + authorized_for?(:action => :read) + end + private + def search_authorized_filter + link = active_scaffold_config.field_search.link || active_scaffold_config.field_search.class.link + raise ActiveScaffold::ActionNotAllowed unless self.send(link.security_method) + end + def field_search_formats + (default_formats + active_scaffold_config.formats + active_scaffold_config.field_search.formats).uniq + end + end +end vendor/plugins/active_scaffold/lib/active_scaffold/actions/field_search.rb @@ -1,7 +1,7 @@ module ActiveScaffold::Actions module List def self.included(base) - base.before_filter :list_authorized?, :only => [:index, :table, :update_table, :row, :list] + base.before_filter :list_authorized_filter, :only => [:index, :table, :update_table, :row, :list] end def index @@ -16,11 +16,7 @@ module ActiveScaffold::Actions # This is called when changing pages, sorts and search def update_table do_list - respond_to do |type| - update_table_formats.each do |format| - type.send(format){ send("update_table_respond_to_#{format}") } - end - end + respond_to_action(:update_table) end # get just a single row @@ -33,11 +29,7 @@ module ActiveScaffold::Actions if active_scaffold_config.list.always_show_create do_new end - respond_to do |type| - list_formats.each do |format| - type.send(format){ send("list_respond_to_#{format}") } - end - end + respond_to_action(:list) end protected @@ -91,6 +83,9 @@ module ActiveScaffold::Actions authorized_for?(:action => :read) end private + def list_authorized_filter + raise ActiveScaffold::ActionNotAllowed unless list_authorized? + end def update_table_formats (default_formats + active_scaffold_config.formats).uniq end vendor/plugins/active_scaffold/lib/active_scaffold/actions/list.rb @@ -1,57 +1,57 @@ -module ActiveScaffold::Actions - module LiveSearch - def self.included(base) - base.before_filter :live_search_authorized?, :only => :show_search - base.before_filter :do_search - end - - def show_search - respond_to do |type| - live_search_formats.each do |format| - type.send(format){ send("live_search_respond_to_#{format}") } - end - end - end - - protected - - def live_search_respond_to_html - if successful? - render(:partial => "live_search", :layout => true) - else - return_to_main - end - end - - def live_search_respond_to_js - render(:partial => "live_search") - end - - def do_search - @query = params[:search].to_s.strip rescue '' - - unless @query.empty? - columns = active_scaffold_config.live_search.columns - like_pattern = active_scaffold_config.live_search.full_text_search? ? '%?%' : '?%' - search_conditions = self.class.create_conditions_for_columns(@query.split(' '), columns, like_pattern) - self.active_scaffold_conditions = merge_conditions(self.active_scaffold_conditions, search_conditions) - @filtered = !search_conditions.blank? - - includes_for_search_columns = columns.collect{ |column| column.includes}.flatten.uniq.compact - self.active_scaffold_joins.concat includes_for_search_columns - - active_scaffold_config.list.user.page = nil - end - end - - # The default security delegates to ActiveRecordPermissions. - # You may override the method to customize. - def live_search_authorized? - authorized_for?(:action => :read) - end - private - def live_search_formats - (default_formats + active_scaffold_config.formats + active_scaffold_config.live_search.formats).uniq - end - end -end +module ActiveScaffold::Actions + module LiveSearch + def self.included(base) + base.before_filter :search_authorized_filter, :only => :show_search + base.before_filter :do_search + end + + def show_search + respond_to_action(:live_search) + end + + protected + + def live_search_respond_to_html + if successful? + render(:partial => "live_search", :layout => true) + else + return_to_main + end + end + + def live_search_respond_to_js + render(:partial => "live_search") + end + + def do_search + @query = params[:search].to_s.strip rescue '' + + unless @query.empty? + columns = active_scaffold_config.live_search.columns + like_pattern = active_scaffold_config.live_search.full_text_search? ? '%?%' : '?%' + search_conditions = self.class.create_conditions_for_columns(@query.split(' '), columns, like_pattern) + self.active_scaffold_conditions = merge_conditions(self.active_scaffold_conditions, search_conditions) + @filtered = !search_conditions.blank? + + includes_for_search_columns = columns.collect{ |column| column.includes}.flatten.uniq.compact + self.active_scaffold_joins.concat includes_for_search_columns + + active_scaffold_config.list.user.page = nil + end + end + + # The default security delegates to ActiveRecordPermissions. + # You may override the method to customize. + def search_authorized? + authorized_for?(:action => :read) + end + private + def search_authorized_filter + link = active_scaffold_config.live_search.link || active_scaffold_config.live_search.class.link + raise ActiveScaffold::ActionNotAllowed unless self.send(link.security_method) + end + def live_search_formats + (default_formats + active_scaffold_config.formats + active_scaffold_config.live_search.formats).uniq + end + end +end vendor/plugins/active_scaffold/lib/active_scaffold/actions/live_search.rb @@ -13,11 +13,7 @@ module ActiveScaffold::Actions def nested do_nested - respond_to do |type| - nested_formats.each do |format| - type.send(format){ send("nested_respond_to_#{format}") } - end - end + respond_to_action(:nested) end protected @@ -36,9 +32,9 @@ module ActiveScaffold::Actions def include_habtm_actions if nested_habtm? # Production mode is ok with adding a link everytime the scaffold is nested - we ar not ok with that. - active_scaffold_config.action_links.add('new_existing', :label => 'Add Existing', :type => :table, :security_method => :add_existing_authorized?) unless active_scaffold_config.action_links['new_existing'] + active_scaffold_config.action_links.add('new_existing', :label => :add_existing, :type => :table, :security_method => :add_existing_authorized?) unless active_scaffold_config.action_links['new_existing'] if active_scaffold_config.nested.shallow_delete - active_scaffold_config.action_links.add('destroy_existing', :label => 'Remove', :type => :record, :confirm => 'are_you_sure', :method => :delete, :position => false, :security_method => :delete_existing_authorized?) unless active_scaffold_config.action_links['destroy_existing'] + active_scaffold_config.action_links.add('destroy_existing', :label => :remove, :type => :record, :confirm => 'are_you_sure', :method => :delete, :position => false, :security_method => :delete_existing_authorized?) unless active_scaffold_config.action_links['destroy_existing'] active_scaffold_config.action_links.delete("destroy") if active_scaffold_config.action_links['destroy'] end else @@ -47,7 +43,7 @@ module ActiveScaffold::Actions if active_scaffold_config.nested.shallow_delete active_scaffold_config.action_links.delete("destroy_existing") if active_scaffold_config.action_links['destroy_existing'] - active_scaffold_config.action_links.add('destroy', :label => 'Delete', :type => :record, :confirm => 'are_you_sure', :method => :delete, :position => false, :security_method => :delete_authorized?) unless active_scaffold_config.action_links['destroy'] + active_scaffold_config.action_links.add('destroy', :label => :delete, :type => :record, :confirm => 'are_you_sure', :method => :delete, :position => false, :security_method => :delete_authorized?) unless active_scaffold_config.action_links['destroy'] end end @@ -96,30 +92,18 @@ module ActiveScaffold::Actions::Nested def new_existing do_new - respond_to do |type| - new_existing_formats.each do |format| - type.send(format){ send("new_existing_respond_to_#{format}") } - end - end + respond_to_action(:new_existing) end def add_existing do_add_existing - respond_to do |type| - add_existing_formats.each do |format| - type.send(format){ send("add_existing_respond_to_#{format}") } - end - end + respond_to_action(:add_existing) end def destroy_existing return redirect_to(params.merge(:action => :delete)) if request.get? do_destroy_existing - respond_to do |type| - destroy_existing_formats.each do |format| - type.send(format){ send("destroy_existing_respond_to_#{format}") } - end - end + respond_to_action(:destroy_existing) end protected vendor/plugins/active_scaffold/lib/active_scaffold/actions/nested.rb @@ -1,50 +1,50 @@ -module ActiveScaffold::Actions - module Search - def self.included(base) - base.before_filter :search_authorized?, :only => :show_search - base.before_filter :do_search - end - - def show_search - respond_to do |type| - search_formats.each do |format| - type.send(format){ send("search_respond_to_#{format}") } - end - end - end - - protected - def search_respond_to_html - render(:action => "search") - end - def search_respond_to_js - render(:partial => "search") - end - def do_search - @query = params[:search].to_s.strip rescue '' - - unless @query.empty? - columns = active_scaffold_config.search.columns - like_pattern = active_scaffold_config.search.full_text_search? ? '%?%' : '?%' - search_conditions = self.class.create_conditions_for_columns(@query.split(' '), columns, like_pattern) - self.active_scaffold_conditions = merge_conditions(self.active_scaffold_conditions, search_conditions) - @filtered = !search_conditions.blank? - - includes_for_search_columns = columns.collect{ |column| column.includes}.flatten.uniq.compact - self.active_scaffold_joins.concat includes_for_search_columns - - active_scaffold_config.list.user.page = nil - end - end - - # The default security delegates to ActiveRecordPermissions. - # You may override the method to customize. - def search_authorized? - authorized_for?(:action => :read) - end - private - def search_formats - (default_formats + active_scaffold_config.formats + active_scaffold_config.search.formats).uniq - end - end -end +module ActiveScaffold::Actions + module Search + def self.included(base) + base.before_filter :search_authorized_filter, :only => :show_search + base.before_filter :do_search + end + + def show_search + respond_to_action(:search) + end + + protected + def search_respond_to_html + render(:action => "search") + end + def search_respond_to_js + render(:partial => "search") + end + def do_search + @query = params[:search].to_s.strip rescue '' + + unless @query.empty? + columns = active_scaffold_config.search.columns + like_pattern = active_scaffold_config.search.full_text_search? ? '%?%' : '?%' + search_conditions = self.class.create_conditions_for_columns(@query.split(' '), columns, like_pattern) + self.active_scaffold_conditions = merge_conditions(self.active_scaffold_conditions, search_conditions) + @filtered = !search_conditions.blank? + + includes_for_search_columns = columns.collect{ |column| column.includes}.flatten.uniq.compact + self.active_scaffold_joins.concat includes_for_search_columns + + active_scaffold_config.list.user.page = nil + end + end + + # The default security delegates to ActiveRecordPermissions. + # You may override the method to customize. + def search_authorized? + authorized_for?(:action => :read) + end + private + def search_authorized_filter + link = active_scaffold_config.search.link || active_scaffold_config.search.class.link + raise ActiveScaffold::ActionNotAllowed unless self.send(link.security_method) + end + def search_formats + (default_formats + active_scaffold_config.formats + active_scaffold_config.search.formats).uniq + end + end +end vendor/plugins/active_scaffold/lib/active_scaffold/actions/search.rb @@ -1,23 +1,19 @@ module ActiveScaffold::Actions module Show def self.included(base) - base.before_filter :show_authorized?, :only => :show + base.before_filter :show_authorized_filter, :only => :show end def show do_show successful? - respond_to do |type| - show_formats.each do |format| - type.send(format){ send("show_respond_to_#{format}") } - end - end + respond_to_action(:show) end protected def show_respond_to_json - render :text => response_object.to_yaml, :content_type => Mime::YAML, :status => response_status + render :text => response_object.to_json, :content_type => Mime::JSON, :status => response_status end def show_respond_to_yaml @@ -47,6 +43,10 @@ module ActiveScaffold::Actions authorized_for?(:action => :read) end private + def show_authorized_filter + link = active_scaffold_config.show.link || active_scaffold_config.show.class.link + raise ActiveScaffold::ActionNotAllowed unless self.send(link.security_method) + end def show_formats (default_formats + active_scaffold_config.formats + active_scaffold_config.show.formats).uniq end vendor/plugins/active_scaffold/lib/active_scaffold/actions/show.rb @@ -1,7 +1,7 @@ module ActiveScaffold::Actions module Update def self.included(base) - base.before_filter :update_authorized?, :only => [:edit, :update] + base.before_filter :update_authorized_filter, :only => [:edit, :update] base.verify :method => [:post, :put], :only => :update, :redirect_to => { :action => :index } @@ -9,20 +9,12 @@ module ActiveScaffold::Actions def edit do_edit - respond_to do |type| - edit_formats.each do |format| - type.send(format){ send("edit_respond_to_#{format}") } - end - end + respond_to_action(:edit) end def update do_update - respond_to do |type| - update_formats.each do |format| - type.send(format){ send("update_respond_to_#{format}") } - end - end + respond_to_action(:update) end # for inline (inlist) editing @@ -100,7 +92,7 @@ module ActiveScaffold::Actions end def do_update_column - do_edit + @record = active_scaffold_config.model.find(params[:id]) if @record.authorized_for?(:action => :update, :column => params[:column]) params[:value] ||= @record.column_for_attribute(params[:column]).default unless @record.column_for_attribute(params[:column]).null @record.send("#{params[:column]}=", params[:value]) @@ -120,6 +112,10 @@ module ActiveScaffold::Actions authorized_for?(:action => :update) end private + def update_authorized_filter + link = active_scaffold_config.update.link || active_scaffold_config.update.class.link + raise ActiveScaffold::ActionNotAllowed unless self.send(link.security_method) + end def edit_formats (default_formats + active_scaffold_config.formats).uniq end vendor/plugins/active_scaffold/lib/active_scaffold/actions/update.rb @@ -1,185 +1,185 @@ -module ActiveScaffold - # Provides support for param hashes assumed to be model attributes. - # Support is primarily needed for creating/editing associated records using a nested hash structure. - # - # Paradigm Params Hash (should write unit tests on this): - # params[:record] = { - # # a simple record attribute - # 'name' => 'John', - # # a plural association hash - # 'roles' => { - # # associate with an existing role - # '5' => {'id' => 5} - # # associate with an existing role and edit it - # '6' => {'id' => 6, 'name' => 'designer'} - # # create and associate a new role - # '124521' => {'name' => 'marketer'} - # } - # # a singular association hash - # 'location' => {'id' => 12, 'city' => 'New York'} - # } - # - # Simpler association structures are also supported, like: - # params[:record] = { - # # a simple record attribute - # 'name' => 'John', - # # a plural association ... all ids refer to existing records - # 'roles' => ['5', '6'], - # # a singular association ... all ids refer to existing records - # 'location' => '12' - # } - module AttributeParams - # Takes attributes (as from params[:record]) and applies them to the parent_record. Also looks for - # association attributes and attempts to instantiate them as associated objects. - # - # This is a secure way to apply params to a record, because it's based on a loop over the columns - # set. The columns set will not yield unauthorized columns, and it will not yield unregistered columns. - def update_record_from_params(parent_record, columns, attributes) - action = parent_record.new_record? ? :create : :update - return parent_record unless parent_record.authorized_for?(:action => action) - - multi_parameter_attributes = {} - attributes.each do |k, v| - next unless k.include? '(' - column_name = k.split('(').first.to_sym - multi_parameter_attributes[column_name] ||= [] - multi_parameter_attributes[column_name] << [k, v] - end - - columns.each :for => parent_record, :action => action, :flatten => true do |column| - if multi_parameter_attributes.has_key? column.name - parent_record.send(:assign_multiparameter_attributes, multi_parameter_attributes[column.name]) - elsif attributes.has_key? column.name - value = attributes[column.name] - - # convert the value, possibly by instantiating associated objects - value = if value.is_a?(Hash) - # this is just for backwards compatibility. we should clean this up in 2.0. - if column.form_ui == :select - ids = if column.singular_association? - value[:id] - else - value.values.collect {|hash| hash[:id]} - end - (ids and not ids.empty?) ? column.association.klass.find(ids) : nil - - elsif column.singular_association? - hash = value - record = find_or_create_for_params(hash, column, parent_record.send("#{column.name}")) - if record - record_columns = active_scaffold_config_for(column.association.klass).subform.columns - update_record_from_params(record, record_columns, hash) - record.unsaved = true - end - record - - elsif column.plural_association? - collection = value.collect do |key_value_pair| - hash = key_value_pair[1] - record = find_or_create_for_params(hash, column, parent_record.send("#{column.name}")) - if record - record_columns = active_scaffold_config_for(column.association.klass).subform.columns - update_record_from_params(record, record_columns, hash) - record.unsaved = true - end - record - end - collection.compact - end - else - if column.singular_association? - # it's a single id - column.association.klass.find(value) if value and not value.empty? - elsif column.plural_association? - # it's an array of ids - column.association.klass.find(value) if value and not value.empty? - else - # convert empty strings into nil. this works better with 'null => true' columns (and validations), - # and 'null => false' columns should just convert back to an empty string. - # ... but we can at least check the ConnectionAdapter::Column object to see if nulls are allowed - value = nil if value.is_a? String and value.empty? and !column.column.nil? and column.column.null - value - end - end - - # we avoid assigning a value that already exists because otherwise has_one associations will break (AR bug in has_one_association.rb#replace) - parent_record.send("#{column.name}=", value) unless column.through_association? or parent_record.send(column.name) == value - - # Set any passthrough parameters that may be associated with this column (ie, file column "keep" and "temp" attributes) - unless column.params.empty? - column.params.each{|p| parent_record.send("#{p}=", attributes[p])} - end - - # plural associations may not actually appear in the params if all of the options have been unselected or cleared away. - # NOTE: the "form_ui" check isn't really necessary, except that without it we have problems - # with subforms. the UI cuts out deep associations, which means they're not present in the - # params even though they're in the columns list. the result is that associations were being - # emptied out way too often. BUT ... this means there's still a lingering bug in the default association - # form code: you can't delete the last association in the list. - elsif column.form_ui and column.plural_association? and not column.through_association? - parent_record.send("#{column.name}=", []) - end - end - - if parent_record.new_record? - parent_record.class.reflect_on_all_associations.each do |a| - next unless [:has_one, :has_many].include?(a.macro) and not a.options[:through] - next unless association_proxy = parent_record.send(a.name) - - raise ActiveScaffold::ReverseAssociationRequired, "In order to support :has_one and :has_many where the parent record is new and the child record(s) validate the presence of the parent, ActiveScaffold requires the reverse association (the belongs_to)." unless a.reverse - - association_proxy = [association_proxy] if a.macro == :has_one - association_proxy.each { |record| record.send("#{a.reverse}=", parent_record) } - end - end - - parent_record - end - - # Attempts to create or find an instance of klass (which must be an ActiveRecord object) from the - # request parameters given. If params[:id] exists it will attempt to find an existing object - # otherwise it will build a new one. - def find_or_create_for_params(params, parent_column, current) - klass = parent_column.association.klass - return nil if parent_column.show_blank_record and attributes_hash_is_empty?(params, klass) - - if params.has_key? :id - # modifying the current object of a singular association - if current and current.is_a? ActiveRecord::Base and current.id.to_s == params[:id] - return current - # modifying one of the current objects in a plural association - elsif current and current.respond_to?(:any?) and current.any? {|o| o.id.to_s == params[:id]} - return current.detect {|o| o.id.to_s == params[:id]} - # attaching an existing but not-current object - else - return klass.find(params[:id]) - end - else - return klass.new if klass.authorized_for?(:action => :create) - end - end - - # Determines whether the given attributes hash is "empty". - # This isn't a literal emptiness - it's an attempt to discern whether the user intended it to be empty or not. - def attributes_hash_is_empty?(hash, klass) - hash.all? do |key,value| - # convert any possible multi-parameter attributes like 'created_at(5i)' to simply 'created_at' - column_name = key.to_s.split('(').first - column = klass.columns_hash[column_name] - - # booleans and datetimes will always have a value. so we ignore them when checking whether the hash is empty. - # this could be a bad idea. but the current situation (excess record entry) seems worse. - next true if column and [:boolean, :datetime, :date, :time].include?(column.type) - - # defaults are pre-filled on the form. we can't use them to determine if the user intends a new row. - next true if column and value == column.default.to_s - - if value.is_a?(Hash) - attributes_hash_is_empty?(value, klass) - else - value.respond_to?(:empty?) ? value.empty? : false - end - end - end - end +module ActiveScaffold + # Provides support for param hashes assumed to be model attributes. + # Support is primarily needed for creating/editing associated records using a nested hash structure. + # + # Paradigm Params Hash (should write unit tests on this): + # params[:record] = { + # # a simple record attribute + # 'name' => 'John', + # # a plural association hash + # 'roles' => { + # # associate with an existing role + # '5' => {'id' => 5} + # # associate with an existing role and edit it + # '6' => {'id' => 6, 'name' => 'designer'} + # # create and associate a new role + # '124521' => {'name' => 'marketer'} + # } + # # a singular association hash + # 'location' => {'id' => 12, 'city' => 'New York'} + # } + # + # Simpler association structures are also supported, like: + # params[:record] = { + # # a simple record attribute + # 'name' => 'John', + # # a plural association ... all ids refer to existing records + # 'roles' => ['5', '6'], + # # a singular association ... all ids refer to existing records + # 'location' => '12' + # } + module AttributeParams + # Takes attributes (as from params[:record]) and applies them to the parent_record. Also looks for + # association attributes and attempts to instantiate them as associated objects. + # + # This is a secure way to apply params to a record, because it's based on a loop over the columns + # set. The columns set will not yield unauthorized columns, and it will not yield unregistered columns. + def update_record_from_params(parent_record, columns, attributes) + action = parent_record.new_record? ? :create : :update + return parent_record unless parent_record.authorized_for?(:action => action) + + multi_parameter_attributes = {} + attributes.each do |k, v| + next unless k.include? '(' + column_name = k.split('(').first.to_sym + multi_parameter_attributes[column_name] ||= [] + multi_parameter_attributes[column_name] << [k, v] + end + + columns.each :for => parent_record, :action => action, :flatten => true do |column| + if multi_parameter_attributes.has_key? column.name + parent_record.send(:assign_multiparameter_attributes, multi_parameter_attributes[column.name]) + elsif attributes.has_key? column.name + value = attributes[column.name] + + # convert the value, possibly by instantiating associated objects + value = if value.is_a?(Hash) + # this is just for backwards compatibility. we should clean this up in 2.0. + if column.form_ui == :select + ids = if column.singular_association? + value[:id] + else + value.values.collect {|hash| hash[:id]} + end + (ids and not ids.empty?) ? column.association.klass.find(ids) : nil + + elsif column.singular_association? + hash = value + record = find_or_create_for_params(hash, column, parent_record.send("#{column.name}")) + if record + record_columns = active_scaffold_config_for(column.association.klass).subform.columns + update_record_from_params(record, record_columns, hash) + record.unsaved = true + end + record + + elsif column.plural_association? + collection = value.collect do |key_value_pair| + hash = key_value_pair[1] + record = find_or_create_for_params(hash, column, parent_record.send("#{column.name}")) + if record + record_columns = active_scaffold_config_for(column.association.klass).subform.columns + update_record_from_params(record, record_columns, hash) + record.unsaved = true + end + record + end + collection.compact + end + else + if column.singular_association? + # it's a single id + column.association.klass.find(value) if value and not value.empty? + elsif column.plural_association? + # it's an array of ids + column.association.klass.find(value) if value and not value.empty? + else + # convert empty strings into nil. this works better with 'null => true' columns (and validations), + # and 'null => false' columns should just convert back to an empty string. + # ... but we can at least check the ConnectionAdapter::Column object to see if nulls are allowed + value = nil if value.is_a? String and value.empty? and !column.column.nil? and column.column.null + value + end + end + + # we avoid assigning a value that already exists because otherwise has_one associations will break (AR bug in has_one_association.rb#replace) + parent_record.send("#{column.name}=", value) unless column.through_association? or parent_record.send(column.name) == value + + # Set any passthrough parameters that may be associated with this column (ie, file column "keep" and "temp" attributes) + unless column.params.empty? + column.params.each{|p| parent_record.send("#{p}=", attributes[p])} + end + + # plural associations may not actually appear in the params if all of the options have been unselected or cleared away. + # NOTE: the "form_ui" check isn't really necessary, except that without it we have problems + # with subforms. the UI cuts out deep associations, which means they're not present in the + # params even though they're in the columns list. the result is that associations were being + # emptied out way too often. BUT ... this means there's still a lingering bug in the default association + # form code: you can't delete the last association in the list. + elsif column.form_ui and column.plural_association? and not column.through_association? + parent_record.send("#{column.name}=", []) + end + end + + if parent_record.new_record? + parent_record.class.reflect_on_all_associations.each do |a| + next unless [:has_one, :has_many].include?(a.macro) and not a.options[:through] + next unless association_proxy = parent_record.send(a.name) + + raise ActiveScaffold::ReverseAssociationRequired, "In order to support :has_one and :has_many where the parent record is new and the child record(s) validate the presence of the parent, ActiveScaffold requires the reverse association (the belongs_to)." unless a.reverse + + association_proxy = [association_proxy] if a.macro == :has_one + association_proxy.each { |record| record.send("#{a.reverse}=", parent_record) } + end + end + + parent_record + end + + # Attempts to create or find an instance of klass (which must be an ActiveRecord object) from the + # request parameters given. If params[:id] exists it will attempt to find an existing object + # otherwise it will build a new one. + def find_or_create_for_params(params, parent_column, current) + klass = parent_column.association.klass + return nil if parent_column.show_blank_record and attributes_hash_is_empty?(params, klass) + + if params.has_key? :id + # modifying the current object of a singular association + if current and current.is_a? ActiveRecord::Base and current.id.to_s == params[:id] + return current + # modifying one of the current objects in a plural association + elsif current and current.respond_to?(:any?) and current.any? {|o| o.id.to_s == params[:id]} + return current.detect {|o| o.id.to_s == params[:id]} + # attaching an existing but not-current object + else + return klass.find(params[:id]) + end + else + return klass.new if klass.authorized_for?(:action => :create) + end + end + + # Determines whether the given attributes hash is "empty". + # This isn't a literal emptiness - it's an attempt to discern whether the user intended it to be empty or not. + def attributes_hash_is_empty?(hash, klass) + hash.all? do |key,value| + # convert any possible multi-parameter attributes like 'created_at(5i)' to simply 'created_at' + column_name = key.to_s.split('(').first + column = klass.columns_hash[column_name] + + # booleans and datetimes will always have a value. so we ignore them when checking whether the hash is empty. + # this could be a bad idea. but the current situation (excess record entry) seems worse. + next true if column and [:boolean, :datetime, :date, :time].include?(column.type) + + # defaults are pre-filled on the form. we can't use them to determine if the user intends a new row. + next true if column and value == column.default.to_s + + if value.is_a?(Hash) + attributes_hash_is_empty?(value, klass) + else + value.respond_to?(:empty?) ? value.empty? : false + end + end + end + end end \ No newline at end of file vendor/plugins/active_scaffold/lib/active_scaffold/attribute_params.rb @@ -83,9 +83,7 @@ module ActiveScaffold::Config # a generally-applicable name for this ActiveScaffold ... will be used for generating page/section headers attr_writer :label def label(options={}) - options[:count] ||= model.count - options[:default] ||= model.name.pluralize if options[:count].to_i > 1 - as_(@label, options) || model.human_name(options) + as_(@label, options) || model.human_name(options.merge(options[:count].to_i == 1 ? {} : {:default => model.name.pluralize})) end ## vendor/plugins/active_scaffold/lib/active_scaffold/config/core.rb @@ -62,7 +62,7 @@ module ActiveScaffold::Config # the label for this List action. used for the header. attr_writer :label def label - @label ? as_(@label) : @core.label + @label ? as_(@label, :count => :many) : @core.label(:count => :many) end attr_writer :no_entries_message vendor/plugins/active_scaffold/lib/active_scaffold/config/list.rb @@ -1,178 +1,178 @@ -module ActiveScaffold - module Constraints - def self.included(base) - base.module_eval do - before_filter :register_constraints_with_action_columns - end - end - - protected - - # Returns the current constraints - def active_scaffold_constraints - return active_scaffold_session_storage[:constraints] || {} - end - - # For each enabled action, adds the constrained columns to the ActionColumns object (if it exists). - # This lets the ActionColumns object skip constrained columns. - # - # If the constraint value is a Hash, then we assume the constraint is a multi-level association constraint (the reverse of a has_many :through) and we do NOT register the constraint column. - def register_constraints_with_action_columns - constrained_fields = active_scaffold_constraints.reject{|k, v| v.is_a? Hash}.keys.collect{|k| k.to_sym} - - if self.class.uses_active_scaffold? - # we actually want to do this whether constrained_fields exist or not, so that we can reset the array when they don't - active_scaffold_config.actions.each do |action_name| - action = active_scaffold_config.send(action_name) - next unless action.respond_to? :columns - action.columns.constraint_columns = constrained_fields - end - end - end - - # Returns search conditions based on the current scaffold constraints. - # - # Supports constraints based on either a column name (in which case it checks for an association - # or just uses the search_sql) or a database field name. - # - # All of this work is primarily to support nested scaffolds in a manner generally useful for other - # embedded scaffolds. - def conditions_from_constraints - conditions = nil - active_scaffold_constraints.each do |k, v| - column = active_scaffold_config.columns[k] - constraint_condition = if column - # Assume this is a multi-level association constraint. - # example: - # data model: Park -> Den -> Bear - # constraint: :den => {:park => 5} - if v.is_a? Hash - far_association = column.association.klass.reflect_on_association(v.keys.first) - field = far_association.klass.primary_key - table = far_association.table_name - - active_scaffold_joins.concat([{k => v.keys.first}]) # e.g. {:den => :park} - constraint_condition_for("#{table}.#{field}", v.values.first) - - # association column constraint - elsif column.association - if column.association.macro == :has_and_belongs_to_many - active_scaffold_habtm_joins.concat column.includes - else - active_scaffold_joins.concat column.includes - end - condition_from_association_constraint(column.association, v) - - # regular column constraints - elsif column.searchable? - active_scaffold_joins.concat column.includes - constraint_condition_for(column.search_sql, v) - end - # unknown-to-activescaffold-but-real-database-column constraint - elsif active_scaffold_config.model.column_names.include? k.to_s - constraint_condition_for(k.to_s, v) - else - raise ActiveScaffold::MalformedConstraint, constraint_error(active_scaffold_config.model, k), caller - end - - conditions = merge_conditions(conditions, constraint_condition) - end - - conditions - end - - # We do NOT want to use .search_sql. If anything, search_sql will refer - # to a human-searchable value on the associated record. - def condition_from_association_constraint(association, value) - # when the reverse association is a :belongs_to, the id for the associated object only exists as - # the primary_key on the other table. so for :has_one and :has_many (when the reverse is :belongs_to), - # we have to use the other model's primary_key. - # - # please see the relevant tests for concrete examples. - field = if [:has_one, :has_many].include?(association.macro) - association.klass.primary_key - else - association.options[:association_foreign_key] || association.options[:foreign_key] || association.association_foreign_key - end - - table = case association.macro - when :has_and_belongs_to_many - association.options[:join_table] - - when :belongs_to - active_scaffold_config.model.table_name - - when :has_many - association.table_name - - else - association.table_name - end - - condition = constraint_condition_for("#{table}.#{field}", value) - if association.options[:polymorphic] - condition = merge_conditions( - condition, - constraint_condition_for("#{table}.#{association.name}_type", params[:parent_model].to_s) - ) - end - - condition - end - - def constraint_error(klass, column_name) - "Malformed constraint `#{klass}##{column_name}'. If it's a legitimate column, and you are using a nested scaffold, please specify or double-check the reverse association name." - end - - # Applies constraints to the given record. - # - # Searches through the known columns for association columns. If the given constraint is an association, - # it assumes that the constraint value is an id. It then does a association.klass.find with the value - # and adds the associated object to the record. - # - # For some operations ActiveRecord will automatically update the database. That's not always ok. - # If it *is* ok (e.g. you're in a transaction), then set :allow_autosave to true. - def apply_constraints_to_record(record, options = {}) - options[:allow_autosave] = false if options[:allow_autosave].nil? - - active_scaffold_constraints.each do |k, v| - column = active_scaffold_config.columns[k] - if column and column.association - if v.is_a? Hash # reverse of a through association ... we need to set the far association - # example - # data model: Park -> Den -> Bear - # constraint: :den => {:park => 5} - # remote_klass: Park - remote_klass = column.association.klass.reflect_on_association(v.keys.first).klass - first_associated = record.send("#{k}") - first_associated.send("#{v.keys.first}=", remote_klass.find(v.values.first)) if first_associated - elsif column.plural_association? - record.send("#{k}").send(:<<, column.association.klass.find(v)) - elsif column.association.options[:polymorphic] - record.send("#{k}=", params[:parent_model].constantize.find(v)) - else # regular singular association - record.send("#{k}=", column.association.klass.find(v)) - - # setting the belongs_to side of a has_one isn't safe. if the has_one was already - # specified, rails won't automatically clear out the previous associated record. - # - # note that we can't take the extra step to correct this unless we're permitted to - # run operations where activerecord auto-saves the object. - reverse = column.association.klass.reflect_on_association(column.association.reverse) - if reverse.macro == :has_one and options[:allow_autosave] - record.send(k).send("#{column.association.reverse}=", record) - end - end - else - record.send("#{k}=", v) - end - end - end - - private - - def constraint_condition_for(sql, value) - value.nil? ? "#{sql} IS NULL" : ["#{sql} = ?", value] - end - end -end +module ActiveScaffold + module Constraints + def self.included(base) + base.module_eval do + before_filter :register_constraints_with_action_columns + end + end + + protected + + # Returns the current constraints + def active_scaffold_constraints + return active_scaffold_session_storage[:constraints] || {} + end + + # For each enabled action, adds the constrained columns to the ActionColumns object (if it exists). + # This lets the ActionColumns object skip constrained columns. + # + # If the constraint value is a Hash, then we assume the constraint is a multi-level association constraint (the reverse of a has_many :through) and we do NOT register the constraint column. + def register_constraints_with_action_columns + constrained_fields = active_scaffold_constraints.reject{|k, v| v.is_a? Hash}.keys.collect{|k| k.to_sym} + + if self.class.uses_active_scaffold? + # we actually want to do this whether constrained_fields exist or not, so that we can reset the array when they don't + active_scaffold_config.actions.each do |action_name| + action = active_scaffold_config.send(action_name) + next unless action.respond_to? :columns + action.columns.constraint_columns = constrained_fields + end + end + end + + # Returns search conditions based on the current scaffold constraints. + # + # Supports constraints based on either a column name (in which case it checks for an association + # or just uses the search_sql) or a database field name. + # + # All of this work is primarily to support nested scaffolds in a manner generally useful for other + # embedded scaffolds. + def conditions_from_constraints + conditions = nil + active_scaffold_constraints.each do |k, v| + column = active_scaffold_config.columns[k] + constraint_condition = if column + # Assume this is a multi-level association constraint. + # example: + # data model: Park -> Den -> Bear + # constraint: :den => {:park => 5} + if v.is_a? Hash + far_association = column.association.klass.reflect_on_association(v.keys.first) + field = far_association.klass.primary_key + table = far_association.table_name + + active_scaffold_joins.concat([{k => v.keys.first}]) # e.g. {:den => :park} + constraint_condition_for("#{table}.#{field}", v.values.first) + + # association column constraint + elsif column.association + if column.association.macro == :has_and_belongs_to_many + active_scaffold_habtm_joins.concat column.includes + else + active_scaffold_joins.concat column.includes + end + condition_from_association_constraint(column.association, v) + + # regular column constraints + elsif column.searchable? + active_scaffold_joins.concat column.includes + constraint_condition_for(column.search_sql, v) + end + # unknown-to-activescaffold-but-real-database-column constraint + elsif active_scaffold_config.model.column_names.include? k.to_s + constraint_condition_for(k.to_s, v) + else + raise ActiveScaffold::MalformedConstraint, constraint_error(active_scaffold_config.model, k), caller + end + + conditions = merge_conditions(conditions, constraint_condition) + end + + conditions + end + + # We do NOT want to use .search_sql. If anything, search_sql will refer + # to a human-searchable value on the associated record. + def condition_from_association_constraint(association, value) + # when the reverse association is a :belongs_to, the id for the associated object only exists as + # the primary_key on the other table. so for :has_one and :has_many (when the reverse is :belongs_to), + # we have to use the other model's primary_key. + # + # please see the relevant tests for concrete examples. + field = if [:has_one, :has_many].include?(association.macro) + association.klass.primary_key + else + association.options[:association_foreign_key] || association.options[:foreign_key] || association.association_foreign_key + end + + table = case association.macro + when :has_and_belongs_to_many + association.options[:join_table] + + when :belongs_to + active_scaffold_config.model.table_name + + when :has_many + association.table_name + + else + association.table_name + end + + condition = constraint_condition_for("#{table}.#{field}", value) + if association.options[:polymorphic] + condition = merge_conditions( + condition, + constraint_condition_for("#{table}.#{association.name}_type", params[:parent_model].to_s) + ) + end + + condition + end + + def constraint_error(klass, column_name) + "Malformed constraint `#{klass}##{column_name}'. If it's a legitimate column, and you are using a nested scaffold, please specify or double-check the reverse association name." + end + + # Applies constraints to the given record. + # + # Searches through the known columns for association columns. If the given constraint is an association, + # it assumes that the constraint value is an id. It then does a association.klass.find with the value + # and adds the associated object to the record. + # + # For some operations ActiveRecord will automatically update the database. That's not always ok. + # If it *is* ok (e.g. you're in a transaction), then set :allow_autosave to true. + def apply_constraints_to_record(record, options = {}) + options[:allow_autosave] = false if options[:allow_autosave].nil? + + active_scaffold_constraints.each do |k, v| + column = active_scaffold_config.columns[k] + if column and column.association + if v.is_a? Hash # reverse of a through association ... we need to set the far association + # example + # data model: Park -> Den -> Bear + # constraint: :den => {:park => 5} + # remote_klass: Park + remote_klass = column.association.klass.reflect_on_association(v.keys.first).klass + first_associated = record.send("#{k}") + first_associated.send("#{v.keys.first}=", remote_klass.find(v.values.first)) if first_associated + elsif column.plural_association? + record.send("#{k}").send(:<<, column.association.klass.find(v)) + elsif column.association.options[:polymorphic] + record.send("#{k}=", params[:parent_model].constantize.find(v)) + else # regular singular association + record.send("#{k}=", column.association.klass.find(v)) + + # setting the belongs_to side of a has_one isn't safe. if the has_one was already + # specified, rails won't automatically clear out the previous associated record. + # + # note that we can't take the extra step to correct this unless we're permitted to + # run operations where activerecord auto-saves the object. + reverse = column.association.klass.reflect_on_association(column.association.reverse) + if reverse.macro == :has_one and options[:allow_autosave] + record.send(k).send("#{column.association.reverse}=", record) + end + end + else + record.send("#{k}=", v) + end + end + end + + private + + def constraint_condition_for(sql, value) + value.nil? ? "#{sql} IS NULL" : ["#{sql} = ?", value] + end + end +end vendor/plugins/active_scaffold/lib/active_scaffold/constraints.rb @@ -1,97 +1,97 @@ -module ActiveScaffold::DataStructures - # A set of columns. These structures can be nested for organization. - class ActionColumns < Set - include ActiveScaffold::Configurable - - # this lets us refer back to the action responsible for this link, if it exists. - # the immediate need here is to get the crud_type so we can dynamically filter columns from the set. - attr_accessor :action - - # labels are useful for the Create/Update forms, when we display columns in a grouped fashion and want to name them separately - attr_writer :label - def label - as_(@label) if @label - end - - # Whether this column set is collapsed by default in contexts where collapsing is supported - attr_accessor :collapsed - - # nests a subgroup in the column set - def add_subgroup(label, &proc) - columns = ActiveScaffold::DataStructures::ActionColumns.new - columns.label = label - columns.action = self.action - columns.configure &proc - self.exclude columns.collect_columns - self.add columns - end - - def include?(item) - @set.each do |c| - return true if !c.is_a? Symbol and c.include? item - return true if c == item.to_sym - end - return false - end - - protected - - def collect_columns - @set.collect {|col| col.is_a?(ActiveScaffold::DataStructures::ActionColumns) ? col.collect_columns : col} - end - - # called during clone or dup. makes the clone/dup deeper. - def initialize_copy(from) - @set = from.instance_variable_get('@set').clone - end - - # A package of stuff to add after the configuration block. This is an attempt at making a certain level of functionality inaccessible during configuration, to reduce possible breakage from misuse. - # The bulk of the package is a means of connecting the referential column set (ActionColumns) with the actual column objects (Columns). This lets us iterate over the set and yield real column objects. - module AfterConfiguration - # Redefine the each method to yield actual Column objects. - # It will skip constrained and unauthorized columns. - # - # Options: - # * :flatten - whether to recursively iterate on nested sets. default is false. - # * :for - the record (or class) being iterated over. used for column-level security. default is the class. - def each(options = {}, &proc) - options[:for] ||= @columns.active_record_class - - @set.each do |item| - unless item.is_a? ActiveScaffold::DataStructures::ActionColumns - item = (@columns[item] || ActiveScaffold::DataStructures::Column.new(item.to_sym, @columns.active_record_class)) - # skip if this matches a constrained column - next if constraint_columns.include?(item.name.to_sym) - # skip if this matches the field_name of a constrained column - next if item.field_name and constraint_columns.include?(item.field_name.to_sym) - # skip this field if it's not authorized - next unless options[:for].authorized_for?(:action => options[:action] || self.action.crud_type, :column => item.name) - end - if item.is_a? ActiveScaffold::DataStructures::ActionColumns and options.has_key?(:flatten) and options[:flatten] - item.each(options, &proc) - else - yield item - end - end - end - - # registers a set of column objects (recursively, for all nested ActionColumns) - def set_columns(columns) - @columns = columns - # iterate over @set instead of self to avoid dealing with security queries - @set.each do |item| - item.set_columns(columns) if item.respond_to? :set_columns - end - end - - attr_writer :constraint_columns - def constraint_columns - @constraint_columns ||= [] - end - - def length - (@set - self.constraint_columns).length - end - end - end -end +module ActiveScaffold::DataStructures + # A set of columns. These structures can be nested for organization. + class ActionColumns < Set + include ActiveScaffold::Configurable + + # this lets us refer back to the action responsible for this link, if it exists. + # the immediate need here is to get the crud_type so we can dynamically filter columns from the set. + attr_accessor :action + + # labels are useful for the Create/Update forms, when we display columns in a grouped fashion and want to name them separately + attr_writer :label + def label + as_(@label) if @label + end + + # Whether this column set is collapsed by default in contexts where collapsing is supported + attr_accessor :collapsed + + # nests a subgroup in the column set + def add_subgroup(label, &proc) + columns = ActiveScaffold::DataStructures::ActionColumns.new + columns.label = label + columns.action = self.action + columns.configure &proc + self.exclude columns.collect_columns + self.add columns + end + + def include?(item) + @set.each do |c| + return true if !c.is_a? Symbol and c.include? item + return true if c == item.to_sym + end + return false + end + + protected + + def collect_columns + @set.collect {|col| col.is_a?(ActiveScaffold::DataStructures::ActionColumns) ? col.collect_columns : col} + end + + # called during clone or dup. makes the clone/dup deeper. + def initialize_copy(from) + @set = from.instance_variable_get('@set').clone + end + + # A package of stuff to add after the configuration block. This is an attempt at making a certain level of functionality inaccessible during configuration, to reduce possible breakage from misuse. + # The bulk of the package is a means of connecting the referential column set (ActionColumns) with the actual column objects (Columns). This lets us iterate over the set and yield real column objects. + module AfterConfiguration + # Redefine the each method to yield actual Column objects. + # It will skip constrained and unauthorized columns. + # + # Options: + # * :flatten - whether to recursively iterate on nested sets. default is false. + # * :for - the record (or class) being iterated over. used for column-level security. default is the class. + def each(options = {}, &proc) + options[:for] ||= @columns.active_record_class + + @set.each do |item| + unless item.is_a? ActiveScaffold::DataStructures::ActionColumns + item = (@columns[item] || ActiveScaffold::DataStructures::Column.new(item.to_sym, @columns.active_record_class)) + # skip if this matches a constrained column + next if constraint_columns.include?(item.name.to_sym) + # skip if this matches the field_name of a constrained column + next if item.field_name and constraint_columns.include?(item.field_name.to_sym) + # skip this field if it's not authorized + next unless options[:for].authorized_for?(:action => options[:action] || self.action.crud_type, :column => item.name) + end + if item.is_a? ActiveScaffold::DataStructures::ActionColumns and options.has_key?(:flatten) and options[:flatten] + item.each(options, &proc) + else + yield item + end + end + end + + # registers a set of column objects (recursively, for all nested ActionColumns) + def set_columns(columns) + @columns = columns + # iterate over @set instead of self to avoid dealing with security queries + @set.each do |item| + item.set_columns(columns) if item.respond_to? :set_columns + end + end + + attr_writer :constraint_columns + def constraint_columns + @constraint_columns ||= [] + end + + def length + (@set - self.constraint_columns).length + end + end + end +end vendor/plugins/active_scaffold/lib/active_scaffold/data_structures/action_columns.rb @@ -1,75 +1,75 @@ -module ActiveScaffold::DataStructures - class Columns - include Enumerable - include ActiveScaffold::Configurable - - # The motivation for this collection is that this Columns data structure fills two roles: it provides - # the master list of all known columns, and it provides an inheritable list for all other actions (e.g. - # Create and Update and List). Well we actually want to *know* about as many columns as possible, so - # we don't want people actually removing columns from @set. But at the same time, we want to be able to - # manage which columns get inherited. Tada! - # - # This collection is referenced by other parts of ActiveScaffold and by methods within this DataStructure. - # IT IS NOT MEANT FOR PUBLIC USE (but if you know what you're doing, go ahead) - def _inheritable=(value) - @sorted = true - @_inheritable = value - end - - # This accessor is used by ActionColumns to create new Column objects without adding them to this set - attr_reader :active_record_class - - def initialize(active_record_class, *args) - @active_record_class = active_record_class - @_inheritable = [] - @set = [] - - self.add *args - end - - # the way to add columns to the set. this is primarily useful for virtual columns. - # note that this also makes columns inheritable - def add(*args) - args.flatten! # allow [] as a param - args = args.collect{ |a| a.to_sym } - - # make the columns inheritable - @_inheritable.concat(args) - # then add columns to @set (unless they already exist) - args.each { |a| @set << ActiveScaffold::DataStructures::Column.new(a.to_sym, @active_record_class) unless find_by_name(a) } - end - alias_method :<<, :add - - def exclude(*args) - # only remove columns from _inheritable. we never want to completely forget about a column. - args.each { |a| @_inheritable.delete a } - end - - # returns an array of columns with the provided names - def find_by_names(*names) - @set.find_all { |column| names.include? column.name } - end - - # returns the column of the given name. - def find_by_name(name) - # this works because of `def column.==' - column = @set.find { |c| c == name } - column - end - alias_method :[], :find_by_name - - def each - @set.each {|i| yield i } - end - - def _inheritable - if @sorted - @_inheritable - else - @_inheritable.sort do |a, b| - self[a] <=> self[b] - end - end - end - end +module ActiveScaffold::DataStructures + class Columns + include Enumerable + include ActiveScaffold::Configurable + + # The motivation for this collection is that this Columns data structure fills two roles: it provides + # the master list of all known columns, and it provides an inheritable list for all other actions (e.g. + # Create and Update and List). Well we actually want to *know* about as many columns as possible, so + # we don't want people actually removing columns from @set. But at the same time, we want to be able to + # manage which columns get inherited. Tada! + # + # This collection is referenced by other parts of ActiveScaffold and by methods within this DataStructure. + # IT IS NOT MEANT FOR PUBLIC USE (but if you know what you're doing, go ahead) + def _inheritable=(value) + @sorted = true + @_inheritable = value + end + + # This accessor is used by ActionColumns to create new Column objects without adding them to this set + attr_reader :active_record_class + + def initialize(active_record_class, *args) + @active_record_class = active_record_class + @_inheritable = [] + @set = [] + + self.add *args + end + + # the way to add columns to the set. this is primarily useful for virtual columns. + # note that this also makes columns inheritable + def add(*args) + args.flatten! # allow [] as a param + args = args.collect{ |a| a.to_sym } + + # make the columns inheritable + @_inheritable.concat(args) + # then add columns to @set (unless they already exist) + args.each { |a| @set << ActiveScaffold::DataStructures::Column.new(a.to_sym, @active_record_class) unless find_by_name(a) } + end + alias_method :<<, :add + + def exclude(*args) + # only remove columns from _inheritable. we never want to completely forget about a column. + args.each { |a| @_inheritable.delete a } + end + + # returns an array of columns with the provided names + def find_by_names(*names) + @set.find_all { |column| names.include? column.name } + end + + # returns the column of the given name. + def find_by_name(name) + # this works because of `def column.==' + column = @set.find { |c| c == name } + column + end + alias_method :[], :find_by_name + + def each + @set.each {|i| yield i } + end + + def _inheritable + if @sorted + @_inheritable + else + @_inheritable.sort do |a, b| + self[a] <=> self[b] + end + end + end + end end \ No newline at end of file vendor/plugins/active_scaffold/lib/active_scaffold/data_structures/columns.rb @@ -1,62 +1,62 @@ -module ActiveScaffold::DataStructures - class Set - include Enumerable - include ActiveScaffold::Configurable - - attr_writer :label - def label - as_(@label) - end - - def initialize(*args) - @set = [] - self.add *args - end - - # the way to add items to the set. - def add(*args) - args.flatten! # allow [] as a param - args.each { |arg| - arg = arg.to_sym if arg.is_a? String - @set << arg unless @set.include? arg # avoid duplicates - } - end - alias_method :<<, :add - - # the way to remove items from the set. - def exclude(*args) - args.flatten! # allow [] as a param - args.collect! { |a| a.to_sym } # symbolize the args - # check respond_to? :to_sym, ActionColumns doesn't respond to to_sym - @set.reject! { |c| c.respond_to? :to_sym and args.include? c.to_sym } # reject all items specified - end - alias_method :remove, :exclude - - # returns an array of items with the provided names - def find_by_names(*names) - @set.find_all { |item| names.include? item } - end - - # returns the item of the given name. - def find_by_name(name) - # this works because of `def item.==' - item = @set.find { |c| c == name } - item - end - alias_method :[], :find_by_name - - def each - @set.each {|i| yield i } - end - - # returns the number of items in the set - def length - @set.length - end - - def empty? - @set.empty? - end - - end +module ActiveScaffold::DataStructures + class Set + include Enumerable + include ActiveScaffold::Configurable + + attr_writer :label + def label + as_(@label) + end + + def initialize(*args) + @set = [] + self.add *args + end + + # the way to add items to the set. + def add(*args) + args.flatten! # allow [] as a param + args.each { |arg| + arg = arg.to_sym if arg.is_a? String + @set << arg unless @set.include? arg # avoid duplicates + } + end + alias_method :<<, :add + + # the way to remove items from the set. + def exclude(*args) + args.flatten! # allow [] as a param + args.collect! { |a| a.to_sym } # symbolize the args + # check respond_to? :to_sym, ActionColumns doesn't respond to to_sym + @set.reject! { |c| c.respond_to? :to_sym and args.include? c.to_sym } # reject all items specified + end + alias_method :remove, :exclude + + # returns an array of items with the provided names + def find_by_names(*names) + @set.find_all { |item| names.include? item } + end + + # returns the item of the given name. + def find_by_name(name) + # this works because of `def item.==' + item = @set.find { |c| c == name } + item + end + alias_method :[], :find_by_name + + def each + @set.each {|i| yield i } + end + + # returns the number of items in the set + def length + @set.length + end + + def empty? + @set.empty? + end + + end end \ No newline at end of file vendor/plugins/active_scaffold/lib/active_scaffold/data_structures/set.rb @@ -1,234 +1,233 @@ -module ActiveScaffold - module Finder - module ClassMethods - # Takes a collection of search terms (the tokens) and creates SQL that - # searches all specified ActiveScaffold columns. A row will match if each - # token is found in at least one of the columns. - def create_conditions_for_columns(tokens, columns, like_pattern = '%?%') - # if there aren't any columns, then just return a nil condition - return unless columns.length > 0 - - tokens = [tokens] if tokens.is_a? String - - where_clauses = [] - columns.each do |column| - where_clauses << ((column.column.nil? || column.column.text?) ? "LOWER(#{column.search_sql}) LIKE ?" : "#{column.search_sql} = ?") - end - phrase = "(#{where_clauses.join(' OR ')})" - - sql = ([phrase] * tokens.length).join(' AND ') - tokens = tokens.collect do |value| - columns.collect {|column| (column.column.nil? || column.column.text?) ? like_pattern.sub('?', value.downcase) : column.column.type_cast(value)} - end.flatten - - [sql, *tokens] - end - - # Generates an SQL condition for the given ActiveScaffold column based on - # that column's database type (or form_ui ... for virtual columns?). - # TODO: this should reside on the column, not the controller - def condition_for_column(column, value, like_pattern = '%?%') - # we must check false or not blank because we want to search for false but false is blank - return unless column and column.search_sql and not value.blank? - search_ui = column.search_ui || column.column.type - if self.respond_to?("condition_for_#{column.name}_column") - self.send("condition_for_#{column.name}_column", column, value, like_pattern) - elsif self.respond_to?("condition_for_#{search_ui}_type") - self.send("condition_for_#{search_ui}_type", column, value, like_pattern) - else - case search_ui - when :boolean, :checkbox - ["#{column.search_sql} = ?", column.column.type_cast(value)] - when :select - ["#{column.search_sql} = ?", value[:id]] unless value[:id].blank? - when :multi_select - ["#{column.search_sql} in (?)", value.values.collect{|hash| hash[:id]}] - else - if column.column.nil? || column.column.text? - ["LOWER(#{column.search_sql}) LIKE ?", like_pattern.sub('?', value.downcase)] - else - ["#{column.search_sql} = ?", column.column.type_cast(value)] - end - end - end - end - - def condition_for_integer_type(column, value, like_pattern) - if value['from'].blank? or not ActiveScaffold::Finder::NumericComparators.include?(value['opt']) - nil - elsif value['opt'] == 'BETWEEN' - ["#{column.search_sql} BETWEEN ? AND ?", value['from'].to_f, value['to'].to_f] - else - ["#{column.search_sql} #{value['opt']} ?", value['from'].to_f] - end - end - alias_method :condition_for_decimal_type, :condition_for_integer_type - alias_method :condition_for_float_type, :condition_for_integer_type - - def condition_for_datetime_type(column, value, like_pattern) - conversion = value['from']['hour'].blank? && value['to']['hour'].blank? ? 'to_date' : 'to_time' - from_value, to_value = ['from', 'to'].collect do |field| - Time.zone.local(*['year', 'month', 'day', 'hour', 'minutes', 'seconds'].collect {|part| value[field][part].to_i}) rescue nil - end - - if from_value.nil? and to_value.nil? - nil - elsif !from_value - ["#{column.search_sql} <= ?", to_value.send(conversion).to_s(:db)] - elsif !to_value - ["#{column.search_sql} >= ?", from_value.send(conversion).to_s(:db)] - else - ["#{column.search_sql} BETWEEN ? AND ?", from_value.send(conversion).to_s(:db), to_value.send(conversion).to_s(:db)] - end - end - alias_method :condition_for_date_type, :condition_for_datetime_type - alias_method :condition_for_time_type, :condition_for_datetime_type - alias_method :condition_for_timestamp_type, :condition_for_datetime_type - end - - NumericComparators = [ - '=', - '>=', - '<=', - '>', - '<', - '!=', - 'BETWEEN' - ] - - def self.included(klass) - klass.extend ClassMethods - end - - protected - - attr_writer :active_scaffold_conditions - def active_scaffold_conditions - @active_scaffold_conditions ||= [] - end - - attr_writer :active_scaffold_joins - def active_scaffold_joins - @active_scaffold_joins ||= [] - end - - attr_writer :active_scaffold_habtm_joins - def active_scaffold_habtm_joins - @active_scaffold_habtm_joins ||= [] - end - - def all_conditions - merge_conditions( - active_scaffold_conditions, # from the search modules - conditions_for_collection, # from the dev - conditions_from_params, # from the parameters (e.g. /users/list?first_name=Fred) - conditions_from_constraints, # from any constraints (embedded scaffolds) - active_scaffold_session_storage[:conditions] # embedding conditions (weaker constraints) - ) - end - - # returns a single record (the given id) but only if it's allowed for the specified action. - # accomplishes this by checking model.#{action}_authorized? - # TODO: this should reside on the model, not the controller - def find_if_allowed(id, action, klass = nil) - klass ||= active_scaffold_config.model - record = klass.find(id) - raise ActiveScaffold::RecordNotAllowed unless record.authorized_for?(:action => action.to_sym) - return record - end - - # returns a Paginator::Page (not from ActiveRecord::Paginator) for the given parameters - # options may include: - # * :sorting - a Sorting DataStructure (basically an array of hashes of field => direction, e.g. [{:field1 => 'asc'}, {:field2 => 'desc'}]). please note that multi-column sorting has some limitations: if any column in a multi-field sort uses method-based sorting, it will be ignored. method sorting only works for single-column sorting. - # * :per_page - # * :page - # TODO: this should reside on the model, not the controller - def find_page(options = {}) - options.assert_valid_keys :sorting, :per_page, :page, :count_includes - - full_includes = (active_scaffold_joins.empty? ? nil : active_scaffold_joins) - options[:per_page] ||= 999999999 - options[:page] ||= 1 - options[:count_includes] ||= full_includes - - klass = active_scaffold_config.model - - # create a general-use options array that's compatible with Rails finders - finder_options = { :order => build_order_clause(options[:sorting]), - :conditions => all_conditions, - :joins => joins_for_finder, - :include => options[:count_includes]} - - finder_options.merge! custom_finder_options - - # NOTE: we must use :include in the count query, because some conditions may reference other tables - count = klass.count(finder_options.reject{|k,v| [:order].include? k}) - - finder_options.merge! :include => full_includes - - # we build the paginator differently for method- and sql-based sorting - if options[:sorting] and options[:sorting].sorts_by_method? - pager = ::Paginator.new(count, options[:per_page]) do |offset, per_page| - sorted_collection = sort_collection_by_column(klass.find(:all, finder_options), *options[:sorting].first) - sorted_collection.slice(offset, per_page) - end - else - pager = ::Paginator.new(count, options[:per_page]) do |offset, per_page| - klass.find(:all, finder_options.merge(:offset => offset, :limit => per_page)) - end - end - - pager.page(options[:page]) - end - - def joins_for_finder - case joins_for_collection - when String - [ joins_for_collection ] - when Array - joins_for_collection - else - [] - end + active_scaffold_habtm_joins - end - - # TODO: this should reside on the model, not the controller - def merge_conditions(*conditions) - c = conditions.find_all {|c| not c.nil? and not c.empty? } - c.empty? ? nil : c.collect{|c| active_scaffold_config.model.send(:sanitize_sql, c)}.join(' AND ') - end - - # accepts a DataStructure::Sorting object and builds an order-by clause - # TODO: this should reside on the model, not the controller - def build_order_clause(sorting) - return nil if sorting.nil? or sorting.sorts_by_method? - - # unless the sorting is by method, create the sql string - order = [] - sorting.each do |clause| - sort_column, sort_direction = clause - sql = sort_column.sort[:sql] - next if sql.nil? or sql.empty? - - order << "#{sql} #{sort_direction}" - end - - order = order.join(', ') - order = nil if order.empty? - - order - end - - # TODO: this should reside on the column, not the controller - def sort_collection_by_column(collection, column, order) - sorter = column.sort[:method] - collection = collection.sort_by { |record| - value = (sorter.is_a? Proc) ? record.instance_eval(&sorter) : record.instance_eval(sorter) - value = '' if value.nil? - value - } - collection.reverse! if order.downcase == 'desc' - collection - end - end -end +module ActiveScaffold + module Finder + module ClassMethods + # Takes a collection of search terms (the tokens) and creates SQL that + # searches all specified ActiveScaffold columns. A row will match if each + # token is found in at least one of the columns. + def create_conditions_for_columns(tokens, columns, like_pattern = '%?%') + # if there aren't any columns, then just return a nil condition + return unless columns.length > 0 + + tokens = [tokens] if tokens.is_a? String + + where_clauses = [] + columns.each do |column| + where_clauses << ((column.column.nil? || column.column.text?) ? "LOWER(#{column.search_sql}) LIKE ?" : "#{column.search_sql} = ?") + end + phrase = "(#{where_clauses.join(' OR ')})" + + sql = ([phrase] * tokens.length).join(' AND ') + tokens = tokens.collect do |value| + columns.collect {|column| (column.column.nil? || column.column.text?) ? like_pattern.sub('?', value.downcase) : column.column.type_cast(value)} + end.flatten + + [sql, *tokens] + end + + # Generates an SQL condition for the given ActiveScaffold column based on + # that column's database type (or form_ui ... for virtual columns?). + # TODO: this should reside on the column, not the controller + def condition_for_column(column, value, like_pattern = '%?%') + # we must check false or not blank because we want to search for false but false is blank + return unless column and column.search_sql and not value.blank? + search_ui = column.search_ui || column.column.type + if self.respond_to?("condition_for_#{column.name}_column") + self.send("condition_for_#{column.name}_column", column, value, like_pattern) + elsif self.respond_to?("condition_for_#{search_ui}_type") + self.send("condition_for_#{search_ui}_type", column, value, like_pattern) + else + case search_ui + when :boolean, :checkbox + ["#{column.search_sql} = ?", column.column.type_cast(value)] + when :select + ["#{column.search_sql} = ?", value[:id]] unless value[:id].blank? + when :multi_select + ["#{column.search_sql} in (?)", value.values.collect{|hash| hash[:id]}] + else + if column.column.nil? || column.column.text? + ["LOWER(#{column.search_sql}) LIKE ?", like_pattern.sub('?', value.downcase)] + else + ["#{column.search_sql} = ?", column.column.type_cast(value)] + end + end + end + end + + def condition_for_integer_type(column, value, like_pattern) + if value['from'].blank? or not ActiveScaffold::Finder::NumericComparators.include?(value['opt']) + nil + elsif value['opt'] == 'BETWEEN' + ["#{column.search_sql} BETWEEN ? AND ?", value['from'].to_f, value['to'].to_f] + else + ["#{column.search_sql} #{value['opt']} ?", value['from'].to_f] + end + end + alias_method :condition_for_decimal_type, :condition_for_integer_type + alias_method :condition_for_float_type, :condition_for_integer_type + + def condition_for_datetime_type(column, value, like_pattern) + conversion = value['from']['hour'].blank? && value['to']['hour'].blank? ? 'to_date' : 'to_time' + from_value, to_value = ['from', 'to'].collect do |field| + Time.zone.local(*['year', 'month', 'day', 'hour', 'minutes', 'seconds'].collect {|part| value[field][part].to_i}) rescue nil + end + + if from_value.nil? and to_value.nil? + nil + elsif !from_value + ["#{column.search_sql} <= ?", to_value.send(conversion).to_s(:db)] + elsif !to_value + ["#{column.search_sql} >= ?", from_value.send(conversion).to_s(:db)] + else + ["#{column.search_sql} BETWEEN ? AND ?", from_value.send(conversion).to_s(:db), to_value.send(conversion).to_s(:db)] + end + end + alias_method :condition_for_date_type, :condition_for_datetime_type + alias_method :condition_for_time_type, :condition_for_datetime_type + alias_method :condition_for_timestamp_type, :condition_for_datetime_type + end + + NumericComparators = [ + '=', + '>=', + '<=', + '>', + '<', + '!=', + 'BETWEEN' + ] + + def self.included(klass) + klass.extend ClassMethods + end + + protected + + attr_writer :active_scaffold_conditions + def active_scaffold_conditions + @active_scaffold_conditions ||= [] + end + + attr_writer :active_scaffold_joins + def active_scaffold_joins + @active_scaffold_joins ||= [] + end + + attr_writer :active_scaffold_habtm_joins + def active_scaffold_habtm_joins + @active_scaffold_habtm_joins ||= [] + end + + def all_conditions + merge_conditions( + active_scaffold_conditions, # from the search modules + conditions_for_collection, # from the dev + conditions_from_params, # from the parameters (e.g. /users/list?first_name=Fred) + conditions_from_constraints, # from any constraints (embedded scaffolds) + active_scaffold_session_storage[:conditions] # embedding conditions (weaker constraints) + ) + end + + # returns a single record (the given id) but only if it's allowed for the specified action. + # accomplishes this by checking model.#{action}_authorized? + # TODO: this should reside on the model, not the controller + def find_if_allowed(id, action, klass = nil) + klass ||= active_scaffold_config.model + record = klass.find(id) + raise ActiveScaffold::RecordNotAllowed unless record.authorized_for?(:action => action.to_sym) + return record + end + + # returns a Paginator::Page (not from ActiveRecord::Paginator) for the given parameters + # options may include: + # * :sorting - a Sorting DataStructure (basically an array of hashes of field => direction, e.g. [{:field1 => 'asc'}, {:field2 => 'desc'}]). please note that multi-column sorting has some limitations: if any column in a multi-field sort uses method-based sorting, it will be ignored. method sorting only works for single-column sorting. + # * :per_page + # * :page + # TODO: this should reside on the model, not the controller + def find_page(options = {}) + options.assert_valid_keys :sorting, :per_page, :page, :count_includes + + full_includes = (active_scaffold_joins.blank? ? nil : active_scaffold_joins) + options[:per_page] ||= 999999999 + options[:page] ||= 1 + options[:count_includes] ||= full_includes + + klass = active_scaffold_config.model + + # create a general-use options array that's compatible with Rails finders + finder_options = { :order => build_order_clause(options[:sorting]), + :conditions => all_conditions, + :joins => joins_for_finder, + :include => options[:count_includes]} + + finder_options.merge! custom_finder_options + + # NOTE: we must use :include in the count query, because some conditions may reference other tables + count = klass.count(finder_options.reject{|k,v| [:select, :order].include? k}) + + finder_options.merge! :include => full_includes + + # we build the paginator differently for method- and sql-based sorting + if options[:sorting] and options[:sorting].sorts_by_method? + pager = ::Paginator.new(count, options[:per_page]) do |offset, per_page| + sorted_collection = sort_collection_by_column(klass.find(:all, finder_options), *options[:sorting].first) + sorted_collection.slice(offset, per_page) + end + else + pager = ::Paginator.new(count, options[:per_page]) do |offset, per_page| + klass.find(:all, finder_options.merge(:offset => offset, :limit => per_page)) + end + end + + pager.page(options[:page]) + end + + def joins_for_finder + case joins_for_collection + when String + [ joins_for_collection ] + when Array + joins_for_collection + else + [] + end + active_scaffold_habtm_joins + end + + # TODO: this should reside on the model, not the controller + def merge_conditions(*conditions) + active_scaffold_config.model.merge_conditions(*conditions) + end + + # accepts a DataStructure::Sorting object and builds an order-by clause + # TODO: this should reside on the model, not the controller + def build_order_clause(sorting) + return nil if sorting.nil? or sorting.sorts_by_method? + + # unless the sorting is by method, create the sql string + order = [] + sorting.each do |clause| + sort_column, sort_direction = clause + sql = sort_column.sort[:sql] + next if sql.nil? or sql.empty? + + order << "#{sql} #{sort_direction}" + end + + order = order.join(', ') + order = nil if order.empty? + + order + end + + # TODO: this should reside on the column, not the controller + def sort_collection_by_column(collection, column, order) + sorter = column.sort[:method] + collection = collection.sort_by { |record| + value = (sorter.is_a? Proc) ? record.instance_eval(&sorter) : record.instance_eval(sorter) + value = '' if value.nil? + value + } + collection.reverse! if order.downcase == 'desc' + collection + end + end +end vendor/plugins/active_scaffold/lib/active_scaffold/finder.rb @@ -1,40 +1,40 @@ -module ActiveScaffold - module Helpers - module AssociationHelpers - # Provides a way to honor the :conditions on an association while searching the association's klass - def association_options_find(association, conditions = nil) - association.klass.find(:all, :conditions => controller.send(:merge_conditions, conditions, association.options[:conditions])) - end - - def association_options_count(association, conditions = nil) - association.klass.count(:all, :conditions => controller.send(:merge_conditions, conditions, association.options[:conditions])) - end - - # returns options for the given association as a collection of [id, label] pairs intended for the +options_for_select+ helper. - def options_for_association(association, include_all = false) - available_records = association_options_find(association, include_all ? nil : options_for_association_conditions(association)) - available_records ||= [] - available_records.sort{|a,b| a.to_label <=> b.to_label}.collect { |model| [ model.to_label, model.id ] } - end - - def options_for_association_count(association) - association_options_count(association, options_for_association_conditions(association)) - end - - # A useful override for customizing the records present in an association dropdown. - # Should work in both the subform and form_ui=>:select modes. - # Check association.name to specialize the conditions per-column. - def options_for_association_conditions(association) - return nil if association.options[:through] - case association.macro - when :has_one, :has_many - # Find only orphaned objects - "#{association.primary_key_name} IS NULL" - when :belongs_to, :has_and_belongs_to_many - # Find all - nil - end - end - end - end -end +module ActiveScaffold + module Helpers + module AssociationHelpers + # Provides a way to honor the :conditions on an association while searching the association's klass + def association_options_find(association, conditions = nil) + association.klass.find(:all, :conditions => controller.send(:merge_conditions, conditions, association.options[:conditions])) + end + + def association_options_count(association, conditions = nil) + association.klass.count(:all, :conditions => controller.send(:merge_conditions, conditions, association.options[:conditions])) + end + + # returns options for the given association as a collection of [id, label] pairs intended for the +options_for_select+ helper. + def options_for_association(association, include_all = false) + available_records = association_options_find(association, include_all ? nil : options_for_association_conditions(association)) + available_records ||= [] + available_records.sort{|a,b| a.to_label <=> b.to_label}.collect { |model| [ model.to_label, model.id ] } + end + + def options_for_association_count(association) + association_options_count(association, options_for_association_conditions(association)) + end + + # A useful override for customizing the records present in an association dropdown. + # Should work in both the subform and form_ui=>:select modes. + # Check association.name to specialize the conditions per-column. + def options_for_association_conditions(association) + return nil if association.options[:through] + case association.macro + when :has_one, :has_many + # Find only orphaned objects + "#{association.primary_key_name} IS NULL" + when :belongs_to, :has_and_belongs_to_many + # Find all + nil + end + end + end + end +end vendor/plugins/active_scaffold/lib/active_scaffold/helpers/association_helpers.rb @@ -1,25 +1,25 @@ -module ActiveScaffold - module Helpers - module ControllerHelpers - def self.included(controller) - controller.class_eval { helper_method :params_for } - end - - include ActiveScaffold::Helpers::IdHelpers - - def params_for(options = {}) - # :adapter and :position are one-use rendering arguments. they should not propagate. - # :sort, :sort_direction, and :page are arguments that stored in the session. they need not propagate. - # and wow. no we don't want to propagate :record. - # :commit is a special rails variable for form buttons - blacklist = [:adapter, :position, :sort, :sort_direction, :page, :record, :commit, :_method] - unless @params_for - @params_for = params.clone.delete_if { |key, value| blacklist.include? key.to_sym if key } - @params_for[:controller] = '/' + @params_for[:controller] unless @params_for[:controller].first(1) == '/' # for namespaced controllers - @params_for.delete(:id) if @params_for[:id].nil? - end - @params_for.merge(options) - end - end - end +module ActiveScaffold + module Helpers + module ControllerHelpers + def self.included(controller) + controller.class_eval { helper_method :params_for } + end + + include ActiveScaffold::Helpers::IdHelpers + + def params_for(options = {}) + # :adapter and :position are one-use rendering arguments. they should not propagate. + # :sort, :sort_direction, and :page are arguments that stored in the session. they need not propagate. + # and wow. no we don't want to propagate :record. + # :commit is a special rails variable for form buttons + blacklist = [:adapter, :position, :sort, :sort_direction, :page, :record, :commit, :_method] + unless @params_for + @params_for = params.clone.delete_if { |key, value| blacklist.include? key.to_sym if key } + @params_for[:controller] = '/' + @params_for[:controller] unless @params_for[:controller].first(1) == '/' # for namespaced controllers + @params_for.delete(:id) if @params_for[:id].nil? + end + @params_for.merge(options) + end + end + end end vendor/plugins/active_scaffold/lib/active_scaffold/helpers/controller_helpers.rb @@ -1,5 +1,3 @@ -I18n.load_path << File.dirname(__FILE__) + '/../../../lib/active_scaffold/locale/en-countries.yml' - module ActiveScaffold module Helpers module CountryHelpers @@ -25,7 +23,7 @@ module ActiveScaffold country_options += "<option value=\"\" disabled=\"disabled\">-------------</option>\n" end - return country_options + options_for_select(COUNTRIES.collect {|country| [I18n.t("countries.#{country}"), country]}, selected) + return country_options + options_for_select(COUNTRIES.collect {|country| [I18n.t("countries.#{country}", :default => country.to_s.titleize), country]}, selected) end # Returns a string of option tags for the states in the United States. Supply a state name as +selected to vendor/plugins/active_scaffold/lib/active_scaffold/helpers/country_helpers.rb @@ -6,15 +6,12 @@ module ActiveScaffold # It does not do any rendering. It only decides which method is responsible for rendering. def active_scaffold_input_for(column, scope = nil) options = active_scaffold_input_options(column, scope) - # first, check if the dev has created an override for this specific field if override_form_field?(column) send(override_form_field(column), @record, options[:name]) - # second, check if the dev has specified a valid form_ui for this column elsif column.form_ui and override_input?(column.form_ui) send(override_input(column.form_ui), column, options) - # fallback: we get to make the decision else if column.association @@ -64,7 +61,7 @@ module ActiveScaffold def javascript_for_update_column(column, scope, options) if column.options[:update_column] - url_params = {:action => 'render_field', :id => @record.id} + url_params = {:action => 'render_field', :id => params[:id]} url_params[:controller] = controller.class.active_scaffold_controller_for(@record.class).controller_path if scope parameters = "column=#{column.name}" @@ -89,7 +86,7 @@ module ActiveScaffold selected = associated.nil? ? nil : associated.id method = column.association.macro == :belongs_to ? column.association.primary_key_name : column.name options[:name] += '[id]' - select(:record, method, select_options.uniq, {:selected => selected, :include_blank => as_(:_select_)}, options) + select(:record, method, select_options.uniq, {:selected => selected, :include_blank => as_(:_select_)}, options.merge(column.options)) end def active_scaffold_input_plural_association(column, options) vendor/plugins/active_scaffold/lib/active_scaffold/helpers/form_column_helpers.rb @@ -35,8 +35,12 @@ module ActiveScaffold firsts = value.first(column.associated_limit + 1).collect { |v| v.to_label } firsts[column.associated_limit] = '…' if firsts.length > column.associated_limit end - formatted_value = clean_column_value(format_value(firsts.join(', '))) - formatted_value << " (#{value.length})" if column.associated_number? and column.associated_limit and firsts.length > column.associated_limit + if column.associated_limit == 0 + formatted_value = value.length if column.associated_number? + else + formatted_value = clean_column_value(format_value(firsts.join(', '))) + formatted_value << " (#{value.length})" if column.associated_number? and column.associated_limit and firsts.length > column.associated_limit + end formatted_value end end @@ -120,7 +124,7 @@ module ActiveScaffold ## Overrides ## def active_scaffold_column_text(column, record) - truncate(clean_column_value(record.send(column.name)), :length => 50) + truncate(clean_column_value(record.send(column.name)), :length => column.options[:truncate] || 50) end def active_scaffold_column_checkbox(column, record) @@ -130,7 +134,7 @@ module ActiveScaffold id_options = {:id => record.id.to_s, :action => 'update_column', :name => column.name.to_s} tag_options = {:tag => "span", :id => element_cell_id(id_options), :class => "in_place_editor_field"} script = remote_function(:method => 'POST', :url => {:controller => params_for[:controller], :action => "update_column", :column => column.name, :id => record.id.to_s, :value => !column_value, :eid => params[:eid]}) - content_tag(:span, check_box_tag(tag_options[:id], 1, checked, {:onchange => script}) , tag_options) + content_tag(:span, check_box_tag(tag_options[:id], 1, checked, {:onclick => script}) , tag_options) else check_box_tag(nil, 1, checked, :disabled => true) end vendor/plugins/active_scaffold/lib/active_scaffold/helpers/list_column_helpers.rb @@ -1,46 +1,46 @@ -module ActiveScaffold - module Helpers - # Helpers that assist with the rendering of a List Column - module ShowColumnHelpers - def show_column_value(record, column) - # check for an override helper - if show_column_override? column - # we only pass the record as the argument. we previously also passed the formatted_value, - # but mike perham pointed out that prohibited the usage of overrides to improve on the - # performance of our default formatting. see issue #138. - send(show_column_override(column), record) - # second, check if the dev has specified a valid list_ui for this column - elsif column.list_ui and override_show_column_ui?(column.list_ui) - send(override_show_column_ui(column.list_ui), column, record) - else - if override_show_column_ui?(column.column.type) - send(override_show_column_ui(column.column.type), column, record) - else - get_column_value(record, column) - end - end - end - - def active_scaffold_show_text(column, record) - simple_format(get_column_value(record, column)) - end - - def show_column_override(column) - "#{column.name.to_s.gsub('?', '')}_show_column" # parse out any question marks (see issue 227) - end - - def show_column_override?(column) - respond_to?(show_column_override(column)) - end - - def override_show_column_ui?(list_ui) - respond_to?(override_show_column_ui(list_ui)) - end - - # the naming convention for overriding show types with helpers - def override_show_column_ui(list_ui) - "active_scaffold_show_#{list_ui}" - end - end - end -end +module ActiveScaffold + module Helpers + # Helpers that assist with the rendering of a List Column + module ShowColumnHelpers + def show_column_value(record, column) + # check for an override helper + if show_column_override? column + # we only pass the record as the argument. we previously also passed the formatted_value, + # but mike perham pointed out that prohibited the usage of overrides to improve on the + # performance of our default formatting. see issue #138. + send(show_column_override(column), record) + # second, check if the dev has specified a valid list_ui for this column + elsif column.list_ui and override_show_column_ui?(column.list_ui) + send(override_show_column_ui(column.list_ui), column, record) + else + if column.column and override_show_column_ui?(column.column.type) + send(override_show_column_ui(column.column.type), column, record) + else + get_column_value(record, column) + end + end + end + + def active_scaffold_show_text(column, record) + simple_format(clean_column_value(record.send(column.name))) + end + + def show_column_override(column) + "#{column.name.to_s.gsub('?', '')}_show_column" # parse out any question marks (see issue 227) + end + + def show_column_override?(column) + respond_to?(show_column_override(column)) + end + + def override_show_column_ui?(list_ui) + respond_to?(override_show_column_ui(list_ui)) + end + + # the naming convention for overriding show types with helpers + def override_show_column_ui(list_ui) + "active_scaffold_show_#{list_ui}" + end + end + end +end vendor/plugins/active_scaffold/lib/active_scaffold/helpers/show_column_helpers.rb @@ -9,6 +9,7 @@ module ActiveScaffold include ActiveScaffold::Helpers::ListColumnHelpers include ActiveScaffold::Helpers::ShowColumnHelpers include ActiveScaffold::Helpers::FormColumnHelpers + include ActiveScaffold::Helpers::CountryHelpers include ActiveScaffold::Helpers::SearchColumnHelpers ## vendor/plugins/active_scaffold/lib/active_scaffold/helpers/view_helpers.rb @@ -76,7 +76,7 @@ module ActionView #:nodoc: # TODO: Work with rails core team to find a better way to check for this. def template_exists?(template_name) begin - self.view_paths.find_template(template_name, @template_format) + self.view_paths.find_template_without_active_scaffold(template_name, @template_format) return true rescue ActionView::MissingTemplate => e return false vendor/plugins/active_scaffold/lib/extensions/action_view_rendering.rb @@ -34,7 +34,8 @@ module RespondsToParent response.headers['Content-Type'] = 'text/html; charset=UTF-8' # Either pull out a redirect or the request body - script = if location = erase_redirect_results + script = if location = response.headers['Location'] # erase_redirect_results returned strange values in production mode + erase_redirect_results "document.location.href = #{location.to_s.inspect}" else response.body vendor/plugins/active_scaffold/lib/responds_to_parent.rb vendor/gems/authlogic-2.0.13/.specification vendor/gems/authlogic-2.0.13/CHANGELOG.rdoc vendor/gems/authlogic-2.0.13/MIT-LICENSE vendor/gems/authlogic-2.0.13/Manifest.txt vendor/gems/authlogic-2.0.13/README.rdoc vendor/gems/authlogic-2.0.13/Rakefile vendor/gems/authlogic-2.0.13/generators/session/session_generator.rb vendor/gems/authlogic-2.0.13/generators/session/templates/session.rb vendor/gems/authlogic-2.0.13/init.rb vendor/gems/authlogic-2.0.13/lib/authlogic.rb vendor/gems/authlogic-2.0.13/lib/authlogic/acts_as_authentic/base.rb vendor/gems/authlogic-2.0.13/lib/authlogic/acts_as_authentic/email.rb vendor/gems/authlogic-2.0.13/lib/authlogic/acts_as_authentic/logged_in_status.rb vendor/gems/authlogic-2.0.13/lib/authlogic/acts_as_authentic/login.rb vendor/gems/authlogic-2.0.13/lib/authlogic/acts_as_authentic/magic_columns.rb vendor/gems/authlogic-2.0.13/lib/authlogic/acts_as_authentic/password.rb vendor/gems/authlogic-2.0.13/lib/authlogic/acts_as_authentic/perishable_token.rb vendor/gems/authlogic-2.0.13/lib/authlogic/acts_as_authentic/persistence_token.rb vendor/gems/authlogic-2.0.13/lib/authlogic/acts_as_authentic/restful_authentication.rb vendor/gems/authlogic-2.0.13/lib/authlogic/acts_as_authentic/session_maintenance.rb vendor/gems/authlogic-2.0.13/lib/authlogic/acts_as_authentic/single_access_token.rb vendor/gems/authlogic-2.0.13/lib/authlogic/acts_as_authentic/validations_scope.rb vendor/gems/authlogic-2.0.13/lib/authlogic/authenticates_many/association.rb vendor/gems/authlogic-2.0.13/lib/authlogic/authenticates_many/base.rb vendor/gems/authlogic-2.0.13/lib/authlogic/controller_adapters/abstract_adapter.rb vendor/gems/authlogic-2.0.13/lib/authlogic/controller_adapters/merb_adapter.rb vendor/gems/authlogic-2.0.13/lib/authlogic/controller_adapters/rails_adapter.rb vendor/gems/authlogic-2.0.13/lib/authlogic/crypto_providers/aes256.rb vendor/gems/authlogic-2.0.13/lib/authlogic/crypto_providers/bcrypt.rb vendor/gems/authlogic-2.0.13/lib/authlogic/crypto_providers/md5.rb vendor/gems/authlogic-2.0.13/lib/authlogic/crypto_providers/sha1.rb vendor/gems/authlogic-2.0.13/lib/authlogic/crypto_providers/sha512.rb vendor/gems/authlogic-2.0.13/lib/authlogic/i18n.rb vendor/gems/authlogic-2.0.13/lib/authlogic/random.rb vendor/gems/authlogic-2.0.13/lib/authlogic/regex.rb vendor/gems/authlogic-2.0.13/lib/authlogic/session/activation.rb vendor/gems/authlogic-2.0.13/lib/authlogic/session/active_record_trickery.rb vendor/gems/authlogic-2.0.13/lib/authlogic/session/base.rb vendor/gems/authlogic-2.0.13/lib/authlogic/session/brute_force_protection.rb vendor/gems/authlogic-2.0.13/lib/authlogic/session/callbacks.rb vendor/gems/authlogic-2.0.13/lib/authlogic/session/cookies.rb vendor/gems/authlogic-2.0.13/lib/authlogic/session/existence.rb vendor/gems/authlogic-2.0.13/lib/authlogic/session/foundation.rb vendor/gems/authlogic-2.0.13/lib/authlogic/session/http_auth.rb vendor/gems/authlogic-2.0.13/lib/authlogic/session/id.rb vendor/gems/authlogic-2.0.13/lib/authlogic/session/klass.rb vendor/gems/authlogic-2.0.13/lib/authlogic/session/magic_columns.rb vendor/gems/authlogic-2.0.13/lib/authlogic/session/magic_states.rb vendor/gems/authlogic-2.0.13/lib/authlogic/session/params.rb vendor/gems/authlogic-2.0.13/lib/authlogic/session/password.rb vendor/gems/authlogic-2.0.13/lib/authlogic/session/perishable_token.rb vendor/gems/authlogic-2.0.13/lib/authlogic/session/persistence.rb vendor/gems/authlogic-2.0.13/lib/authlogic/session/priority_record.rb vendor/gems/authlogic-2.0.13/lib/authlogic/session/scopes.rb vendor/gems/authlogic-2.0.13/lib/authlogic/session/session.rb vendor/gems/authlogic-2.0.13/lib/authlogic/session/timeout.rb vendor/gems/authlogic-2.0.13/lib/authlogic/session/unauthorized_record.rb vendor/gems/authlogic-2.0.13/lib/authlogic/session/validation.rb vendor/gems/authlogic-2.0.13/lib/authlogic/test_case.rb vendor/gems/authlogic-2.0.13/lib/authlogic/test_case/mock_controller.rb vendor/gems/authlogic-2.0.13/lib/authlogic/test_case/mock_cookie_jar.rb vendor/gems/authlogic-2.0.13/lib/authlogic/test_case/mock_logger.rb vendor/gems/authlogic-2.0.13/lib/authlogic/test_case/mock_request.rb vendor/gems/authlogic-2.0.13/lib/authlogic/test_case/rails_request_adapter.rb vendor/gems/authlogic-2.0.13/lib/authlogic/version.rb vendor/gems/authlogic-2.0.13/rails/init.rb vendor/gems/authlogic-2.0.13/shoulda_macros/authlogic.rb vendor/gems/authlogic-2.0.13/test/acts_as_authentic_test/base_test.rb vendor/gems/authlogic-2.0.13/test/acts_as_authentic_test/email_test.rb vendor/gems/authlogic-2.0.13/test/acts_as_authentic_test/logged_in_status_test.rb vendor/gems/authlogic-2.0.13/test/acts_as_authentic_test/login_test.rb vendor/gems/authlogic-2.0.13/test/acts_as_authentic_test/magic_columns_test.rb vendor/gems/authlogic-2.0.13/test/acts_as_authentic_test/password_test.rb vendor/gems/authlogic-2.0.13/test/acts_as_authentic_test/perishable_token_test.rb vendor/gems/authlogic-2.0.13/test/acts_as_authentic_test/persistence_token_test.rb vendor/gems/authlogic-2.0.13/test/acts_as_authentic_test/restful_authentication_test.rb vendor/gems/authlogic-2.0.13/test/acts_as_authentic_test/session_maintenance_test.rb vendor/gems/authlogic-2.0.13/test/acts_as_authentic_test/single_access_test.rb vendor/gems/authlogic-2.0.13/test/authenticates_many_test.rb vendor/gems/authlogic-2.0.13/test/crypto_provider_test/aes256_test.rb vendor/gems/authlogic-2.0.13/test/crypto_provider_test/bcrypt_test.rb vendor/gems/authlogic-2.0.13/test/crypto_provider_test/sha1_test.rb vendor/gems/authlogic-2.0.13/test/crypto_provider_test/sha512_test.rb vendor/gems/authlogic-2.0.13/test/fixtures/companies.yml vendor/gems/authlogic-2.0.13/test/fixtures/employees.yml vendor/gems/authlogic-2.0.13/test/fixtures/projects.yml vendor/gems/authlogic-2.0.13/test/fixtures/users.yml vendor/gems/authlogic-2.0.13/test/libs/affiliate.rb vendor/gems/authlogic-2.0.13/test/libs/company.rb vendor/gems/authlogic-2.0.13/test/libs/employee.rb vendor/gems/authlogic-2.0.13/test/libs/employee_session.rb vendor/gems/authlogic-2.0.13/test/libs/ldaper.rb vendor/gems/authlogic-2.0.13/test/libs/ordered_hash.rb vendor/gems/authlogic-2.0.13/test/libs/project.rb vendor/gems/authlogic-2.0.13/test/libs/user.rb vendor/gems/authlogic-2.0.13/test/libs/user_session.rb vendor/gems/authlogic-2.0.13/test/random_test.rb vendor/gems/authlogic-2.0.13/test/session_test/activation_test.rb vendor/gems/authlogic-2.0.13/test/session_test/active_record_trickery_test.rb vendor/gems/authlogic-2.0.13/test/session_test/brute_force_protection_test.rb vendor/gems/authlogic-2.0.13/test/session_test/callbacks_test.rb vendor/gems/authlogic-2.0.13/test/session_test/cookies_test.rb vendor/gems/authlogic-2.0.13/test/session_test/credentials_test.rb vendor/gems/authlogic-2.0.13/test/session_test/existence_test.rb vendor/gems/authlogic-2.0.13/test/session_test/http_auth_test.rb vendor/gems/authlogic-2.0.13/test/session_test/id_test.rb vendor/gems/authlogic-2.0.13/test/session_test/klass_test.rb vendor/gems/authlogic-2.0.13/test/session_test/magic_columns_test.rb vendor/gems/authlogic-2.0.13/test/session_test/magic_states_test.rb vendor/gems/authlogic-2.0.13/test/session_test/params_test.rb vendor/gems/authlogic-2.0.13/test/session_test/password_test.rb vendor/gems/authlogic-2.0.13/test/session_test/perishability_test.rb vendor/gems/authlogic-2.0.13/test/session_test/persistence_test.rb vendor/gems/authlogic-2.0.13/test/session_test/scopes_test.rb vendor/gems/authlogic-2.0.13/test/session_test/session_test.rb vendor/gems/authlogic-2.0.13/test/session_test/timeout_test.rb vendor/gems/authlogic-2.0.13/test/session_test/unauthorized_record_test.rb vendor/gems/authlogic-2.0.13/test/session_test/validation_test.rb vendor/gems/authlogic-2.0.13/test/test_helper.rb vendor/gems/searchlogic-1.6.6/.specification vendor/gems/searchlogic-1.6.6/CHANGELOG.rdoc vendor/gems/searchlogic-1.6.6/MIT-LICENSE vendor/gems/searchlogic-1.6.6/Manifest.txt vendor/gems/searchlogic-1.6.6/README.rdoc vendor/gems/searchlogic-1.6.6/Rakefile vendor/gems/searchlogic-1.6.6/TODO.rdoc vendor/gems/searchlogic-1.6.6/init.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/active_record/associations.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/active_record/base.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/active_record/connection_adapters/mysql_adapter.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/active_record/connection_adapters/postgresql_adapter.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/active_record/connection_adapters/sqlite_adapter.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/condition/base.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/condition/begins_with.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/condition/blank.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/condition/child_of.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/condition/descendant_of.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/condition/ends_with.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/condition/equals.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/condition/greater_than.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/condition/greater_than_or_equal_to.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/condition/inclusive_descendant_of.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/condition/keywords.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/condition/less_than.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/condition/less_than_or_equal_to.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/condition/like.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/condition/nested_set.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/condition/nil.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/condition/not_begin_with.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/condition/not_blank.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/condition/not_end_with.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/condition/not_equal.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/condition/not_have_keywords.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/condition/not_like.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/condition/not_nil.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/condition/sibling_of.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/conditions/any_or_all.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/conditions/base.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/conditions/groups.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/conditions/magic_methods.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/conditions/multiparameter_attributes.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/conditions/protection.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/config.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/config/helpers.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/config/search.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/core_ext/hash.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/core_ext/object.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/helpers/control_types/link.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/helpers/control_types/links.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/helpers/control_types/remote_link.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/helpers/control_types/remote_links.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/helpers/control_types/remote_select.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/helpers/control_types/select.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/helpers/form.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/helpers/utilities.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/modifiers/absolute.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/modifiers/acos.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/modifiers/asin.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/modifiers/atan.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/modifiers/avg.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/modifiers/base.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/modifiers/ceil.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/modifiers/char_length.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/modifiers/cos.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/modifiers/cot.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/modifiers/count.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/modifiers/day_of_month.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/modifiers/day_of_week.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/modifiers/day_of_year.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/modifiers/degrees.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/modifiers/exp.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/modifiers/floor.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/modifiers/hex.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/modifiers/hour.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/modifiers/log.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/modifiers/log10.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/modifiers/log2.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/modifiers/lower.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/modifiers/ltrim.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/modifiers/md5.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/modifiers/microseconds.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/modifiers/milliseconds.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/modifiers/minute.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/modifiers/month.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/modifiers/octal.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/modifiers/radians.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/modifiers/round.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/modifiers/rtrim.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/modifiers/second.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/modifiers/sign.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/modifiers/sin.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/modifiers/square_root.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/modifiers/sum.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/modifiers/tan.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/modifiers/trim.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/modifiers/upper.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/modifiers/week.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/modifiers/year.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/search/base.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/search/conditions.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/search/ordering.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/search/pagination.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/search/protection.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/search/searching.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/shared/utilities.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/shared/virtual_classes.rb vendor/gems/searchlogic-1.6.6/lib/searchlogic/version.rb vendor/gems/searchlogic-1.6.6/test/active_record_tests/associations_test.rb vendor/gems/searchlogic-1.6.6/test/active_record_tests/base_test.rb vendor/gems/searchlogic-1.6.6/test/condition_tests/base_test.rb vendor/gems/searchlogic-1.6.6/test/condition_tests/begins_with_test.rb vendor/gems/searchlogic-1.6.6/test/condition_tests/blank_test.rb vendor/gems/searchlogic-1.6.6/test/condition_tests/child_of_test.rb vendor/gems/searchlogic-1.6.6/test/condition_tests/descendant_of_test.rb vendor/gems/searchlogic-1.6.6/test/condition_tests/ends_with_test.rb vendor/gems/searchlogic-1.6.6/test/condition_tests/equals_test.rb vendor/gems/searchlogic-1.6.6/test/condition_tests/greater_than_or_equal_to_test.rb vendor/gems/searchlogic-1.6.6/test/condition_tests/greater_than_test.rb vendor/gems/searchlogic-1.6.6/test/condition_tests/inclusive_descendant_of_test.rb vendor/gems/searchlogic-1.6.6/test/condition_tests/keywords_test.rb vendor/gems/searchlogic-1.6.6/test/condition_tests/less_than_or_equal_to_test.rb vendor/gems/searchlogic-1.6.6/test/condition_tests/less_than_test.rb vendor/gems/searchlogic-1.6.6/test/condition_tests/like_test.rb vendor/gems/searchlogic-1.6.6/test/condition_tests/nil_test.rb vendor/gems/searchlogic-1.6.6/test/condition_tests/not_begin_with_test.rb vendor/gems/searchlogic-1.6.6/test/condition_tests/not_blank_test.rb vendor/gems/searchlogic-1.6.6/test/condition_tests/not_end_with_test.rb vendor/gems/searchlogic-1.6.6/test/condition_tests/not_equal_test.rb vendor/gems/searchlogic-1.6.6/test/condition_tests/not_have_keywords_test.rb vendor/gems/searchlogic-1.6.6/test/condition_tests/not_like_test.rb vendor/gems/searchlogic-1.6.6/test/condition_tests/not_nil_test.rb vendor/gems/searchlogic-1.6.6/test/condition_tests/sibling_of_test.rb vendor/gems/searchlogic-1.6.6/test/conditions_tests/any_or_all_test.rb vendor/gems/searchlogic-1.6.6/test/conditions_tests/base_test.rb vendor/gems/searchlogic-1.6.6/test/conditions_tests/groups_test.rb vendor/gems/searchlogic-1.6.6/test/conditions_tests/magic_methods_test.rb vendor/gems/searchlogic-1.6.6/test/conditions_tests/multiparameter_attributes_test.rb vendor/gems/searchlogic-1.6.6/test/conditions_tests/protection_test.rb vendor/gems/searchlogic-1.6.6/test/config_test.rb vendor/gems/searchlogic-1.6.6/test/fixtures/accounts.yml vendor/gems/searchlogic-1.6.6/test/fixtures/animals.yml vendor/gems/searchlogic-1.6.6/test/fixtures/orders.yml vendor/gems/searchlogic-1.6.6/test/fixtures/user_groups.yml vendor/gems/searchlogic-1.6.6/test/fixtures/users.yml vendor/gems/searchlogic-1.6.6/test/libs/awesome_nested_set.rb vendor/gems/searchlogic-1.6.6/test/libs/awesome_nested_set/.autotest vendor/gems/searchlogic-1.6.6/test/libs/awesome_nested_set/compatability.rb vendor/gems/searchlogic-1.6.6/test/libs/awesome_nested_set/helper.rb vendor/gems/searchlogic-1.6.6/test/libs/awesome_nested_set/named_scope.rb vendor/gems/searchlogic-1.6.6/test/libs/rexml_fix.rb vendor/gems/searchlogic-1.6.6/test/modifier_tests/day_of_month_test.rb vendor/gems/searchlogic-1.6.6/test/search_tests/base_test.rb vendor/gems/searchlogic-1.6.6/test/search_tests/conditions_test.rb vendor/gems/searchlogic-1.6.6/test/search_tests/ordering_test.rb vendor/gems/searchlogic-1.6.6/test/search_tests/pagination_test.rb vendor/gems/searchlogic-1.6.6/test/search_tests/protection_test.rb vendor/gems/searchlogic-1.6.6/test/test_helper.rb 6e0a2a31bc1cc4ed0874da9215532d0af3ca52dd Geoffrey Dagley gdagley@gmail.com http://github.com/gdagley/basejumper/commit/c8364c07a45d24705969275a2739a326b1bd5799 c8364c07a45d24705969275a2739a326b1bd5799 2009-06-24T18:56:57-07:00 2009-06-24T18:56:57-07:00 update gems and plugins 178cf59ca827c0df0d8ae7f93f549f083ec094e6 Geoffrey Dagley gdagley@gmail.com