Permalink
Browse files

Merge branches 'file_uploader' and 'master'

  • Loading branch information...
2 parents 29652bb + f6cc4d1 commit 19f3ef4fe4ad434b49966b88dcaed91b417e3ea6 @strix3000 strix3000 committed Feb 21, 2012
Showing with 49 additions and 324 deletions.
  1. +10 −0 db/migrate/20120213192439_create_uploads.rb
  2. +10 −0 db/migrate/20120213192439_create_uploads.rb~
  3. +0 −26 public/404.html
  4. +0 −26 public/422.html
  5. +0 −26 public/500.html
  6. 0 public/favicon.ico
  7. +0 −241 public/index.html
  8. +0 −5 public/robots.txt
  9. BIN public/uploads/tmp/20120130-1703-18556-4668/pirate-bay-wallpaper.jpg
  10. BIN public/uploads/tmp/20120130-1703-18556-4668/thumb_pirate-bay-wallpaper.jpg
  11. BIN public/uploads/tmp/20120130-1703-18556-6079/pirate-bay-wallpaper.jpg
  12. BIN public/uploads/tmp/20120130-1703-18556-6079/thumb_pirate-bay-wallpaper.jpg
  13. BIN public/uploads/tmp/20120130-1714-18556-2872/avatar_b07.jpg
  14. BIN public/uploads/tmp/20120130-1714-18556-2872/thumb_avatar_b07.jpg
  15. BIN public/uploads/tmp/20120130-1714-18556-4551/avatar_b07.jpg
  16. BIN public/uploads/tmp/20120130-1714-18556-4551/thumb_avatar_b07.jpg
  17. BIN public/uploads/tmp/20120130-1714-18556-5609/avatar_b07.jpg
  18. BIN public/uploads/tmp/20120130-1714-18556-5609/thumb_avatar_b07.jpg
  19. BIN public/uploads/tmp/20120130-1715-18556-2435/avatar_b07.jpg
  20. BIN public/uploads/tmp/20120130-1715-18556-2435/thumb_avatar_b07.jpg
  21. BIN public/uploads/tmp/20120130-1716-18556-8468/avatar_b07.jpg
  22. BIN public/uploads/tmp/20120130-1716-18556-8468/thumb_avatar_b07.jpg
  23. BIN public/uploads/tmp/20120130-1716-18556-8849/avatar_b07.jpg
  24. BIN public/uploads/tmp/20120130-1716-18556-8849/thumb_avatar_b07.jpg
  25. BIN public/uploads/user/image/1/pirate-bay-wallpaper.jpg
  26. BIN public/uploads/user/image/1/thumb_pirate-bay-wallpaper.jpg
  27. +11 −0 test/fixtures/uploads.yml
  28. +7 −0 test/functional/upload_controller_test.rb
  29. +4 −0 test/unit/helpers/upload_helper_test.rb
  30. +7 −0 test/unit/uploads_test.rb
