imagine_cms 3.0.25 → 3.0.26

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Zjg2MDIyZDAwZWVkNzdlZTQ4NWE5ODY5N2FjZWM3ODBiYWI3MTJmYg==
-  data.tar.gz: !binary |-
-    ZTkwZGY5YTkyZDI5MWE3MTc0ZjUzM2U5YmYxOGIyNWY1YjRkMjE0YQ==
+SHA1:
+  metadata.gz: dfcd4a5ebffef204bd7855a693e65ec8419bf65a
+  data.tar.gz: dce16df887f99e7ab688881b5ad702672d08fdbb
 SHA512:
-  metadata.gz: !binary |-
-    Njc5YTcyMDdhNDMyY2JhMDlmMWVjN2Y3M2NmNzc3Yjk5NmRhMTYxY2RiMzM4
-    ZjA3OWExYTBmMTg2MmQ5MDc0OGFmYmQ0MGZhYWU3ZDdiNDFiYThiYmUzNGU3
-    MjVjZDNiYTNjM2JmOTY3YmMyMDU3M2NkZTczMjVhNDYwODMzNTI=
-  data.tar.gz: !binary |-
-    ZDA2ODJjZjhkMmZhMGYwM2NiNWZhMDdhZmNmYTU5YzAzYWQ4ZWRkMzdhMTlk
-    MTk1ODk1ZWU0NjUwMzdmZTVhZWExZmIzZjcwM2IxOWZmNzk5NGFlZmM5NWE2
-    YTVjMGQzOTNjY2YwYzUwZWUyNjAyMDg3ZjA5MjIyMWI2MzJiOTY=
+  metadata.gz: 10fe0edfbcfe8e6b75e0fe4961d020d5ad36fd105b5ce63597ddaf5bd504979542908cd2b50d54f0369651872ce6c6bd670a539baf921a1f47f1b220b6725082
+  data.tar.gz: fa8c59235aa9b3a0ad08b78819e933ce274f9fed2227d1dd320324f79139fa5e9a4c99a27f3f5c7b5c61aa3f552d8e93a3fd27912910f9b19a30e19befd13aad

data/.ruby-version

@@ -1 +1 @@
-ruby-1.9.3-p484
+ruby-2.0.0-p353

data/app/controllers/management/cms_controller.rb

@@ -771,7 +771,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     # read zip file
     
     entries = []
-    Zip::ZipFile.foreach(data.path) do |zipentry|
+    Zip::File.foreach(data.path) do |zipentry|
       next if ![ '.jpg', '.jpeg', '.png', '.gif' ].include?(File.extname(zipentry.name).downcase) || zipentry.size < 1000
       next if File.basename(zipentry.name) =~ /^\._/
       
@@ -779,7 +779,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     end
     entries.sort! { |a,b| File.basename(a.name).downcase <=> File.basename(b.name).downcase }
     
-    Zip::ZipFile.open(data.path) do |zipfile|
+    Zip::File.open(data.path) do |zipfile|
       entries.each_with_index do |zipentry, index|
         upload_progress.message = "Extracting #{File.basename(zipentry.name)}"
         ext = File.extname(zipentry.name)
@@ -1049,7 +1049,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
       
     elsif ext == '.zip'
       begin
-        Zip::ZipFile.foreach(data.path) do |zipentry|
+        Zip::File.foreach(data.path) do |zipentry|
           next if ![ '.jpg', '.jpeg', '.png', '.gif' ].include?(File.extname(zipentry.name).downcase) || zipentry.size < 1000
           upload_progress.message = "Extracting #{File.basename(zipentry.name)}"
           localfile = File.join(temp_location, ((last_id+1).to_s + File.extname(zipentry.name)).downcase)

data/app/models/cms_page.rb

@@ -21,6 +21,8 @@ class CmsPage < ActiveRecord::Base
   
   before_validation :compute_and_store_path, :set_versions
   
+  after_save :resave_children
+  
   def compute_and_store_path
     if self.parent
       if self.parent.path != ''
@@ -42,6 +44,13 @@ class CmsPage < ActiveRecord::Base
     self.published_date ||= self.created_on || Time.now
   end
   
+  def resave_children
+    # get all pages under this one (even the offline ones)
+    CmsPage.where(:parent_id => id).each do |subpg|
+      subpg.save_without_revision if subpg.valid?
+    end
+  end
+  
   def tags_as_css_classes
     self.tags.map { |t| t.name.downcase.gsub(/[^\w]+/, '-') }.join(' ')
   end
@@ -92,7 +101,6 @@ class CmsPage < ActiveRecord::Base
   def set_parent_id!(new_id)
     self.parent_id = new_id
     self.save_without_revision
-    pg.children.each { |subpg| subpg.save_without_revision }
     self.valid?
   end
   

data/app/views/management/cms/edit_page_content.html.erb

@@ -2,3 +2,9 @@
   <%= submit_tag 'Save', :id => 'btn_save', :style => 'display: none' %>
   <%= render :inline => @template_content %>
 <% end %>
+
+<script type="text/javascript">
+  window.onbeforeunload = function () {
+    return "This page is asking you to confirm that you want to leave - data you have entered may not be saved."
+  };
+</script>

data/imagine_cms.gemspec

@@ -27,12 +27,12 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
-  s.add_dependency "rails",               "~> 3.2.12"
+  s.add_dependency "rails",               "~> 3.2.16"
   s.add_dependency "prototype-rails",     "~> 3.2.0"
   s.add_dependency "aws-s3",              "~> 0.6.3"
   s.add_dependency "rmagick"
   s.add_dependency "mini_magick",         "~> 3.3"
-  s.add_dependency "rubyzip",             "< 1.0"
+  s.add_dependency "rubyzip",             "~> 1.0"
   s.add_dependency "rinku",               "~> 1.7.2"
   s.add_dependency "net-dns",             "~> 0.7.1"
   s.add_dependency "acts_as_tree",        "~> 1.1"

data/lib/imagine_cms/engine.rb

@@ -28,7 +28,7 @@ module ImagineCms
     require 'aws/s3'
     require 'RMagick'
     require 'mini_magick'
-    require 'zip/zip'
+    require 'zip'
     require 'rails_rinku'
     require 'net/dns'
     require 'acts_as_tree'

data/lib/imagine_cms/version.rb

@@ -1,3 +1,3 @@
 module ImagineCms
-  VERSION = "3.0.25"
+  VERSION = "3.0.26"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imagine_cms
 version: !ruby/object:Gem::Version
-  version: 3.0.25
+  version: 3.0.26
 platform: ruby
 authors:
 - Aaron Namba
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-15 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.12
+        version: 3.2.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.12
+        version: 3.2.16
 - !ruby/object:Gem::Dependency
   name: prototype-rails
   requirement: !ruby/object:Gem::Requirement
@@ -56,14 +56,14 @@ dependencies:
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -84,14 +84,14 @@ dependencies:
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
@@ -140,14 +140,14 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: See README for details.
@@ -510,12 +510,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []