effective_addresses 1.0.6 → 1.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (55) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/effective/addresses_controller.rb +0 -1
  3. data/app/models/concerns/acts_as_addressable.rb +35 -9
  4. data/lib/effective_addresses/version.rb +1 -1
  5. data/lib/effective_addresses.rb +1 -1
  6. data/spec/controllers/addresses_controller_spec.rb +5 -2
  7. data/spec/dummy/README.rdoc +5 -258
  8. data/spec/dummy/Rakefile +1 -2
  9. data/spec/dummy/app/assets/javascripts/application.js +3 -5
  10. data/spec/dummy/app/assets/stylesheets/application.css +5 -3
  11. data/spec/dummy/app/controllers/application_controller.rb +3 -1
  12. data/spec/dummy/app/models/user.rb +24 -0
  13. data/spec/dummy/app/models/user_with_address.rb +3 -0
  14. data/spec/dummy/app/models/user_with_required_address.rb +3 -0
  15. data/spec/dummy/app/models/user_with_required_address_and_full_name.rb +3 -0
  16. data/spec/dummy/app/models/user_with_required_full_name.rb +3 -0
  17. data/spec/dummy/app/models/user_with_singular_address.rb +3 -0
  18. data/spec/dummy/app/views/layouts/application.html.erb +2 -2
  19. data/spec/dummy/bin/bundle +3 -0
  20. data/spec/dummy/bin/rails +4 -0
  21. data/spec/dummy/bin/rake +4 -0
  22. data/spec/dummy/config/application.rb +6 -42
  23. data/spec/dummy/config/boot.rb +4 -9
  24. data/spec/dummy/config/database.yml +9 -9
  25. data/spec/dummy/config/environment.rb +3 -3
  26. data/spec/dummy/config/environments/development.rb +19 -19
  27. data/spec/dummy/config/environments/production.rb +45 -29
  28. data/spec/dummy/config/environments/test.rb +17 -15
  29. data/spec/dummy/config/initializers/cookies_serializer.rb +3 -0
  30. data/spec/dummy/config/initializers/effective_addresses.rb +15 -0
  31. data/spec/dummy/config/initializers/session_store.rb +1 -6
  32. data/spec/dummy/config/initializers/wrap_parameters.rb +6 -6
  33. data/spec/dummy/config/routes.rb +1 -57
  34. data/spec/dummy/config/secrets.yml +22 -0
  35. data/spec/dummy/config.ru +1 -1
  36. data/spec/dummy/db/schema.rb +24 -1
  37. data/spec/dummy/db/test.sqlite3 +0 -0
  38. data/spec/dummy/log/test.log +11534 -0
  39. data/spec/models/acts_as_addressable_spec.rb +159 -0
  40. data/spec/models/address_spec.rb +1 -2
  41. data/spec/rails_helper.rb +60 -0
  42. data/spec/spec_helper.rb +87 -30
  43. data/spec/support/factories.rb +48 -1
  44. metadata +172 -24
  45. data/spec/dummy/config/initializers/backtrace_silencers.rb +0 -7
  46. data/spec/dummy/config/initializers/inflections.rb +0 -15
  47. data/spec/dummy/config/initializers/mime_types.rb +0 -5
  48. data/spec/dummy/config/initializers/secret_token.rb +0 -7
  49. data/spec/dummy/config/locales/en.yml +0 -5
  50. data/spec/dummy/public/404.html +0 -26
  51. data/spec/dummy/public/422.html +0 -26
  52. data/spec/dummy/public/500.html +0 -25
  53. data/spec/dummy/public/favicon.ico +0 -0
  54. data/spec/dummy/script/rails +0 -6
  55. data/spec/dummy/spec_link +0 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 5d46ad50e796ff7c0c17cdd23a1fe6d29b3bf1a3
4
- data.tar.gz: 0485776d5ae75eb3ec9ecca74d2c739c0652de82
3
+ metadata.gz: 28f6b6f23ffd681d9d6262daa29eb0dc0e29da6c
4
+ data.tar.gz: 3b5ccebe83b32d75d1d98abb886f8fdf79c8978f
5
5
  SHA512:
