alchemy_cms 2.1.9.1 → 2.1.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. data/README.md +8 -4
  2. data/alchemy_cms.gemspec +1 -1
  3. data/app/assets/stylesheets/alchemy/base.css.scss +6 -0
  4. data/app/controllers/alchemy/admin/clipboard_controller.rb +3 -3
  5. data/app/helpers/alchemy/pages_helper.rb +6 -0
  6. data/app/views/alchemy/admin/trash/index.html.erb +4 -4
  7. data/app/views/alchemy/navigation/_link.html.erb +2 -1
  8. data/lib/alchemy/version.rb +1 -1
  9. data/spec/controllers/admin/clipboard_controller_spec.rb +2 -2
  10. metadata +111 -36
data/README.md CHANGED
@@ -1,12 +1,16 @@
1
1
  Alchemy CMS
2
2
  ===========
3
3
 
4
- [![Build Status](https://secure.travis-ci.org/magiclabs/alchemy_cms.png?branch=master)](http://travis-ci.org/magiclabs/alchemy_cms)
4
+ [![Build Status](https://secure.travis-ci.org/magiclabs/alchemy_cms.png?branch=2.1-stable)](http://travis-ci.org/magiclabs/alchemy_cms)
5
5
  [![Development Status](http://stillmaintained.com/magiclabs/alchemy_cms.png)](http://stillmaintained.com/magiclabs/alchemy_cms)
6
6
 
7
7
  About
8
8
  -----
9
9
 
10
+ Alchemy is a Rails 3 CMS with a flexible content storing architecture.
11
+
12
+ Read more on the [website](http://alchemy-cms.com) and in the [guidelines](http://guides.alchemy-cms.com).
13
+
10
14
  Features
11
15
  --------
12
16
 
@@ -29,11 +33,11 @@ Features
29
33
  Rails Version
30
34
  -------------
31
35
 
32
- This branch of Alchemy runs with Rails 3.1.3.
36
+ This branch of Alchemy runs with Rails 3.1.
33
37
 
34
- If you are looking for a Rails 3 compatible version check the 2.0-stable branch.
38
+ If you are looking for a Rails 3.0 compatible version check the 2.0-stable branch.
35
39
 
36
- If you are looking for a Rails 2 compatible version check the 1.6-stable branch.
40
+ If you are looking for a Rails 2.3 compatible version check the 1.6-stable branch.
37
41
 
38
42
  Ruby Version
39
43
  ------------
data/alchemy_cms.gemspec CHANGED
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
19
19
  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
20
20
  s.require_paths = ["lib"]
21
21
 
22
- s.add_runtime_dependency(%q<rails>, ["~> 3.1.4"])
22
+ s.add_runtime_dependency(%q<rails>, ["~> 3.1.6"])
23
23
  s.add_runtime_dependency(%q<authlogic>)
24
24
  s.add_runtime_dependency(%q<awesome_nested_set>, ["~> 2.0"])
25
25
  s.add_runtime_dependency(%q<declarative_authorization>, ["~> 0.5.4"])
data/app/assets/stylesheets/alchemy/base.css.scss CHANGED
@@ -1489,6 +1489,12 @@ div#overlay_toolbar a.button:active {
1489
1489
  }
1490
1490
  }
1491
1491
 
1492
+ #trash_items {
1493
+ height: 310px;
1494
+ overflow-x: hidden;
1495
+ overflow-y: auto;
1496
+ }
1497
+
1492
1498
  .mceEditor table {
1493
1499
  border-spacing: 0 !important;
1494
1500
  }
data/app/controllers/alchemy/admin/clipboard_controller.rb CHANGED
@@ -14,8 +14,8 @@ module Alchemy
14
14
  def insert
15
15
  @clipboard = get_clipboard(params[:remarkable_type])
16
16
  @item = model_class.find(params[:remarkable_id])
17
- unless @clipboard.collect { |i| i[:id].to_s }.include?(params[:remarkable_id])
18
- @clipboard.push({:id => params[:remarkable_id], :action => params[:remove] ? 'cut' : 'copy'})
17
+ unless @clipboard.collect { |i| i[:id].to_i }.include?(params[:remarkable_id].to_i)
18
+ @clipboard.push({:id => params[:remarkable_id].to_i, :action => params[:remove] ? 'cut' : 'copy'})
19
19
  end
20
20
  respond_to do |format|
21
21
  format.js
@@ -25,7 +25,7 @@ module Alchemy
25
25
  def remove
26
26
  @clipboard = get_clipboard(params[:remarkable_type])
27
27
  @item = model_class.find(params[:remarkable_id])
28
- @clipboard.delete_if { |i| i[:id].to_s == params[:remarkable_id] }
28
+ @clipboard.delete_if { |i| i[:id].to_i == params[:remarkable_id].to_i }
29
29
  respond_to do |format|
30
30
  format.js
31
31
  end
data/app/helpers/alchemy/pages_helper.rb CHANGED
@@ -219,6 +219,12 @@ module Alchemy
219
219
  @breadcrumb.include?(page)
220
220
  end
221
221
 
222
+ # Returns +'active'+ if the given external page is in the current url path or +nil+.
223
+ def external_page_css_class(page)
224
+ return nil if !page.redirects_to_external?
225
+ request.path.split('/').delete_if(&:blank?).first == page.urlname.gsub(/^\//, '') ? 'active' : nil
226
+ end
227
+
222
228
  # Returns page links in a breadcrumb beginning from root to current page.
223
229
  #
224
230
  # === Options:
data/app/views/alchemy/admin/trash/index.html.erb CHANGED
@@ -11,12 +11,12 @@
11
11
  </div>
12
12
  <div id="trash_items">
13
13
  <%- @elements.each do |element| -%>
14
- <%= render :partial => 'alchemy/admin/elements/element', :object => element, :locals => {:draggable => !@allowed_elements.detect { |e| e['name'] == element.name }.nil?} %>
14
+ <%= render :partial => 'alchemy/admin/elements/element', :object => element, :locals => {:draggable => !@allowed_elements.detect { |e| e['name'] == element.name }.nil? } %>
15
15
  <%- end -%>
16
- <p>
17
- <%= link_to_confirmation_window(t('clear trash'), t('Do you really want to clear the trash?'), alchemy.clear_admin_trash_path(:page_id => @page.id), :class => 'button') %>
18
- </p>
19
16
  </div>
17
+ <p>
18
+ <%= link_to_confirmation_window(t('clear trash'), t('Do you really want to clear the trash?'), alchemy.clear_admin_trash_path(:page_id => @page.id), :class => 'button') %>
19
+ </p>
20
20
  <%- end -%>
21
21
  </div>
22
22
  <script type="text/javascript" charset="utf-8">
data/app/views/alchemy/navigation/_link.html.erb CHANGED
@@ -3,7 +3,8 @@
3
3
  h(page.name),
4
4
  page.urlname,
5
5
  :title => (options[:show_title] == true ? page.title : nil),
6
- :target => configuration(:open_external_links_in_new_tab) ? '_blank' : nil
6
+ :target => configuration(:open_external_links_in_new_tab) ? '_blank' : nil,
7
+ :class => external_page_css_class(page)
7
8
  ) -%>
8
9
  <%- else -%>
9
10
  <%= link_to(
data/lib/alchemy/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Alchemy
2
2
 
3
- VERSION = "2.1.9.1"
3
+ VERSION = "2.1.11"
4
4
 
5
5
  end
data/spec/controllers/admin/clipboard_controller_spec.rb CHANGED
@@ -4,7 +4,7 @@ describe Alchemy::Admin::ClipboardController do
4
4
 
5
5
  before(:each) do
6
6
  activate_authlogic
7
- Alchemy::UserSession.create(Factory(:admin_user))
7
+ Alchemy::UserSession.create(Factory(:admin_user))
8
8
  end
9
9
 
10
10
  context "clipboard" do
@@ -15,7 +15,7 @@ describe Alchemy::Admin::ClipboardController do
15
15
  @another_element = Factory(:element, :page => @page)
16
16
  session['clipboard'] = { 'elements' => [{:id => @element.id, :action => 'copy'}] }
17
17
  post(:insert, {:remarkable_type => 'element', :remarkable_id => @another_element.id, :format => :js})
18
- session['clipboard']['elements'].should == [{:id => @element.id, :action => 'copy'}, {:id => @another_element.id.to_s, :action => 'copy'}]
18
+ session['clipboard']['elements'].should == [{:id => @element.id, :action => 'copy'}, {:id => @another_element.id, :action => 'copy'}]
19
19
  end
20
20
 
21
21
  it "should not have the same element twice" do
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: alchemy_cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.9.1
4
+ version: 2.1.11
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -11,22 +11,27 @@ authors:
11
11
  autorequire:
12
12
  bindir: bin
13
13
  cert_chain: []
14
- date: 2012-04-17 00:00:00.000000000 Z
14
+ date: 2012-06-15 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: rails
18
- requirement: &70284747089940 !ruby/object:Gem::Requirement
18
+ requirement: !ruby/object:Gem::Requirement
19
19
  none: false
20
20
  requirements:
21
21
  - - ~>
22
22
  - !ruby/object:Gem::Version
23
- version: 3.1.4
23
+ version: 3.1.6
24
24
  type: :runtime
25
25
  prerelease: false
26
- version_requirements: *70284747089940
26
+ version_requirements: !ruby/object:Gem::Requirement
27
+ none: false
28
+ requirements:
29
+ - - ~>
30
+ - !ruby/object:Gem::Version
31
+ version: 3.1.6
27
32
  - !ruby/object:Gem::Dependency
28
33
  name: authlogic
29
- requirement: &70284747092840 !ruby/object:Gem::Requirement
34
+ requirement: !ruby/object:Gem::Requirement
30
35
  none: false
31
36
  requirements:
32
37
  - - ! '>='
@@ -34,10 +39,15 @@ dependencies:
34
39
  version: '0'
35
40
  type: :runtime
36
41
  prerelease: false
37
- version_requirements: *70284747092840
42
+ version_requirements: !ruby/object:Gem::Requirement
43
+ none: false
44
+ requirements:
45
+ - - ! '>='
46
+ - !ruby/object:Gem::Version
47
+ version: '0'
38
48
  - !ruby/object:Gem::Dependency
39
49
  name: awesome_nested_set
40
- requirement: &70284747084300 !ruby/object:Gem::Requirement
50
+ requirement: !ruby/object:Gem::Requirement
41
51
  none: false
42
52
  requirements:
43
53
  - - ~>
@@ -45,10 +55,15 @@ dependencies:
45
55
  version: '2.0'
46
56
  type: :runtime
47
57
  prerelease: false
48
- version_requirements: *70284747084300
58
+ version_requirements: !ruby/object:Gem::Requirement
59
+ none: false
60
+ requirements:
61
+ - - ~>
62
+ - !ruby/object:Gem::Version
63
+ version: '2.0'
49
64
  - !ruby/object:Gem::Dependency
50
65
  name: declarative_authorization
51
- requirement: &70284746634060 !ruby/object:Gem::Requirement
66
+ requirement: !ruby/object:Gem::Requirement
52
67
  none: false
53
68
  requirements:
54
69
  - - ~>
@@ -56,10 +71,15 @@ dependencies:
56
71
  version: 0.5.4
57
72
  type: :runtime
58
73
  prerelease: false
59
- version_requirements: *70284746634060
74
+ version_requirements: !ruby/object:Gem::Requirement
75
+ none: false
76
+ requirements:
77
+ - - ~>
78
+ - !ruby/object:Gem::Version
79
+ version: 0.5.4
60
80
  - !ruby/object:Gem::Dependency
61
81
  name: tvdeyen-fleximage
62
- requirement: &70284746630840 !ruby/object:Gem::Requirement
82
+ requirement: !ruby/object:Gem::Requirement
63
83
  none: false
64
84
  requirements:
65
85
  - - ~>
@@ -67,10 +87,15 @@ dependencies:
67
87
  version: 1.2.0
68
88
  type: :runtime
69
89
  prerelease: false
70
- version_requirements: *70284746630840
90
+ version_requirements: !ruby/object:Gem::Requirement
91
+ none: false
92
+ requirements:
93
+ - - ~>
94
+ - !ruby/object:Gem::Version
95
+ version: 1.2.0
71
96
  - !ruby/object:Gem::Dependency
72
97
  name: kaminari
73
- requirement: &70284740758960 !ruby/object:Gem::Requirement
98
+ requirement: !ruby/object:Gem::Requirement
74
99
  none: false
75
100
  requirements:
76
101
  - - ~>
@@ -78,10 +103,15 @@ dependencies:
78
103
  version: 0.13.0
79
104
  type: :runtime
80
105
  prerelease: false
81
- version_requirements: *70284740758960
106
+ version_requirements: !ruby/object:Gem::Requirement
107
+ none: false
108
+ requirements:
109
+ - - ~>
110
+ - !ruby/object:Gem::Version
111
+ version: 0.13.0
82
112
  - !ruby/object:Gem::Dependency
83
113
  name: acts_as_ferret
84
- requirement: &70284740785920 !ruby/object:Gem::Requirement
114
+ requirement: !ruby/object:Gem::Requirement
85
115
  none: false
86
116
  requirements:
87
117
  - - ~>
@@ -89,10 +119,15 @@ dependencies:
89
119
  version: '0.5'
90
120
  type: :runtime
91
121
  prerelease: false
92
- version_requirements: *70284740785920
122
+ version_requirements: !ruby/object:Gem::Requirement
123
+ none: false
124
+ requirements:
125
+ - - ~>
126
+ - !ruby/object:Gem::Version
127
+ version: '0.5'
93
128
  - !ruby/object:Gem::Dependency
94
129
  name: acts_as_list
95
- requirement: &70284740784760 !ruby/object:Gem::Requirement
130
+ requirement: !ruby/object:Gem::Requirement
96
131
  none: false
97
132
  requirements:
98
133
  - - ~>
@@ -100,10 +135,15 @@ dependencies:
100
135
  version: '0.1'
101
136
  type: :runtime
102
137
  prerelease: false
103
- version_requirements: *70284740784760
138
+ version_requirements: !ruby/object:Gem::Requirement
139
+ none: false
140
+ requirements:
141
+ - - ~>
142
+ - !ruby/object:Gem::Version
143
+ version: '0.1'
104
144
  - !ruby/object:Gem::Dependency
105
145
  name: magiclabs-userstamp
106
- requirement: &70284740782660 !ruby/object:Gem::Requirement
146
+ requirement: !ruby/object:Gem::Requirement
107
147
  none: false
108
148
  requirements:
109
149
  - - ~>
@@ -111,10 +151,15 @@ dependencies:
111
151
  version: 2.0.2
112
152
  type: :runtime
113
153
  prerelease: false
114
- version_requirements: *70284740782660
154
+ version_requirements: !ruby/object:Gem::Requirement
155
+ none: false
156
+ requirements:
157
+ - - ~>
158
+ - !ruby/object:Gem::Version
159
+ version: 2.0.2
115
160
  - !ruby/object:Gem::Dependency
116
161
  name: dynamic_form
117
- requirement: &70284740797300 !ruby/object:Gem::Requirement
162
+ requirement: !ruby/object:Gem::Requirement
118
163
  none: false
119
164
  requirements:
120
165
  - - ~>
@@ -122,10 +167,15 @@ dependencies:
122
167
  version: '1.1'
123
168
  type: :runtime
124
169
  prerelease: false
125
- version_requirements: *70284740797300
170
+ version_requirements: !ruby/object:Gem::Requirement
171
+ none: false
172
+ requirements:
173
+ - - ~>
174
+ - !ruby/object:Gem::Version
175
+ version: '1.1'
126
176
  - !ruby/object:Gem::Dependency
127
177
  name: jquery-rails
128
- requirement: &70284740796020 !ruby/object:Gem::Requirement
178
+ requirement: !ruby/object:Gem::Requirement
129
179
  none: false
130
180
  requirements:
131
181
  - - ~>
@@ -133,10 +183,15 @@ dependencies:
133
183
  version: 1.0.16
134
184
  type: :runtime
135
185
  prerelease: false
136
- version_requirements: *70284740796020
186
+ version_requirements: !ruby/object:Gem::Requirement
187
+ none: false
188
+ requirements:
189
+ - - ~>
190
+ - !ruby/object:Gem::Version
191
+ version: 1.0.16
137
192
  - !ruby/object:Gem::Dependency
138
193
  name: attachment_magic
139
- requirement: &70284740792180 !ruby/object:Gem::Requirement
194
+ requirement: !ruby/object:Gem::Requirement
140
195
  none: false
141
196
  requirements:
142
197
  - - ~>
@@ -144,10 +199,15 @@ dependencies:
144
199
  version: 0.2.1
145
200
  type: :runtime
146
201
  prerelease: false
147
- version_requirements: *70284740792180
202
+ version_requirements: !ruby/object:Gem::Requirement
203
+ none: false
204
+ requirements:
205
+ - - ~>
206
+ - !ruby/object:Gem::Version
207
+ version: 0.2.1
148
208
  - !ruby/object:Gem::Dependency
149
209
  name: sass-rails
150
- requirement: &70284740791220 !ruby/object:Gem::Requirement
210
+ requirement: !ruby/object:Gem::Requirement
151
211
  none: false
152
212
  requirements:
153
213
  - - ~>
@@ -155,10 +215,15 @@ dependencies:
155
215
  version: 3.1.4
156
216
  type: :runtime
157
217
  prerelease: false
158
- version_requirements: *70284740791220
218
+ version_requirements: !ruby/object:Gem::Requirement
219
+ none: false
220
+ requirements:
221
+ - - ~>
222
+ - !ruby/object:Gem::Version
223
+ version: 3.1.4
159
224
  - !ruby/object:Gem::Dependency
160
225
  name: rspec-rails
161
- requirement: &70284740804680 !ruby/object:Gem::Requirement
226
+ requirement: !ruby/object:Gem::Requirement
162
227
  none: false
163
228
  requirements:
164
229
  - - ~>
@@ -166,10 +231,15 @@ dependencies:
166
231
  version: '2.8'
167
232
  type: :development
168
233
  prerelease: false
169
- version_requirements: *70284740804680
234
+ version_requirements: !ruby/object:Gem::Requirement
235
+ none: false
236
+ requirements:
237
+ - - ~>
238
+ - !ruby/object:Gem::Version
239
+ version: '2.8'
170
240
  - !ruby/object:Gem::Dependency
171
241
  name: sqlite3
172
- requirement: &70284740803480 !ruby/object:Gem::Requirement
242
+ requirement: !ruby/object:Gem::Requirement
173
243
  none: false
174
244
  requirements:
175
245
  - - ! '>='
@@ -177,7 +247,12 @@ dependencies:
177
247
  version: '0'
178
248
  type: :development
179
249
  prerelease: false
180
- version_requirements: *70284740803480
250
+ version_requirements: !ruby/object:Gem::Requirement
251
+ none: false
252
+ requirements:
253
+ - - ! '>='
254
+ - !ruby/object:Gem::Version
255
+ version: '0'
181
256
  description: Alchemy is a Rails 3 CMS with a flexible content storing architecture.
182
257
  email:
183
258
  - alchemy@magiclabs.de
@@ -816,7 +891,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
816
891
  version: '0'
817
892
  segments:
818
893
  - 0
819
- hash: 219358527196005840
894
+ hash: 3542557089447580413
820
895
  required_rubygems_version: !ruby/object:Gem::Requirement
821
896
  none: false
822
897
  requirements:
@@ -825,11 +900,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
825
900
  version: '0'
826
901
  segments:
827
902
  - 0
828
- hash: 219358527196005840
903
+ hash: 3542557089447580413
829
904
  requirements:
830
905
  - ImageMagick (libmagick), v6.6 or greater.
831
906
  rubyforge_project:
832
- rubygems_version: 1.8.15
907
+ rubygems_version: 1.8.24
833
908
  signing_key:
834
909
  specification_version: 3
835
910
  summary: An extremly flexbile CMS for Rails 3.1.