imagine_cms 4.0.1 → 4.1.0

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.
@@ -68,7 +68,7 @@
68
68
  position: absolute;
69
69
  width: 100%;
70
70
  height: 1px;
71
- background: transparent url(/assets/cropper/marqueeHoriz.gif) repeat-x 0 0;
71
+ background: transparent asset-url('cropper/marqueeHoriz.gif') repeat-x 0 0;
72
72
  z-index: 3;
73
73
  }
74
74
 
@@ -76,7 +76,7 @@
76
76
  position: absolute;
77
77
  height: 100%;
78
78
  width: 1px;
79
- background: transparent url(/assets/cropper/marqueeVert.gif) repeat-y 0 0;
79
+ background: transparent asset-url('cropper/marqueeVert.gif') repeat-y 0 0;
80
80
  z-index: 3;
81
81
  }
82
82
 
@@ -66,7 +66,7 @@
66
66
  position: absolute;
67
67
  width: 100%;
68
68
  height: 1px;
69
- background: transparent url(/assets/cropper/marqueeHoriz.gif) repeat-x 0 0;
69
+ background: transparent asset-url('cropper/marqueeHoriz.gif') repeat-x 0 0;
70
70
  z-index: 3;
71
71
  }
72
72
 
@@ -74,7 +74,7 @@
74
74
  position: absolute;
75
75
  height: 100%;
76
76
  width: 1px;
77
- background: transparent url(/assets/cropper/marqueeVert.gif) repeat-y 0 0;
77
+ background: transparent asset-url('cropper/marqueeVert.gif') repeat-y 0 0;
78
78
  z-index: 3;
79
79
  }
80
80
 
@@ -239,7 +239,7 @@ module Cms # :nodoc:
239
239
  conds << "(title regexp ?)"
240
240
  vars << "[[:<:]](#{term_variant})[[:>:]]"
241
241
  end
242
- @pages.concat CmsPage.find(:all, :conditions => [ conds.join(' and ') ].concat(vars))
242
+ @pages.concat CmsPage.where([ conds.join(' and ') ].concat(vars))
243
243
 
244
244
  conds = [ 'published_version >= 0' ]
245
245
  vars = []
@@ -247,11 +247,11 @@ module Cms # :nodoc:
247
247
  conds << "(title regexp ? or search_index regexp ?)"
248
248
  vars << "[[:<:]](#{term_variant})[[:>:]]" << "[[:<:]](#{term_variant})[[:>:]]"
249
249
  end
250
- @pages.concat CmsPage.find(:all, :conditions => [ conds.join(' and ') ].concat(vars))
250
+ @pages.concat CmsPage.where([ conds.join(' and ') ].concat(vars))
251
251
 
252
252
  # fulltext doesn't work with innodb... may need to make a separate myisam
253
253
  # table just for search. (this would be better because it would sort by relevance)
254
- # @pages.concat CmsPage.find(:all, :conditions => [ 'match (title, search_index) against (?)', params[:q] ])
254
+ # @pages.concat CmsPage.where('match (title, search_index) against (?)', params[:q])
255
255
  end
256
256
  @pages = @pages.uniq.reject { |pg| pg.search_index.blank? }.first(100)
257
257
 
@@ -218,7 +218,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
218
218
  params[:tags].split(',').map(&:strip).reject(&:blank?).each do |t|
219
219
  if existing_tags.include?(t)
220
220
  # still in use, don't delete
221
- tags_to_delete.reject! { |tag| tag.name == t }
221
+ tags_to_delete = tags_to_delete.reject { |tag| tag.name == t }
222
222
  else
223
223
  # doesn't exist, create
224
224
  @pg.tags.create(:name => t)
@@ -241,7 +241,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
241
241
  obj ||= @pg.objects.build(:name => $2, :obj_type => $1)
242
242
  obj.content = val
243
243
  obj.save
244
- objects_to_delete.reject! { |obj| obj.name == $2 }
244
+ objects_to_delete = objects_to_delete.reject { |obj| obj.name == $2 }
245
245
  end