6
- metadata.gz: 2d0f8119f35746bb95ab5774b5a3c6f4fe42e098c5491b6cb50f47d15a104daf0c1eda92914652e5e8c198be72cab523b8289d91e381aa0a0f5eeafd3ad21e66
7
- data.tar.gz: 4f63eaa8c584c15592849e33a32a0457ed976b89d575e28ccd49a2c5a91ce13c41c7f3c78c991b42fc9d2843b06b9d27d778d08248801cb2d10fc4c4db29b634
6
+ metadata.gz: ac77042f20ab233e63cf53bdad086d2a7d365e4b5a9883d3b8633d8fd788cedd19c5566ee61961584c1907b52a9e2177f17f202be5303f5dc80bd72b59fe2e1b
7
+ data.tar.gz: 85dae36c3ed4448d2f8990ecdd8f28734ed86b64ef98e20d2d9da5d013110adb94ebd1c3c6e87461735da0b4dfabdeaad06e24b9986a8d4fd9511548ae116f58
@@ -1,7 +1,6 @@
1
1
  module Effective
2
2
  class AddressesController < ApplicationController
3
3
  skip_authorization_check if defined?(CanCan)
4
- respond_to :json
5
4
 
6
5
  def subregions
7
6
  @subregions = Carmen::Country.coded(params[:country_code]).try(:subregions)
@@ -11,7 +11,7 @@ module ActsAsAddressable
11
11
  end
12
12
 
13
13
  included do
14
- has_many :addresses, :as => :addressable, :class_name => 'Effective::Address', :dependent => :delete_all
14
+ has_many :addresses, :as => :addressable, :class_name => 'Effective::Address', :dependent => :delete_all, :autosave => true
15
15
 
16
16
  # Setup validations and methods
17
17
  categories = @acts_as_addressable_opts.try(:flatten) || []
@@ -19,21 +19,30 @@ module ActsAsAddressable
19
19
  if categories.first.kind_of?(Hash) # We were passed some validation requirements
20
20
  categories = categories.first
21
21
 
22
- categories.each do |category, validation| # billing, shipping
22
+ categories.each do |category, options| # billing, shipping
23
23
  category = category.to_s.gsub('_address', '')
24
24
 
25
25
  self.send(:define_method, "#{category}_address") { effective_address(category) }
26
26
  self.send(:define_method, "#{category}_addresses") { effective_addresses(category) }
27
- self.send(:define_method, "#{category}_address=") { |atts| set_effective_address(category, atts) }
28
27
 
29
28
  validates "#{category}_address", :effective_address_valid => true
30
29
 
31
- if validation.kind_of?(Hash)
32
- validates "#{category}_address", :presence => validation.fetch(:presence, false)
33
- validates "#{category}_address", :effective_address_full_name_presence => validation.fetch(:use_full_name, EffectiveAddresses.use_full_name)
34
- elsif validation == true
35
- validates "#{category}_address", :presence => true
30
+ if options.kind_of?(Hash)
31
+ validates "#{category}_address", :presence => options.fetch(:presence, false)
32
+ validates "#{category}_address", :effective_address_full_name_presence => options.fetch(:use_full_name, EffectiveAddresses.use_full_name)
33
+
34
+ if options.fetch(:singular, false)
35
+ self.send(:define_method, "#{category}_address=") { |atts| set_singular_effective_address(category, atts) }
36
+ else
37
+ self.send(:define_method, "#{category}_address=") { |atts| set_effective_address(category, atts) }
38
+ end
39
+
40
+ else # Probably just true or false passed
41
+ validates "#{category}_address", :presence => (options == true)
36
42
  validates "#{category}_address", :effective_address_full_name_presence => EffectiveAddresses.use_full_name
43
+
44
+ # Multiple Addresses
45
+ self.send(:define_method, "#{category}_address=") { |atts| set_effective_address(category, atts) }
37
46
  end
38
47
  end
39
48
  else # No validation requirements passed
@@ -63,7 +72,7 @@ module ActsAsAddressable
63
72
  end
64
73
 
65
74
  def set_effective_address(category, atts)
