alchemy_cms 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22899ddac5bccee25b1e3438bcec28374381edc6
-  data.tar.gz: 92792959062f3873ff293a491a7c981e83ed2797
+  metadata.gz: 2bab31bb3ea923d47cdd096c29f4e389df529859
+  data.tar.gz: 72aba254bc066b4eb4f54dc1e8c40abdfca35278
 SHA512:
-  metadata.gz: ec3084ada69925e12a6458ed3768d4f63e23c3b20def9ebe63543946b05ad3d4288fd040ef20c88fa2857a0c123daa8462ef2f87d2facaa8b78ff7dd4926eea7
-  data.tar.gz: 8f0f74f54d0b903c5d02c445107ea8358927c5faa2ff4ab30ac37f0b1612f92ef63ed00d9b4bdbe6cb856200d43664e82754e4d197200a044fe84e797b8dc2c3
+  metadata.gz: 590ccca504b3fb42b370d11d2316fd2b748a71659d9294e13bf889fa6c47c260fd77fc0d613deac628c1d1cdc49e00af80aa7bdf9c95a496deba311b4582a10b
+  data.tar.gz: 6a220a27a0d560964e0be33eb649675187d3bc06c008779ef16cb2dac013698393abd6a174283a78992808243117ce23c087d9793a8a2400062a486e6bb3bd97

data/alchemy_cms.gemspec

@@ -42,6 +42,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'turbolinks',                       '~> 2.0'
   gem.add_runtime_dependency 'non-stupid-digest-assets',         '~> 1.0.3'
   gem.add_runtime_dependency 'active_model_serializers',         '>= 0.8.1', '< 0.10.0'
+  gem.add_runtime_dependency 'request_store',                    '~> 1.1.0'
 
   gem.add_development_dependency 'rspec-rails', '~> 2.0'
   gem.add_development_dependency 'capybara'

data/app/models/alchemy/language.rb

@@ -45,12 +45,12 @@ module Alchemy
 
       # Store the current language in the current thread.
       def current=(v)
-        Thread.current[:alchemy_current_language] = v
+        RequestStore.store[:alchemy_current_language] = v
       end
 
       # Current language from current thread or default.
       def current
-        Thread.current[:alchemy_current_language] || default
+        RequestStore.store[:alchemy_current_language] || default
       end
 
       # The root page of the current language.

data/app/models/alchemy/page.rb

@@ -84,6 +84,7 @@ module Alchemy
     before_save :set_language_code, if: -> { language.present? }, unless: :systempage?
     before_save :set_restrictions_to_child_pages, if: :restricted_changed?, unless: :systempage?
     before_save :inherit_restricted_status, if: -> { parent && parent.restricted? }, unless: :systempage?
+    before_save :update_published_at, if: -> { public && read_attribute(:published_at).nil? }, unless: :systempage?
     before_create :set_language_from_parent_or_default, if: -> { language_id.blank? }, unless: :systempage?
     after_update :create_legacy_url, if: :urlname_changed?, unless: :redirects_to_external?
 
@@ -104,13 +105,13 @@ module Alchemy
       # Used to store the current page previewed in the edit page template.
       #
       def current_preview=(page)
-        Thread.current[:alchemy_current_preview] = page
+        RequestStore.store[:alchemy_current_preview] = page
       end
 
       # Returns the current page previewed in the edit page template.
       #
       def current_preview
-        Thread.current[:alchemy_current_preview]
+        RequestStore.store[:alchemy_current_preview]
       end
 
       # @return the language root page for given language id.
@@ -392,5 +393,9 @@ module Alchemy
       legacy_urls.find_or_create_by(urlname: urlname_was)
     end
 
+    def update_published_at
+      self.published_at = Time.now
+    end
+
   end
 end

data/app/models/alchemy/site.rb

@@ -43,11 +43,11 @@ module Alchemy
 
     class << self
       def current=(v)
-        Thread.current[:alchemy_current_site] = v
+        RequestStore.store[:alchemy_current_site] = v
       end
 
       def current
-        Thread.current[:alchemy_current_site] || default
+        RequestStore.store[:alchemy_current_site] || default
       end
 
       def default

data/bin/alchemy

@@ -79,7 +79,7 @@ EOF
       <<-GITIGNORE
 
 # Ignore Alchemy uploads folder
-upload/*
+uploads/*
 
 # Ignore sensitive data
 config/database.yml

data/lib/alchemy/engine.rb

@@ -12,6 +12,7 @@ require 'jquery-rails'
 require 'jquery-ui-rails'
 require 'kaminari'
 require 'non-stupid-digest-assets'
+require 'request_store'
 require 'sass-rails'
 require 'sassy-buttons'
 require 'simple_form'
@@ -79,7 +80,7 @@ module Alchemy
     end
 
     initializer 'alchemy.non_digest_assets' do |app|
-      NonStupidDigestAssets.whitelist = [/^tinymce\//]
+      NonStupidDigestAssets.whitelist += [/^tinymce\//]
     end
 
     config.after_initialize do

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
-  VERSION = "3.0.1"
+  VERSION = "3.0.2"
 
   def self.version
     VERSION

data/spec/models/page_spec.rb

@@ -180,6 +180,26 @@ module Alchemy
             page.legacy_urls.should be_empty
           end
         end
+
+        context "public has changed" do
+          it "should update published_at" do
+            page.update_attributes!(public: true)
+            page.read_attribute(:published_at).should be_within(1.second).of(Time.now)
+          end
+
+          it "should not update already set published_at" do
+            page.update_attributes!(published_at: 2.weeks.ago)
+            page.update_attributes!(public: true)
+            page.read_attribute(:published_at).should be_within(1.second).of(2.weeks.ago)
+          end
+        end
+
+        context "public has not changed" do
+          it "should not update published_at" do
+            page.update_attributes!(name: 'New Name')
+            page.read_attribute(:published_at).should be_nil
+          end
+        end
       end
 
       context 'after_move' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-11 00:00:00.000000000 Z
+date: 2014-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -348,6 +348,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 0.10.0
+- !ruby/object:Gem::Dependency
+  name: request_store
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement