active_application 0.0.1 → 0.1.0
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGELOG.md +4 -0
- data/LICENSE.txt +2 -2
- data/README.md +6 -2
- data/active_application.gemspec +13 -12
- data/app/assets/stylesheets/bootstrap_and_overrides.css.less +8 -4
- data/app/controllers/active_application/resource_controller.rb +0 -9
- data/app/helpers/simple_resource/custom_helper.rb +0 -22
- data/app/views/devise/sessions/new.html.erb +12 -5
- data/app/views/devise/shared/_links.erb +0 -0
- data/app/views/layouts/_menu.html.erb +3 -0
- data/lib/active_application.rb +2 -1
- data/lib/active_application/version.rb +1 -1
- data/spec/features/users/forgot_password_spec.rb +8 -8
- metadata +49 -40
- data/app/views/devise/passwords/edit.html.erb +0 -11
- data/app/views/devise/passwords/new.html.erb +0 -9
- data/app/views/devise/registrations/edit.html.erb +0 -39
- data/app/views/devise/registrations/new.html.erb +0 -11
- data/app/views/simple_resource/base/_collection.html.erb +0 -26
- data/lib/generators/active_application/cancan/cancan_generator.rb +0 -15
- data/lib/generators/active_application/cancan/templates/ability.rb +0 -10
- data/lib/generators/active_application/devise/devise_generator.rb +0 -46
- data/lib/generators/active_application/install/install_generator.rb +0 -21
data/CHANGELOG.md
CHANGED
data/LICENSE.txt
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
Copyright (c) 2012 Jari Jokinen
|
1
|
+
Copyright (c) 2012 - 2013 Jari Jokinen
|
2
2
|
|
3
3
|
MIT License
|
4
4
|
|
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
19
19
|
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
20
20
|
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
21
21
|
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
22
|
-
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
22
|
+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
data/README.md
CHANGED
@@ -2,7 +2,7 @@
|
|
2
2
|
|
3
3
|
NOTICE: EXPERIMENTAL ALPHA VERSION, DO NOT USE IN PRODUCTION
|
4
4
|
|
5
|
-
[![Build Status](https://secure.travis-ci.org/jarijokinen/
|
5
|
+
[![Build Status](https://secure.travis-ci.org/jarijokinen/active_application.png)](http://travis-ci.org/jarijokinen/active_application) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/jarijokinen/active_application)
|
6
6
|
|
7
7
|
## Features
|
8
8
|
|
@@ -28,10 +28,14 @@ And then execute:
|
|
28
28
|
|
29
29
|
$ bundle
|
30
30
|
|
31
|
+
Run generator:
|
32
|
+
|
33
|
+
$ rails g active_application:install
|
34
|
+
|
31
35
|
## Support
|
32
36
|
|
33
37
|
If you have any questions or issues with ActiveApplication, or if you like to report a bug, please create an [issue on GitHub](https://github.com/jarijokinen/active_application/issues).
|
34
38
|
|
35
39
|
## License
|
36
40
|
|
37
|
-
MIT License. Copyright (c) 2012 [Jari Jokinen](http://jarijokinen.com). See [LICENSE](https://github.com/jarijokinen/active_application/blob/master/LICENSE.txt) for further details.
|
41
|
+
MIT License. Copyright (c) 2012 - 2013 [Jari Jokinen](http://jarijokinen.com). See [LICENSE](https://github.com/jarijokinen/active_application/blob/master/LICENSE.txt) for further details.
|
data/active_application.gemspec
CHANGED
@@ -16,27 +16,28 @@ Gem::Specification.new do |gem|
|
|
16
16
|
gem.test_files = gem.files.grep(%r{^spec/})
|
17
17
|
gem.require_paths = ["lib"]
|
18
18
|
|
19
|
-
gem.add_dependency "rails", "~> 3.2.
|
19
|
+
gem.add_dependency "rails", "~> 3.2.11"
|
20
20
|
gem.add_dependency "cancan", "~> 1.6.8"
|
21
|
-
gem.add_dependency "devise", "~>
|
21
|
+
gem.add_dependency "devise-formtastic", "~> 0.0.1"
|
22
22
|
gem.add_dependency "formtastic-bootstrap", "~> 2.0.0"
|
23
23
|
gem.add_dependency "has_scope", "~> 0.5.1"
|
24
|
+
gem.add_dependency "jquery-rails", "~> 2.1.4"
|
24
25
|
gem.add_dependency "kaminari", "~> 0.14.1"
|
25
26
|
gem.add_dependency "less-rails", "~> 2.2.6"
|
26
27
|
gem.add_dependency "modernizr-rails", "~> 2.6.1"
|
27
|
-
gem.add_dependency "simple_resource", "~> 0.
|
28
|
-
gem.add_dependency "therubyracer", "~> 0.
|
29
|
-
gem.add_dependency "twitter-bootstrap-rails", "~> 2.
|
28
|
+
gem.add_dependency "simple_resource", "~> 0.4.0"
|
29
|
+
gem.add_dependency "therubyracer", "~> 0.11.2"
|
30
|
+
gem.add_dependency "twitter-bootstrap-rails", "~> 2.2.0"
|
30
31
|
|
31
|
-
gem.add_development_dependency "capybara", "
|
32
|
+
gem.add_development_dependency "capybara", "1.1.4"
|
32
33
|
gem.add_development_dependency "database_cleaner", "~> 0.9.1"
|
33
34
|
gem.add_development_dependency "factory_girl_rails", "~> 4.1.0"
|
34
35
|
gem.add_development_dependency "forgery", "~> 0.5.0"
|
35
|
-
gem.add_development_dependency "guard-rspec", "~> 2.3.
|
36
|
-
gem.add_development_dependency "guard-spork", "~> 1.4.
|
36
|
+
gem.add_development_dependency "guard-rspec", "~> 2.3.3"
|
37
|
+
gem.add_development_dependency "guard-spork", "~> 1.4.1"
|
37
38
|
gem.add_development_dependency "launchy", "~> 2.1.2"
|
38
|
-
gem.add_development_dependency "rb-inotify", "~> 0.
|
39
|
-
gem.add_development_dependency "rspec-rails", "~> 2.12.
|
40
|
-
gem.add_development_dependency "spork-rails", "~> 3.2.
|
41
|
-
gem.add_development_dependency "sqlite3", "~> 1.3.
|
39
|
+
gem.add_development_dependency "rb-inotify", "~> 0.9.0"
|
40
|
+
gem.add_development_dependency "rspec-rails", "~> 2.12.2"
|
41
|
+
gem.add_development_dependency "spork-rails", "~> 3.2.1"
|
42
|
+
gem.add_development_dependency "sqlite3", "~> 1.3.7"
|
42
43
|
end
|
@@ -2,19 +2,23 @@
|
|
2
2
|
@import "twitter/bootstrap/responsive";
|
3
3
|
|
4
4
|
// Set the correct sprite paths
|
5
|
-
@iconSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings
|
6
|
-
@iconWhiteSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings-white
|
5
|
+
@iconSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings");
|
6
|
+
@iconWhiteSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings-white");
|
7
7
|
|
8
8
|
// Set the Font Awesome (Font Awesome is default. You can disable by commenting below lines)
|
9
|
-
// Note: If you use asset_path() here, your compiled
|
9
|
+
// Note: If you use asset_path() here, your compiled bootstrap_and_overrides.css will not
|
10
10
|
// have the proper paths. So for now we use the absolute path.
|
11
11
|
@fontAwesomeEotPath: asset-path("fontawesome-webfont.eot");
|
12
|
+
@fontAwesomeEotPath_iefix: asset-path("fontawesome-webfont.eot#iefix");
|
12
13
|
@fontAwesomeWoffPath: asset-path("fontawesome-webfont.woff");
|
13
14
|
@fontAwesomeTtfPath: asset-path("fontawesome-webfont.ttf");
|
14
15
|
@fontAwesomeSvgPath: asset-path("fontawesome-webfont.svg");
|
15
16
|
|
16
17
|
// Font Awesome
|
17
|
-
|
18
|
+
@import "fontawesome";
|
19
|
+
|
20
|
+
// Glyphicons
|
21
|
+
//@import "twitter/bootstrap/sprites.less";
|
18
22
|
|
19
23
|
// Your custom LESS stylesheets goes here
|
20
24
|
//
|
@@ -1,7 +1,6 @@
|
|
1
1
|
class ActiveApplication::ResourceController < SimpleResource::BaseController
|
2
2
|
defaults route_prefix: ""
|
3
3
|
before_filter :authenticate_user!
|
4
|
-
load_and_authorize_resource
|
5
4
|
|
6
5
|
has_scope :page, default: 1
|
7
6
|
|
@@ -12,12 +11,4 @@ class ActiveApplication::ResourceController < SimpleResource::BaseController
|
|
12
11
|
rescue_from CanCan::AccessDenied do |exception|
|
13
12
|
return render_not_found
|
14
13
|
end
|
15
|
-
|
16
|
-
def create
|
17
|
-
create! { collection_url }
|
18
|
-
end
|
19
|
-
|
20
|
-
def update
|
21
|
-
update! { collection_url }
|
22
|
-
end
|
23
14
|
end
|
@@ -13,28 +13,6 @@ module SimpleResource
|
|
13
13
|
|
14
14
|
human_attributes
|
15
15
|
end
|
16
|
-
|
17
|
-
def new_resource_link
|
18
|
-
link_to("<i class='icon-plus-sign'></i> #{new_resource_title}".html_safe, new_resource_path, class: "btn")
|
19
|
-
end
|
20
|
-
|
21
|
-
def link_to_action(action_name, title, path)
|
22
|
-
action_name = action_name.to_sym
|
23
|
-
if action_name == :delete
|
24
|
-
link_to(t("simple_resource.#{action_name.to_s}", default: title), path,
|
25
|
-
method: :delete, confirm: t("simple_resource.delete_confirmation", default: "Are you sure?"), class: "btn btn-mini btn-danger")
|
26
|
-
else
|
27
|
-
link_to(t("simple_resource.#{action_name.to_s}", default: title), path, class: "btn btn-mini")
|
28
|
-
end
|
29
|
-
end
|
30
|
-
|
31
|
-
def default_actions_for(resource)
|
32
|
-
html = Array.new
|
33
|
-
html << link_to_action(:show, "<i class='icon-zoom-in'></i> Show".html_safe, resource_path(resource))
|
34
|
-
html << link_to_action(:edit, "<i class='icon-edit'></i> Edit".html_safe, edit_resource_path(resource))
|
35
|
-
html << link_to_action(:delete, "<i class='icon-trash icon-white'></i> Delete".html_safe, resource_path(resource))
|
36
|
-
html.join("\n").html_safe
|
37
|
-
end
|
38
16
|
end
|
39
17
|
end
|
40
18
|
|
@@ -1,10 +1,17 @@
|
|
1
|
-
<% @title
|
1
|
+
<% @title ||= t("devise.titles.sign_in") %>
|
2
2
|
|
3
3
|
<%= semantic_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
|
4
|
-
<%= f.
|
4
|
+
<%= f.input :email, input_html: {autofocus: true} %>
|
5
|
+
<%= f.input :password %>
|
6
|
+
|
7
|
+
<% if devise_mapping.rememberable? -%>
|
8
|
+
<%= f.input :remember_me, as: :boolean, label: false %>
|
9
|
+
<% end -%>
|
10
|
+
|
5
11
|
<%= f.actions do %>
|
6
|
-
<%= f.action :submit, label: t("devise.sign_in"
|
12
|
+
<%= f.action :submit, label: t("devise.buttons.sign_in") %>
|
13
|
+
|
14
|
+
|
15
|
+
<%= link_to(t("devise.links.forgot_password"), new_user_password_path) %>
|
7
16
|
<% end %>
|
8
17
|
<% end %>
|
9
|
-
|
10
|
-
<%= link_to(t("devise.forgot_password", default: "Forgot Your Password?"), new_user_password_path) %>
|
File without changes
|
data/lib/active_application.rb
CHANGED
@@ -6,7 +6,7 @@ describe "Forgot password feature" do
|
|
6
6
|
before :each do
|
7
7
|
visit "/"
|
8
8
|
click_link "Sign in"
|
9
|
-
click_link "Forgot
|
9
|
+
click_link "Forgot your password?"
|
10
10
|
fill_in "Email", with: user.email
|
11
11
|
click_button "Send me reset password instructions"
|
12
12
|
page.should have_content "You will receive an email with instructions about how to reset your password in a few minutes."
|
@@ -45,11 +45,11 @@ describe "Forgot password feature" do
|
|
45
45
|
end
|
46
46
|
|
47
47
|
it "has a correct title" do
|
48
|
-
page.html.should have_xpath "//title", text: "Change
|
48
|
+
page.html.should have_xpath "//title", text: "Change your password"
|
49
49
|
end
|
50
50
|
|
51
51
|
it "has a correct heading" do
|
52
|
-
page.should have_css "h1", text: "Change
|
52
|
+
page.should have_css "h1", text: "Change your password"
|
53
53
|
end
|
54
54
|
|
55
55
|
it "has a password field" do
|
@@ -61,7 +61,7 @@ describe "Forgot password feature" do
|
|
61
61
|
end
|
62
62
|
|
63
63
|
it "has a change my password button" do
|
64
|
-
page.should have_button "Change
|
64
|
+
page.should have_button "Change password"
|
65
65
|
end
|
66
66
|
end
|
67
67
|
|
@@ -77,7 +77,7 @@ describe "Forgot password feature" do
|
|
77
77
|
before :each do
|
78
78
|
fill_in "user_password", with: "newpassword"
|
79
79
|
fill_in "user_password_confirmation", with: "newpassword"
|
80
|
-
click_button "Change
|
80
|
+
click_button "Change password"
|
81
81
|
end
|
82
82
|
|
83
83
|
it "should redirect to root page" do
|
@@ -91,7 +91,7 @@ describe "Forgot password feature" do
|
|
91
91
|
|
92
92
|
context "with empty fields" do
|
93
93
|
before :each do
|
94
|
-
click_button "Change
|
94
|
+
click_button "Change password"
|
95
95
|
end
|
96
96
|
|
97
97
|
it "should not redirect" do
|
@@ -107,7 +107,7 @@ describe "Forgot password feature" do
|
|
107
107
|
before :each do
|
108
108
|
fill_in "user_password", with: "newpassword"
|
109
109
|
fill_in "user_password_confirmation", with: "notnewpassword"
|
110
|
-
click_button "Change
|
110
|
+
click_button "Change password"
|
111
111
|
end
|
112
112
|
|
113
113
|
it "should not redirect" do
|
@@ -123,7 +123,7 @@ describe "Forgot password feature" do
|
|
123
123
|
before :each do
|
124
124
|
fill_in "user_password", with: "new45"
|
125
125
|
fill_in "user_password_confirmation", with: "new45"
|
126
|
-
click_button "Change
|
126
|
+
click_button "Change password"
|
127
127
|
end
|
128
128
|
|
129
129
|
it "should not redirect" do
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: active_application
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0
|
4
|
+
version: 0.1.0
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date:
|
12
|
+
date: 2013-01-15 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: rails
|
@@ -18,7 +18,7 @@ dependencies:
|
|
18
18
|
requirements:
|
19
19
|
- - ~>
|
20
20
|
- !ruby/object:Gem::Version
|
21
|
-
version: 3.2.
|
21
|
+
version: 3.2.11
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
24
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -26,7 +26,7 @@ dependencies:
|
|
26
26
|
requirements:
|
27
27
|
- - ~>
|
28
28
|
- !ruby/object:Gem::Version
|
29
|
-
version: 3.2.
|
29
|
+
version: 3.2.11
|
30
30
|
- !ruby/object:Gem::Dependency
|
31
31
|
name: cancan
|
32
32
|
requirement: !ruby/object:Gem::Requirement
|
@@ -44,13 +44,13 @@ dependencies:
|
|
44
44
|
- !ruby/object:Gem::Version
|
45
45
|
version: 1.6.8
|
46
46
|
- !ruby/object:Gem::Dependency
|
47
|
-
name: devise
|
47
|
+
name: devise-formtastic
|
48
48
|
requirement: !ruby/object:Gem::Requirement
|
49
49
|
none: false
|
50
50
|
requirements:
|
51
51
|
- - ~>
|
52
52
|
- !ruby/object:Gem::Version
|
53
|
-
version:
|
53
|
+
version: 0.0.1
|
54
54
|
type: :runtime
|
55
55
|
prerelease: false
|
56
56
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -58,7 +58,7 @@ dependencies:
|
|
58
58
|
requirements:
|
59
59
|
- - ~>
|
60
60
|
- !ruby/object:Gem::Version
|
61
|
-
version:
|
61
|
+
version: 0.0.1
|
62
62
|
- !ruby/object:Gem::Dependency
|
63
63
|
name: formtastic-bootstrap
|
64
64
|
requirement: !ruby/object:Gem::Requirement
|
@@ -91,6 +91,22 @@ dependencies:
|
|
91
91
|
- - ~>
|
92
92
|
- !ruby/object:Gem::Version
|
93
93
|
version: 0.5.1
|
94
|
+
- !ruby/object:Gem::Dependency
|
95
|
+
name: jquery-rails
|
96
|
+
requirement: !ruby/object:Gem::Requirement
|
97
|
+
none: false
|
98
|
+
requirements:
|
99
|
+
- - ~>
|
100
|
+
- !ruby/object:Gem::Version
|
101
|
+
version: 2.1.4
|
102
|
+
type: :runtime
|
103
|
+
prerelease: false
|
104
|
+
version_requirements: !ruby/object:Gem::Requirement
|
105
|
+
none: false
|
106
|
+
requirements:
|
107
|
+
- - ~>
|
108
|
+
- !ruby/object:Gem::Version
|
109
|
+
version: 2.1.4
|
94
110
|
- !ruby/object:Gem::Dependency
|
95
111
|
name: kaminari
|
96
112
|
requirement: !ruby/object:Gem::Requirement
|
@@ -146,7 +162,7 @@ dependencies:
|
|
146
162
|
requirements:
|
147
163
|
- - ~>
|
148
164
|
- !ruby/object:Gem::Version
|
149
|
-
version: 0.
|
165
|
+
version: 0.4.0
|
150
166
|
type: :runtime
|
151
167
|
prerelease: false
|
152
168
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -154,7 +170,7 @@ dependencies:
|
|
154
170
|
requirements:
|
155
171
|
- - ~>
|
156
172
|
- !ruby/object:Gem::Version
|
157
|
-
version: 0.
|
173
|
+
version: 0.4.0
|
158
174
|
- !ruby/object:Gem::Dependency
|
159
175
|
name: therubyracer
|
160
176
|
requirement: !ruby/object:Gem::Requirement
|
@@ -162,7 +178,7 @@ dependencies:
|
|
162
178
|
requirements:
|
163
179
|
- - ~>
|
164
180
|
- !ruby/object:Gem::Version
|
165
|
-
version: 0.
|
181
|
+
version: 0.11.2
|
166
182
|
type: :runtime
|
167
183
|
prerelease: false
|
168
184
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -170,7 +186,7 @@ dependencies:
|
|
170
186
|
requirements:
|
171
187
|
- - ~>
|
172
188
|
- !ruby/object:Gem::Version
|
173
|
-
version: 0.
|
189
|
+
version: 0.11.2
|
174
190
|
- !ruby/object:Gem::Dependency
|
175
191
|
name: twitter-bootstrap-rails
|
176
192
|
requirement: !ruby/object:Gem::Requirement
|
@@ -178,7 +194,7 @@ dependencies:
|
|
178
194
|
requirements:
|
179
195
|
- - ~>
|
180
196
|
- !ruby/object:Gem::Version
|
181
|
-
version: 2.
|
197
|
+
version: 2.2.0
|
182
198
|
type: :runtime
|
183
199
|
prerelease: false
|
184
200
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -186,23 +202,23 @@ dependencies:
|
|
186
202
|
requirements:
|
187
203
|
- - ~>
|
188
204
|
- !ruby/object:Gem::Version
|
189
|
-
version: 2.
|
205
|
+
version: 2.2.0
|
190
206
|
- !ruby/object:Gem::Dependency
|
191
207
|
name: capybara
|
192
208
|
requirement: !ruby/object:Gem::Requirement
|
193
209
|
none: false
|
194
210
|
requirements:
|
195
|
-
- -
|
211
|
+
- - '='
|
196
212
|
- !ruby/object:Gem::Version
|
197
|
-
version:
|
213
|
+
version: 1.1.4
|
198
214
|
type: :development
|
199
215
|
prerelease: false
|
200
216
|
version_requirements: !ruby/object:Gem::Requirement
|
201
217
|
none: false
|
202
218
|
requirements:
|
203
|
-
- -
|
219
|
+
- - '='
|
204
220
|
- !ruby/object:Gem::Version
|
205
|
-
version:
|
221
|
+
version: 1.1.4
|
206
222
|
- !ruby/object:Gem::Dependency
|
207
223
|
name: database_cleaner
|
208
224
|
requirement: !ruby/object:Gem::Requirement
|
@@ -258,7 +274,7 @@ dependencies:
|
|
258
274
|
requirements:
|
259
275
|
- - ~>
|
260
276
|
- !ruby/object:Gem::Version
|
261
|
-
version: 2.3.
|
277
|
+
version: 2.3.3
|
262
278
|
type: :development
|
263
279
|
prerelease: false
|
264
280
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -266,7 +282,7 @@ dependencies:
|
|
266
282
|
requirements:
|
267
283
|
- - ~>
|
268
284
|
- !ruby/object:Gem::Version
|
269
|
-
version: 2.3.
|
285
|
+
version: 2.3.3
|
270
286
|
- !ruby/object:Gem::Dependency
|
271
287
|
name: guard-spork
|
272
288
|
requirement: !ruby/object:Gem::Requirement
|
@@ -274,7 +290,7 @@ dependencies:
|
|
274
290
|
requirements:
|
275
291
|
- - ~>
|
276
292
|
- !ruby/object:Gem::Version
|
277
|
-
version: 1.4.
|
293
|
+
version: 1.4.1
|
278
294
|
type: :development
|
279
295
|
prerelease: false
|
280
296
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -282,7 +298,7 @@ dependencies:
|
|
282
298
|
requirements:
|
283
299
|
- - ~>
|
284
300
|
- !ruby/object:Gem::Version
|
285
|
-
version: 1.4.
|
301
|
+
version: 1.4.1
|
286
302
|
- !ruby/object:Gem::Dependency
|
287
303
|
name: launchy
|
288
304
|
requirement: !ruby/object:Gem::Requirement
|
@@ -306,7 +322,7 @@ dependencies:
|
|
306
322
|
requirements:
|
307
323
|
- - ~>
|
308
324
|
- !ruby/object:Gem::Version
|
309
|
-
version: 0.
|
325
|
+
version: 0.9.0
|
310
326
|
type: :development
|
311
327
|
prerelease: false
|
312
328
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -314,7 +330,7 @@ dependencies:
|
|
314
330
|
requirements:
|
315
331
|
- - ~>
|
316
332
|
- !ruby/object:Gem::Version
|
317
|
-
version: 0.
|
333
|
+
version: 0.9.0
|
318
334
|
- !ruby/object:Gem::Dependency
|
319
335
|
name: rspec-rails
|
320
336
|
requirement: !ruby/object:Gem::Requirement
|
@@ -322,7 +338,7 @@ dependencies:
|
|
322
338
|
requirements:
|
323
339
|
- - ~>
|
324
340
|
- !ruby/object:Gem::Version
|
325
|
-
version: 2.12.
|
341
|
+
version: 2.12.2
|
326
342
|
type: :development
|
327
343
|
prerelease: false
|
328
344
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -330,7 +346,7 @@ dependencies:
|
|
330
346
|
requirements:
|
331
347
|
- - ~>
|
332
348
|
- !ruby/object:Gem::Version
|
333
|
-
version: 2.12.
|
349
|
+
version: 2.12.2
|
334
350
|
- !ruby/object:Gem::Dependency
|
335
351
|
name: spork-rails
|
336
352
|
requirement: !ruby/object:Gem::Requirement
|
@@ -338,7 +354,7 @@ dependencies:
|
|
338
354
|
requirements:
|
339
355
|
- - ~>
|
340
356
|
- !ruby/object:Gem::Version
|
341
|
-
version: 3.2.
|
357
|
+
version: 3.2.1
|
342
358
|
type: :development
|
343
359
|
prerelease: false
|
344
360
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -346,7 +362,7 @@ dependencies:
|
|
346
362
|
requirements:
|
347
363
|
- - ~>
|
348
364
|
- !ruby/object:Gem::Version
|
349
|
-
version: 3.2.
|
365
|
+
version: 3.2.1
|
350
366
|
- !ruby/object:Gem::Dependency
|
351
367
|
name: sqlite3
|
352
368
|
requirement: !ruby/object:Gem::Requirement
|
@@ -354,7 +370,7 @@ dependencies:
|
|
354
370
|
requirements:
|
355
371
|
- - ~>
|
356
372
|
- !ruby/object:Gem::Version
|
357
|
-
version: 1.3.
|
373
|
+
version: 1.3.7
|
358
374
|
type: :development
|
359
375
|
prerelease: false
|
360
376
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -362,7 +378,7 @@ dependencies:
|
|
362
378
|
requirements:
|
363
379
|
- - ~>
|
364
380
|
- !ruby/object:Gem::Version
|
365
|
-
version: 1.3.
|
381
|
+
version: 1.3.7
|
366
382
|
description: Application framework for Rails
|
367
383
|
email:
|
368
384
|
- info@jarijokinen.com
|
@@ -395,11 +411,8 @@ files:
|
|
395
411
|
- app/models/active_application/user.rb
|
396
412
|
- app/views/active_application/public/404.html.erb
|
397
413
|
- app/views/active_application/public/index.html.erb
|
398
|
-
- app/views/devise/passwords/edit.html.erb
|
399
|
-
- app/views/devise/passwords/new.html.erb
|
400
|
-
- app/views/devise/registrations/edit.html.erb
|
401
|
-
- app/views/devise/registrations/new.html.erb
|
402
414
|
- app/views/devise/sessions/new.html.erb
|
415
|
+
- app/views/devise/shared/_links.erb
|
403
416
|
- app/views/kaminari/_first_page.html.erb
|
404
417
|
- app/views/kaminari/_gap.html.erb
|
405
418
|
- app/views/kaminari/_last_page.html.erb
|
@@ -407,17 +420,13 @@ files:
|
|
407
420
|
- app/views/kaminari/_page.html.erb
|
408
421
|
- app/views/kaminari/_paginator.html.erb
|
409
422
|
- app/views/kaminari/_prev_page.html.erb
|
423
|
+
- app/views/layouts/_menu.html.erb
|
410
424
|
- app/views/layouts/application.html.erb
|
411
|
-
- app/views/simple_resource/base/_collection.html.erb
|
412
425
|
- config/routes.rb
|
413
426
|
- lib/active_application.rb
|
414
427
|
- lib/active_application/engine.rb
|
415
428
|
- lib/active_application/routes.rb
|
416
429
|
- lib/active_application/version.rb
|
417
|
-
- lib/generators/active_application/cancan/cancan_generator.rb
|
418
|
-
- lib/generators/active_application/cancan/templates/ability.rb
|
419
|
-
- lib/generators/active_application/devise/devise_generator.rb
|
420
|
-
- lib/generators/active_application/install/install_generator.rb
|
421
430
|
- spec/dummy/README.rdoc
|
422
431
|
- spec/dummy/Rakefile
|
423
432
|
- spec/dummy/app/assets/javascripts/application.js
|
@@ -488,7 +497,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
488
497
|
version: '0'
|
489
498
|
segments:
|
490
499
|
- 0
|
491
|
-
hash: -
|
500
|
+
hash: -1445150368486840211
|
492
501
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
493
502
|
none: false
|
494
503
|
requirements:
|
@@ -497,7 +506,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
497
506
|
version: '0'
|
498
507
|
segments:
|
499
508
|
- 0
|
500
|
-
hash: -
|
509
|
+
hash: -1445150368486840211
|
501
510
|
requirements: []
|
502
511
|
rubyforge_project:
|
503
512
|
rubygems_version: 1.8.24
|
@@ -1,11 +0,0 @@
|
|
1
|
-
<% @title = t("devise.change_password", :default => "Change Your Password") %>
|
2
|
-
|
3
|
-
<%= semantic_form_for(resource, :as => resource_name,
|
4
|
-
:url => password_path(resource_name), :html => { :method => :put }) do |f| %>
|
5
|
-
<%= f.input :password %>
|
6
|
-
<%= f.input :password_confirmation, required: true %>
|
7
|
-
<%= f.input :reset_password_token, :as => :hidden %>
|
8
|
-
<%= f.actions do %>
|
9
|
-
<%= f.action :submit, label: t("devise.change_my_password", :default => "Change My Password") %>
|
10
|
-
<% end %>
|
11
|
-
<% end %>
|
@@ -1,9 +0,0 @@
|
|
1
|
-
<% @title = t("devise.forgot_password", :default => "Forgot Your Password?") %>
|
2
|
-
|
3
|
-
<%= semantic_form_for(resource, :as => resource_name,
|
4
|
-
:url => password_path(resource_name), :html => { :method => :post }) do |f| %>
|
5
|
-
<%= f.inputs :email %>
|
6
|
-
<%= f.actions do %>
|
7
|
-
<%= f.action :submit, label: t("devise.send_reset_password_instructions", :default => "Send me reset password instructions") %>
|
8
|
-
<% end %>
|
9
|
-
<% end %>
|
@@ -1,39 +0,0 @@
|
|
1
|
-
<% @title = t("devise.my_account", default: "My Account") %>
|
2
|
-
<%
|
3
|
-
if params[:user] && params[:user][:password]
|
4
|
-
email_class = ""
|
5
|
-
password_class = "active"
|
6
|
-
else
|
7
|
-
email_class = "active"
|
8
|
-
password_class = ""
|
9
|
-
end
|
10
|
-
%>
|
11
|
-
|
12
|
-
<div class="tabbable">
|
13
|
-
|
14
|
-
<ul class="nav nav-tabs">
|
15
|
-
<%= tab(t("devise.change_email", default: "Change Email"), "change_email", (email_class == "active")) %>
|
16
|
-
<%= tab(t("devise.change_password", default: "Change Password"), "change_password", (password_class == "active")) %>
|
17
|
-
</ul>
|
18
|
-
|
19
|
-
<%= semantic_form_for(resource, as: resource_name,
|
20
|
-
url: registration_path(resource_name), html: { method: :put }) do |f| %>
|
21
|
-
|
22
|
-
<div class="tab-content">
|
23
|
-
<%= f.inputs id: "change_email", class: ["tab-pane", email_class] do %>
|
24
|
-
<%= f.input :email, required: true %>
|
25
|
-
<% end %>
|
26
|
-
<%= f.inputs id: "change_password", class: ["tab-pane", password_class] do %>
|
27
|
-
<%= f.input :password, required: true %>
|
28
|
-
<%= f.input :password_confirmation, required: true %>
|
29
|
-
<% end %>
|
30
|
-
<%= f.inputs do %>
|
31
|
-
<%= f.input :current_password, required: true, hint: t("devise.current_password_hint", default: "We need your current password to confirm your changes.") %>
|
32
|
-
<% end %>
|
33
|
-
</div>
|
34
|
-
<%= f.actions do %>
|
35
|
-
<%= f.action :submit, label: t(:update, default: "Update") %>
|
36
|
-
<% end %>
|
37
|
-
<% end %>
|
38
|
-
|
39
|
-
</div>
|
@@ -1,11 +0,0 @@
|
|
1
|
-
<% @title = t("devise.sign_up", default: "Sign up") %>
|
2
|
-
|
3
|
-
<%= semantic_form_for(resource, as: resource_name,
|
4
|
-
url: registration_path(resource_name)) do |f| %>
|
5
|
-
<%= f.input :email %>
|
6
|
-
<%= f.input :password %>
|
7
|
-
<%= f.input :password_confirmation, required: true %>
|
8
|
-
<%= f.actions do %>
|
9
|
-
<%= f.action :submit, label: t("devise.sign_up", default: "Sign up") %>
|
10
|
-
<% end %>
|
11
|
-
<% end %>
|
@@ -1,26 +0,0 @@
|
|
1
|
-
<% @title ||= collection_title %>
|
2
|
-
|
3
|
-
<% if !collection.empty? %>
|
4
|
-
<table class="table table-striped">
|
5
|
-
<thead>
|
6
|
-
<tr>
|
7
|
-
<% attributes.each do |attribute_name| %>
|
8
|
-
<th><%= attribute_human_name(attribute_name) %></th>
|
9
|
-
<% end %>
|
10
|
-
<th> </th>
|
11
|
-
</tr>
|
12
|
-
</thead>
|
13
|
-
<tbody>
|
14
|
-
<% collection.each do |resource| %>
|
15
|
-
<tr>
|
16
|
-
<% attributes.each do |attribute_name| %>
|
17
|
-
<td><%= attribute_value(resource, attribute_name) %></td>
|
18
|
-
<% end %>
|
19
|
-
<td class="actions"><%= render_actions_for(resource) %></td>
|
20
|
-
</tr>
|
21
|
-
<% end %>
|
22
|
-
</tbody>
|
23
|
-
</table>
|
24
|
-
|
25
|
-
<%= paginate collection %>
|
26
|
-
<% end %>
|
@@ -1,15 +0,0 @@
|
|
1
|
-
module ActiveApplication
|
2
|
-
module Generators
|
3
|
-
class CancanGenerator < Rails::Generators::Base
|
4
|
-
argument :cancan_model, type: :string, default: "User"
|
5
|
-
|
6
|
-
def self.source_root
|
7
|
-
@source_root ||= File.join(File.dirname(__FILE__), "templates")
|
8
|
-
end
|
9
|
-
|
10
|
-
def setup_cancan
|
11
|
-
template "ability.rb", "app/models/ability.rb"
|
12
|
-
end
|
13
|
-
end
|
14
|
-
end
|
15
|
-
end
|
@@ -1,46 +0,0 @@
|
|
1
|
-
module ActiveApplication
|
2
|
-
module Generators
|
3
|
-
class DeviseGenerator < Rails::Generators::Base
|
4
|
-
argument :devise_model, type: :string, default: "User"
|
5
|
-
|
6
|
-
def self.source_root
|
7
|
-
@source_root ||= File.join(File.dirname(__FILE__), "templates")
|
8
|
-
end
|
9
|
-
|
10
|
-
def install_devise
|
11
|
-
generate "devise:install --quiet"
|
12
|
-
end
|
13
|
-
|
14
|
-
def generate_model
|
15
|
-
generate "active_record:devise #{self.devise_model.classify}"
|
16
|
-
end
|
17
|
-
|
18
|
-
# def add_route
|
19
|
-
# route "devise_for :#{self.devise_model.tableize}"
|
20
|
-
# end
|
21
|
-
|
22
|
-
def setup_model
|
23
|
-
model_file = "app/models/#{self.devise_model.underscore}.rb"
|
24
|
-
# gsub_file model_file, ":rememberable", ":confirmable"
|
25
|
-
# gsub_file model_file, ", :remember_me", ""
|
26
|
-
end
|
27
|
-
|
28
|
-
# def setup_initializer
|
29
|
-
# initializer_file = "config/initializers/devise.rb"
|
30
|
-
# gsub_file initializer_file,
|
31
|
-
# /config\.mailer_sender = .+$/,
|
32
|
-
# 'config.mailer_sender = "info@example.com"'
|
33
|
-
# end
|
34
|
-
|
35
|
-
# def setup_migrations
|
36
|
-
# migration_file =
|
37
|
-
# Dir["db/migrate/*create_#{self.devise_model.tableize}.rb"][0]
|
38
|
-
# gsub_file migration_file, "t.rememberable", "# t.rememberable"
|
39
|
-
# gsub_file migration_file, "# t.confirmable", "t.confirmable"
|
40
|
-
# gsub_file migration_file,
|
41
|
-
# "# add_index :#{self.devise_model.tableize}, :confirmation_token",
|
42
|
-
# "add_index :#{self.devise_model.tableize}, :confirmation_token"
|
43
|
-
# end
|
44
|
-
end
|
45
|
-
end
|
46
|
-
end
|
@@ -1,21 +0,0 @@
|
|
1
|
-
module ActiveApplication
|
2
|
-
module Generators
|
3
|
-
class InstallGenerator < Rails::Generators::Base
|
4
|
-
class_option :user_model, type: :string, default: "User"
|
5
|
-
class_option :authentication_engine, type: :string, default: "devise"
|
6
|
-
class_option :authorization_engine, type: :string, default: "cancan"
|
7
|
-
|
8
|
-
def install_authentication
|
9
|
-
if options[:authentication_engine] == "devise"
|
10
|
-
generate "active_application:devise #{options[:user_model].classify}"
|
11
|
-
end
|
12
|
-
end
|
13
|
-
|
14
|
-
def install_authorization
|
15
|
-
if options[:authorization_engine] == "cancan"
|
16
|
-
generate "active_application:cancan #{options[:user_model].classify}"
|
17
|
-
end
|
18
|
-
end
|
19
|
-
end
|
20
|
-
end
|
21
|
-
end
|