66
- raise ArgumentError.new("Effective::Address #{category}_address= expecting an Effective::Address or Hash of attributes") unless (atts.kind_of?(Effective::Address) || atts.kind_of?(Hash) || atts == nil)
75
+ raise ArgumentError.new("Effective::Address #{category}_address= expecting an Effective::Address or Hash of attributes") unless (atts.kind_of?(Effective::Address) || atts.kind_of?(Hash))
67
76
 
68
77
  atts = HashWithIndifferentAccess.new(atts.kind_of?(Effective::Address) ? atts.attributes : atts)
69
78
 
@@ -81,5 +90,22 @@ module ActsAsAddressable
81
90
  self.addresses << add unless (add.empty? || add == effective_address(category))
82
91
  end
83
92
 
93
+ def set_singular_effective_address(category, atts)
94
+ raise ArgumentError.new("Effective::Address #{category}_address= expecting an Effective::Address or Hash of attributes") unless (atts.kind_of?(Effective::Address) || atts.kind_of?(Hash))
95
+
96
+ atts = HashWithIndifferentAccess.new(atts.kind_of?(Effective::Address) ? atts.attributes : atts)
97
+
98
+ (effective_address(category) || self.addresses.build()).tap do |existing|
99
+ existing.category = category
100
+ existing.full_name = atts[:full_name]
101
+ existing.address1 = atts[:address1]
102
+ existing.address2 = atts[:address2]
103
+ existing.city = atts[:city]
104
+ existing.state_code = atts[:state_code]
105
+ existing.country_code = atts[:country_code]
106
+ existing.postal_code = atts[:postal_code]
107
+ end
108
+ end
109
+
84
110
  end
85
111
 
@@ -1,3 +1,3 @@
1
1
  module EffectiveAddresses
2
- VERSION = '1.0.6'.freeze
2
+ VERSION = '1.1.0'.freeze
3
3
  end
@@ -1,6 +1,6 @@
1
1
  require "effective_addresses/engine"
2
2
  require "effective_addresses/version"
3
- #require 'migrant' # Required for rspec to run properly
3
+ require 'migrant' # Required for rspec to run properly
4
4
 
5
5
  module EffectiveAddresses
6
6
 
@@ -1,6 +1,8 @@
1
- require 'spec_helper'
1
+ require 'rails_helper'
2
2
 
3
3
  describe Effective::AddressesController do
4
+ routes { EffectiveAddresses::Engine.routes }
5
+
4
6
  it 'should render the subregions partial' do
5
7
  get :subregions, :country_code => 'CA'
6
8
  response.status.should be 200
@@ -24,7 +26,8 @@ describe Effective::AddressesController do
24
26
 
25
27
  it 'Should return an error when passed bad country code' do
26
28
  get :subregions, :country_code => 'NOPE'
27
- response.status.should be 422 # Unprocessable Entity
29
+ response.status.should be 200
30
+ response.body.should eq "<option value=''>None Available</option>"
28
31
  end
29
32
 
30
33
  end