246
246
  end
247
247
 
@@ -485,7 +485,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
485
485
  end
486
486
 
487
487
  old_objs.each do |obj|
488
- unless @pg.objects.find(:all, :conditions => [ 'name = ? and cms_page_version = ?', obj.name, @pg.version])
488
+ unless @pg.objects.where(name: obj.name, cms_page_version: @pg.version)
489
489
  obj = @pg.objects.build(:name => obj.name, :obj_type => obj.type, :content => obj.content)
490
490
  end
491
491
  end
@@ -504,7 +504,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
504
504
 
505
505
  load_page_objects
506
506
  @pg.revert_to(params[:version]) if params[:version]
507
- @pg.objects.find(:all, :conditions => [ 'cms_page_version = ?', @pg.version]).each do |obj|
507
+ @pg.objects.where(cms_page_version: @pg.version).each do |obj|
508
508
  key = "obj-#{obj.obj_type.to_s}-#{obj.name}"
509
509
  @page_objects[key] = obj.content
510
510
  end
@@ -565,7 +565,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
565
565
 
566
566
  # send email to request administrative review
567
567
  # find all users with email address set
568
- User.find(:all).reject { |u| !u.active? || !u.can_manage_cms_publishing? || !u.cms_allowed_sections.blank? }.each do |u|
568
+ User.all.reject { |u| !u.active? || !u.can_manage_cms_publishing? || !u.cms_allowed_sections.blank? }.each do |u|
569
569
  next unless valid_email_address?(u.email_address)
570
570
  begin
571
571
  Mailer.deliver_cms_request_review(url_for(:controller => '/cms/content', :action => 'show', :content_path => []) + @pg.path, @pg.title, @version, u, @user, params[:change_description].to_s)
@@ -1530,16 +1530,21 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
1530
1530
  s3success = false
1531
1531
 
1532
1532
  if ImagineCmsConfig['amazon_s3'] && ImagineCmsConfig['amazon_s3']['enabled']
1533
+ s3 = Aws::S3::Client.new
1534
+
1533
1535
  bucket ||= ImagineCmsConfig['amazon_s3'][Rails.env]['image_bucket']
1534
1536
  prefix ||= ImagineCmsConfig['amazon_s3']['image_prefix']
1535
1537
 
1536
- # set options + metadata
1537
- options = ImagineCmsConfig['amazon_s3']['metadata']
1538
- options[:access] = :public_read
1538
+ params = {}
1539
+ params[:bucket] = bucket
1540
+ params[:key] = "#{prefix}/#{page.path.blank? ? 'index' : page.path}/#{File.basename(filename)}"
1541
+ params[:body] = open(filename)
1542
+ params[:acl] = 'public-read'
1543
+ params[:metadata] = ImagineCmsConfig['amazon_s3']['metadata']
1539
1544
 
1540
- while s3retries < 2 && !s3success
1541
- response = AWS::S3::S3Object.store("#{prefix}/#{page.path.blank? ? 'index' : page.path}/#{File.basename(filename)}", open(filename), bucket, options)
1542
- s3success = response.code == 200
1545
+ while !s3success && s3retries < 2
1546
+ response = s3.put_object(params)
1547
+ s3success = response.successful?
1543
1548
  s3retries += 1
1544
1549
  end
1545
1550
  File.unlink(filename) if s3success
@@ -13,7 +13,7 @@ class UtilController < ApplicationController # :nodoc:
13
13
  @css_prefix = params[:css_prefix].to_s.gsub(/[^-\w]/, '')
14
14
  @popout_direction = params[:popout_direction]
15
15
 
16
- events = @calendar.events.find(:all, :conditions => [ 'start_date >= ? and start_date < ?', first_of_month, last_of_month + 1.day ])
16
+ events = @calendar.events.where('start_date >= ? and start_date < ?', first_of_month, last_of_month + 1.day)
17
17
 
18
18
  @event_days = {}
19
19
  events.each do |e|
@@ -87,7 +87,7 @@ class CmsPage < ActiveRecord::Base
87
87
 
88
88
  if self.published_version.to_i >= 0
89
89
  idx_version = self.published_version.to_i == 0 ? self.version : self.published_version
90
- self.objects.find(:all, :conditions => [ "cms_page_version = ? and (obj_type = 'text' or obj_type = 'string')", idx_version ]).each do |obj|
90
+ self.objects.where(cms_page_version: idx_version, obj_type: [ 'text', 'string' ]).each do |obj|
91
91
  content << obj.content << "\n"
92
92
  end
93
93
  end
@@ -164,8 +164,8 @@ Pressing "Save Feature Image" will crop the image and set it as the new feature
164
164
  x <%= text_field :image, :max_height, :size => 3, :value => @height, :onchange => "recalculateWidth();" %>
165
165
  <%= javascript_tag "$('image_max_width').onkeydown = disableEnterKey; $('image_max_height').onkeydown = disableEnterKey;" %>
166
166
 
167
- <%= image_tag('/assets/management/icon_unlocked.png', :id => 'icon_unlocked', :onclick => "lockImageSize();") %>
168
- <%= image_tag('/assets/management/icon_locked.png', :id => 'icon_locked', :onclick => "unlockImageSize();", :style => 'display: none;') %>
167
+ <%= image_tag('management/icon_unlocked.png', :id => 'icon_unlocked', :onclick => "lockImageSize();") %>
168
+ <%= image_tag('management/icon_locked.png', :id => 'icon_locked', :onclick => "unlockImageSize();", :style => 'display: none;') %>
169
169
 
170
170
  <%= link_to_function "Apply", "resizeCropperScaled();" %> |
171
171
  <%= link_to_function "Reset", "cropper.reset(); resize_ratio = 1.0;" %>
@@ -164,8 +164,8 @@ Pressing "Save Image" will crop the image and insert it into the page.
164
164
  x <%= text_field :image, :max_height, :size => 3, :value => @height, :onchange => "recalculateWidth();" %>
165
165
  <%= javascript_tag "$('image_max_width').onkeydown = disableEnterKey; $('image_max_height').onkeydown = disableEnterKey;" %>
166
166
 
167
- <%= image_tag('/assets/management/icon_unlocked.png', :id => 'icon_unlocked', :onclick => "lockImageSize();") %>
168
- <%= image_tag('/assets/management/icon_locked.png', :id => 'icon_locked', :onclick => "unlockImageSize();", :style => 'display: none;') %>
167
+ <%= image_tag('management/icon_unlocked.png', :id => 'icon_unlocked', :onclick => "lockImageSize();") %>
168
+ <%= image_tag('management/icon_locked.png', :id => 'icon_locked', :onclick => "unlockImageSize();", :style => 'display: none;') %>
169
169
 
170
170
  <%= link_to_function "Apply", "resizeCropperScaled();" %> |
171
171
  <%= link_to_function "Reset", "cropper.reset(); resize_ratio = 1.0;" %>
@@ -164,8 +164,8 @@ Pressing "Save Thumbnail" will crop the thumbnail and set it as the new thumbnai
164
164
  x <%= text_field :image, :max_height, :size => 3, :value => @height, :onchange => "recalculateWidth();" %>
165
165
  <%= javascript_tag "$('image_max_width').onkeydown = disableEnterKey; $('image_max_height').onkeydown = disableEnterKey;" %>
166
166
 
167
- <%= image_tag('/assets/management/icon_unlocked.png', :id => 'icon_unlocked', :onclick => "lockImageSize();") %>
168
- <%= image_tag('/assets/management/icon_locked.png', :id => 'icon_locked', :onclick => "unlockImageSize();", :style => 'display: none;') %>
167
+ <%= image_tag('management/icon_unlocked.png', :id => 'icon_unlocked', :onclick => "lockImageSize();") %>
168
+ <%= image_tag('management/icon_locked.png', :id => 'icon_locked', :onclick => "unlockImageSize();", :style => 'display: none;') %>
169
169
 
