Created
January 29, 2012 11:32
-
-
Save bsodmike/1698390 to your computer and use it in GitHub Desktop.
git diff between Rails 3.2.0 and Rails 3.1.0 generated apps
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/.gitignore b/.gitignore | |
index 923b697..eb3489a 100644 | |
--- a/.gitignore | |
+++ b/.gitignore | |
@@ -1,5 +1,15 @@ | |
-.bundle | |
-db/*.sqlite3 | |
-log/*.log | |
-tmp/ | |
-.sass-cache/ | |
+# See http://help.github.com/ignore-files/ for more about ignoring files. | |
+# | |
+# If you find yourself ignoring temporary files generated by your text editor | |
+# or operating system, you probably want to add a global ignore instead: | |
+# git config --global core.excludesfile ~/.gitignore_global | |
+ | |
+# Ignore bundler config | |
+/.bundle | |
+ | |
+# Ignore the default SQLite database. | |
+/db/*.sqlite3 | |
+ | |
+# Ignore all logfiles and tempfiles. | |
+/log/*.log | |
+/tmp | |
diff --git a/Gemfile b/Gemfile | |
index a345696..7689850 100644 | |
--- a/Gemfile | |
+++ b/Gemfile | |
@@ -1,9 +1,9 @@ | |
-source 'http://rubygems.org' | |
+source 'https://rubygems.org' | |
-gem 'rails', '3.1.0' | |
+gem 'rails', '3.2.0' | |
# Bundle edge Rails instead: | |
-# gem 'rails', :git => 'git://github.com/rails/rails.git' | |
+# gem 'rails', :git => 'git://github.com/rails/rails.git' | |
gem 'sqlite3' | |
@@ -11,13 +11,23 @@ gem 'sqlite3' | |
# Gems used only for assets and not required | |
# in production environments by default. | |
group :assets do | |
- gem 'sass-rails', " ~> 3.1.0" | |
- gem 'coffee-rails', "~> 3.1.0" | |
- gem 'uglifier' | |
+ gem 'sass-rails', '~> 3.2.3' | |
+ gem 'coffee-rails', '~> 3.2.1' | |
+ | |
+ # See https://github.com/sstephenson/execjs#readme for more supported runtimes | |
+ # gem 'therubyracer' | |
+ | |
+ gem 'uglifier', '>= 1.0.3' | |
end | |
gem 'jquery-rails' | |
+# To use ActiveModel has_secure_password | |
+# gem 'bcrypt-ruby', '~> 3.0.0' | |
+ | |
+# To use Jbuilder templates for JSON | |
+# gem 'jbuilder' | |
+ | |
# Use unicorn as the web server | |
# gem 'unicorn' | |
@@ -26,8 +36,3 @@ gem 'jquery-rails' | |
# To use debugger | |
# gem 'ruby-debug19', :require => 'ruby-debug' | |
- | |
-group :test do | |
- # Pretty printed test output | |
- gem 'turn', :require => false | |
-end | |
diff --git a/README b/README | |
deleted file mode 100644 | |
index 7c36f23..0000000 | |
--- a/README | |
+++ /dev/null | |
@@ -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. | |
diff --git a/README.rdoc b/README.rdoc | |
new file mode 100644 | |
index 0000000..7c36f23 | |
--- /dev/null | |
+++ b/README.rdoc | |
@@ -0,0 +1,261 @@ | |
+== 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. | |
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js | |
index 37c7bfc..9097d83 100644 | |
--- a/app/assets/javascripts/application.js | |
+++ b/app/assets/javascripts/application.js | |
@@ -1,9 +1,15 @@ | |
-// This is a manifest file that'll be compiled into including all the files listed below. | |
-// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically | |
-// be included in the compiled file accessible from http://example.com/assets/application.js | |
+// This is a manifest file that'll be compiled into application.js, which will include all the files | |
+// listed below. | |
+// | |
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts, | |
+// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path. | |
+// | |
// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the | |
// the compiled file. | |
// | |
+// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD | |
+// GO AFTER THE REQUIRES BELOW. | |
+// | |
//= require jquery | |
//= require jquery_ujs | |
//= require_tree . | |
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css | |
index fc25b57..3b5cc66 100644 | |
--- a/app/assets/stylesheets/application.css | |
+++ b/app/assets/stylesheets/application.css | |
@@ -1,7 +1,13 @@ | |
/* | |
- * This is a manifest file that'll automatically include all the stylesheets available in this directory | |
- * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at | |
- * the top of the compiled file, but it's generally better to create a new file per style scope. | |
+ * This is a manifest file that'll be compiled into application.css, which will include all the files | |
+ * listed below. | |
+ * | |
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, | |
+ * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path. | |
+ * | |
+ * You're free to add application-wide styles to this file and they'll appear at the top of the | |
+ * compiled file, but it's generally better to create a new file per style scope. | |
+ * | |
*= require_self | |
- *= require_tree . | |
-*/ | |
\ No newline at end of file | |
+ *= require_tree . | |
+*/ | |
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb | |
index a76cf36..f45a734 100644 | |
--- a/app/views/layouts/application.html.erb | |
+++ b/app/views/layouts/application.html.erb | |
@@ -2,7 +2,7 @@ | |
<html> | |
<head> | |
<title>AppCore</title> | |
- <%= stylesheet_link_tag "application" %> | |
+ <%= stylesheet_link_tag "application", :media => "all" %> | |
<%= javascript_include_tag "application" %> | |
<%= csrf_meta_tags %> | |
</head> | |
diff --git a/config/application.rb b/config/application.rb | |
index 2f520fd..e930368 100644 | |
--- a/config/application.rb | |
+++ b/config/application.rb | |
@@ -4,7 +4,7 @@ require 'rails/all' | |
if defined?(Bundler) | |
# If you precompile assets before deploying to production, use this line | |
- Bundler.require *Rails.groups(:assets => %w(development test)) | |
+ Bundler.require(*Rails.groups(:assets => %w(development test))) | |
# If you want your assets lazily compiled in production, use this line | |
# Bundler.require(:default, :assets, Rails.env) | |
end | |
@@ -39,6 +39,17 @@ module AppCore | |
# Configure sensitive parameters which will be filtered from the log file. | |
config.filter_parameters += [:password] | |
+ # Use SQL instead of Active Record's schema dumper when creating the database. | |
+ # This is necessary if your schema can't be completely dumped by the schema dumper, | |
+ # like if you have constraints or database-specific column types | |
+ # config.active_record.schema_format = :sql | |
+ | |
+ # Enforce whitelist mode for mass assignment. | |
+ # This will create an empty whitelist of attributes available for mass-assignment for all models | |
+ # in your app. As such, your models will need to explicitly whitelist or blacklist accessible | |
+ # parameters by using an attr_accessible or attr_protected declaration. | |
+ # config.active_record.whitelist_attributes = true | |
+ | |
# Enable the asset pipeline | |
config.assets.enabled = true | |
diff --git a/config/environments/development.rb b/config/environments/development.rb | |
index c4e129b..0b493e9 100644 | |
--- a/config/environments/development.rb | |
+++ b/config/environments/development.rb | |
@@ -2,7 +2,7 @@ AppCore::Application.configure do | |
# Settings specified here will take precedence over those in config/application.rb | |
# In the development environment your application's code is reloaded on | |
- # every request. This slows down response time but is perfect for development | |
+ # every request. This slows down response time but is perfect for development | |
# since you don't have to restart the web server when you make code changes. | |
config.cache_classes = false | |
@@ -22,6 +22,13 @@ AppCore::Application.configure do | |
# Only use best-standards-support built into browsers | |
config.action_dispatch.best_standards_support = :builtin | |
+ # Raise exception on mass assignment protection for Active Record models | |
+ config.active_record.mass_assignment_sanitizer = :strict | |
+ | |
+ # Log the query plan for queries taking more than this (works | |
+ # with SQLite, MySQL, and PostgreSQL) | |
+ config.active_record.auto_explain_threshold_in_seconds = 0.5 | |
+ | |
# Do not compress assets | |
config.assets.compress = false | |
diff --git a/config/environments/production.rb b/config/environments/production.rb | |
index be83d14..606e7d2 100644 | |
--- a/config/environments/production.rb | |
+++ b/config/environments/production.rb | |
@@ -33,8 +33,11 @@ AppCore::Application.configure do | |
# See everything in the log (default is :info) | |
# config.log_level = :debug | |
+ # Prepend all log lines with the following tags | |
+ # config.log_tags = [ :subdomain, :uuid ] | |
+ | |
# Use a different logger for distributed setups | |
- # config.logger = SyslogLogger.new | |
+ # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new) | |
# Use a different cache store in production | |
# config.cache_store = :mem_cache_store | |
@@ -57,4 +60,8 @@ AppCore::Application.configure do | |
# Send deprecation notices to registered listeners | |
config.active_support.deprecation = :notify | |
+ | |
+ # Log the query plan for queries taking more than this (works | |
+ # with SQLite, MySQL, and PostgreSQL) | |
+ # config.active_record.auto_explain_threshold_in_seconds = 0.5 | |
end | |
diff --git a/config/environments/test.rb b/config/environments/test.rb | |
index 48709b8..0616dd5 100644 | |
--- a/config/environments/test.rb | |
+++ b/config/environments/test.rb | |
@@ -2,9 +2,9 @@ AppCore::Application.configure do | |
# Settings specified here will take precedence over those in config/application.rb | |
# The test environment is used exclusively to run your application's | |
- # test suite. You never need to work with it otherwise. Remember that | |
+ # test suite. You never need to work with it otherwise. Remember that | |
# your test database is "scratch space" for the test suite and is wiped | |
- # and recreated between test runs. Don't rely on the data there! | |
+ # and recreated between test runs. Don't rely on the data there! | |
config.cache_classes = true | |
# Configure static asset server for tests with Cache-Control for performance | |
@@ -29,14 +29,9 @@ AppCore::Application.configure do | |
# ActionMailer::Base.deliveries array. | |
config.action_mailer.delivery_method = :test | |
- # Use SQL instead of Active Record's schema dumper when creating the test database. | |
- # This is necessary if your schema can't be completely dumped by the schema dumper, | |
- # like if you have constraints or database-specific column types | |
- # config.active_record.schema_format = :sql | |
+ # Raise exception on mass assignment protection for Active Record models | |
+ config.active_record.mass_assignment_sanitizer = :strict | |
# Print deprecation notices to the stderr | |
config.active_support.deprecation = :stderr | |
- | |
- # Allow pass debug_assets=true as a query parameter to load pages with unpackaged assets | |
- config.assets.allow_debugging = true | |
end | |
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb | |
index 9e8b013..5d8d9be 100644 | |
--- a/config/initializers/inflections.rb | |
+++ b/config/initializers/inflections.rb | |
@@ -8,3 +8,8 @@ | |
# inflect.irregular 'person', 'people' | |
# inflect.uncountable %w( fish sheep ) | |
# end | |
+# | |
+# These inflection rules are supported but not enabled by default: | |
+# ActiveSupport::Inflector.inflections do |inflect| | |
+# inflect.acronym 'RESTful' | |
+# end | |
diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb | |
index bb0ab93..e3ff35f 100644 | |
--- a/config/initializers/secret_token.rb | |
+++ b/config/initializers/secret_token.rb | |
@@ -4,4 +4,4 @@ | |
# If you change this key, all old signed cookies will become invalid! | |
# Make sure the secret is at least 30 characters and all random, | |
# no regular words or you'll be exposed to dictionary attacks. | |
-AppCore::Application.config.secret_token = '8298068b5f4d2769fb0c29cebe692c883c6e03f1bcf1cc4378ecb45dcd845f3f1b3da773924c7d8d894e51b459978d4fd7c33a64e589a3286b2da3279c30ea59' | |
+AppCore::Application.config.secret_token = '72d44d70a54ad502b14a277938a5a28425056e4d78adbd4fb938dfdeebc78878fa16b03e092cbb8d86c616400789e266bc2e49405c07fb75d967e2ebb29d4503' | |
diff --git a/config/routes.rb b/config/routes.rb | |
index 1cfc70c..0b63a7b 100644 | |
--- a/config/routes.rb | |
+++ b/config/routes.rb | |
@@ -54,5 +54,5 @@ AppCore::Application.routes.draw do | |
# This is a legacy wild controller route that's not recommended for RESTful applications. | |
# Note: This route will make all actions in every controller accessible via GET requests. | |
- # match ':controller(/:action(/:id(.:format)))' | |
+ # match ':controller(/:action(/:id))(.:format)' | |
end | |
diff --git a/public/500.html b/public/500.html | |
index b80307f..f3648a0 100644 | |
--- a/public/500.html | |
+++ b/public/500.html | |
@@ -20,7 +20,6 @@ | |
<!-- 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> | |
diff --git a/public/index.html b/public/index.html | |
index 9d9811a..a1d5099 100644 | |
--- a/public/index.html | |
+++ b/public/index.html | |
@@ -59,7 +59,7 @@ | |
#header { | |
- background-image: url("/assets/rails.png"); | |
+ background-image: url("assets/rails.png"); | |
background-repeat: no-repeat; | |
background-position: top left; | |
height: 64px; | |
diff --git a/vendor/assets/javascripts/.gitkeep b/vendor/assets/javascripts/.gitkeep | |
new file mode 100644 | |
index 0000000..e69de29 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment