diff --git a/.gitignore b/.gitignore index dddf79d..142c0c9 100644 --- a/.gitignore +++ b/.gitignore @@ -2,8 +2,4 @@ log/*.log tmp/**/* db/*.sqlite3 -encodings.xml -misc.xml -modules.xml -profiles_settings.xml coverage/* diff --git a/Capfile b/Capfile new file mode 100644 index 0000000..c36d48d --- /dev/null +++ b/Capfile @@ -0,0 +1,3 @@ +load 'deploy' if respond_to?(:namespace) # cap2 differentiator +Dir['vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) } +load 'config/deploy' \ No newline at end of file diff --git a/Rakefile b/Rakefile index 58dc70c..c4ccdb4 100755 --- a/Rakefile +++ b/Rakefile @@ -1,5 +1,5 @@ # Add your own tasks in files placed in lib/tasks ending in .rake, -# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. +# for example lib/tasks/capistrano.rake, and they will automatically be availab$ require(File.join(File.dirname(__FILE__), 'config', 'boot')) @@ -7,9 +7,4 @@ require 'rake' require 'rake/testtask' require 'rake/rdoctask' -require 'tasks/rails' - -require 'rubygems' -gem 'ci_reporter' -require 'ci/reporter/rake/test_unit' -#require 'ci/reporter/rake/rspec' \ No newline at end of file +require 'tasks/rails' \ No newline at end of file diff --git a/app/controllers/application.rb b/app/controllers/application_controller.rb similarity index 100% rename from app/controllers/application.rb rename to app/controllers/application_controller.rb diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb index cf8cce9..63eb3fc 100644 --- a/app/views/users/edit.html.erb +++ b/app/views/users/edit.html.erb @@ -13,11 +13,11 @@
<%= f.label :password %>
- <%= f.text_field :password %>
+ <%= f.password_field :password %>
<%= f.label :user_password_confirmation %>
- <%= f.text_field :password_confirmation %>
+ <%= f.password_field :password_confirmation %>
<%= f.submit "Update" %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index f795374..85bcf36 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -8,15 +8,5 @@ <%=h @user.email %>
-- Hashed password: - <%=h @user.hashed_password %> -
- -- Salt: - <%=h @user.salt %> -
- <%= link_to 'Edit', edit_user_path(@user) %> | <%= link_to 'Back', users_path %> diff --git a/config/boot.rb b/config/boot.rb index 0a51688..0ad0f78 100755 --- a/config/boot.rb +++ b/config/boot.rb @@ -44,6 +44,7 @@ class VendorBoot < Boot def load_initializer require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer" Rails::Initializer.run(:install_gem_spec_stubs) + Rails::GemDependency.add_frozen_gem_path end end diff --git a/config/deploy.rb b/config/deploy.rb new file mode 100644 index 0000000..4718d9b --- /dev/null +++ b/config/deploy.rb @@ -0,0 +1,48 @@ +# be sure to change these +set :user, 'davidhalldor' +set :domain, 'davidhalldor.com' +set :application, 'rskrif' + +# file paths +set :repository, "git://github.com/davidhalldor/rskrif.git" +# set :repository, "dabbi@adsl-13-196.simnet.is:git/#{application}.git" +set :deploy_to, "/home/#{user}/Sites/#{domain}" + +# distribute your applications across servers (the instructions below put them +# all on the same server, defined above as 'domain', adjust as necessary) +role :app, domain +role :web, domain +role :db, domain, :primary => true + +# you might need to set this if you aren't seeing password prompts +# default_run_options[:pty] = true + +# As Capistrano executes in a non-interactive mode and therefore doesn't cause +# any of your shell profile scripts to be run, the following might be needed +# if (for example) you have locally installed gems or applications. Note: +# this needs to contain the full values for the variables set, not simply +# the deltas. +# default_environment['PATH']='In development...
+ + +This site is currently in development
+Twitter +Linkedin + \ No newline at end of file diff --git a/vendor/rails/actionmailer/CHANGELOG b/vendor/rails/actionmailer/CHANGELOG new file mode 100644 index 0000000..773e603 --- /dev/null +++ b/vendor/rails/actionmailer/CHANGELOG @@ -0,0 +1,358 @@ +*2.3.2 [Final] (March 15, 2009)* + +* Fixed that ActionMailer should send correctly formatted Return-Path in MAIL FROM for SMTP #1842 [Matt Jones] + +* Fixed RFC-2045 quoted-printable bug #1421 [squadette] + +* Fixed that no body charset would be set when there are attachments present #740 [Paweł Kondzior] + + +*2.2.1 [RC2] (November 14th, 2008)* + +* Turn on STARTTLS if it is available in Net::SMTP (added in Ruby 1.8.7) and the SMTP server supports it (This is required for Gmail's SMTP server) #1336 [Grant Hollingworth] + + +*2.2.0 [RC1] (October 24th, 2008)* + +* Add layout functionality to mailers [Pratik Naik] + + Mailer layouts behaves just like controller layouts, except layout names need to + have '_mailer' postfix for them to be automatically picked up. + + +*2.1.0 (May 31st, 2008)* + +* Fixed that a return-path header would be ignored #7572 [joost] + +* Less verbose mail logging: just recipients for :info log level; the whole email for :debug only. #8000 [iaddict, Tarmo Tänav] + +* Updated TMail to version 1.2.1 [Mikel Lindsaar] + +* Fixed that you don't have to call super in ActionMailer::TestCase#setup #10406 [jamesgolick] + + +*2.0.2* (December 16th, 2007) + +* Included in Rails 2.0.2 + + +*2.0.1* (December 7th, 2007) + +* Update ActionMailer so it treats ActionView the same way that ActionController does. Closes #10244 [Rick Olson] + + * Pass the template_root as an array as ActionView's view_path + * Request templates with the "#{mailer_name}/#{action}" as opposed to just "#{action}" + +* Fixed that partials would be broken when using text.plain.erb as the extension #10130 [java] + +* Update README to use new smtp settings configuration API. Closes #10060 [psq] + +* Allow ActionMailer subclasses to individually set their delivery method (so two subclasses can have different delivery methods) #10033 [Zach Dennis] + +* Update TMail to v1.1.0. Use an updated version of TMail if available. [Mikel Lindsaar] + +* Introduce a new base test class for testing Mailers. ActionMailer::TestCase [Michael Koziarski] + +* Fix silent failure of rxml templates. #9879 [jstewart] + +* Fix attachment decoding when using the TMail C extension. #7861 [orangechicken] + +* Increase mail delivery test coverage. #8692 [Kamal Fariz Mahyuddin] + +* Register alternative template engines using ActionMailer::Base.register_template_extension('haml'). #7534 [cwd, Josh Peek] + +* Only load ActionController::UrlWriter if ActionController is present [Rick Olson] + +* Make sure parsed emails recognized attachments nested inside multipart parts. #6714 [Jamis Buck] + +* Allow mailer actions named send by using __send__ internally. #6467 [iGEL] + +* Add assert_emails and assert_no_emails to test the number of emails delivered. #6479 [Jonathan Viney] + # Assert total number of emails delivered: + assert_emails 0 + ContactMailer.deliver_contact + assert_emails 1 + + # Assert number of emails delivered within a block: + assert_emails 1 do + post :signup, :name => 'Jonathan' + end + + +*1.3.3* (March 12th, 2007) + +* Depend on Action Pack 1.13.3 + + +*1.3.2* (February 5th, 2007) + +* Deprecate server_settings renaming it to smtp_settings, add sendmail_settings to allow you to override the arguments to and location of the sendmail executable. [Michael Koziarski] + + +*1.3.1* (January 16th, 2007) + +* Depend on Action Pack 1.13.1 + + +*1.3.0* (January 16th, 2007) + +* Make mime version default to 1.0. closes #2323 [ror@andreas-s.net] + +* Make sure quoted-printable text is decoded correctly when only portions of the text are encoded. closes #3154. [jon@siliconcircus.com] + +* Make sure DOS newlines in quoted-printable text are normalized to unix newlines before unquoting. closes #4166 and #4452. [Jamis Buck] + +* Fixed that iconv decoding should catch InvalidEncoding #3153 [jon@siliconcircus.com] + +* Tighten rescue clauses. #5985 [james@grayproductions.net] + +* Automatically included ActionController::UrlWriter, such that URL generation can happen within ActionMailer controllers. [David Heinemeier Hansson] + +* Replace Reloadable with Reloadable::Deprecated. [Nicholas Seckar] + +* Mailer template root applies to a class and its subclasses rather than acting globally. #5555 [somekool@gmail.com] + +* Resolve action naming collision. #5520 [ssinghi@kreeti.com] + +* ActionMailer::Base documentation rewrite. Closes #4991 [Kevin Clark, Marcel Molina Jr.] + +* Replace alias method chaining with Module#alias_method_chain. [Marcel Molina Jr.] + +* Replace Ruby's deprecated append_features in favor of included. [Marcel Molina Jr.] + +* Correct spurious documentation example code which results in a SyntaxError. [Marcel Molina Jr.] + + +*1.2.1* (April 6th, 2006) + +* Be part of Rails 1.1.1 + + +*1.2.0* (March 27th, 2006) + +* Nil charset caused subject line to be improperly quoted in implicitly multipart messages #2662 [ehalvorsen+rails@runbox.com] + +* Parse content-type apart before using it so that sub-parts of the header can be set correctly #2918 [Jamis Buck] + +* Make custom headers work in subparts #4034 [elan@bluemandrill.com] + +* Template paths with dot chars in them no longer mess up implicit template selection for multipart messages #3332 [Chad Fowler] + +* Make sure anything with content-disposition of "attachment" is passed to the attachment presenter when parsing an email body [Jamis Buck] + +* Make sure TMail#attachments includes anything with content-disposition of "attachment", regardless of content-type [Jamis Buck] + + +*1.1.5* (December 13th, 2005) + +* Become part of Rails 1.0 + + +*1.1.4* (December 7th, 2005) + +* Rename Version constant to VERSION. #2802 [Marcel Molina Jr.] + +* Stricter matching for implicitly multipart filenames excludes files ending in unsupported extensions (such as foo.rhtml.bak) and without a two-part content type (such as foo.text.rhtml or foo.text.really.plain.rhtml). #2398 [Dave Burtline #1
\nline #2
\rline #3
\r\nline #4
\r\r" + end + + def nested_multipart(recipient) + recipients recipient + subject "nested multipart" + from "test@example.com" + content_type "multipart/mixed" + part :content_type => "multipart/alternative", :content_disposition => "inline", :headers => { "foo" => "bar" } do |p| + p.part :content_type => "text/plain", :body => "test text\nline #2" + p.part :content_type => "text/html", :body => "test HTMLline #1
\nline #2
\nline #3
\nline #4
\n\n", mail.parts[1].body + end + + def test_headers_removed_on_smtp_delivery + ActionMailer::Base.delivery_method = :smtp + TestMailer.deliver_cc_bcc(@recipient) + assert MockSMTP.deliveries[0][2].include?("root@loudthinking.com") + assert MockSMTP.deliveries[0][2].include?("nobody@loudthinking.com") + assert MockSMTP.deliveries[0][2].include?(@recipient) + assert_match %r{^Cc: nobody@loudthinking.com}, MockSMTP.deliveries[0][0] + assert_match %r{^To: #{@recipient}}, MockSMTP.deliveries[0][0] + assert_no_match %r{^Bcc: root@loudthinking.com}, MockSMTP.deliveries[0][0] + end + + def test_recursive_multipart_processing + fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email7") + mail = TMail::Mail.parse(fixture) + assert_equal "This is the first part.\n\nAttachment: test.rb\nAttachment: test.pdf\n\n\nAttachment: smime.p7s\n", mail.body + end + + def test_decode_encoded_attachment_filename + fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email8") + mail = TMail::Mail.parse(fixture) + attachment = mail.attachments.last + + expected = "01 Quien Te Dij\212at. Pitbull.mp3" + expected.force_encoding(Encoding::ASCII_8BIT) if expected.respond_to?(:force_encoding) + + assert_equal expected, attachment.original_filename + end + + def test_wrong_mail_header + fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email9") + assert_raise(TMail::SyntaxError) { TMail::Mail.parse(fixture) } + end + + def test_decode_message_with_unknown_charset + fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email10") + mail = TMail::Mail.parse(fixture) + assert_nothing_raised { mail.body } + end + + def test_empty_header_values_omitted + result = TestMailer.create_unnamed_attachment(@recipient).encoded + assert_match %r{Content-Type: application/octet-stream[^;]}, result + assert_match %r{Content-Disposition: attachment[^;]}, result + end + + def test_headers_with_nonalpha_chars + mail = TestMailer.create_headers_with_nonalpha_chars(@recipient) + assert !mail.from_addrs.empty? + assert !mail.cc_addrs.empty? + assert !mail.bcc_addrs.empty? + assert_match(/:/, mail.from_addrs.to_s) + assert_match(/:/, mail.cc_addrs.to_s) + assert_match(/:/, mail.bcc_addrs.to_s) + end + + def test_deliver_with_mail_object + mail = TestMailer.create_headers_with_nonalpha_chars(@recipient) + assert_nothing_raised { TestMailer.deliver(mail) } + assert_equal 1, TestMailer.deliveries.length + end + + def test_multipart_with_template_path_with_dots + mail = FunkyPathMailer.create_multipart_with_template_path_with_dots(@recipient) + assert_equal 2, mail.parts.length + assert_equal 'text/plain', mail.parts[0].content_type + assert_equal 'utf-8', mail.parts[0].charset + end + + def test_custom_content_type_attributes + mail = TestMailer.create_custom_content_type_attributes + assert_match %r{format=flowed}, mail['content-type'].to_s + assert_match %r{charset=utf-8}, mail['content-type'].to_s + end + + def test_return_path_with_create + mail = TestMailer.create_return_path + assert_equal "