170
170
  <%= link_to_function "Apply", "resizeCropperScaled();" %> |
171
171
  <%= link_to_function "Reset", "cropper.reset(); resize_ratio = 1.0;" %>
@@ -1,6 +1,6 @@
1
1
  <table>
2
2
  <tr valign="top">
3
- <td><%= image_tag "/assets/content/#{params[:path]}/#{params[:gallery_id]}/#{params[:image]}" %></td>
3
+ <td><%= image_tag "content/#{params[:path]}/#{params[:gallery_id]}/#{params[:image]}" %></td>
4
4
  <td style="padding-left: 10px;">
5
5
  <div id="caption_container" style="margin-bottom: 20px;">
6
6
  <strong>Caption</strong><br/>
@@ -26,7 +26,7 @@
26
26
  all_images.each { |img| images << img unless File.basename(img).include?('thumb') }
27
27
  -%>
28
28
  <div id="<%= File.basename(gallery) %>" style="float: left; width: 130px; margin: 0 20px 20px 0; text-align: center;">
29
- <%= link_to_remote image_tag(File.join('/assets/content', @pg.path, File.basename(gallery), 'management', 'preview.jpg')),
29
+ <%= link_to_remote image_tag(File.join('content', @pg.path, File.basename(gallery), 'management', 'preview.jpg')),
30
30
  :url => { :action => 'select_gallery', :id => @pg, :gallery_id => File.basename(gallery) },
31
31
  :update => 'select_gallery_container' %><br/>
32
32
  <strong><%= File.basename(gallery).titleize %></strong><br/>
@@ -13,14 +13,14 @@
13
13
  <td bgcolor="#dedede" width="10%">&nbsp;</td>
14
14
  <td bgcolor="#dedede" width="10%">&nbsp;</td>
15
15
  </tr>
16
- <% for u in @users %>
16
+ <%- @users.each do |u| %>
17
17
  <tr>
18
18
  <td><%= link_to u.username, :action => 'edit', :id => u %></td>
19
19
  <td><%= u.first_name %></td>
20
20
  <td><%= u.last_name %></td>
21
21
  <td><%= u.active? ? 'Y' : 'N' %>
22
- <td><%= button_to((u.active ? 'Disable' : 'Enable'), { :action => (u.active ? 'disable' : 'enable'), :id => u}, { :class => 'form_button' }) if u.username != session[:user_username] %></td>
23
- <td><%= button_to('Delete', { :action => 'destroy', :id => u }, { :confirm => 'Are you sure you want to delete ' + u.username + '?', :class => 'form_button' }) if u.username != session[:user_username] %></td>
22
+ <td><%= button_to(u.active? ? 'Disable' : 'Enable', { :action => (u.active? ? 'disable' : 'enable'), :id => u}, :class => 'form_button') if u.username != session[:user_username] %></td>
23
+ <td><%= button_to('Delete', { :action => 'destroy', :id => u }, :method => :delete, :class => 'form_button', :data => { :confirm => 'Are you sure you want to delete ' + u.username + '?' }) if u.username != session[:user_username] %></td>
24
24
  </tr>
25
25
  <% end %>
26
26
  </table>
@@ -4,10 +4,9 @@ if File.exists?(config_file)
4
4
  ImagineCmsConfig = YAML.load(File.read(config_file))
5
5
 
6
6
  if ImagineCmsConfig['amazon_s3'] && ImagineCmsConfig['amazon_s3']['enabled']
7
- AWS::S3::Base.establish_connection!(
8
- :access_key_id => ImagineCmsConfig['amazon_s3'][Rails.env]['access_key_id'],
9
- :secret_access_key => ImagineCmsConfig['amazon_s3'][Rails.env]['secret_access_key']
10
- )
7
+ Aws.config[:s3] = { region: ImagineCmsConfig['amazon_s3']['region'] || 'us-east-1' }
8
+ Aws.config[:credentials] = Aws::Credentials.new(ImagineCmsConfig['amazon_s3'][Rails.env]['access_key_id'],
9
+ ImagineCmsConfig['amazon_s3'][Rails.env]['secret_access_key'])
11
10
  end
