witch_doctor 0.0.3 → 0.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (49) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +4 -2
  3. data/Rakefile +1 -0
  4. data/app/controllers/witch_doctor/virus_scans_controller.rb +13 -2
  5. data/app/models/virus_scan.rb +0 -3
  6. data/app/permiterters/virus_scan_permitter.rb +7 -0
  7. data/lib/witch_doctor/antivirus +0 -0
  8. data/lib/witch_doctor/antivirus_concern.rb +3 -1
  9. data/lib/witch_doctor/version.rb +1 -1
  10. data/spec/controllers/virus_scans_controller_spec.rb +4 -4
  11. data/spec/dummy/README.rdoc +15 -248
  12. data/spec/dummy/Rakefile +1 -2
  13. data/spec/dummy/app/assets/javascripts/application.js +3 -5
  14. data/spec/dummy/app/assets/stylesheets/application.css +5 -3
  15. data/spec/dummy/app/controllers/application_controller.rb +3 -1
  16. data/spec/dummy/app/views/layouts/application.html.erb +2 -2
  17. data/spec/dummy/bin/bundle +3 -0
  18. data/spec/dummy/bin/rails +4 -0
  19. data/spec/dummy/bin/rake +4 -0
  20. data/spec/dummy/config/application.rb +7 -37
  21. data/spec/dummy/config/boot.rb +4 -9
  22. data/spec/dummy/config/database.yml +8 -8
  23. data/spec/dummy/config/environment.rb +3 -3
  24. data/spec/dummy/config/environments/development.rb +18 -18
  25. data/spec/dummy/config/environments/production.rb +40 -29
  26. data/spec/dummy/config/environments/test.rb +16 -14
  27. data/spec/dummy/config/initializers/assets.rb +8 -0
  28. data/spec/dummy/config/initializers/cookies_serializer.rb +3 -0
  29. data/spec/dummy/config/initializers/filter_parameter_logging.rb +4 -0
  30. data/spec/dummy/config/initializers/inflections.rb +6 -5
  31. data/spec/dummy/config/initializers/mime_types.rb +0 -1
  32. data/spec/dummy/config/initializers/session_store.rb +1 -6
  33. data/spec/dummy/config/initializers/wrap_parameters.rb +6 -6
  34. data/spec/dummy/config/locales/en.yml +20 -2
  35. data/spec/dummy/config/routes.rb +1 -0
  36. data/spec/dummy/config/secrets.yml +22 -0
  37. data/spec/dummy/config.ru +1 -1
  38. data/spec/dummy/db/development.sqlite3 +0 -0
  39. data/spec/dummy/db/schema.rb +8 -8
  40. data/spec/dummy/db/test.sqlite3 +0 -0
  41. data/spec/dummy/log/development.log +277 -0
  42. data/spec/dummy/log/test.log +1438 -0
  43. data/spec/dummy/public/404.html +54 -13
  44. data/spec/dummy/public/422.html +54 -13
  45. data/spec/dummy/public/500.html +53 -12
  46. data/spec/models/virus_scan_spec.rb +1 -1
  47. data/spec/permitters/virus_scan_permitter_spec.rb +34 -0
  48. metadata +37 -27
  49. data/spec/dummy/script/rails +0 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f73af9aaaf48c0f55ddd920215c0b29fa28f45d6
4
- data.tar.gz: c6c58658eb260e4c8ced01a3f48032ce939186e0
3
+ metadata.gz: e5b9df9e5b20a8134f37c6c5726b61b249e7b0f8
4
+ data.tar.gz: 58ce3647b1e543fe7360c21a327a229aa36001d0
5
5
  SHA512:
6
- metadata.gz: ea8065910e20b6ed1f9e7d807602e0f6afbce62f4413f2cfe1eb907203f140fd60915adb423b240c33b854908c856a13f77361f84a1afc95415b8baabd145418
7
- data.tar.gz: d5581753ea307593ca0d78807c2c83120350c4970ed990b8c901f1ead2b1c2870d64f4b61c9030e199af605e28c16e5f138917450d59c1883ca250d5deec40d3
6
+ metadata.gz: 075f3f3154d146984dc482efe7cd04f3cfa491a096bb962d154057f49bc0edc63aaf4a6f141a87acb7a044dee87b0cfa1a4ea474ae07d6d8e6c75ecef8c5ba45
7
+ data.tar.gz: f7f8a7c0f4f02f73522fac205618d3037c9b8eb7af5ad1539eb11c77962cb67ce009c947827636e07efff45f98a3c99482d98d59ab12c60a308780f53c8dd852
data/README.md CHANGED
@@ -1,4 +1,6 @@
1
- (check BADGES.md for build status & test coverage)
1
+ [![Build Status](https://travis-ci.org/equivalent/witch_doctor.svg)](https://travis-ci.org/equivalent/witch_doctor)
2
+ [![Code Climate](https://codeclimate.com/github/equivalent/witch_doctor/badges/gpa.svg)](https://codeclimate.com/github/equivalent/witch_doctor)
3
+ [![Test Coverage](https://codeclimate.com/github/equivalent/witch_doctor/badges/coverage.svg)](https://codeclimate.com/github/equivalent/witch_doctor)
2
4
 
3
5
  # Witch Doctor
4
6
 
@@ -29,7 +31,7 @@ In your application:
29
31
  # Gemfile
30
32
 
31
33
  # ...
32
- gem 'witch_doctor', github: 'equivalent/witch_doctor'
34
+ gem 'witch_doctor'
33
35
 
34
36
  ```
35
37
 
data/Rakefile CHANGED
@@ -32,6 +32,7 @@ RSpec::Core::RakeTask.new(:spec => 'app:prepare_test_db')
32
32
  namespace :app do
33
33
  task :prepare_test_db do
34
34
  Rails.env = "test"
35
+ ENV['RAILS_ENV'] = 'test'
35
36
  Rake::Task["app:db:create"].invoke
36
37
  Rake::Task["app:db:migrate"].invoke
37
38
  end
@@ -4,6 +4,9 @@ module WitchDoctor
4
4
  class VirusScansController < ApplicationController
5
5
  respond_to :json
6
6
 
7
+ # ActionController::UnknownFormat not defined in rails 3. Remove this "if" when all apps are rails 4!!
8
+ rescue_from ActionController::UnknownFormat, with: :incorrect_format if defined?(ActionController::UnknownFormat)
9
+
7
10
  def index
8
11
  authenticate! do
9
12
  @virus_scans = VirusScan
@@ -19,13 +22,13 @@ module WitchDoctor
19
22
  format.json do
20
23
  begin
21
24
  @virus_scan = VirusScan.where(scan_result: nil).find params[:id]
22
- @virus_scan.update_attributes params[:virus_scan], as: :scan_update
25
+ @virus_scan.update_attributes virus_scan_params# as: :scan_update
23
26
  if @virus_scan.errors.any?
24
27
  render json: { errors: @virus_scan.errors }, status: 400
25
28
  else
26
29
  render json: @virus_scan.reload
27
30
  end
28
- rescue ActiveModel::MassAssignmentSecurity::Error => e
31
+ rescue ActionController::ParameterMissing => e
29
32
  render json: { errors: { request: [e.to_s] } }, status: 406
30
33
  rescue ActiveRecord::RecordNotFound => e
31
34
  render json: { errors: { request: ['Record not found or already scanned'] } }, status: 404
@@ -56,5 +59,13 @@ module WitchDoctor
56
59
  .match(/Token\s+(.*)/) { |m| m[1] } \
57
60
  || params[:token]
58
61
  end
62
+
63
+ def virus_scan_params
64
+ VirusScanPermitter.new.attributes(params)
65
+ end
66
+
67
+ def incorrect_format
68
+ render json: { errors: { request: ["Incorrect format"] } }, status: 406
69
+ end
59
70
  end
60
71
  end
@@ -9,9 +9,6 @@ class VirusScan < ActiveRecord::Base
9
9
  end
10
10
  end
11
11
 
12
- attr_accessible :scan_result, :scanned_at, :mount_point
13
- attr_accessible :scan_result, as: :scan_update
14
-
15
12
  belongs_to :resource, polymorphic: true
16
13
  scope :not_scanned, -> { where scan_result: nil }
17
14
  validates_inclusion_of :scan_result, in: WitchDoctor::Antivirus::RESULTS, allow_nil: true
@@ -0,0 +1,7 @@
1
+ class VirusScanPermitter
2
+ def attributes(params)
3
+ params
4
+ .require(:virus_scan)
5
+ .permit [:scan_result]
6
+ end
7
+ end
File without changes
@@ -13,7 +13,9 @@ module WitchDoctor
13
13
  after_save "schedule_#{mount_point}_virus_scan", if: "schedule_#{mount_point}_virus_scan?"
14
14
 
15
15
  define_method("schedule_#{mount_point}_virus_scan") do
16
- virus_scans.create!(mount_point: mount_point.to_s)
16
+ virus_scans.create! do |vs|
17
+ vs.mount_point = mount_point.to_s
18
+ end
17
19
  end
18
20
 
19
21
  define_method("schedule_#{mount_point}_virus_scan?") do
@@ -1,3 +1,3 @@
1
1
  module WitchDoctor
2
- VERSION = "0.0.3"
2
+ VERSION = "0.1.0"
3
3
  end
@@ -59,7 +59,7 @@ RSpec.describe WitchDoctor::VirusScansController, type: :controller do
59
59
  before { trigger }
60
60
  let(:format) { 'html' }
61
61
  it{ expect(response.status).to eq 406 }
62
- it{ expect(response.body).to eq ' ' }
62
+ it{ expect(response.body).to eq %q{{"errors":{"request":["Incorrect format"]}}} }
63
63
  end
64
64
  end
65
65
  end
@@ -108,14 +108,14 @@ RSpec.describe WitchDoctor::VirusScansController, type: :controller do
108
108
  expect(response.body).to eq(virus_scan.to_json)
109
109
  end
110
110
 
111
- context 'sending restricted params' do
112
- let(:virus_scan_params) { { scan_result: 'Clean', mount_point: 'abc' } }
111
+ context 'sending missing params' do
112
+ let(:virus_scan_params) { {} }
113
113
  it do
114
114
  expect do trigger end
115
115
  .not_to change { virus_scan.reload.mount_point }
116
116
 
117
117
  expect(response.status).to eq 406
118
- expect(response.body).to eq(%q{{"errors":{"request":["Can't mass-assign protected attributes: mount_point"]}}})
118
+ expect(response.body).to eq(%q{{"errors":{"request":["param is missing or the value is empty: virus_scan"]}}})
119
119
  end
120
120
  end
121
121
 
@@ -1,261 +1,28 @@
1
- == Welcome to Rails
1
+ == README
2
2
 
3
- Rails is a web-application framework that includes everything needed to create
4
- database-backed web applications according to the Model-View-Control pattern.
3
+ This README would normally document whatever steps are necessary to get the
4
+ application up and running.
5
5
 
6
- This pattern splits the view (also called the presentation) into "dumb"
7
- templates that are primarily responsible for inserting pre-built data in between
8
- HTML tags. The model contains the "smart" domain objects (such as Account,
9
- Product, Person, Post) that holds all the business logic and knows how to
10
- persist themselves to a database. The controller handles the incoming requests
11
- (such as Save New Account, Update Product, Show Post) by manipulating the model
12
- and directing data to the view.
6
+ Things you may want to cover:
13
7
 
14
- In Rails, the model is handled by what's called an object-relational mapping
15
- layer entitled Active Record. This layer allows you to present the data from
16
- database rows as objects and embellish these data objects with business logic
17
- methods. You can read more about Active Record in
18
- link:files/vendor/rails/activerecord/README.html.
8
+ * Ruby version
19
9
 
20
- The controller and view are handled by the Action Pack, which handles both
21
- layers by its two parts: Action View and Action Controller. These two layers
22
- are bundled in a single package due to their heavy interdependence. This is
23
- unlike the relationship between the Active Record and Action Pack that is much
24
- more separate. Each of these packages can be used independently outside of
25
- Rails. You can read more about Action Pack in
26
- link:files/vendor/rails/actionpack/README.html.
10
+ * System dependencies
27
11
 
12
+ * Configuration
28
13
 
29
- == Getting Started
14
+ * Database creation
30
15
 
31
- 1. At the command prompt, create a new Rails application:
32
- <tt>rails new myapp</tt> (where <tt>myapp</tt> is the application name)
16
+ * Database initialization
33
17
 
34
- 2. Change directory to <tt>myapp</tt> and start the web server:
35
- <tt>cd myapp; rails server</tt> (run with --help for options)
18
+ * How to run the test suite
36
19
 
37
- 3. Go to http://localhost:3000/ and you'll see:
38
- "Welcome aboard: You're riding Ruby on Rails!"
20
+ * Services (job queues, cache servers, search engines, etc.)
39
21
 
40
- 4. Follow the guidelines to start developing your application. You can find
41
- the following resources handy:
22
+ * Deployment instructions
42
23
 
43
- * The Getting Started Guide: http://guides.rubyonrails.org/getting_started.html
44
- * Ruby on Rails Tutorial Book: http://www.railstutorial.org/
24
+ * ...
45
25
 
46
26
 
47
- == Debugging Rails
48
-
49
- Sometimes your application goes wrong. Fortunately there are a lot of tools that
50
- will help you debug it and get it back on the rails.
51
-
52
- First area to check is the application log files. Have "tail -f" commands
53
- running on the server.log and development.log. Rails will automatically display
54
- debugging and runtime information to these files. Debugging info will also be
55
- shown in the browser on requests from 127.0.0.1.
56
-
57
- You can also log your own messages directly into the log file from your code
58
- using the Ruby logger class from inside your controllers. Example:
59
-
60
- class WeblogController < ActionController::Base
61
- def destroy
62
- @weblog = Weblog.find(params[:id])
63
- @weblog.destroy
64
- logger.info("#{Time.now} Destroyed Weblog ID ##{@weblog.id}!")
65
- end
66
- end
67
-
68
- The result will be a message in your log file along the lines of:
69
-
70
- Mon Oct 08 14:22:29 +1000 2007 Destroyed Weblog ID #1!
71
-
72
- More information on how to use the logger is at http://www.ruby-doc.org/core/
73
-
74
- Also, Ruby documentation can be found at http://www.ruby-lang.org/. There are
75
- several books available online as well:
76
-
77
- * Programming Ruby: http://www.ruby-doc.org/docs/ProgrammingRuby/ (Pickaxe)
78
- * Learn to Program: http://pine.fm/LearnToProgram/ (a beginners guide)
79
-
80
- These two books will bring you up to speed on the Ruby language and also on
81
- programming in general.
82
-
83
-
84
- == Debugger
85
-
86
- Debugger support is available through the debugger command when you start your
87
- Mongrel or WEBrick server with --debugger. This means that you can break out of
88
- execution at any point in the code, investigate and change the model, and then,
89
- resume execution! You need to install ruby-debug to run the server in debugging
90
- mode. With gems, use <tt>sudo gem install ruby-debug</tt>. Example:
91
-
92
- class WeblogController < ActionController::Base
93
- def index
94
- @posts = Post.all
95
- debugger
96
- end
97
- end
98
-
99
- So the controller will accept the action, run the first line, then present you
100
- with a IRB prompt in the server window. Here you can do things like:
101
-
102
- >> @posts.inspect
103
- => "[#<Post:0x14a6be8
104
- @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>,
105
- #<Post:0x14a6620
106
- @attributes={"title"=>"Rails", "body"=>"Only ten..", "id"=>"2"}>]"
107
- >> @posts.first.title = "hello from a debugger"
108
- => "hello from a debugger"
109
-
110
- ...and even better, you can examine how your runtime objects actually work:
111
-
112
- >> f = @posts.first
113
- => #<Post:0x13630c4 @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>
114
- >> f.
115
- Display all 152 possibilities? (y or n)
116
-
117
- Finally, when you're ready to resume execution, you can enter "cont".
118
-
119
-
120
- == Console
121
-
122
- The console is a Ruby shell, which allows you to interact with your
123
- application's domain model. Here you'll have all parts of the application
124
- configured, just like it is when the application is running. You can inspect
125
- domain models, change values, and save to the database. Starting the script
126
- without arguments will launch it in the development environment.
127
-
128
- To start the console, run <tt>rails console</tt> from the application
129
- directory.
130
-
131
- Options:
132
-
133
- * Passing the <tt>-s, --sandbox</tt> argument will rollback any modifications
134
- made to the database.
135
- * Passing an environment name as an argument will load the corresponding
136
- environment. Example: <tt>rails console production</tt>.
137
-
138
- To reload your controllers and models after launching the console run
139
- <tt>reload!</tt>
140
-
141
- More information about irb can be found at:
142
- link:http://www.rubycentral.org/pickaxe/irb.html
143
-
144
-
145
- == dbconsole
146
-
147
- You can go to the command line of your database directly through <tt>rails
148
- dbconsole</tt>. You would be connected to the database with the credentials
149
- defined in database.yml. Starting the script without arguments will connect you
150
- to the development database. Passing an argument will connect you to a different
151
- database, like <tt>rails dbconsole production</tt>. Currently works for MySQL,
152
- PostgreSQL and SQLite 3.
153
-
154
- == Description of Contents
155
-
156
- The default directory structure of a generated Ruby on Rails application:
157
-
158
- |-- app
159
- | |-- assets
160
- | | |-- images
161
- | | |-- javascripts
162
- | | `-- stylesheets
163
- | |-- controllers
164
- | |-- helpers
165
- | |-- mailers
166
- | |-- models
167
- | `-- views
168
- | `-- layouts
169
- |-- config
170
- | |-- environments
171
- | |-- initializers
172
- | `-- locales
173
- |-- db
174
- |-- doc
175
- |-- lib
176
- | |-- assets
177
- | `-- tasks
178
- |-- log
179
- |-- public
180
- |-- script
181
- |-- test
182
- | |-- fixtures
183
- | |-- functional
184
- | |-- integration
185
- | |-- performance
186
- | `-- unit
187
- |-- tmp
188
- | `-- cache
189
- | `-- assets
190
- `-- vendor
191
- |-- assets
192
- | |-- javascripts
193
- | `-- stylesheets
194
- `-- plugins
195
-
196
- app
197
- Holds all the code that's specific to this particular application.
198
-
199
- app/assets
200
- Contains subdirectories for images, stylesheets, and JavaScript files.
201
-
202
- app/controllers
203
- Holds controllers that should be named like weblogs_controller.rb for
204
- automated URL mapping. All controllers should descend from
205
- ApplicationController which itself descends from ActionController::Base.
206
-
207
- app/models
208
- Holds models that should be named like post.rb. Models descend from
209
- ActiveRecord::Base by default.
210
-
211
- app/views
212
- Holds the template files for the view that should be named like
213
- weblogs/index.html.erb for the WeblogsController#index action. All views use
214
- eRuby syntax by default.
215
-
216
- app/views/layouts
217
- Holds the template files for layouts to be used with views. This models the
218
- common header/footer method of wrapping views. In your views, define a layout
219
- using the <tt>layout :default</tt> and create a file named default.html.erb.
220
- Inside default.html.erb, call <% yield %> to render the view using this
221
- layout.
222
-
223
- app/helpers
224
- Holds view helpers that should be named like weblogs_helper.rb. These are
225
- generated for you automatically when using generators for controllers.
226
- Helpers can be used to wrap functionality for your views into methods.
227
-
228
- config
229
- Configuration files for the Rails environment, the routing map, the database,
230
- and other dependencies.
231
-
232
- db
233
- Contains the database schema in schema.rb. db/migrate contains all the
234
- sequence of Migrations for your schema.
235
-
236
- doc
237
- This directory is where your application documentation will be stored when
238
- generated using <tt>rake doc:app</tt>
239
-
240
- lib
241
- Application specific libraries. Basically, any kind of custom code that
242
- doesn't belong under controllers, models, or helpers. This directory is in
243
- the load path.
244
-
245
- public
246
- The directory available for the web server. Also contains the dispatchers and the
247
- default HTML files. This should be set as the DOCUMENT_ROOT of your web
248
- server.
249
-
250
- script
251
- Helper scripts for automation and generation.
252
-
253
- test
254
- Unit and functional tests along with fixtures. When using the rails generate
255
- command, template test files will be generated for you and placed in this
256
- directory.
257
-
258
- vendor
259
- External libraries that the application depends on. Also includes the plugins
260
- subdirectory. If the app has frozen rails, those gems also go here, under
261
- vendor/rails/. This directory is in the load path.
27
+ Please feel free to use a different markup language if you do not plan to run
28
+ <tt>rake doc:app</tt>.
data/spec/dummy/Rakefile CHANGED
@@ -1,7 +1,6 @@
1
- #!/usr/bin/env rake
2
1
  # Add your own tasks in files placed in lib/tasks ending in .rake,
3
2
  # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
4
3
 
5
4
  require File.expand_path('../config/application', __FILE__)
6
5
 
7
- Dummy::Application.load_tasks
6
+ Rails.application.load_tasks
@@ -5,11 +5,9 @@
5
5
  // or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
6
6
  //
7
7
  // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
8
- // the compiled file.
8
+ // compiled file.
9
9
  //
10
- // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
11
- // GO AFTER THE REQUIRES BELOW.
10
+ // Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
11
+ // about supported directives.
12
12
  //
13
- //= require jquery
14
- //= require jquery_ujs
15
13
  //= require_tree .
@@ -5,9 +5,11 @@
5
5
  * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
6
6
  * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
7
7
  *
8
- * You're free to add application-wide styles to this file and they'll appear at the top of the
9
- * compiled file, but it's generally better to create a new file per style scope.
8
+ * You're free to add application-wide styles to this file and they'll appear at the bottom of the
9
+ * compiled file so the styles you add here take precedence over styles defined in any styles
10
+ * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
11
+ * file per style scope.
10
12
  *
11
- *= require_self
12
13
  *= require_tree .
14
+ *= require_self
13
15
  */
@@ -1,3 +1,5 @@
1
1
  class ApplicationController < ActionController::Base
2
- protect_from_forgery
2
+ # Prevent CSRF attacks by raising an exception.
3
+ # For APIs, you may want to use :null_session instead.
4
+ protect_from_forgery with: :exception
3
5
  end
@@ -2,8 +2,8 @@
2
2
  <html>
3
3
  <head>
4
4
  <title>Dummy</title>
5
- <%= stylesheet_link_tag "application", :media => "all" %>
6
- <%= javascript_include_tag "application" %>
5
+ <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %>
6
+ <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
7
7
  <%= csrf_meta_tags %>
8
8
  </head>
9
9
  <body>
@@ -0,0 +1,3 @@
1
+ #!/usr/bin/env ruby
2
+ ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
3
+ load Gem.bin_path('bundler', 'bundle')
@@ -0,0 +1,4 @@
1
+ #!/usr/bin/env ruby
2
+ APP_PATH = File.expand_path('../../config/application', __FILE__)
3
+ require_relative '../config/boot'
4
+ require 'rails/commands'
@@ -0,0 +1,4 @@
1
+ #!/usr/bin/env ruby
2
+ require_relative '../config/boot'
3
+ require 'rake'
4
+ Rake.application.run
@@ -1,6 +1,12 @@
1
1
  require File.expand_path('../boot', __FILE__)
2
2
 
3
- require 'rails/all'
3
+ # Pick the frameworks you want:
4
+ require "active_record/railtie"
5
+ require "action_controller/railtie"
6
+ require "action_mailer/railtie"
7
+ require "action_view/railtie"
8
+ require "sprockets/railtie"
9
+ # require "rails/test_unit/railtie"
4
10
 
5
11
  Bundler.require(*Rails.groups)
6
12
  require "witch_doctor"
@@ -11,16 +17,6 @@ module Dummy
11
17
  # Application configuration should go into files in config/initializers
12
18
  # -- all .rb files in that directory are automatically loaded.
13
19
 
14
- # Custom directories with classes and modules you want to be autoloadable.
15
- # config.autoload_paths += %W(#{config.root}/extras)
16
-
17
- # Only load the plugins named here, in the order given (default is alphabetical).
18
- # :all can be used as a placeholder for all plugins not explicitly named.
19
- # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
20
-
21
- # Activate observers that should always be running.
22
- # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
23
-
24
20
  # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
25
21
  # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
26
22
  # config.time_zone = 'Central Time (US & Canada)'
@@ -28,32 +24,6 @@ module Dummy
28
24
  # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
29
25
  # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
30
26
  # config.i18n.default_locale = :de
31
-
32
- # Configure the default encoding used in templates for Ruby 1.9.
33
- config.encoding = "utf-8"
34
-
35
- # Configure sensitive parameters which will be filtered from the log file.
36
- config.filter_parameters += [:password]
37
-
38
- # Enable escaping HTML in JSON.
39
- config.active_support.escape_html_entities_in_json = true
40
-
41
- # Use SQL instead of Active Record's schema dumper when creating the database.
42
- # This is necessary if your schema can't be completely dumped by the schema dumper,
43
- # like if you have constraints or database-specific column types
44
- # config.active_record.schema_format = :sql
45
-
46
- # Enforce whitelist mode for mass assignment.
47
- # This will create an empty whitelist of attributes available for mass-assignment for all models
48
- # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
49
- # parameters by using an attr_accessible or attr_protected declaration.
50
- config.active_record.whitelist_attributes = true
51
-
52
- # Enable the asset pipeline
53
- config.assets.enabled = true
54
-
55
- # Version of your assets, change this if you want to expire all your assets
56
- config.assets.version = '1.0'
57
27
  end
58
28
  end
59
29
 
@@ -1,10 +1,5 @@
1
- require 'rubygems'
2
- gemfile = File.expand_path('../../../../Gemfile', __FILE__)
1
+ # Set up gems listed in the Gemfile.
2
+ ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
3
3
 
4
- if File.exist?(gemfile)
5
- ENV['BUNDLE_GEMFILE'] = gemfile
6
- require 'bundler'
7
- Bundler.setup
8
- end
9
-
10
- $:.unshift File.expand_path('../../../../lib', __FILE__)
4
+ require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
5
+ $LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)
@@ -3,23 +3,23 @@
3
3
  #
4
4
  # Ensure the SQLite 3 gem is defined in your Gemfile
5
5
  # gem 'sqlite3'
6
- development:
6
+ #
7
+ default: &default
7
8
  adapter: sqlite3
8
- database: db/development.sqlite3
9
9
  pool: 5
10
10
  timeout: 5000
11
11
 
12
+ development:
13
+ <<: *default
14
+ database: db/development.sqlite3
15
+
12
16
  # Warning: The database defined as "test" will be erased and
13
17
  # re-generated from your development database when you run "rake".
14
18
  # Do not set this db to the same as development or production.
15
19
  test:
16
- adapter: sqlite3
20
+ <<: *default
17
21
  database: db/test.sqlite3
18
- pool: 5
19
- timeout: 5000
20
22
 
21
23
  production:
22
- adapter: sqlite3
24
+ <<: *default
23
25
  database: db/production.sqlite3
24
- pool: 5
25
- timeout: 5000
@@ -1,5 +1,5 @@
1
- # Load the rails application
1
+ # Load the Rails application.
2
2
  require File.expand_path('../application', __FILE__)
3
3
 
4
- # Initialize the rails application
5
- Dummy::Application.initialize!
4
+ # Initialize the Rails application.
5
+ Rails.application.initialize!