From d4faecd1b9164c86146c2a5ea235c2540ceeab46 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Tue, 29 Apr 2014 10:28:36 -0300 Subject: [PATCH] rails3: development + packaging updates --- Gemfile | 22 ++++++++++------------ Gemfile.lock | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------- Vagrantfile | 11 +++++++++++ config/initializers/01_load_config.rb | 2 +- debian/bundle/config | 3 +++ debian/control | 19 ++++++++++++++++--- debian/noosfero.dirs | 1 + debian/noosfero.install | 12 +++++++----- gitignore.example | 1 + lib/tasks/data.rake | 2 +- lib/tasks/doc.rake | 9 +++++---- lib/tasks/gettext.rake | 2 +- lib/tasks/multitenancy.rake | 2 +- po/eo/noosfero-doc.po | 4 ++-- po/es/noosfero-doc.po | 4 ++-- po/it/noosfero-doc.po | 4 ++-- po/noosfero-doc.pot | 2 +- script/install-dependencies/debian-wheezy.sh | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------- script/vagrant | 16 ++++++++++++++++ vendor/prototype_legacy_helper/README.markdown | 13 +++++++++++++ vendor/prototype_legacy_helper/init.rb | 1 + vendor/prototype_legacy_helper/lib/prototype_legacy_helper.rb | 432 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ vendor/prototype_legacy_helper/test/test_prototype_helper.rb | 297 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 23 files changed, 1005 insertions(+), 81 deletions(-) create mode 100644 Vagrantfile create mode 100644 debian/bundle/config create mode 100755 script/vagrant create mode 100644 vendor/prototype_legacy_helper/README.markdown create mode 100644 vendor/prototype_legacy_helper/init.rb create mode 100644 vendor/prototype_legacy_helper/lib/prototype_legacy_helper.rb create mode 100644 vendor/prototype_legacy_helper/test/test_prototype_helper.rb diff --git a/Gemfile b/Gemfile index 4cd3b55..49f23a6 100644 --- a/Gemfile +++ b/Gemfile @@ -3,11 +3,18 @@ gem 'rails' gem 'fast_gettext' gem 'acts-as-taggable-on' gem 'prototype-rails' -gem 'prototype_legacy_helper', '0.0.0', :git => 'http://git.github.com/rails/prototype_legacy_helper.git' +gem 'prototype_legacy_helper', '0.0.0', :path => 'vendor/prototype_legacy_helper' gem 'rails_autolink' gem 'pg' - -# TODO needs a rebuild diff-lcs wrt wheezy +gem 'rmagick' +gem 'RedCloth' +gem 'will_paginate' +gem 'ruby-feedparser' +gem 'daemons' +gem 'thin' +gem 'hpricot' +gem 'nokogiri' +gem 'rake', :require => false # FIXME list here all actual dependencies (i.e. the ones in debian/control), # with their GEM names (not the Debian package names) @@ -35,12 +42,3 @@ Dir.glob(File.join('config', 'plugins', '*')).each do |plugin| plugin_gemfile = File.join(plugin, 'Gemfile') eval File.read(plugin_gemfile) if File.exists?(plugin_gemfile) end - -def program(name) - unless system("which #{name} > /dev/null") - puts "W: Program #{name} is needed, but was not found in your PATH" - end -end - -program 'java' -program 'firefox' diff --git a/Gemfile.lock b/Gemfile.lock index df12cdf..518e712 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ -GIT - remote: http://git.github.com/rails/prototype_legacy_helper.git - revision: a2cd95c3e3c1a4f7a9566efdab5ce59c886cb05f +PATH + remote: vendor/prototype_legacy_helper specs: prototype_legacy_helper (0.0.0) GEM remote: https://rubygems.org/ specs: + RedCloth (4.2.9) actionmailer (3.2.6) actionpack (= 3.2.6) mail (~> 2.4.4) @@ -34,49 +34,51 @@ GEM activesupport (3.2.6) i18n (~> 0.6) multi_json (~> 1.0) - acts-as-taggable-on (3.0.1) + acts-as-taggable-on (3.0.2) rails (>= 3, < 5) arel (3.0.2) builder (3.0.0) - capybara (2.2.1) + capybara (2.1.0) mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - childprocess (0.4.0) - ffi (~> 1.0, >= 1.0.11) - cucumber (1.3.2) + childprocess (0.3.3) + ffi (~> 1.0.6) + cucumber (1.0.6) builder (>= 2.1.2) - diff-lcs (>= 1.1.3) - gherkin (~> 2.12.0) - multi_json (~> 1.3) - cucumber-rails (1.4.0) - capybara (>= 1.1.2) - cucumber (>= 1.2.0) + diff-lcs (>= 1.1.2) + gherkin (~> 2.4.18) + json (>= 1.4.6) + term-ansicolor (>= 1.0.6) + cucumber-rails (1.0.6) + capybara (>= 1.1.1) + cucumber (>= 1.0.6) nokogiri (>= 1.5.0) - rails (>= 3.0.0) + daemons (1.1.5) dalli (2.7.0) database_cleaner (1.2.0) - diff-lcs (1.2.5) + diff-lcs (1.1.3) erubis (2.7.0) + eventmachine (0.12.11) fast_gettext (0.6.8) - ffi (1.9.3) - gherkin (2.12.2) - multi_json (~> 1.3) + ffi (1.0.11) + gherkin (2.4.21) + json (>= 1.4.6) hike (1.2.1) + hpricot (0.8.6) i18n (0.6.0) journey (1.0.3) + json (1.7.3) mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.19) - mini_portile (0.5.2) multi_json (1.3.6) - nokogiri (1.6.1) - mini_portile (~> 0.5.0) - pg (0.17.1) + nokogiri (1.5.5) + pg (0.13.2) polyglot (0.3.3) prototype-rails (3.2.1) rails (~> 3.2) @@ -106,23 +108,22 @@ GEM thor (>= 0.14.6, < 2.0) rake (0.9.2.2) rdoc (3.9.4) - rspec (2.14.1) - rspec-core (~> 2.14.0) - rspec-expectations (~> 2.14.0) - rspec-mocks (~> 2.14.0) - rspec-core (2.14.7) - rspec-expectations (2.14.5) - diff-lcs (>= 1.1.3, < 2.0) - rspec-mocks (2.14.5) - rspec-rails (2.14.1) + rmagick (2.13.1) + rspec (2.10.0) + rspec-core (~> 2.10.0) + rspec-expectations (~> 2.10.0) + rspec-mocks (~> 2.10.0) + rspec-core (2.10.1) + rspec-expectations (2.10.0) + diff-lcs (~> 1.1.3) + rspec-mocks (2.10.1) + rspec-rails (2.10.1) actionpack (>= 3.0) - activemodel (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 2.14.0) - rspec-expectations (~> 2.14.0) - rspec-mocks (~> 2.14.0) - rubyzip (1.1.0) + rspec (~> 2.10.0) + ruby-feedparser (0.7) + rubyzip (1.1.2) selenium-webdriver (2.39.0) childprocess (>= 0.2.5) multi_json (~> 1.0) @@ -133,6 +134,11 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) + term-ansicolor (1.0.7) + thin (1.3.1) + daemons (>= 1.0.9) + eventmachine (>= 0.12.6) + rack (>= 1.0.0) thor (0.15.3) tilt (1.3.3) treetop (1.4.10) @@ -140,6 +146,7 @@ GEM polyglot (>= 0.3.1) tzinfo (0.3.33) websocket (1.0.7) + will_paginate (3.0.3) xpath (2.0.0) nokogiri (~> 1.3) @@ -147,19 +154,27 @@ PLATFORMS ruby DEPENDENCIES + RedCloth acts-as-taggable-on capybara cucumber cucumber-rails + daemons dalli database_cleaner fast_gettext + hpricot + nokogiri pg prototype-rails prototype_legacy_helper (= 0.0.0)! rails rails_autolink rake + rmagick rspec rspec-rails + ruby-feedparser selenium-webdriver + thin + will_paginate diff --git a/Vagrantfile b/Vagrantfile new file mode 100644 index 0000000..23c4211 --- /dev/null +++ b/Vagrantfile @@ -0,0 +1,11 @@ +# -*- mode: ruby -*- +# vi: set ft=ruby : + +VAGRANTFILE_API_VERSION = "2" +Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| + config.vm.box = "debian-wheezy" + config.vm.network :forwarded_port, host: 3000, guest: 3000 + config.vm.provision :shell do |shell| + shell.inline = 'su vagrant -c /vagrant/script/vagrant' + end +end diff --git a/config/initializers/01_load_config.rb b/config/initializers/01_load_config.rb index a808d85..6eb6b6c 100644 --- a/config/initializers/01_load_config.rb +++ b/config/initializers/01_load_config.rb @@ -1,2 +1,2 @@ file = Rails.root.join('config', 'noosfero.yml') -NOOSFERO_CONF = File.exists?(file) ? YAML.load_file(file)[RAILS_ENV] || {} : {} +NOOSFERO_CONF = File.exists?(file) ? YAML.load_file(file)[Rails.env] || {} : {} diff --git a/debian/bundle/config b/debian/bundle/config new file mode 100644 index 0000000..8c72cba --- /dev/null +++ b/debian/bundle/config @@ -0,0 +1,3 @@ +--- +BUNDLE_WITHOUT: test:cucumber + diff --git a/debian/control b/debian/control index 91c48eb..e462b9a 100644 --- a/debian/control +++ b/debian/control @@ -10,9 +10,19 @@ Build-Depends: ruby-sqlite3, rake, rails3 (>= 3.2.6-1~), + ruby-rspec, + ruby-rspec-rails, ruby-will-paginate, + cucumber, + ruby-cucumber-rails, + ruby-capybara, + ruby-database-cleaner, + ruby-selenium-webdriver, + ruby-tidy, + ruby-mocha, + imagemagick, + xvfb, tango-icon-theme, - rcov Standards-Version: 3.8.4 Homepage: http://noosfero.org/ Vcs-Git: git://git.colivre.coop.br/noosfero.git @@ -25,8 +35,8 @@ Depends: ruby, ruby1.9.3, rake, + ruby-dalli, ruby-fast-gettext, - ruby-sqlite3, ruby-pg, ruby-rmagick, ruby-redcloth, @@ -34,12 +44,15 @@ Depends: iso-codes, ruby-feedparser, ruby-daemons, - rcov, thin, tango-icon-theme, ruby-hpricot, ruby-nokogiri, + ruby-acts-as-taggable-on, + ruby-prototype-rails, + ruby-rails-autolink, memcached, + ruby-memcache-client, debconf, dbconfig-common, adduser, diff --git a/debian/noosfero.dirs b/debian/noosfero.dirs index ff47a9f..34fdccf 100644 --- a/debian/noosfero.dirs +++ b/debian/noosfero.dirs @@ -1,3 +1,4 @@ etc/noosfero etc/noosfero/plugins usr/share/noosfero/locale +usr/share/noosfero/.bundle diff --git a/debian/noosfero.install b/debian/noosfero.install index da53ebf..4d0e046 100644 --- a/debian/noosfero.install +++ b/debian/noosfero.install @@ -5,18 +5,20 @@ lib usr/share/noosfero script usr/share/noosfero util usr/share/noosfero Rakefile usr/share/noosfero -vendor/cardmagic-contacts-f66219e6589ccaf3ab9e3574fdd41225d0dd5073 usr/share/noosfero/vendor -vendor/gdata-1.1.1 usr/share/noosfero/vendor -vendor/plugins usr/share/noosfero/vendor -vendor/terceiro-fast_gettext-fe7bb09e30f7b1b5876a3b7a18fe8a254c6f59cb usr/share/noosfero/vendor -vendor/ezcrypto-0.7.2 usr/share/noosfero/vendor +vendor usr/share/noosfero +Gemfile usr/share/noosfero +Gemfile.lock usr/share/noosfero +debian/bundle/config usr/share/noosfero/.bundle + +config/application.rb usr/share/noosfero/config config/boot.rb usr/share/noosfero/config config/environment.rb usr/share/noosfero/config config/environments usr/share/noosfero/config config/initializers usr/share/noosfero/config config/routes.rb usr/share/noosfero/config config/locales usr/share/noosfero/config +config.ru usr/share/noosfero plugins usr/share/noosfero diff --git a/gitignore.example b/gitignore.example index 1f67828..c616c36 100644 --- a/gitignore.example +++ b/gitignore.example @@ -1,5 +1,6 @@ .gitignore .rbenv-* +.vagrant vendor/rails doc/api doc/noosfero/plugins diff --git a/lib/tasks/data.rake b/lib/tasks/data.rake index ba4f8e3..0e10116 100644 --- a/lib/tasks/data.rake +++ b/lib/tasks/data.rake @@ -1,7 +1,7 @@ namespace :db do namespace :data do task :minimal do - sh 'rails', 'runner', "Environment.create!(:name => 'Noosfero', :is_default => true)" + sh 'rails', 'runner', "Environment.create!(:name => 'Noosfero', :contact_email => 'noosfero@localhost.localdomain', :is_default => true)" unless ENV['NOOSFERO_DOMAIN'].blank? sh 'rails', 'runner', "Environment.default.domains << Domain.new(:name => ENV['NOOSFERO_DOMAIN'])" end diff --git a/lib/tasks/doc.rake b/lib/tasks/doc.rake index be860d9..82d44d5 100644 --- a/lib/tasks/doc.rake +++ b/lib/tasks/doc.rake @@ -41,8 +41,8 @@ namespace :noosfero do toc_sections.each do |toc| section_topics = Dir.glob(File.dirname(toc) + '/*.textile').map {|item| item.sub('.textile', '.en.xhtml') }.reject {|item| ['index.en.xhtml', 'toc.en.xhtml' ].include?(File.basename(item))} file toc => section_topics do |t| - require 'app/models/doc_item' - require 'app/models/doc_topic' + require './app/models/doc_item' + require './app/models/doc_topic' begin File.open(toc, 'w') do |output_file| section = File.basename(File.dirname(toc)) @@ -67,8 +67,9 @@ namespace :noosfero do top_level_toc = 'doc/noosfero/toc.en.xhtml' file top_level_toc => index_sections do - require 'app/models/doc_item' - require 'app/models/doc_topic' + $LOAD_PATH << '.' + require './app/models/doc_item' + require './app/models/doc_topic' begin File.open(top_level_toc, 'w') do |output_file| output_file.puts "" diff --git a/lib/tasks/gettext.rake b/lib/tasks/gettext.rake index 6fa8de9..33c04aa 100644 --- a/lib/tasks/gettext.rake +++ b/lib/tasks/gettext.rake @@ -6,7 +6,7 @@ makemo_stamp = 'tmp/makemo.stamp' desc "Create mo-files for L10n" task :makemo => makemo_stamp file makemo_stamp => Dir.glob('po/*/noosfero.po') do - ruby '-rconfig/boot -e \'require "gettext"; require "gettext/utils"; GetText.create_mofiles(true, "po", "locale")\' 2>/dev/null' + ruby '-I. -rconfig/boot -e \'require "gettext"; require "gettext/utils"; GetText.create_mofiles(true, "po", "locale")\'' Rake::Task['symlinkmo'].invoke FileUtils.mkdir_p 'tmp' FileUtils.touch makemo_stamp diff --git a/lib/tasks/multitenancy.rake b/lib/tasks/multitenancy.rake index 1e25dcb..d2994ab 100644 --- a/lib/tasks/multitenancy.rake +++ b/lib/tasks/multitenancy.rake @@ -19,7 +19,7 @@ end namespace :db do task :migrate_other_environments => :environment do - envs = ActiveRecord::Base.configurations.keys.select{ |k| k.match(/_#{RAILS_ENV}$/) } + envs = ActiveRecord::Base.configurations.keys.select{ |k| k.match(/_#{Rails.env}$/) } envs.each do |e| puts "*** Migrating #{e}" if Rake.application.options.trace system "rake db:migrate RAILS_ENV=#{e}" diff --git a/po/eo/noosfero-doc.po b/po/eo/noosfero-doc.po index d32de5c..47ab5ad 100644 --- a/po/eo/noosfero-doc.po +++ b/po/eo/noosfero-doc.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2013-12-10 15:48-0300\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"PO-Revision-Date: 2014-03-23 17:11-0300\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "Language: eo\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" diff --git a/po/es/noosfero-doc.po b/po/es/noosfero-doc.po index 4c0cdc4..80b8df6 100644 --- a/po/es/noosfero-doc.po +++ b/po/es/noosfero-doc.po @@ -7,14 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2013-12-10 15:48-0300\n" -"PO-Revision-Date: 2012-10-04 13:01-0600\n" +"PO-Revision-Date: 2014-03-23 17:11-0300\n" "Last-Translator: Luis David Aguilar Carlos , Freddy " "Martn Hernndez Facio , Pedro Alonzo Ramrez Tovar \n" "Language-Team: Spanish \n" "Language: \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: ENCODING\n" # type: Content of:

diff --git a/po/it/noosfero-doc.po b/po/it/noosfero-doc.po index 2bc1910..c09c7f6 100644 --- a/po/it/noosfero-doc.po +++ b/po/it/noosfero-doc.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: noosfero 0.36.6\n" "POT-Creation-Date: 2013-12-10 15:48-0300\n" -"PO-Revision-Date: 2012-06-05 10:32-0300\n" +"PO-Revision-Date: 2014-03-23 17:10-0300\n" "Last-Translator: Daniela Feitosa \n" "Language-Team: LANGUAGE TEAM \n" "Language: \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #. type: Content of:

diff --git a/po/noosfero-doc.pot b/po/noosfero-doc.pot index 284f459..02af681 100644 --- a/po/noosfero-doc.pot +++ b/po/noosfero-doc.pot @@ -13,7 +13,7 @@ msgstr "" "Language-Team: LANGUAGE \n" "Language: \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #. type: Content of:

diff --git a/script/install-dependencies/debian-wheezy.sh b/script/install-dependencies/debian-wheezy.sh index 8799d28..106844a 100644 --- a/script/install-dependencies/debian-wheezy.sh +++ b/script/install-dependencies/debian-wheezy.sh @@ -1,14 +1,134 @@ -# needed to run noosfero -runtime_dependencies=$(sed -e '/^\s*#/d; 1,/^Depends:/d; /^Recommends:/,$ d; s/([^)]*)//g; s/,\s*/\n/g' debian/control | grep -v 'memcached\|debconf\|dbconfig-common\|postgresql\|misc:Depends\|adduser\|mail-transport-agent') -run sudo apt-get -y install $runtime_dependencies -sudo apt-get -y install iceweasel || sudo apt-get -y install firefox +# FIXME upload to a more official repository and sign with an existing key +if [ ! -e /etc/apt/sources.list.d/noosfero.list ]; then + sudo tee /etc/apt/sources.list.d/noosfero.list < 'git://github.com/rails/prototype_legacy_helper.git' + +or run the following command to vendor the plugin within your app: + + rails plugin install git://github.com/rails/prototype_legacy_helper.git diff --git a/vendor/prototype_legacy_helper/init.rb b/vendor/prototype_legacy_helper/init.rb new file mode 100644 index 0000000..8590056 --- /dev/null +++ b/vendor/prototype_legacy_helper/init.rb @@ -0,0 +1 @@ +require 'prototype_legacy_helper' diff --git a/vendor/prototype_legacy_helper/lib/prototype_legacy_helper.rb b/vendor/prototype_legacy_helper/lib/prototype_legacy_helper.rb new file mode 100644 index 0000000..8161eed --- /dev/null +++ b/vendor/prototype_legacy_helper/lib/prototype_legacy_helper.rb @@ -0,0 +1,432 @@ +module PrototypeHelper + # Creates a button with an onclick event which calls a remote action + # via XMLHttpRequest + # The options for specifying the target with :url + # and defining callbacks is the same as link_to_remote. + def button_to_remote(name, options = {}, html_options = {}) + button_to_function(name, remote_function(options), html_options) + end + + # Returns a button input tag with the element name of +name+ and a value (i.e., display text) of +value+ + # that will submit form using XMLHttpRequest in the background instead of a regular POST request that + # reloads the page. + # + # # Create a button that submits to the create action + # # + # # Generates: + # <%= submit_to_remote 'create_btn', 'Create', :url => { :action => 'create' } %> + # + # # Submit to the remote action update and update the DIV succeed or fail based + # # on the success or failure of the request + # # + # # Generates: + # <%= submit_to_remote 'update_btn', 'Update', :url => { :action => 'update' }, + # :update => { :success => "succeed", :failure => "fail" } + # + # options argument is the same as in form_remote_tag. + def submit_to_remote(name, value, options = {}) + options[:with] ||= 'Form.serialize(this.form)' + + html_options = options.delete(:html) || {} + html_options[:name] = name + + button_to_remote(value, options, html_options) + end + + # Returns a link to a remote action defined by options[:url] + # (using the url_for format) that's called in the background using + # XMLHttpRequest. The result of that request can then be inserted into a + # DOM object whose id can be specified with options[:update]. + # Usually, the result would be a partial prepared by the controller with + # render :partial. + # + # Examples: + # # Generates: Delete this post + # link_to_remote "Delete this post", :update => "posts", + # :url => { :action => "destroy", :id => post.id } + # + # # Generates: Refresh + # link_to_remote(image_tag("refresh"), :update => "emails", + # :url => { :action => "list_emails" }) + # + # You can override the generated HTML options by specifying a hash in + # options[:html]. + # + # link_to_remote "Delete this post", :update => "posts", + # :url => post_url(@post), :method => :delete, + # :html => { :class => "destructive" } + # + # You can also specify a hash for options[:update] to allow for + # easy redirection of output to an other DOM element if a server-side + # error occurs: + # + # Example: + # # Generates: Delete this post + # link_to_remote "Delete this post", + # :url => { :action => "destroy", :id => post.id }, + # :update => { :success => "posts", :failure => "error" } + # + # Optionally, you can use the options[:position] parameter to + # influence how the target DOM element is updated. It must be one of + # :before, :top, :bottom, or :after. + # + # The method used is by default POST. You can also specify GET or you + # can simulate PUT or DELETE over POST. All specified with options[:method] + # + # Example: + # # Generates: Destroy + # link_to_remote "Destroy", :url => person_url(:id => person), :method => :delete + # + # By default, these remote requests are processed asynchronous during + # which various JavaScript callbacks can be triggered (for progress + # indicators and the likes). All callbacks get access to the + # request object, which holds the underlying XMLHttpRequest. + # + # To access the server response, use request.responseText, to + # find out the HTTP status, use request.status. + # + # Example: + # # Generates: hello + # word = 'hello' + # link_to_remote word, + # :url => { :action => "undo", :n => word_counter }, + # :complete => "undoRequestCompleted(request)" + # + # The callbacks that may be specified are (in order): + # + # :loading:: Called when the remote document is being + # loaded with data by the browser. + # :loaded:: Called when the browser has finished loading + # the remote document. + # :interactive:: Called when the user can interact with the + # remote document, even though it has not + # finished loading. + # :success:: Called when the XMLHttpRequest is completed, + # and the HTTP status code is in the 2XX range. + # :failure:: Called when the XMLHttpRequest is completed, + # and the HTTP status code is not in the 2XX + # range. + # :complete:: Called when the XMLHttpRequest is complete + # (fires after success/failure if they are + # present). + # + # You can further refine :success and :failure by + # adding additional callbacks for specific status codes. + # + # Example: + # # Generates: hello + # link_to_remote word, + # :url => { :action => "action" }, + # 404 => "alert('Not found...? Wrong URL...?')", + # :failure => "alert('HTTP Error ' + request.status + '!')" + # + # A status code callback overrides the success/failure handlers if + # present. + # + # If you for some reason or another need synchronous processing (that'll + # block the browser while the request is happening), you can specify + # options[:type] = :synchronous. + # + # You can customize further browser side call logic by passing in + # JavaScript code snippets via some optional parameters. In their order + # of use these are: + # + # :confirm:: Adds confirmation dialog. + # :condition:: Perform remote request conditionally + # by this expression. Use this to + # describe browser-side conditions when + # request should not be initiated. + # :before:: Called before request is initiated. + # :after:: Called immediately after request was + # initiated and before :loading. + # :submit:: Specifies the DOM element ID that's used + # as the parent of the form elements. By + # default this is the current form, but + # it could just as well be the ID of a + # table row or any other DOM element. + # :with:: A JavaScript expression specifying + # the parameters for the XMLHttpRequest. + # Any expressions should return a valid + # URL query string. + # + # Example: + # + # :with => "'name=' + $('name').value" + # + # You can generate a link that uses AJAX in the general case, while + # degrading gracefully to plain link behavior in the absence of + # JavaScript by setting html_options[:href] to an alternate URL. + # Note the extra curly braces around the options hash separate + # it as the second parameter from html_options, the third. + # + # Example: + # link_to_remote "Delete this post", + # { :update => "posts", :url => { :action => "destroy", :id => post.id } }, + # :href => url_for(:action => "destroy", :id => post.id) + def link_to_remote(name, options = {}, html_options = nil) + link_to_function(name, remote_function(options), html_options || options.delete(:html)) + end + + # Returns a form tag that will submit using XMLHttpRequest in the + # background instead of the regular reloading POST arrangement. Even + # though it's using JavaScript to serialize the form elements, the form + # submission will work just like a regular submission as viewed by the + # receiving side (all elements available in params). The options for + # specifying the target with :url and defining callbacks is the same as + # +link_to_remote+. + # + # A "fall-through" target for browsers that doesn't do JavaScript can be + # specified with the :action/:method options on :html. + # + # Example: + # # Generates: + # #
+ # form_remote_tag :html => { :action => + # url_for(:controller => "some", :action => "place") } + # + # The Hash passed to the :html key is equivalent to the options (2nd) + # argument in the FormTagHelper.form_tag method. + # + # By default the fall-through action is the same as the one specified in + # the :url (and the default method is :post). + # + # form_remote_tag also takes a block, like form_tag: + # # Generates: + # #
+ # #
+ # <% form_remote_tag :url => '/posts' do -%> + #
<%= submit_tag 'Save' %>
+ # <% end -%> + def form_remote_tag(options = {}, &block) + options[:form] = true + + options[:html] ||= {} + options[:html][:onsubmit] = + (options[:html][:onsubmit] ? options[:html][:onsubmit] + "; " : "") + + "#{remote_function(options)}; return false;" + + form_tag(options[:html].delete(:action) || url_for(options[:url]), options[:html], &block) + end + + # Creates a form that will submit using XMLHttpRequest in the background + # instead of the regular reloading POST arrangement and a scope around a + # specific resource that is used as a base for questioning about + # values for the fields. + # + # === Resource + # + # Example: + # <% remote_form_for(@post) do |f| %> + # ... + # <% end %> + # + # This will expand to be the same as: + # + # <% remote_form_for :post, @post, :url => post_path(@post), :html => { :method => :put, :class => "edit_post", :id => "edit_post_45" } do |f| %> + # ... + # <% end %> + # + # === Nested Resource + # + # Example: + # <% remote_form_for([@post, @comment]) do |f| %> + # ... + # <% end %> + # + # This will expand to be the same as: + # + # <% remote_form_for :comment, @comment, :url => post_comment_path(@post, @comment), :html => { :method => :put, :class => "edit_comment", :id => "edit_comment_45" } do |f| %> + # ... + # <% end %> + # + # If you don't need to attach a form to a resource, then check out form_remote_tag. + # + # See FormHelper#form_for for additional semantics. + def remote_form_for(record_or_name_or_array, *args, &proc) + options = args.extract_options! + + case record_or_name_or_array + when String, Symbol + object_name = record_or_name_or_array + when Array + object = record_or_name_or_array.last + object_name = ActiveModel::Naming.singular(object) + apply_form_for_options!(record_or_name_or_array, options) + args.unshift object + else + object = record_or_name_or_array + object_name = ActiveModel::Naming.singular(record_or_name_or_array) + apply_form_for_options!(object, options) + args.unshift object + end + + form_remote_tag options do + fields_for object_name, *(args << options), &proc + end + end + alias_method :form_remote_for, :remote_form_for + + # Returns 'eval(request.responseText)' which is the JavaScript function + # that +form_remote_tag+ can call in :complete to evaluate a multiple + # update return document using +update_element_function+ calls. + def evaluate_remote_response + "eval(request.responseText)" + end + + # Observes the field with the DOM ID specified by +field_id+ and calls a + # callback when its contents have changed. The default callback is an + # Ajax call. By default the value of the observed field is sent as a + # parameter with the Ajax call. + # + # Example: + # # Generates: new Form.Element.Observer('suggest', 0.25, function(element, value) {new Ajax.Updater('suggest', + # # '/testing/find_suggestion', {asynchronous:true, evalScripts:true, parameters:'q=' + value})}) + # <%= observe_field :suggest, :url => { :action => :find_suggestion }, + # :frequency => 0.25, + # :update => :suggest, + # :with => 'q' + # %> + # + # Required +options+ are either of: + # :url:: +url_for+-style options for the action to call + # when the field has changed. + # :function:: Instead of making a remote call to a URL, you + # can specify javascript code to be called instead. + # Note that the value of this option is used as the + # *body* of the javascript function, a function definition + # with parameters named element and value will be generated for you + # for example: + # observe_field("glass", :frequency => 1, :function => "alert('Element changed')") + # will generate: + # new Form.Element.Observer('glass', 1, function(element, value) {alert('Element changed')}) + # The element parameter is the DOM element being observed, and the value is its value at the + # time the observer is triggered. + # + # Additional options are: + # :frequency:: The frequency (in seconds) at which changes to + # this field will be detected. Not setting this + # option at all or to a value equal to or less than + # zero will use event based observation instead of + # time based observation. + # :update:: Specifies the DOM ID of the element whose + # innerHTML should be updated with the + # XMLHttpRequest response text. + # :with:: A JavaScript expression specifying the parameters + # for the XMLHttpRequest. The default is to send the + # key and value of the observed field. Any custom + # expressions should return a valid URL query string. + # The value of the field is stored in the JavaScript + # variable +value+. + # + # Examples + # + # :with => "'my_custom_key=' + value" + # :with => "'person[name]=' + prompt('New name')" + # :with => "Form.Element.serialize('other-field')" + # + # Finally + # :with => 'name' + # is shorthand for + # :with => "'name=' + value" + # This essentially just changes the key of the parameter. + # + # Additionally, you may specify any of the options documented in the + # Common options section at the top of this document. + # + # Example: + # + # # Sends params: {:title => 'Title of the book'} when the book_title input + # # field is changed. + # observe_field 'book_title', + # :url => 'http://example.com/books/edit/1', + # :with => 'title' + # + # + def observe_field(field_id, options = {}) + if options[:frequency] && options[:frequency] > 0 + build_observer('Form.Element.Observer', field_id, options) + else + build_observer('Form.Element.EventObserver', field_id, options) + end + end + + # Observes the form with the DOM ID specified by +form_id+ and calls a + # callback when its contents have changed. The default callback is an + # Ajax call. By default all fields of the observed field are sent as + # parameters with the Ajax call. + # + # The +options+ for +observe_form+ are the same as the options for + # +observe_field+. The JavaScript variable +value+ available to the + # :with option is set to the serialized form by default. + def observe_form(form_id, options = {}) + if options[:frequency] + build_observer('Form.Observer', form_id, options) + else + build_observer('Form.EventObserver', form_id, options) + end + end + + # Periodically calls the specified url (options[:url]) every + # options[:frequency] seconds (default is 10). Usually used to + # update a specified div (options[:update]) with the results + # of the remote call. The options for specifying the target with :url + # and defining callbacks is the same as link_to_remote. + # Examples: + # # Call get_averages and put its results in 'avg' every 10 seconds + # # Generates: + # # new PeriodicalExecuter(function() {new Ajax.Updater('avg', '/grades/get_averages', + # # {asynchronous:true, evalScripts:true})}, 10) + # periodically_call_remote(:url => { :action => 'get_averages' }, :update => 'avg') + # + # # Call invoice every 10 seconds with the id of the customer + # # If it succeeds, update the invoice DIV; if it fails, update the error DIV + # # Generates: + # # new PeriodicalExecuter(function() {new Ajax.Updater({success:'invoice',failure:'error'}, + # # '/testing/invoice/16', {asynchronous:true, evalScripts:true})}, 10) + # periodically_call_remote(:url => { :action => 'invoice', :id => customer.id }, + # :update => { :success => "invoice", :failure => "error" } + # + # # Call update every 20 seconds and update the new_block DIV + # # Generates: + # # new PeriodicalExecuter(function() {new Ajax.Updater('news_block', 'update', {asynchronous:true, evalScripts:true})}, 20) + # periodically_call_remote(:url => 'update', :frequency => '20', :update => 'news_block') + # + def periodically_call_remote(options = {}) + frequency = options[:frequency] || 10 # every ten seconds by default + code = "new PeriodicalExecuter(function() {#{remote_function(options)}}, #{frequency})" + javascript_tag(code) + end + + protected + def build_observer(klass, name, options = {}) + if options[:with] && (options[:with] !~ /[\{=(.]/) + options[:with] = "'#{options[:with]}=' + encodeURIComponent(value)" + else + options[:with] ||= 'value' unless options[:function] + end + + callback = options[:function] || remote_function(options) + javascript = "new #{klass}('#{name}', " + javascript << "#{options[:frequency]}, " if options[:frequency] + javascript << "function(element, value) {" + javascript << "#{callback}}" + javascript << ")" + javascript_tag(javascript) + end +end + +ActionController::Base.helper PrototypeHelper diff --git a/vendor/prototype_legacy_helper/test/test_prototype_helper.rb b/vendor/prototype_legacy_helper/test/test_prototype_helper.rb new file mode 100644 index 0000000..f21666f --- /dev/null +++ b/vendor/prototype_legacy_helper/test/test_prototype_helper.rb @@ -0,0 +1,297 @@ +if ENV['RAILS_ROOT'] + environment = File.expand_path('vendor/gems/environment', ENV['RAILS_ROOT']) + require environment if File.exist?("#{environment}.rb") +end + +$:.unshift File.expand_path('../../lib', __FILE__) + +require 'test/unit' +require 'action_view' +require 'action_controller' +require 'active_model' +require 'prototype_helper' + +class Bunny < Struct.new(:Bunny, :id) +end + +class Author + extend ActiveModel::Naming + + attr_reader :id + def save; @id = 1 end + def new_record?; @id.nil? end + def name + @id.nil? ? 'new author' : "author ##{@id}" + end +end + +class Article + extend ActiveModel::Naming + + attr_reader :id + attr_reader :author_id + def save; @id = 1; @author_id = 1 end + def new_record?; @id.nil? end + def name + @id.nil? ? 'new article' : "article ##{@id}" + end +end + +class Author::Nested < Author; end + +class PrototypeHelperTest < ActionView::TestCase + attr_accessor :formats, :output_buffer, :template_format + + def _evaluate_assigns_and_ivars() end + + def reset_formats(format) + @format = format + end + + def setup + @record = @author = Author.new + @article = Article.new + super + @template = self + @controller = Class.new do + def url_for(options) + if options.is_a?(String) + options + else + url = "http://www.example.com/" + url << options[:action].to_s if options and options[:action] + url << "?a=#{options[:a]}" if options && options[:a] + url << "&b=#{options[:b]}" if options && options[:a] && options[:b] + url + end + end + end.new + end + + + def test_observe_form + assert_dom_equal %(), + observe_form("cart", :frequency => 2, :url => { :action => "cart_changed" }) + end + + def test_observe_form_using_function_for_callback + assert_dom_equal %(), + observe_form("cart", :frequency => 2, :function => "alert('Form changed')") + end + + def test_observe_field + assert_dom_equal %(), + observe_field("glass", :frequency => 5.minutes, :url => { :action => "reorder_if_empty" }) + end + + def test_observe_field_using_with_option + expected = %() + assert_dom_equal expected, observe_field("glass", :frequency => 5.minutes, :url => { :action => "check_value" }, :with => 'id') + assert_dom_equal expected, observe_field("glass", :frequency => 5.minutes, :url => { :action => "check_value" }, :with => "'id=' + encodeURIComponent(value)") + end + + def test_observe_field_using_json_in_with_option + expected = %() + assert_dom_equal expected, observe_field("glass", :frequency => 5.minutes, :url => { :action => "check_value" }, :with => "{'id':value}") + end + + def test_observe_field_using_function_for_callback + assert_dom_equal %(), + observe_field("glass", :frequency => 5.minutes, :function => "alert('Element changed')") + end + + def test_observe_field_without_frequency + assert_dom_equal %(), + observe_field("glass") + end + + + def test_periodically_call_remote + assert_dom_equal %(), + periodically_call_remote(:update => "schremser_bier", :url => { :action => "mehr_bier" }) + end + + def test_periodically_call_remote_with_frequency + assert_dom_equal( + "", + periodically_call_remote(:frequency => 2) + ) + end + + + def test_form_remote_tag + assert_dom_equal %(
), + form_remote_tag(:update => "glass_of_beer", :url => { :action => :fast }) + assert_dom_equal %(), + form_remote_tag(:update => { :success => "glass_of_beer" }, :url => { :action => :fast }) + assert_dom_equal %(), + form_remote_tag(:update => { :failure => "glass_of_water" }, :url => { :action => :fast }) + assert_dom_equal %(), + form_remote_tag(:update => { :success => 'glass_of_beer', :failure => "glass_of_water" }, :url => { :action => :fast }) + end + + def test_form_remote_tag_with_method + assert_dom_equal %(
), + form_remote_tag(:update => "glass_of_beer", :url => { :action => :fast }, :html => { :method => :put }) + end + + def test_form_remote_tag_with_block_in_erb + __in_erb_template = '' + form_remote_tag(:update => "glass_of_beer", :url => { :action => :fast }) { concat "Hello world!" } + assert_dom_equal %(Hello world!
), output_buffer + end + + def test_on_callbacks + callbacks = [:uninitialized, :loading, :loaded, :interactive, :complete, :success, :failure] + callbacks.each do |callback| + assert_dom_equal %(
), + form_remote_tag(:update => "glass_of_beer", :url => { :action => :fast }, callback=>"monkeys();") + assert_dom_equal %(), + form_remote_tag(:update => { :success => "glass_of_beer" }, :url => { :action => :fast }, callback=>"monkeys();") + assert_dom_equal %(), + form_remote_tag(:update => { :failure => "glass_of_beer" }, :url => { :action => :fast }, callback=>"monkeys();") + assert_dom_equal %(), + form_remote_tag(:update => { :success => "glass_of_beer", :failure => "glass_of_water" }, :url => { :action => :fast }, callback=>"monkeys();") + end + + #HTTP status codes 200 up to 599 have callbacks + #these should work + 100.upto(599) do |callback| + assert_dom_equal %(), + form_remote_tag(:update => "glass_of_beer", :url => { :action => :fast }, callback=>"monkeys();") + end + + #test 200 and 404 + assert_dom_equal %(), + form_remote_tag(:update => "glass_of_beer", :url => { :action => :fast }, 200=>"monkeys();", 404=>"bananas();") + + #these shouldn't + 1.upto(99) do |callback| + assert_dom_equal %(), + form_remote_tag(:update => "glass_of_beer", :url => { :action => :fast }, callback=>"monkeys();") + end + 600.upto(999) do |callback| + assert_dom_equal %(), + form_remote_tag(:update => "glass_of_beer", :url => { :action => :fast }, callback=>"monkeys();") + end + + #test ultimate combo + assert_dom_equal %(), + form_remote_tag(:update => "glass_of_beer", :url => { :action => :fast }, :loading => "c1()", :success => "s()", :failure => "f();", :complete => "c();", 200=>"monkeys();", 404=>"bananas();") + end + + def test_remote_form_for_with_record_identification_with_new_record + remote_form_for(@record, {:html => { :id => 'create-author' }}) {} + + expected = %(
) + assert_dom_equal expected, output_buffer + end + + def test_remote_form_for_with_record_identification_without_html_options + remote_form_for(@record) {} + + expected = %(
) + assert_dom_equal expected, output_buffer + end + + def test_remote_form_for_with_record_identification_with_existing_record + @record.save + remote_form_for(@record) {} + + expected = %(
) + assert_dom_equal expected, output_buffer + end + + def test_remote_form_for_with_new_object_in_list + remote_form_for([@author, @article]) {} + + expected = %(
) + assert_dom_equal expected, output_buffer + end + + def test_remote_form_for_with_existing_object_in_list + @author.save + @article.save + remote_form_for([@author, @article]) {} + + expected = %(
) + assert_dom_equal expected, output_buffer + end + + + def test_button_to_remote + assert_dom_equal %(), + button_to_remote("Remote outpost", { :url => { :action => "whatnot" }}, { :class => "fine" }) + assert_dom_equal %(), + button_to_remote("Remote outpost", :complete => "alert(request.reponseText)", :url => { :action => "whatnot" }) + assert_dom_equal %(), + button_to_remote("Remote outpost", :success => "alert(request.reponseText)", :url => { :action => "whatnot" }) + assert_dom_equal %(), + button_to_remote("Remote outpost", :failure => "alert(request.reponseText)", :url => { :action => "whatnot" }) + assert_dom_equal %(), + button_to_remote("Remote outpost", :failure => "alert(request.reponseText)", :url => { :action => "whatnot", :a => '10', :b => '20' }) + end + + def test_submit_to_remote + assert_dom_equal %(), + submit_to_remote("More beer!", 1_000_000, :update => "empty_bottle") + end + + + def test_link_to_remote + assert_dom_equal %(Remote outauthor), + link_to_remote("Remote outauthor", { :url => { :action => "whatnot" }}, { :class => "fine" }) + assert_dom_equal %(Remote outauthor), + link_to_remote("Remote outauthor", :complete => "alert(request.responseText)", :url => { :action => "whatnot" }) + assert_dom_equal %(Remote outauthor), + link_to_remote("Remote outauthor", :success => "alert(request.responseText)", :url => { :action => "whatnot" }) + assert_dom_equal %(Remote outauthor), + link_to_remote("Remote outauthor", :failure => "alert(request.responseText)", :url => { :action => "whatnot" }) + assert_dom_equal %(Remote outauthor), + link_to_remote("Remote outauthor", :failure => "alert(request.responseText)", :url => { :action => "whatnot", :a => '10', :b => '20' }) + assert_dom_equal %(Remote outauthor), + link_to_remote("Remote outauthor", :url => { :action => "whatnot" }, :type => :synchronous) + assert_dom_equal %(Remote outauthor), + link_to_remote("Remote outauthor", :url => { :action => "whatnot" }, :position => :bottom) + end + + def test_link_to_remote_html_options + assert_dom_equal %(Remote outauthor), + link_to_remote("Remote outauthor", { :url => { :action => "whatnot" }, :html => { :class => "fine" } }) + end + + def test_link_to_remote_url_quote_escaping + assert_dom_equal %(Remote), + link_to_remote("Remote", { :url => { :action => "whatnot's" } }) + end + + protected + def request_forgery_protection_token + nil + end + + def protect_against_forgery? + false + end + + def create_generator + block = Proc.new { |*args| yield *args if block_given? } + JavaScriptGenerator.new self, &block + end + + def author_path(record) + "/authors/#{record.id}" + end + + def authors_path + "/authors" + end + + def author_articles_path(author) + "/authors/#{author.id}/articles" + end + + def author_article_path(author, article) + "/authors/#{author.id}/articles/#{article.id}" + end +end -- libgit2 0.21.2