merbiful-release 0.1.2 → 0.2.1
Sign up to get free protection for your applications and to get access to all the features.
- data/Rakefile +1 -3
- data/lib/merbiful-release/admin.rb +15 -11
- data/lib/merbiful-release/admin.rb~ +3 -275
- data/lib/merbiful-release/body.rb +10 -2
- data/lib/merbiful-release/body.rb~ +6 -27
- data/lib/merbiful-release/controller.rb~ +12 -0
- data/lib/merbiful-release/css.rb~ +5 -20
- data/lib/merbiful-release/erubis.rb~ +2 -4
- data/lib/merbiful-release/eruby.rb~ +11 -0
- data/lib/merbiful-release/filters.rb +4 -9
- data/lib/merbiful-release/haml.rb~ +1 -13
- data/lib/merbiful-release/js.rb~ +11 -25
- data/lib/merbiful-release/layout.rb~ +18 -46
- data/lib/merbiful-release/merbiful.rb~ +8 -0
- data/lib/merbiful-release/page.rb~ +24 -76
- data/lib/merbiful-release/relative_time.rb~ +78 -0
- data/lib/merbiful-release/routes.rb~ +4 -0
- data/lib/merbiful-release/version.rb~ +45 -0
- data/lib/merbiful-release.rb +0 -4
- data/lib/merbiful-release.rb~ +1 -28
- data/templates/admin.css +5 -0
- data/templates/admin.css~ +2 -13
- data/templates/admin_layout.html.haml~ +5 -6
- data/templates/admin_layout.html.rhtml~ +10 -0
- data/templates/css.html.haml~ +7 -10
- data/templates/index.html.haml~ +2 -0
- data/templates/js.html.haml~ +22 -22
- data/templates/layouts.html.haml~ +0 -26
- data/templates/page_form.html.haml~ +1 -41
- data/templates/pages.html.haml~ +3 -0
- metadata +35 -52
- data/lib/merbiful-release/erubis.rb +0 -13
- data/lib/merbiful-release/filters.rb~ +0 -22
- data/lib/merbiful-release/haml.rb +0 -23
- data/lib/merbiful-release/images.rb~ +0 -14
- data/lib/merbiful-release/string.rb~ +0 -16
- data/templates/css.html.haml.orig +0 -28
- data/templates/images.html.haml~ +0 -17
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: merbiful-release
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1
|
4
|
+
version: 0.2.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Martin Kihlgren
|
@@ -9,29 +9,10 @@ autorequire: merbiful-release
|
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
11
|
|
12
|
-
date: 2008-
|
12
|
+
date: 2008-10-07 00:00:00 +02:00
|
13
13
|
default_executable:
|
14
|
-
dependencies:
|
15
|
-
|
16
|
-
name: merb-core
|
17
|
-
type: :runtime
|
18
|
-
version_requirement:
|
19
|
-
version_requirements: !ruby/object:Gem::Requirement
|
20
|
-
requirements:
|
21
|
-
- - ">="
|
22
|
-
- !ruby/object:Gem::Version
|
23
|
-
version: 0.9.5
|
24
|
-
version:
|
25
|
-
- !ruby/object:Gem::Dependency
|
26
|
-
name: dm-core
|
27
|
-
type: :runtime
|
28
|
-
version_requirement:
|
29
|
-
version_requirements: !ruby/object:Gem::Requirement
|
30
|
-
requirements:
|
31
|
-
- - ">="
|
32
|
-
- !ruby/object:Gem::Version
|
33
|
-
version: 0.9.5
|
34
|
-
version:
|
14
|
+
dependencies: []
|
15
|
+
|
35
16
|
description: Merb plugin that provides a simple CMS
|
36
17
|
email: martin@wemind.se
|
37
18
|
executables: []
|
@@ -44,49 +25,51 @@ files:
|
|
44
25
|
- Rakefile
|
45
26
|
- LICENSE
|
46
27
|
- lib/merbiful-release
|
47
|
-
- lib/merbiful-release/
|
28
|
+
- lib/merbiful-release/page.rb~
|
29
|
+
- lib/merbiful-release/layout.rb~
|
30
|
+
- lib/merbiful-release/merbiful.rb~
|
31
|
+
- lib/merbiful-release/routes.rb~
|
32
|
+
- lib/merbiful-release/routes.rb
|
48
33
|
- lib/merbiful-release/admin.rb~
|
49
|
-
- lib/merbiful-release/
|
50
|
-
- lib/merbiful-release/body.rb~
|
34
|
+
- lib/merbiful-release/controller.rb~
|
51
35
|
- lib/merbiful-release/controller.rb
|
52
|
-
- lib/merbiful-release/
|
36
|
+
- lib/merbiful-release/haml.rb~
|
37
|
+
- lib/merbiful-release/version.rb~
|
38
|
+
- lib/merbiful-release/body.rb~
|
53
39
|
- lib/merbiful-release/css.rb~
|
54
|
-
- lib/merbiful-release/
|
40
|
+
- lib/merbiful-release/js.rb~
|
41
|
+
- lib/merbiful-release/eruby.rb~
|
55
42
|
- lib/merbiful-release/erubis.rb~
|
56
|
-
- lib/merbiful-release/
|
57
|
-
- lib/merbiful-release/
|
58
|
-
- lib/merbiful-release/haml.rb
|
59
|
-
- lib/merbiful-release/haml.rb~
|
43
|
+
- lib/merbiful-release/relative_time.rb~
|
44
|
+
- lib/merbiful-release/relative_time.rb
|
60
45
|
- lib/merbiful-release/images.rb
|
61
|
-
- lib/merbiful-release/images.rb~
|
62
|
-
- lib/merbiful-release/js.rb
|
63
|
-
- lib/merbiful-release/js.rb~
|
64
46
|
- lib/merbiful-release/layout.rb
|
65
|
-
- lib/merbiful-release/
|
47
|
+
- lib/merbiful-release/admin.rb
|
48
|
+
- lib/merbiful-release/body.rb
|
49
|
+
- lib/merbiful-release/css.rb
|
50
|
+
- lib/merbiful-release/js.rb
|
66
51
|
- lib/merbiful-release/page.rb
|
67
|
-
- lib/merbiful-release/page.rb~
|
68
|
-
- lib/merbiful-release/relative_time.rb
|
69
|
-
- lib/merbiful-release/routes.rb
|
70
52
|
- lib/merbiful-release/string.rb
|
71
|
-
- lib/merbiful-release/
|
72
|
-
- lib/merbiful-release.rb
|
53
|
+
- lib/merbiful-release/filters.rb
|
73
54
|
- lib/merbiful-release.rb~
|
74
|
-
-
|
75
|
-
- templates/
|
76
|
-
- templates/
|
55
|
+
- lib/merbiful-release.rb
|
56
|
+
- templates/index.html.haml~
|
57
|
+
- templates/index.html.haml
|
77
58
|
- templates/admin_layout.html.haml~
|
78
|
-
- templates/
|
79
|
-
- templates/css
|
59
|
+
- templates/pages.html.haml~
|
60
|
+
- templates/admin.css~
|
61
|
+
- templates/page_form.html.haml~
|
62
|
+
- templates/layouts.html.haml~
|
63
|
+
- templates/admin_layout.html.rhtml~
|
80
64
|
- templates/css.html.haml~
|
65
|
+
- templates/js.html.haml~
|
66
|
+
- templates/admin.css
|
67
|
+
- templates/admin_layout.html.haml
|
81
68
|
- templates/images.html.haml
|
82
|
-
- templates/
|
83
|
-
- templates/
|
69
|
+
- templates/page_form.html.haml
|
70
|
+
- templates/css.html.haml
|
84
71
|
- templates/js.html.haml
|
85
|
-
- templates/js.html.haml~
|
86
72
|
- templates/layouts.html.haml
|
87
|
-
- templates/layouts.html.haml~
|
88
|
-
- templates/page_form.html.haml
|
89
|
-
- templates/page_form.html.haml~
|
90
73
|
has_rdoc: true
|
91
74
|
homepage: ""
|
92
75
|
post_install_message:
|
@@ -1,22 +0,0 @@
|
|
1
|
-
|
2
|
-
module Merbiful
|
3
|
-
|
4
|
-
module Filter
|
5
|
-
|
6
|
-
@filters = []
|
7
|
-
|
8
|
-
def self.register_filter(filter)
|
9
|
-
@filters << filter
|
10
|
-
end
|
11
|
-
|
12
|
-
def self.filters
|
13
|
-
@filters.inject([[nil, "Verbatim"]]) do |sum, filter|
|
14
|
-
filter_name = filter.name.gsub(/^Merbiful::/, "")
|
15
|
-
sum + [[filter_name, filter_name]]
|
16
|
-
end
|
17
|
-
end
|
18
|
-
|
19
|
-
end
|
20
|
-
|
21
|
-
end
|
22
|
-
|
@@ -1,23 +0,0 @@
|
|
1
|
-
|
2
|
-
module Merbiful
|
3
|
-
|
4
|
-
class Haml
|
5
|
-
|
6
|
-
def render(text, scope)
|
7
|
-
::Haml::Engine.new(text).render(scope)
|
8
|
-
end
|
9
|
-
|
10
|
-
end
|
11
|
-
|
12
|
-
class Sass
|
13
|
-
|
14
|
-
def render(text, scope)
|
15
|
-
::Sass::Engine.new(text).render
|
16
|
-
end
|
17
|
-
|
18
|
-
end
|
19
|
-
|
20
|
-
Filter.register_filter(Haml)
|
21
|
-
Filter.register_filter(Sass)
|
22
|
-
|
23
|
-
end
|
@@ -1,16 +0,0 @@
|
|
1
|
-
|
2
|
-
String.class_eval do
|
3
|
-
|
4
|
-
def cached_path
|
5
|
-
path = Pathname.new(File.join(Merb.root, "public", self))
|
6
|
-
raise "H4xx0r" unless path.to_s.index(Pathname.new(Merb.root).join("public").expand_path.to_s) == 0
|
7
|
-
if path.parent.file?
|
8
|
-
path.parent.unlink
|
9
|
-
elsif path.directory?
|
10
|
-
path = path.join("index.html")
|
11
|
-
end
|
12
|
-
path
|
13
|
-
end
|
14
|
-
|
15
|
-
|
16
|
-
end
|
@@ -1,28 +0,0 @@
|
|
1
|
-
%ul{:class => "images"}
|
2
|
-
- Merbiful::Images.all.each do |css|
|
3
|
-
%li{:class => "css"}
|
4
|
-
%ul{:class => "css_info info"}
|
5
|
-
%a{:href => url(:merbiful_admin, :action => "css", :css_id => css.id)}
|
6
|
-
%li{:class => "css_name"}= css.name
|
7
|
-
%li{:class => "css_version"}= "ver##{css.latest.id} (#{time_ago_in_words(css.latest.created_at)} ago)"
|
8
|
-
%li= link_to("-", url(:merbiful_admin, :action => "destroy_css", :css_id => css.id))
|
9
|
-
- if params[:css_id].to_s == css.id.to_s
|
10
|
-
%table.css
|
11
|
-
%form{:action => url(:merbiful_admin, :action => "css", :css_id => css.id), :method => "post"}
|
12
|
-
%tr
|
13
|
-
%td Name
|
14
|
-
%td= text_field(:name => "css[name]", :value => @form_css.name) + errors(@form_css, :name)
|
15
|
-
%tr
|
16
|
-
%td Body
|
17
|
-
%td~ text_area(@form_css.body, :name => "version[body]", :cols => 80, :rows => text_area_rows) + errors(@form_version, :body)
|
18
|
-
%tr{:class => "filter"}
|
19
|
-
%td Filter
|
20
|
-
%td= select(:name => "version[filter]", :collection => Merbiful::filters, :selected => @form_css.latest.filter) + errors(@form_version, :filter)
|
21
|
-
%tr
|
22
|
-
%td Media
|
23
|
-
%td= text_field(:name => "css[media]", :value => @form_css.media) + errors(@form_css, :media)
|
24
|
-
%tr{:class => "cached"}
|
25
|
-
%td Cached
|
26
|
-
%td= check_box(:name => "css[cached]", :checked => @form_css.cached) + errors(@form_css, :cached)
|
27
|
-
%tr{:class => "submit"}
|
28
|
-
%td{:colspan => "2"}= submit("Save")
|
data/templates/images.html.haml~
DELETED
@@ -1,17 +0,0 @@
|
|
1
|
-
- if Merbiful::Images.upload_possible?
|
2
|
-
%form{:action => url(:merbiful_admin, :action => "upload_image"), :enctype => "multipart/form-data", :method => "post"}
|
3
|
-
Upload new image
|
4
|
-
%input{:name => "image", :size => "30", :type => "file"}
|
5
|
-
%input{:type => "submit", :value => "Upload"}
|
6
|
-
- else
|
7
|
-
%p Upload seems to be impossible, perhaps the 'public/images' directory is not writable?
|
8
|
-
%ul{:class => "images"}
|
9
|
-
- Merbiful::Images.images.each do |image|
|
10
|
-
%li{:class => "image"}
|
11
|
-
%ul{:class => "image_info info"}
|
12
|
-
%a{:href => image}
|
13
|
-
%li{:class => "picture"}
|
14
|
-
%img{:height => 20, :src => image.to_s, :alt => image.to_s}
|
15
|
-
%li{:class => "path"}= image
|
16
|
-
- if Merbiful::Images.delete_possible?(image)
|
17
|
-
%a{:href => url(:merbiful_admin, :action => "delete_image", :path => image)} -
|