Permalink
Browse files

Merge branch 'master' of github.com:RubySchools/social_network

  • Loading branch information...
2 parents a8b8d22 + 7f83f58 commit 90efb87a1a35c39f314f503a120bac4ca75b32b8 @strix3000 strix3000 committed Feb 24, 2012
Showing with 6,166 additions and 905 deletions.
  1. +1 −1 .gitignore
  2. +9 −3 Gemfile
  3. +5 −3 Gemfile.lock
  4. +0 −37 Gemfile~
  5. +1 −0 Procfile
  6. +0 −261 README~
  7. BIN app/assets/images/logo.png
  8. +43 −0 app/assets/stylesheets/AUTHORS.textile
  9. +168 −0 app/assets/stylesheets/CHANGELOG
  10. +12 −0 app/assets/stylesheets/Gemfile
  11. +71 −0 app/assets/stylesheets/Gemfile.lock
  12. +22 −0 app/assets/stylesheets/LICENSE
  13. +83 −0 app/assets/stylesheets/README.textile
  14. +8 −0 app/assets/stylesheets/Rakefile
  15. +206 −0 app/assets/stylesheets/TUTORIAL.textile
  16. +36 −0 app/assets/stylesheets/blueprint/ie.css
  17. BIN app/assets/stylesheets/blueprint/plugins/buttons/icons/cross.png
  18. BIN app/assets/stylesheets/blueprint/plugins/buttons/icons/key.png
  19. BIN app/assets/stylesheets/blueprint/plugins/buttons/icons/tick.png
  20. +32 −0 app/assets/stylesheets/blueprint/plugins/buttons/readme.txt
  21. +97 −0 app/assets/stylesheets/blueprint/plugins/buttons/screen.css
  22. +14 −0 app/assets/stylesheets/blueprint/plugins/fancy-type/readme.txt
  23. +71 −0 app/assets/stylesheets/blueprint/plugins/fancy-type/screen.css
  24. BIN app/assets/stylesheets/blueprint/plugins/link-icons/icons/doc.png
  25. BIN app/assets/stylesheets/blueprint/plugins/link-icons/icons/email.png
  26. BIN app/assets/stylesheets/blueprint/plugins/link-icons/icons/external.png
  27. BIN app/assets/stylesheets/blueprint/plugins/link-icons/icons/feed.png
  28. BIN app/assets/stylesheets/blueprint/plugins/link-icons/icons/im.png
  29. BIN app/assets/stylesheets/blueprint/plugins/link-icons/icons/lock.png
  30. BIN app/assets/stylesheets/blueprint/plugins/link-icons/icons/pdf.png
  31. BIN app/assets/stylesheets/blueprint/plugins/link-icons/icons/visited.png
  32. BIN app/assets/stylesheets/blueprint/plugins/link-icons/icons/xls.png
  33. +18 −0 app/assets/stylesheets/blueprint/plugins/link-icons/readme.txt
  34. +42 −0 app/assets/stylesheets/blueprint/plugins/link-icons/screen.css
  35. +10 −0 app/assets/stylesheets/blueprint/plugins/rtl/readme.txt
  36. +110 −0 app/assets/stylesheets/blueprint/plugins/rtl/screen.css
  37. +29 −0 app/assets/stylesheets/blueprint/print.css
  38. +265 −0 app/assets/stylesheets/blueprint/screen.css
  39. +82 −0 app/assets/stylesheets/blueprint/src/forms.css
  40. +280 −0 app/assets/stylesheets/blueprint/src/grid.css
  41. BIN app/assets/stylesheets/blueprint/src/grid.png
  42. +79 −0 app/assets/stylesheets/blueprint/src/ie.css
  43. +92 −0 app/assets/stylesheets/blueprint/src/print.css
  44. +65 −0 app/assets/stylesheets/blueprint/src/reset.css
  45. +123 −0 app/assets/stylesheets/blueprint/src/typography.css
  46. +102 −0 app/assets/stylesheets/custom.css
  47. +61 −0 app/assets/stylesheets/debug/README.textile
  48. +307 −0 app/assets/stylesheets/debug/debug.css
  49. +122 −0 app/assets/stylesheets/debug/debug.html
  50. +217 −0 app/assets/stylesheets/features/generate_stylesheets.feature
  51. +37 −0 app/assets/stylesheets/features/step_definitions/blueprint_steps.rb
  52. +13 −0 app/assets/stylesheets/features/support/blueprint_app.rb
  53. +44 −0 app/assets/stylesheets/features/support/blueprint_helpers.rb
  54. +44 −0 app/assets/stylesheets/features/support/document_element.rb
  55. +7 −0 app/assets/stylesheets/features/support/element_helpers.rb
  56. +9 −0 app/assets/stylesheets/features/support/env.rb
  57. +18 −0 app/assets/stylesheets/features/support/jquery.js
  58. +54 −0 app/assets/stylesheets/lib/blueprint/blueprint.rb
  59. +295 −0 app/assets/stylesheets/lib/blueprint/compressor.rb
  60. +39 −0 app/assets/stylesheets/lib/blueprint/core_ext.rb
  61. +72 −0 app/assets/stylesheets/lib/blueprint/css_parser.rb
  62. +72 −0 app/assets/stylesheets/lib/blueprint/custom_layout.rb
  63. +146 −0 app/assets/stylesheets/lib/blueprint/grid.css.erb
  64. +33 −0 app/assets/stylesheets/lib/blueprint/grid_builder.rb
  65. +38 −0 app/assets/stylesheets/lib/blueprint/namespace.rb
  66. +64 −0 app/assets/stylesheets/lib/blueprint/semantic_class_names.rb
  67. +93 −0 app/assets/stylesheets/lib/blueprint/validate/COPYRIGHT.html
  68. +64 −0 app/assets/stylesheets/lib/blueprint/validate/JIGSAW_COPYRIGHT
  69. +83 −0 app/assets/stylesheets/lib/blueprint/validate/README.html
  70. +56 −0 app/assets/stylesheets/lib/blueprint/validate/XERCES_COPYING.txt
  71. BIN app/assets/stylesheets/lib/blueprint/validate/css-validator-javadoc.jar
  72. BIN app/assets/stylesheets/lib/blueprint/validate/css-validator.jar
  73. BIN app/assets/stylesheets/lib/blueprint/validate/jigsaw.jar
  74. BIN app/assets/stylesheets/lib/blueprint/validate/xerces.jar
  75. +49 −0 app/assets/stylesheets/lib/blueprint/validator.rb
  76. +167 −0 app/assets/stylesheets/lib/compress.rb
  77. +33 −0 app/assets/stylesheets/lib/settings.example.yml
  78. +15 −0 app/assets/stylesheets/lib/validate.rb
  79. BIN app/assets/stylesheets/templates/psd/fixed-width.psd
  80. +106 −0 app/assets/stylesheets/tests/index.html
  81. +247 −0 app/assets/stylesheets/tests/parts/elements.html
  82. +204 −0 app/assets/stylesheets/tests/parts/forms.html
  83. +163 −0 app/assets/stylesheets/tests/parts/grid.html
  84. +89 −0 app/assets/stylesheets/tests/parts/plugins/link-icons.html
  85. +75 −0 app/assets/stylesheets/tests/parts/sample.html
  86. BIN app/assets/stylesheets/tests/parts/test-small.jpg
  87. BIN app/assets/stylesheets/tests/parts/test.jpg
  88. BIN app/assets/stylesheets/tests/parts/valid.png
  89. +0 −9 app/controllers/application_controller.rb~
  90. +0 −16 app/controllers/upload_controller.rb~
  91. +1 −1 app/controllers/uploads_controller.rb
  92. +0 −82 app/controllers/uploads_controller.rb~
  93. +4 −0 app/controllers/user_sessions_controller.rb
  94. +0 −23 app/controllers/user_sessions_controller.rb~
  95. +5 −4 app/controllers/users_controller.rb
  96. +5 −4 app/controllers/users_controller.rb~
  97. +0 −3 app/models/upload.rb~
  98. +0 −5 app/models/uploads.rb~
  99. +0 −22 app/models/user.rb~
  100. +0 −48 app/uploaders/avatar_uploader.rb~
  101. +0 −48 app/uploaders/image_uploader.rb~
  102. +15 −0 app/views/layouts/_header.html.erb
  103. +7 −0 app/views/layouts/_stylesheets.html.erb
  104. +44 −20 app/views/layouts/application.html.erb
  105. +44 −20 app/views/layouts/application.html.erb~
  106. +0 −38 app/views/uploads/_form.html.erb~
  107. +0 −6 app/views/uploads/edit.html.erb~
  108. +0 −24 app/views/uploads/index.html.erb~
  109. +0 −5 app/views/uploads/new.html.erb~
  110. +0 −19 app/views/uploads/show.html.erb~
  111. 0 app/views/user_sessions/_form.htm.erb~
  112. +0 −13 app/views/user_sessions/_form.html.erb~
  113. +0 −2 app/views/user_sessions/create.html.erb~
  114. +0 −2 app/views/user_sessions/destroy.html.erb~
  115. +0 −5 app/views/user_sessions/new.html.erb~
  116. +31 −25 app/views/users/_form.html.erb
  117. +5 −1 app/views/users/_form.html.erb~
  118. +6 −0 app/views/users/edit.html.erb~
  119. +0 −29 app/views/users/index.html.erb~
  120. +0 −19 app/views/users/show.html.erb~
  121. +3 −0 config/application.rb
  122. +52 −0 config/application.rb~
  123. +0 −29 config/database.yml~
  124. +0 −68 config/routes.rb~
  125. +0 −10 db/migrate/20120213192439_create_uploads.rb~
  126. +43 −0 public/assets/AUTHORS-d1c86f618341e690c55be3ca6604c471.textile
  127. +168 −0 public/assets/CHANGELOG
  128. +12 −0 public/assets/Gemfile
  129. +71 −0 public/assets/Gemfile-4edc0ff13c73681d20c9d0e21091c5ca.lock
  130. +22 −0 public/assets/LICENSE
  131. +83 −0 public/assets/README-e925e24e9129f5413354d6198c209a45.textile
  132. +8 −0 public/assets/Rakefile
  133. +206 −0 public/assets/TUTORIAL-b0c67b1fdddf2336f48c27919ab3e0a4.textile
  134. +19 −0 public/assets/application-5a1906f1c83ad9b9b4300709b63186ba.js
  135. BIN public/assets/application-5a1906f1c83ad9b9b4300709b63186ba.js.gz
  136. BIN public/assets/logo-98e8223e0cd072d064b5783a2e225530.png
  137. BIN public/assets/rails-782b548cc1ba7f898cdad2d9eb8420d2.png
View
@@ -6,7 +6,7 @@
# Ignore bundler config
/.bundle
-
+*~
# Ignore the default SQLite database.
/db/*.sqlite3
View
12 Gemfile
@@ -5,13 +5,14 @@ gem 'rails'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
-gem 'sqlite3'
+#gem 'sqlite3'
gem 'sorcery'
-gem 'therubyracer'
+gem 'therubyracer', :platforms => [:ruby]
gem 'sorcery'
gem 'carrierwave'
gem 'rmagick'
-
+gem 'thin'
+gem 'eventmachine', '~> 1.0.0.beta', :platforms => [:mswin, :mingw]
# Gems used only for assets and not required
# in production environments by default.
group :assets do
@@ -41,3 +42,8 @@ group :development do
gem 'thin'
gem 'daemons'
end
+
+group :test do
+ gem 'cucumber'
+ gem 'rspec'
+end
View
@@ -31,6 +31,7 @@ GEM
addressable (2.2.6)
arel (3.0.0)
bcrypt-ruby (3.0.1)
+ bcrypt-ruby (3.0.1-x86-mingw32)
builder (3.0.0)
cancan (1.6.7)
carrierwave (0.5.8)
@@ -44,7 +45,7 @@ GEM
coffee-script-source (1.2.0)
daemons (1.1.6)
erubis (2.7.0)
- eventmachine (0.12.10)
+ eventmachine (1.0.0.beta.4.1-x86-mingw32)
execjs (1.3.0)
multi_json (~> 1.0)
faraday (0.7.6)
@@ -71,6 +72,7 @@ GEM
faraday (~> 0.7)
multi_json (~> 1.0)
pg (0.12.2)
+ pg (0.12.2-x86-mingw32)
polyglot (0.3.3)
rack (1.4.0)
rack-cache (1.1)
@@ -113,7 +115,6 @@ GEM
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- sqlite3 (1.3.5)
therubyracer (0.9.9)
libv8 (~> 3.3.10)
thin (1.3.1)
@@ -132,19 +133,20 @@ GEM
PLATFORMS
ruby
+ x86-mingw32
DEPENDENCIES
cancan
carrierwave
coffee-rails (~> 3.2.1)
daemons
+ eventmachine (~> 1.0.0.beta)
jquery-rails
pg
rails
rmagick
sass-rails (~> 3.2.3)
sorcery
- sqlite3
therubyracer
thin
uglifier (>= 1.0.3)
View
@@ -1,37 +0,0 @@
-source 'http://rubygems.org'
-
-gem 'rails', '3.1.3'
-
-# Bundle edge Rails instead:
-# gem 'rails', :git => 'git://github.com/rails/rails.git'
-
-gem 'sqlite3'
-gem 'sorcery'
-
-
-# Gems used only for assets and not required
-# in production environments by default.
-group :assets do
- gem 'sass-rails', '~> 3.1.5'
- gem 'coffee-rails', '~> 3.1.1'
- gem 'uglifier', '>= 1.0.3'
-end
-
-gem 'jquery-rails'
-
-# To use ActiveModel has_secure_password
-# gem 'bcrypt-ruby', '~> 3.0.0'
-
-# Use unicorn as the web server
-# gem 'unicorn'
-
-# Deploy with Capistrano
-# gem 'capistrano'
-
-# To use debugger
-# gem 'ruby-debug19', :require => 'ruby-debug'
-
-group :test do
- # Pretty printed test output
- gem 'turn', '0.8.2', :require => false
-end
View
@@ -0,0 +1 @@
+web: bundle exec rails server thin -p $PORT
View
261 README~
@@ -1,261 +0,0 @@
-== Welcome to Rails
-
-Rails is a web-application framework that includes everything needed to create
-database-backed web applications according to the Model-View-Control pattern.
-
-This pattern splits the view (also called the presentation) into "dumb"
-templates that are primarily responsible for inserting pre-built data in between
-HTML tags. The model contains the "smart" domain objects (such as Account,
-Product, Person, Post) that holds all the business logic and knows how to
-persist themselves to a database. The controller handles the incoming requests
-(such as Save New Account, Update Product, Show Post) by manipulating the model
-and directing data to the view.
-
-In Rails, the model is handled by what's called an object-relational mapping
-layer entitled Active Record. This layer allows you to present the data from
-database rows as objects and embellish these data objects with business logic
-methods. You can read more about Active Record in
-link:files/vendor/rails/activerecord/README.html.
-
-The controller and view are handled by the Action Pack, which handles both
-layers by its two parts: Action View and Action Controller. These two layers
-are bundled in a single package due to their heavy interdependence. This is
-unlike the relationship between the Active Record and Action Pack that is much
-more separate. Each of these packages can be used independently outside of
-Rails. You can read more about Action Pack in
-link:files/vendor/rails/actionpack/README.html.
-
-
-== Getting Started
-
-1. At the command prompt, create a new Rails application:
- <tt>rails new myapp</tt> (where <tt>myapp</tt> is the application name)
-
-2. Change directory to <tt>myapp</tt> and start the web server:
- <tt>cd myapp; rails server</tt> (run with --help for options)
-
-3. Go to http://localhost:3000/ and you'll see:
- "Welcome aboard: You're riding Ruby on Rails!"
-
-4. Follow the guidelines to start developing your application. You can find
-the following resources handy:
-
-* The Getting Started Guide: http://guides.rubyonrails.org/getting_started.html
-* Ruby on Rails Tutorial Book: http://www.railstutorial.org/
-
-
-== Debugging Rails
-
-Sometimes your application goes wrong. Fortunately there are a lot of tools that
-will help you debug it and get it back on the rails.
-
-First area to check is the application log files. Have "tail -f" commands
-running on the server.log and development.log. Rails will automatically display
-debugging and runtime information to these files. Debugging info will also be
-shown in the browser on requests from 127.0.0.1.
-
-You can also log your own messages directly into the log file from your code
-using the Ruby logger class from inside your controllers. Example:
-
- class WeblogController < ActionController::Base
- def destroy
- @weblog = Weblog.find(params[:id])
- @weblog.destroy
- logger.info("#{Time.now} Destroyed Weblog ID ##{@weblog.id}!")
- end
- end
-
-The result will be a message in your log file along the lines of:
-
- Mon Oct 08 14:22:29 +1000 2007 Destroyed Weblog ID #1!
-
-More information on how to use the logger is at http://www.ruby-doc.org/core/
-
-Also, Ruby documentation can be found at http://www.ruby-lang.org/. There are
-several books available online as well:
-
-* Programming Ruby: http://www.ruby-doc.org/docs/ProgrammingRuby/ (Pickaxe)
-* Learn to Program: http://pine.fm/LearnToProgram/ (a beginners guide)
-
-These two books will bring you up to speed on the Ruby language and also on
-programming in general.
-
-
-== Debugger
-
-Debugger support is available through the debugger command when you start your
-Mongrel or WEBrick server with --debugger. This means that you can break out of
-execution at any point in the code, investigate and change the model, and then,
-resume execution! You need to install ruby-debug to run the server in debugging
-mode. With gems, use <tt>sudo gem install ruby-debug</tt>. Example:
-
- class WeblogController < ActionController::Base
- def index
- @posts = Post.all
- debugger
- end
- end
-
-So the controller will accept the action, run the first line, then present you
-with a IRB prompt in the server window. Here you can do things like:
-
- >> @posts.inspect
- => "[#<Post:0x14a6be8
- @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>,
- #<Post:0x14a6620
- @attributes={"title"=>"Rails", "body"=>"Only ten..", "id"=>"2"}>]"
- >> @posts.first.title = "hello from a debugger"
- => "hello from a debugger"
-
-...and even better, you can examine how your runtime objects actually work:
-
- >> f = @posts.first
- => #<Post:0x13630c4 @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>
- >> f.
- Display all 152 possibilities? (y or n)
-
-Finally, when you're ready to resume execution, you can enter "cont".
-
-
-== Console
-
-The console is a Ruby shell, which allows you to interact with your
-application's domain model. Here you'll have all parts of the application
-configured, just like it is when the application is running. You can inspect
-domain models, change values, and save to the database. Starting the script
-without arguments will launch it in the development environment.
-
-To start the console, run <tt>rails console</tt> from the application
-directory.
-
-Options:
-
-* Passing the <tt>-s, --sandbox</tt> argument will rollback any modifications
- made to the database.
-* Passing an environment name as an argument will load the corresponding
- environment. Example: <tt>rails console production</tt>.
-
-To reload your controllers and models after launching the console run
-<tt>reload!</tt>
-
-More information about irb can be found at:
-link:http://www.rubycentral.org/pickaxe/irb.html
-
-
-== dbconsole
-
-You can go to the command line of your database directly through <tt>rails
-dbconsole</tt>. You would be connected to the database with the credentials
-defined in database.yml. Starting the script without arguments will connect you
-to the development database. Passing an argument will connect you to a different
-database, like <tt>rails dbconsole production</tt>. Currently works for MySQL,
-PostgreSQL and SQLite 3.
-
-== Description of Contents
-
-The default directory structure of a generated Ruby on Rails application:
-
- |-- app
- | |-- assets
- | |-- images
- | |-- javascripts
- | `-- stylesheets
- | |-- controllers
- | |-- helpers
- | |-- mailers
- | |-- models
- | `-- views
- | `-- layouts
- |-- config
- | |-- environments
- | |-- initializers
- | `-- locales
- |-- db
- |-- doc
- |-- lib
- | `-- tasks
- |-- log
- |-- public
- |-- script
- |-- test
- | |-- fixtures
- | |-- functional
- | |-- integration
- | |-- performance
- | `-- unit
- |-- tmp
- | |-- cache
- | |-- pids
- | |-- sessions
- | `-- sockets
- `-- vendor
- |-- assets
- `-- stylesheets
- `-- plugins
-
-app
- Holds all the code that's specific to this particular application.
-
-app/assets
- Contains subdirectories for images, stylesheets, and JavaScript files.
-
-app/controllers
- Holds controllers that should be named like weblogs_controller.rb for
- automated URL mapping. All controllers should descend from
- ApplicationController which itself descends from ActionController::Base.
-
-app/models
- Holds models that should be named like post.rb. Models descend from
- ActiveRecord::Base by default.
-
-app/views
- Holds the template files for the view that should be named like
- weblogs/index.html.erb for the WeblogsController#index action. All views use
- eRuby syntax by default.
-
-app/views/layouts
- Holds the template files for layouts to be used with views. This models the
- common header/footer method of wrapping views. In your views, define a layout
- using the <tt>layout :default</tt> and create a file named default.html.erb.
- Inside default.html.erb, call <% yield %> to render the view using this
- layout.
-
-app/helpers
- Holds view helpers that should be named like weblogs_helper.rb. These are
- generated for you automatically when using generators for controllers.
- Helpers can be used to wrap functionality for your views into methods.
-
-config
- Configuration files for the Rails environment, the routing map, the database,
- and other dependencies.
-
-db
- Contains the database schema in schema.rb. db/migrate contains all the
- sequence of Migrations for your schema.
-
-doc
- This directory is where your application documentation will be stored when
- generated using <tt>rake doc:app</tt>
-
-lib
- Application specific libraries. Basically, any kind of custom code that
- doesn't belong under controllers, models, or helpers. This directory is in
- the load path.
-
-public
- The directory available for the web server. Also contains the dispatchers and the
- default HTML files. This should be set as the DOCUMENT_ROOT of your web
- server.
-
-script
- Helper scripts for automation and generation.
-
-test
- Unit and functional tests along with fixtures. When using the rails generate
- command, template test files will be generated for you and placed in this
- directory.
-
-vendor
- External libraries that the application depends on. Also includes the plugins
- subdirectory. If the app has frozen rails, those gems also go here, under
- vendor/rails/. This directory is in the load path.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.

0 comments on commit 90efb87

Please sign in to comment.