cartoonist 0.0.8 → 0.0.9
Sign up to get free protection for your applications and to get access to all the features.
- data/app/assets/stylesheets/admin.css.scss +2 -0
- data/app/controllers/{accounts_controller.rb → admin/accounts_controller.rb} +4 -4
- data/app/controllers/{cache_controller.rb → admin/cache_controller.rb} +6 -6
- data/app/controllers/{settings_controller.rb → admin/settings_controller.rb} +11 -6
- data/app/controllers/{static_cache_controller.rb → admin/static_cache_controller.rb} +3 -3
- data/app/controllers/admin_controller.rb +7 -33
- data/app/controllers/cartoonist_controller.rb +1 -1
- data/app/helpers/{cache_helper.rb → admin/cache_helper.rb} +1 -1
- data/app/helpers/admin/settings_helper.rb +17 -0
- data/app/models/entity.rb +104 -0
- data/app/models/postable.rb +59 -0
- data/app/models/setting.rb +70 -26
- data/app/models/simple_template.rb +2 -0
- data/app/views/{accounts → admin/accounts}/edit.html.erb +1 -1
- data/app/views/{accounts → admin/accounts}/index.html.erb +3 -3
- data/app/views/{accounts → admin/accounts}/new.html.erb +1 -1
- data/app/views/{accounts → admin/accounts}/show.html.erb +1 -1
- data/app/views/{cache → admin/cache}/index.html.erb +5 -5
- data/app/views/{settings → admin/settings}/initial_setup.html.erb +1 -1
- data/app/views/{settings → admin/settings}/show.html.erb +18 -6
- data/app/views/{static_cache → admin/static_cache}/index.html.erb +2 -2
- data/app/views/layouts/admin.html.erb +2 -2
- data/app/views/layouts/admin/accounts.html.erb +8 -0
- data/app/views/layouts/{initial_setup.html.erb → admin/initial_setup.html.erb} +0 -0
- data/app/views/layouts/general_admin.html.erb +3 -3
- data/cartoonist.gemspec +0 -1
- data/config/locales/en.yml +0 -11
- data/lib/cartoonist.rb +47 -1
- data/lib/cartoonist/engine.rb +75 -91
- metadata +28 -37
- data/app/models/tweetable.rb +0 -17
- data/app/views/layouts/accounts.html.erb +0 -8
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: cartoonist
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.9
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,11 +9,11 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2012-
|
12
|
+
date: 2012-05-15 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: devise
|
16
|
-
requirement: &
|
16
|
+
requirement: &11950700 !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - ~>
|
@@ -21,10 +21,10 @@ dependencies:
|
|
21
21
|
version: 2.0.0
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
|
-
version_requirements: *
|
24
|
+
version_requirements: *11950700
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: jquery-rails
|
27
|
-
requirement: &
|
27
|
+
requirement: &11937860 !ruby/object:Gem::Requirement
|
28
28
|
none: false
|
29
29
|
requirements:
|
30
30
|
- - ~>
|
@@ -32,10 +32,10 @@ dependencies:
|
|
32
32
|
version: 2.0.0
|
33
33
|
type: :runtime
|
34
34
|
prerelease: false
|
35
|
-
version_requirements: *
|
35
|
+
version_requirements: *11937860
|
36
36
|
- !ruby/object:Gem::Dependency
|
37
37
|
name: railties
|
38
|
-
requirement: &
|
38
|
+
requirement: &11935680 !ruby/object:Gem::Requirement
|
39
39
|
none: false
|
40
40
|
requirements:
|
41
41
|
- - ~>
|
@@ -43,10 +43,10 @@ dependencies:
|
|
43
43
|
version: 3.2.0
|
44
44
|
type: :runtime
|
45
45
|
prerelease: false
|
46
|
-
version_requirements: *
|
46
|
+
version_requirements: *11935680
|
47
47
|
- !ruby/object:Gem::Dependency
|
48
48
|
name: redcarpet
|
49
|
-
requirement: &
|
49
|
+
requirement: &11934640 !ruby/object:Gem::Requirement
|
50
50
|
none: false
|
51
51
|
requirements:
|
52
52
|
- - ~>
|
@@ -54,18 +54,7 @@ dependencies:
|
|
54
54
|
version: 2.1.0
|
55
55
|
type: :runtime
|
56
56
|
prerelease: false
|
57
|
-
version_requirements: *
|
58
|
-
- !ruby/object:Gem::Dependency
|
59
|
-
name: twitter
|
60
|
-
requirement: &6814720 !ruby/object:Gem::Requirement
|
61
|
-
none: false
|
62
|
-
requirements:
|
63
|
-
- - ~>
|
64
|
-
- !ruby/object:Gem::Version
|
65
|
-
version: 2.2.0
|
66
|
-
type: :runtime
|
67
|
-
prerelease: false
|
68
|
-
version_requirements: *6814720
|
57
|
+
version_requirements: *11934640
|
69
58
|
description: This provides the main functionality and plugin api for Cartoonist.
|
70
59
|
email: reasonnumber@gmail.com
|
71
60
|
executables: []
|
@@ -75,44 +64,46 @@ files:
|
|
75
64
|
- .gitignore
|
76
65
|
- app/assets/javascripts/cartoonist.js.erb
|
77
66
|
- app/assets/stylesheets/admin.css.scss
|
78
|
-
- app/controllers/accounts_controller.rb
|
67
|
+
- app/controllers/admin/accounts_controller.rb
|
68
|
+
- app/controllers/admin/cache_controller.rb
|
69
|
+
- app/controllers/admin/settings_controller.rb
|
70
|
+
- app/controllers/admin/static_cache_controller.rb
|
79
71
|
- app/controllers/admin_controller.rb
|
80
|
-
- app/controllers/cache_controller.rb
|
81
72
|
- app/controllers/cartoonist_controller.rb
|
82
|
-
- app/controllers/settings_controller.rb
|
83
73
|
- app/controllers/site_controller.rb
|
84
|
-
- app/
|
85
|
-
- app/helpers/
|
74
|
+
- app/helpers/admin/cache_helper.rb
|
75
|
+
- app/helpers/admin/settings_helper.rb
|
86
76
|
- app/helpers/cartoonist_helper.rb
|
87
77
|
- app/models/backup.rb
|
88
78
|
- app/models/database_file.rb
|
79
|
+
- app/models/entity.rb
|
89
80
|
- app/models/markdown.rb
|
90
81
|
- app/models/page_cache.rb
|
82
|
+
- app/models/postable.rb
|
91
83
|
- app/models/setting.rb
|
92
84
|
- app/models/simple_template.rb
|
93
85
|
- app/models/sitemap_entry.rb
|
94
86
|
- app/models/static_cache.rb
|
95
|
-
- app/models/tweetable.rb
|
96
87
|
- app/models/user.rb
|
97
|
-
- app/views/accounts/edit.html.erb
|
98
|
-
- app/views/accounts/index.html.erb
|
99
|
-
- app/views/accounts/new.html.erb
|
100
|
-
- app/views/accounts/show.html.erb
|
88
|
+
- app/views/admin/accounts/edit.html.erb
|
89
|
+
- app/views/admin/accounts/index.html.erb
|
90
|
+
- app/views/admin/accounts/new.html.erb
|
91
|
+
- app/views/admin/accounts/show.html.erb
|
92
|
+
- app/views/admin/cache/index.html.erb
|
101
93
|
- app/views/admin/main.html.erb
|
102
|
-
- app/views/
|
103
|
-
- app/views/
|
94
|
+
- app/views/admin/settings/initial_setup.html.erb
|
95
|
+
- app/views/admin/settings/show.html.erb
|
96
|
+
- app/views/admin/static_cache/index.html.erb
|
104
97
|
- app/views/layouts/admin.html.erb
|
98
|
+
- app/views/layouts/admin/accounts.html.erb
|
99
|
+
- app/views/layouts/admin/initial_setup.html.erb
|
105
100
|
- app/views/layouts/cartoonist.html.erb
|
106
101
|
- app/views/layouts/cartoonist.rss.erb
|
107
102
|
- app/views/layouts/cartoonist.xml.erb
|
108
103
|
- app/views/layouts/general_admin.html.erb
|
109
|
-
- app/views/layouts/initial_setup.html.erb
|
110
104
|
- app/views/layouts/users.html.erb
|
111
|
-
- app/views/settings/initial_setup.html.erb
|
112
|
-
- app/views/settings/show.html.erb
|
113
105
|
- app/views/site/robots.text.erb
|
114
106
|
- app/views/site/sitemap.xml.erb
|
115
|
-
- app/views/static_cache/index.html.erb
|
116
107
|
- cartoonist.gemspec
|
117
108
|
- config/locales/devise.en.yml
|
118
109
|
- config/locales/en.yml
|
data/app/models/tweetable.rb
DELETED
@@ -1,17 +0,0 @@
|
|
1
|
-
module Tweetable
|
2
|
-
def tweet!
|
3
|
-
return if tweeted?
|
4
|
-
return unless Time.now >= expected_tweet_time
|
5
|
-
|
6
|
-
if Rails.env.production?
|
7
|
-
Twitter.update tweet
|
8
|
-
end
|
9
|
-
|
10
|
-
self.tweeted_at = Time.now
|
11
|
-
save!
|
12
|
-
end
|
13
|
-
|
14
|
-
def tweeted?
|
15
|
-
tweeted_at.present?
|
16
|
-
end
|
17
|
-
end
|
@@ -1,8 +0,0 @@
|
|
1
|
-
<% content_for :subtabs do %>
|
2
|
-
<a class="subtab" href="/accounts/<%= current_user.id %>"><%= t "admin.accounts.layout.my_account" %></a>
|
3
|
-
<a class="subtab" href="/accounts"><%= t "admin.accounts.layout.users" %></a>
|
4
|
-
<% end %>
|
5
|
-
|
6
|
-
<% content_for :page_title, t("admin.accounts.layout.section") %>
|
7
|
-
<% content_for(:content) { yield } %>
|
8
|
-
<%= render :template => "layouts/admin" %>
|