12
11
  else
13
12
  ImagineCmsConfig = {}
data/imagine_cms.gemspec CHANGED
@@ -27,17 +27,17 @@ Gem::Specification.new do |s|
27
27
  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
28
28
  s.require_paths = ["lib"]
29
29
 
30
- s.add_dependency "rails", [ ">= 4.0.9", "< 5.0" ]
30
+ s.add_dependency "rails", [ ">= 4.1.0", "< 5.0" ]
31
31
  s.add_dependency "rails-observers", "~> 0.1"
32
32
  s.add_dependency "actionpack-action_caching", "~> 1.0"
33
33
  s.add_dependency "actionpack-page_caching", "~> 1.0"
34
34
  s.add_dependency "non-stupid-digest-assets", "~> 1.0"
35
35
  s.add_dependency "prototype-rails", "~> 4.0.0"
36
- s.add_dependency "aws-s3", "~> 0.6.3"
37
- s.add_dependency "rmagick"
36
+ s.add_dependency "aws-sdk", "~> 2.0.0.pre"
37
+ s.add_dependency "rmagick", [ ">= 1.15.0", "< 3.0" ]
38
38
  s.add_dependency "mini_magick", "~> 3.3"
39
39
  s.add_dependency "rubyzip", "~> 1.0"
40
- s.add_dependency "rinku", "~> 1.7.2"
40
+ s.add_dependency "rinku", "~> 1.7"
41
41
  s.add_dependency "net-dns", "~> 0.7"
42
42
  s.add_dependency "acts_as_tree", "~> 1.1"
43
43
  s.add_dependency "safe_yaml"
@@ -238,7 +238,7 @@ class VersionedTest < ActiveSupport::TestCase
238
238
  end
239
239
 
240
240
  def test_find_versions
241
- assert_equal 1, locked_pages(:welcome).versions.find(:all, :conditions => ['title LIKE ?', '%weblog%']).size
241
+ assert_equal 1, locked_pages(:welcome).versions.where(['title LIKE ?', '%weblog%']).size
242
242
  end
243
243
 
244
244
  def test_find_version
@@ -65,9 +65,10 @@ module ActionControllerExtensions
65
65
  def expire_session_data # :nodoc:
66
66
  # make sure this is not the first run (session being initialized)
67
67
  if session[:last_active]
68
- idle_time = Time.now - session[:last_active]
69
-
70
68
  # expire session data as necessary
69
+ #
70
+ # idle_time = Time.now - session[:last_active]
71
+ #
71
72
  # session_data = session.instance_variable_get("@data")
72
73
  # session_data.select { |k,v| k.to_s !~ /_expiration$/ && v }.each do |k,v|
73
74
  # idx = k.to_s + '_expiration'
@@ -217,7 +218,7 @@ module ActionControllerExtensions
217
218
  content << " onmouseout=\"this.className = 'page_list_segment'\""
218
219
  content << " onclick=\"$('#{key}').style.cursor = 'wait'; $('#{key}').style.opacity = 0.5; "
219
220
  # FIXME: Prototype
220
- content << " new Ajax.Updater('#{key}', '#{url_for(:content_path => @pg.path.split('/').concat([ 'segment', start.to_s, name ]))}', {asynchronous:true, evalScripts:true, method:'get'});"
221
+ content << " new Ajax.Updater('#{key}', '#{url_for(:content_path => @pg.path.split('/').concat([ 'segment', start.to_s, name ]), :only_path => true)}', {asynchronous:true, evalScripts:true, method:'get'});"
221
222
  content << "; window.scrollBy(0, - 20 + document.getElementById('#{key}').getBoundingClientRect().top); return false;\""