View
10 db/migrate/20120213192439_create_uploads.rb
@@ -0,0 +1,10 @@
+class CreateUploads < ActiveRecord::Migration
+ def change
+ create_table :uploads do |t|
+ t.string :name
+ t.text :description
+ t.string :file
+ t.timestamps
+ end
+ end
+end
View
10 db/migrate/20120213192439_create_uploads.rb~
@@ -0,0 +1,10 @@
+class CreateUploads < ActiveRecord::Migration
+ def change
+ create_table :uploads do |t|
+ t.string :name
+ t.text :description
+ t.string :file
+ t.timestamps
+ end
+ end
+end
View
26 public/404.html
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title>The page you were looking for doesn't exist (404)</title>
- <style type="text/css">
- body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
- div.dialog {
- width: 25em;
- padding: 0 4em;
- margin: 4em auto 0 auto;
- border: 1px solid #ccc;
- border-right-color: #999;
- border-bottom-color: #999;
- }
- h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
- </style>
-</head>
-
-<body>
- <!-- This file lives in public/404.html -->
- <div class="dialog">
- <h1>The page you were looking for doesn't exist.</h1>
- <p>You may have mistyped the address or the page may have moved.</p>
- </div>
-</body>
-</html>
View
26 public/422.html
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title>The change you wanted was rejected (422)</title>
- <style type="text/css">
- body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
- div.dialog {
- width: 25em;
- padding: 0 4em;
- margin: 4em auto 0 auto;
- border: 1px solid #ccc;
- border-right-color: #999;
- border-bottom-color: #999;
- }
- h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
- </style>
-</head>
-
-<body>
- <!-- This file lives in public/422.html -->
- <div class="dialog">
- <h1>The change you wanted was rejected.</h1>
- <p>Maybe you tried to change something you didn't have access to.</p>
- </div>
-</body>
-</html>
View
26 public/500.html
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title>We're sorry, but something went wrong (500)</title>
- <style type="text/css">
- body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
- div.dialog {
- width: 25em;
- padding: 0 4em;
- margin: 4em auto 0 auto;
- border: 1px solid #ccc;
- border-right-color: #999;
- border-bottom-color: #999;
- }
- h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
- </style>
-</head>
-
-<body>
- <!-- This file lives in public/500.html -->
- <div class="dialog">
- <h1>We're sorry, but something went wrong.</h1>
- <p>We've been notified about this issue and we'll take a look at it shortly.</p>
- </div>
-</body>
-</html>
View
0 public/favicon.ico
No changes.
View
241 public/index.html
@@ -1,241 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
- <title>Ruby on Rails: Welcome aboard</title>
- <style type="text/css" media="screen">
- body {
- margin: 0;
- margin-bottom: 25px;
- padding: 0;
- background-color: #f0f0f0;
- font-family: "Lucida Grande", "Bitstream Vera Sans", "Verdana";
- font-size: 13px;
- color: #333;
- }
-
- h1 {
- font-size: 28px;
- color: #000;
- }
-
- a {color: #03c}
- a:hover {
- background-color: #03c;
- color: white;
- text-decoration: none;
- }
-
-
- #page {
- background-color: #f0f0f0;
- width: 750px;
- margin: 0;
- margin-left: auto;
- margin-right: auto;
- }
-
- #content {
- float: left;
- background-color: white;
- border: 3px solid #aaa;
- border-top: none;
- padding: 25px;
- width: 500px;
- }
-
- #sidebar {
- float: right;
- width: 175px;
- }
-
- #footer {
- clear: both;
- }
-
- #header, #about, #getting-started {
- padding-left: 75px;
- padding-right: 30px;
- }
-
-
- #header {
- background-image: url("/assets/rails.png");
- background-repeat: no-repeat;
- background-position: top left;
- height: 64px;
- }
- #header h1, #header h2 {margin: 0}
- #header h2 {
- color: #888;
- font-weight: normal;
- font-size: 16px;
- }
-
-
- #about h3 {
- margin: 0;
- margin-bottom: 10px;
- font-size: 14px;
- }
-
- #about-content {
- background-color: #ffd;
- border: 1px solid #fc0;
- margin-left: -55px;
- margin-right: -10px;
- }
- #about-content table {
- margin-top: 10px;
- margin-bottom: 10px;
- font-size: 11px;
- border-collapse: collapse;
- }
- #about-content td {
- padding: 10px;
- padding-top: 3px;
- padding-bottom: 3px;
- }
- #about-content td.name {color: #555}
- #about-content td.value {color: #000}
-
- #about-content ul {
- padding: 0;
- list-style-type: none;
- }
-
- #about-content.failure {
- background-color: #fcc;
- border: 1px solid #f00;
- }
- #about-content.failure p {
- margin: 0;
- padding: 10px;
- }
-
-
- #getting-started {
- border-top: 1px solid #ccc;
- margin-top: 25px;
- padding-top: 15px;
- }
- #getting-started h1 {
- margin: 0;
- font-size: 20px;
- }
- #getting-started h2 {
- margin: 0;
- font-size: 14px;
- font-weight: normal;
- color: #333;
- margin-bottom: 25px;
- }
- #getting-started ol {
- margin-left: 0;
- padding-left: 0;
- }
- #getting-started li {
- font-size: 18px;
- color: #888;
- margin-bottom: 25px;
- }
- #getting-started li h2 {
- margin: 0;
- font-weight: normal;
- font-size: 18px;
- color: #333;
- }
- #getting-started li p {
- color: #555;
- font-size: 13px;
- }
-
-
- #sidebar ul {
- margin-left: 0;
- padding-left: 0;
- }
- #sidebar ul h3 {
- margin-top: 25px;
- font-size: 16px;
- padding-bottom: 10px;
- border-bottom: 1px solid #ccc;
- }
- #sidebar li {
- list-style-type: none;
- }
- #sidebar ul.links li {
- margin-bottom: 5px;
- }
-
- .filename {
- font-style: italic;
- }
- </style>
- <script type="text/javascript">
- function about() {
- info = document.getElementById('about-content');
- if (window.XMLHttpRequest)
- { xhr = new XMLHttpRequest(); }
- else
- { xhr = new ActiveXObject("Microsoft.XMLHTTP"); }
- xhr.open("GET","rails/info/properties",false);
- xhr.send("");
- info.innerHTML = xhr.responseText;
- info.style.display = 'block'
- }
- </script>
- </head>
- <body>
- <div id="page">
- <div id="sidebar">
- <ul id="sidebar-items">
- <li>
- <h3>Browse the documentation</h3>
- <ul class="links">
- <li><a href="http://guides.rubyonrails.org/">Rails Guides</a></li>
- <li><a href="http://api.rubyonrails.org/">Rails API</a></li>
- <li><a href="http://www.ruby-doc.org/core/">Ruby core</a></li>
- <li><a href="http://www.ruby-doc.org/stdlib/">Ruby standard library</a></li>
- </ul>
- </li>
- </ul>
- </div>
-
- <div id="content">
- <div id="header">
- <h1>Welcome aboard</h1>
- <h2>You&rsquo;re riding Ruby on Rails!</h2>
- </div>
-
- <div id="about">
- <h3><a href="rails/info/properties" onclick="about(); return false">About your application&rsquo;s environment</a></h3>
- <div id="about-content" style="display: none"></div>
- </div>
-
- <div id="getting-started">
- <h1>Getting started</h1>
- <h2>Here&rsquo;s how to get rolling:</h2>
-
- <ol>
- <li>
- <h2>Use <code>rails generate</code> to create your models and controllers</h2>
- <p>To see all available options, run it without parameters.</p>
- </li>
-
- <li>
- <h2>Set up a default route and remove <span class="filename">public/index.html</span></h2>
- <p>Routes are set up in <span class="filename">config/routes.rb</span>.</p>
- </li>
-
- <li>
- <h2>Create your database</h2>
- <p>Run <code>rake db:create</code> to create your database. If you're not using SQLite (the default), edit <span class="filename">config/database.yml</span> with your username and password.</p>
- </li>
- </ol>
- </div>
- </div>
-
- <div id="footer">&nbsp;</div>
- </div>
- </body>
-</html>
View
5 public/robots.txt
@@ -1,5 +0,0 @@
-# See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file
-#
-# To ban all spiders from the entire site uncomment the next two lines:
-# User-Agent: *
-# Disallow: /
View
BIN public/uploads/tmp/20120130-1703-18556-4668/pirate-bay-wallpaper.jpg
Deleted file not rendered
View
BIN public/uploads/tmp/20120130-1703-18556-4668/thumb_pirate-bay-wallpaper.jpg
Deleted file not rendered
View
BIN public/uploads/tmp/20120130-1703-18556-6079/pirate-bay-wallpaper.jpg
Deleted file not rendered
View
BIN public/uploads/tmp/20120130-1703-18556-6079/thumb_pirate-bay-wallpaper.jpg
Deleted file not rendered
View
BIN public/uploads/tmp/20120130-1714-18556-2872/avatar_b07.jpg
Deleted file not rendered
View
BIN public/uploads/tmp/20120130-1714-18556-2872/thumb_avatar_b07.jpg
Deleted file not rendered
View
BIN public/uploads/tmp/20120130-1714-18556-4551/avatar_b07.jpg
Deleted file not rendered
View
BIN public/uploads/tmp/20120130-1714-18556-4551/thumb_avatar_b07.jpg
Deleted file not rendered
View
BIN public/uploads/tmp/20120130-1714-18556-5609/avatar_b07.jpg
Deleted file not rendered
View
BIN public/uploads/tmp/20120130-1714-18556-5609/thumb_avatar_b07.jpg
Deleted file not rendered
View
BIN public/uploads/tmp/20120130-1715-18556-2435/avatar_b07.jpg
Deleted file not rendered
View
BIN public/uploads/tmp/20120130-1715-18556-2435/thumb_avatar_b07.jpg
Deleted file not rendered
View
BIN public/uploads/tmp/20120130-1716-18556-8468/avatar_b07.jpg
Deleted file not rendered
View
BIN public/uploads/tmp/20120130-1716-18556-8468/thumb_avatar_b07.jpg
Deleted file not rendered
View
BIN public/uploads/tmp/20120130-1716-18556-8849/avatar_b07.jpg
Deleted file not rendered
View
BIN public/uploads/tmp/20120130-1716-18556-8849/thumb_avatar_b07.jpg
Deleted file not rendered
View
BIN public/uploads/user/image/1/pirate-bay-wallpaper.jpg
Deleted file not rendered
View
BIN public/uploads/user/image/1/thumb_pirate-bay-wallpaper.jpg
Deleted file not rendered
View
11 test/fixtures/uploads.yml
@@ -0,0 +1,11 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
+
+# This model initially had no columns defined. If you add columns to the
+# model remove the '{}' from the fixture names and add the columns immediately
+# below each fixture, per the syntax in the comments below
+#
+one: {}
+# column: value
+#
+two: {}
+# column: value
View
7 test/functional/upload_controller_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class UploadControllerTest < ActionController::TestCase
+ # test "the truth" do
+ # assert true
+ # end
+end
View
4 test/unit/helpers/upload_helper_test.rb
@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class UploadHelperTest < ActionView::TestCase
+end
View
7 test/unit/uploads_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class UploadsTest < ActiveSupport::TestCase
+ # test "the truth" do
+ # assert true
+ # end
+end

0 comments on commit 19f3ef4

Please sign in to comment.