@@ -1,261 +1,8 @@
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
+ To change the test database in this dummy app:
5
4
 
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.
5
+ - Delete the existing test.sqlite3
6
+ - No migrations, so just make whatever changes you want to schema.rb
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.
19
-
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.
27
-
28
-
29
- == Getting Started
30
-
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)
33
-
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)
36
-
37
- 3. Go to http://localhost:3000/ and you'll see:
38
- "Welcome aboard: You're riding Ruby on Rails!"
39
-
40
- 4. Follow the guidelines to start developing your application. You can find
41
- the following resources handy:
42
-
43
- * The Getting Started Guide: http://guides.rubyonrails.org/getting_started.html
44
- * Ruby on Rails Tutorial Book: http://www.railstutorial.org/
45
-
46
-
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.
8
+ bundle exec rake app:db:test:prepare
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
@@ -0,0 +1,24 @@
1
+ class User < ActiveRecord::Base
2
+ structure do
3
+ # Devise attributes
4
+ encrypted_password :string
5
+ reset_password_token :string
6
+ reset_password_sent_at :datetime
7
+ remember_created_at :datetime
8
+ confirmation_sent_at :datetime
9
+ confirmed_at :datetime
10
+ confirmation_token :string
11
+ unconfirmed_email :string
12
+ sign_in_count :integer, :default => 0
13
+ current_sign_in_at :datetime
14
+ last_sign_in_at :datetime
15
+ current_sign_in_ip :string
16
+ last_sign_in_ip :string
17
+
18
+ email :string
19
+ first_name :string
20
+ last_name :string
21
+
22
+ timestamps
23
+ end
24
+ end
@@ -0,0 +1,3 @@
1
+ class UserWithAddress < User
2
+ acts_as_addressable :billing, :shipping
3
+ end
@@ -0,0 +1,3 @@
1
+ class UserWithRequiredAddress < User
2
+ acts_as_addressable :billing => {:presence => true, :use_full_name => false}, :shipping => false
3
+ end
@@ -0,0 +1,3 @@
1
+ class UserWithRequiredAddressAndFullName < User
2
+ acts_as_addressable :billing => {:presence => true, :use_full_name => true}, :shipping => false
3
+ end
@@ -0,0 +1,3 @@
1
+ class UserWithRequiredFullName < User
2
+ acts_as_addressable :billing => {:presence => false, :use_full_name => true}, :shipping => false
3
+ end
@@ -0,0 +1,3 @@
1
+ class UserWithSingularAddress < User
2
+ acts_as_addressable :billing => {:singular => true}, :shipping => false
3
+ 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,15 +1,10 @@
1
1
  require File.expand_path('../boot', __FILE__)
2
2
 
3
- # Pick the frameworks you want:
4
- require "active_record/railtie"
5
- require "action_controller/railtie"
6
- require "action_mailer/railtie"
7
- require "active_resource/railtie"
8
- require "sprockets/railtie"
9
- # require "rails/test_unit/railtie"
3
+ require 'rails/all'
10
4
 
11
5
  Bundler.require(*Rails.groups)
12
- require "effective_addresses"
6
+ require 'haml'
7
+ require 'effective_addresses'
13
8
 
14
9
  module Dummy
15
10
  class Application < Rails::Application
@@ -17,16 +12,6 @@ module Dummy
17
12
  # Application configuration should go into files in config/initializers
18
13
  # -- all .rb files in that directory are automatically loaded.
19
14
 
20
- # Custom directories with classes and modules you want to be autoloadable.
21
- # config.autoload_paths += %W(#{config.root}/extras)
22
-
23
- # Only load the plugins named here, in the order given (default is alphabetical).
24
- # :all can be used as a placeholder for all plugins not explicitly named.
25
- # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
26
-
27
- # Activate observers that should always be running.
28
- # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
29
-
30
15
  # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
31
16
  # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
32
17
  # config.time_zone = 'Central Time (US & Canada)'
@@ -35,31 +20,10 @@ module Dummy
35
20
  # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
36
21
  # config.i18n.default_locale = :de
37
22
 
38
- # Configure the default encoding used in templates for Ruby 1.9.
39
- config.encoding = "utf-8"
40
-
41
- # Configure sensitive parameters which will be filtered from the log file.
42
- config.filter_parameters += [:password]
43
-
44
- # Enable escaping HTML in JSON.
45
- config.active_support.escape_html_entities_in_json = true
46
-
47
- # Use SQL instead of Active Record's schema dumper when creating the database.
48
- # This is necessary if your schema can't be completely dumped by the schema dumper,
49
- # like if you have constraints or database-specific column types
50
- # config.active_record.schema_format = :sql
51
-
52
- # Enforce whitelist mode for mass assignment.
53
- # This will create an empty whitelist of attributes available for mass-assignment for all models
54
- # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
55
- # parameters by using an attr_accessible or attr_protected declaration.
56
- config.active_record.whitelist_attributes = true
57
-
58
- # Enable the asset pipeline
59
- config.assets.enabled = true
23
+ config.generators do |g|
24
+ g.template_engine :haml
25
+ end
60
26
 
61
- # Version of your assets, change this if you want to expire all your assets
62
- config.assets.version = '1.0'
63
27
  end
64
28
  end
65
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/test.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
23
- database: db/test.sqlite3
24
- pool: 5
25
- timeout: 5000
24
+ <<: *default
25
+ database: db/production.sqlite3
@@ -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!