222
223
  end
223
224
  content << ">#{seg+1}</a></td>"
File without changes
@@ -35,7 +35,7 @@ module ImagineCms
35
35
  require 'actionpack/page_caching'
36
36
  require 'non-stupid-digest-assets'
37
37
  require 'prototype-rails'
38
- require 'aws/s3'
38
+ require 'aws-sdk'
39
39
  require 'RMagick'
40
40
  require 'mini_magick'
41
41
  require 'zip'
@@ -66,10 +66,10 @@ module ImagineCms
66
66
  #
67
67
  # load extensions
68
68
  #
69
- require 'extensions/array'
69
+ require 'extensions/array_extensions'
70
70
 
71
71
  ActiveSupport.on_load(:action_controller) do
72
- require 'extensions/action_controller'
72
+ require 'extensions/action_controller_extensions'
73
73
  extend ActionControllerExtensions::ClassMethods
74
74
  include ActionControllerExtensions::InstanceMethods
75
75
 
@@ -1,3 +1,3 @@
1
1
  module ImagineCms
2
- VERSION = "4.0.1"
2
+ VERSION = "4.1.0"
3
3
  end
@@ -1,5 +1,6 @@
1
1
  amazon_s3:
2
2
  enabled: true
3
+ region: us-east-1
3
4
 
4
5
  metadata:
5
6
  'Cache-Control': 'max-age=2592000'
@@ -9,8 +10,8 @@ amazon_s3:
9
10
  media_prefix: site1/media
10
11
 
11
12
  development:
12
- access_key_id:
13
- secret_access_key:
13
+ access_key_id: AKIAJG6SL2GZP4C6GYFA
14
+ secret_access_key: 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
14
15
  image_bucket: abc-dev
15
16
  file_bucket: abc-dev
16
17
  media_bucket: abc-dev
@@ -29,8 +30,8 @@ amazon_s3:
29
30
  media_hostname: abc-test.s3.amazonaws.com
30
31
 
31
32
  production:
32
- access_key_id: AKIAJG6SL2GZP4C6GYFA
33
- secret_access_key: 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
33
+ access_key_id: <%= ENV['AWS_ACCESS_KEY_ID'] %>
34
+ secret_access_key: <%= ENV['AWS_SECRET_ACCESS_KEY'] %>
34
35
  image_bucket: abc
35
36
  file_bucket: abc
36
37
  media_bucket: abc
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: imagine_cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.0.1
4
+ version: 4.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Aaron Namba
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-09-27 00:00:00.000000000 Z
11
+ date: 2014-11-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -16,7 +16,7 @@ dependencies:
16
16
  requirements:
17
17
  - - ">="
18
18
  - !ruby/object:Gem::Version
19
- version: 4.0.9
19
+ version: 4.1.0
20
20
  - - "<"
21
21
  - !ruby/object:Gem::Version
22
22
  version: '5.0'
@@ -26,7 +26,7 @@ dependencies:
26
26
  requirements:
27
27
  - - ">="
28
28
  - !ruby/object:Gem::Version
29
- version: 4.0.9
29
+ version: 4.1.0
30
30
  - - "<"
31
31
  - !ruby/object:Gem::Version
32
32
  version: '5.0'
@@ -101,33 +101,39 @@ dependencies:
101
101
  - !ruby/object:Gem::Version
102
102
  version: 4.0.0
103
103
  - !ruby/object:Gem::Dependency
104
- name: aws-s3
104
+ name: aws-sdk
105
105
  requirement: !ruby/object:Gem::Requirement
106
106
  requirements:
107
107
  - - "~>"
108
108
  - !ruby/object:Gem::Version
109
- version: 0.6.3
109
+ version: 2.0.0.pre
110
110
  type: :runtime
111
111
  prerelease: false
112
112
  version_requirements: !ruby/object:Gem::Requirement
113
113
  requirements:
114
114
  - - "~>"
115
115
  - !ruby/object:Gem::Version
116
- version: 0.6.3
116
+ version: 2.0.0.pre
117
117
  - !ruby/object:Gem::Dependency
118
118
  name: rmagick
119
119
  requirement: !ruby/object:Gem::Requirement
120
120
  requirements:
121
121
  - - ">="
122
122
  - !ruby/object:Gem::Version
123
- version: '0'
123
+ version: 1.15.0
124
+ - - "<"
125
+ - !ruby/object:Gem::Version
126
+ version: '3.0'
124
127
  type: :runtime
125
128
  prerelease: false
126
129
  version_requirements: !ruby/object:Gem::Requirement
127
130
  requirements:
128
131
  - - ">="
129
132
  - !ruby/object:Gem::Version
130
- version: '0'
133
+ version: 1.15.0
134
+ - - "<"
135
+ - !ruby/object:Gem::Version
136
+ version: '3.0'
131
137
  - !ruby/object:Gem::Dependency
132
138
  name: mini_magick
133
139
  requirement: !ruby/object:Gem::Requirement
@@ -162,14 +168,14 @@ dependencies:
162
168
  requirements:
163
169
  - - "~>"
164
170
  - !ruby/object:Gem::Version
165
- version: 1.7.2
171
+ version: '1.7'
166
172
  type: :runtime
167
173
  prerelease: false
168
174
  version_requirements: !ruby/object:Gem::Requirement
169
175
  requirements:
170
176
  - - "~>"
171
177
  - !ruby/object:Gem::Version
172
- version: 1.7.2
178
+ version: '1.7'
173
179
  - !ruby/object:Gem::Dependency
174
180
  name: net-dns
175
181
  requirement: !ruby/object:Gem::Requirement
@@ -392,10 +398,10 @@ files:
392
398
  - app/assets/stylesheets/codepress/languages/ruby.css
393
399
  - app/assets/stylesheets/codepress/languages/sql.css
394
400
  - app/assets/stylesheets/codepress/languages/text.css
395
- - app/assets/stylesheets/cropper.css
396
- - app/assets/stylesheets/imagine_cms.css
397
- - app/assets/stylesheets/imagine_controls.css
398
- - app/assets/stylesheets/management.css
401
+ - app/assets/stylesheets/cropper.css.scss
402
+ - app/assets/stylesheets/imagine_cms.css.scss
403
+ - app/assets/stylesheets/imagine_controls.css.scss
404
+ - app/assets/stylesheets/management.css.scss
399
405
  - app/controllers/cms/content_controller.rb
400
406
  - app/controllers/management/application_controller.rb
401
407
  - app/controllers/management/cms_controller.rb
@@ -523,8 +529,8 @@ files:
523
529
  - lib/acts_as_versioned/test/versioned_test.rb
524
530
  - lib/auto_link_email_addresses.rb
525
531
  - lib/dynamic_methods.rb
526
- - lib/extensions/action_controller.rb
527
- - lib/extensions/array.rb
532
+ - lib/extensions/action_controller_extensions.rb
533
+ - lib/extensions/array_extensions.rb
528
534
  - lib/hash_object.rb
529
535
  - lib/hash_wrapper.rb
530
536
  - lib/imagine_cms.rb
@@ -586,7 +592,6 @@ files:
586
592
  - test/imagine_cms_test.rb
587
593
  - test/integration/navigation_test.rb
588
594
  - test/test_helper.rb
589
- - vendor/.DS_Store
590
595
  homepage: https://github.com/anamba/imagine_cms
591
596
  licenses:
592
597
  - AGPLv3
@@ -607,7 +612,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
607
612
  version: 1.8.11
608
613
  requirements: []
609
614
  rubyforge_project: imagine_cms
610
- rubygems_version: 2.2.2
615
+ rubygems_version: 2.4.3
611
616
  signing_key:
612
617
  specification_version: 4
613
618
  summary: Imagine Content Management System for Rails
data/vendor/.DS_Store DELETED
Binary file