RubyGems - alchemy_cms - Versions diffs - 3.1.3 → 3.2.0.beta - Mend

alchemy_cms 3.1.3 → 3.2.0.beta

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 (110) hide show

data/spec/dummy/public/500.html CHANGED

@@ -2,17 +2,23 @@
 <html>
 <head>
   <title>We're sorry, but something went wrong (500)</title>
+  <meta name="viewport" content="width=device-width,initial-scale=1">
   <style>
   body {
     background-color: #EFEFEF;
     color: #2E2F30;
     text-align: center;
     font-family: arial, sans-serif;
+    margin: 0;
   }
   div.dialog {
-    width: 25em;
-    margin: 4em auto 0 auto;
+    width: 95%;
+    max-width: 33em;
+    margin: 4em auto 0;
+  }
+  div.dialog > div {
     border: 1px solid #CCC;
     border-right-color: #999;
     border-left-color: #999;
@@ -21,7 +27,8 @@
     border-top-left-radius: 9px;
     border-top-right-radius: 9px;
     background-color: white;
-    padding: 7px 4em 0 4em;
+    padding: 7px 12% 0;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
   }
   h1 {
@@ -30,19 +37,19 @@
     line-height: 1.5em;
   }
-  body > p {
-    width: 33em;
-    margin: 0 auto 1em;
-    padding: 1em 0;
+  div.dialog > p {
+    margin: 0 0 1em;
+    padding: 1em;
     background-color: #F7F7F7;
     border: 1px solid #CCC;
     border-right-color: #999;
+    border-left-color: #999;
     border-bottom-color: #999;
     border-bottom-left-radius: 4px;
     border-bottom-right-radius: 4px;
     border-top-color: #DADADA;
     color: #666;
-    box-shadow:0 3px 8px rgba(50, 50, 50, 0.17);
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
   }
   </style>
 </head>
@@ -50,8 +57,10 @@
 <body>
   <!-- This file lives in public/500.html -->
   <div class="dialog">
-    <h1>We're sorry, but something went wrong.</h1>
+    <div>
+      <h1>We're sorry, but something went wrong.</h1>
+    </div>
+    <p>If you are the application owner check the logs for more information.</p>
   </div>
-  <p>If you are the application owner check the logs for more information.</p>
 </body>
 </html>

data/spec/features/admin/page_creation_feature_spec.rb CHANGED

@@ -30,8 +30,8 @@ module Alchemy
           it "the create page tab is visible by default" do
             within('#overlay_tabs') do
-              expect(page).to have_selector('#create_page_tab', visible: true)
-              expect(page).to have_selector('#paste_page_tab')
+              expect(find '#create_page_tab').to be_visible
+              expect(find '#paste_page_tab').to_not be_visible
             end
           end

data/spec/libraries/resource_spec.rb CHANGED

@@ -310,7 +310,7 @@ module Alchemy
         it "should contain model_association from ActiveRecord::Reflections" do
           relation = resource.resource_relations[:location_id]
           expect(relation.keys).to include(:model_association)
-          expect(relation[:model_association].class).to be(ActiveRecord::Reflection::AssociationReflection)
+          expect(relation[:model_association].class).to be(ActiveRecord::Reflection::BelongsToReflection)
         end
         it "adds '_id' to relation key" do

data/spec/libraries/shell_spec.rb CHANGED

@@ -63,6 +63,8 @@ module Alchemy
     end
     describe '.log' do
+      before { Alchemy::Shell.verbose! }
       context 'if the message type is "skip"' do
         it "the output color should be yellow and cleared again" do
           expect(MyToDoList).to receive(:color).with(:yellow)

data/spec/models/page_spec.rb CHANGED

@@ -55,7 +55,7 @@ module Alchemy
         end
         context "with url_nesting set to true" do
-          let(:other_parent) { FactoryGirl.create(:page, parent_id: Page.root.id, visible: true) }
+          let(:other_parent) { FactoryGirl.create(:page, parent_id: Page.root.id) }
           before do
             allow(Config).to receive(:get).and_return(true)
@@ -1333,18 +1333,6 @@ module Alchemy
           expect(contact.urlname).not_to match(/invisible/)
         end
-        context "with an invisible parent" do
-          before { parent.update_attribute(:visible, false) }
-          it "does not change if set_urlname is called" do
-            expect { page.send(:set_urlname) }.not_to change { page.urlname }
-          end
-          it "does not change if update_urlname! is called" do
-            expect { page.update_urlname! }.not_to change { page.urlname }
-          end
-        end
         context "after changing page's urlname" do
           it "updates urlnames of descendants" do
             page

data/spec/spec_helper.rb CHANGED

@@ -1,11 +1,11 @@
-require 'simplecov'
 if ENV['TRAVIS']
-  require 'coveralls'
-  SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+  require "codeclimate-test-reporter"
+  CodeClimate::TestReporter.start
 else
+  require 'simplecov'
   SimpleCov.formatter = SimpleCov::Formatter::HTMLFormatter
+  SimpleCov.start 'rails'
 end
-SimpleCov.start 'rails'
 # Configure Rails Environment
 ENV["RAILS_ENV"] = "test"
@@ -27,6 +27,7 @@ require 'alchemy/test_support/factories'
 require_relative "support/hint_examples.rb"
 require_relative "support/transformation_examples.rb"
+require_relative "support/rspec-activemodel-mocks_patch.rb"
 ActionMailer::Base.delivery_method = :test
 ActionMailer::Base.perform_deliveries = true
@@ -60,6 +61,7 @@ RSpec.configure do |config|
   # Make sure the database is clean and ready for test
   config.before(:suite) do
     DatabaseCleaner.clean_with(:truncation)
+    Alchemy::Shell.silence!
     Alchemy::Seeder.seed!
   end

data/spec/support/rspec-activemodel-mocks_patch.rb ADDED

@@ -0,0 +1,8 @@
+# Manually applied the patch from https://github.com/jdelStrother/rspec-activemodel-mocks/commit/1211c347c5a574739616ccadf4b3b54686f9051f
+if Gem.loaded_specs['rspec-activemodel-mocks'].version.to_s != "1.0.1"
+  raise "RSpec-ActiveModel-Mocks version has changed, please check if the behaviour has already been fixed: https://github.com/rspec/rspec-activemodel-mocks/pull/10
+If so, this patch might be obsolete-"
+end
+RSpec::ActiveModel::Mocks::Mocks::ActiveRecordInstanceMethods.class_eval do
+  alias_method :_read_attribute, :[]
+end

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.2.0.beta
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack-page_caching
@@ -32,22 +32,16 @@ dependencies:
   name: active_model_serializers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: acts_as_list
   requirement: !ruby/object:Gem::Requirement
@@ -97,9 +91,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -107,9 +98,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.13.0
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -130,14 +118,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.4
 - !ruby/object:Gem::Dependency
   name: dragonfly
   requirement: !ruby/object:Gem::Requirement
@@ -158,14 +152,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.0.3
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
@@ -228,20 +222,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: request_store
   requirement: !ruby/object:Gem::Requirement
@@ -256,20 +250,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: responders
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: sassy-buttons
   requirement: !ruby/object:Gem::Requirement
@@ -454,7 +462,9 @@ extra_rdoc_files: []
 files:
 - ".editorconfig"
 - ".gitignore"
+- ".hound.yml"
 - ".rspec"
+- ".rubocop.yml"
 - ".teatro.yml"
 - ".travis.yml"
 - ".yardopts"
@@ -517,7 +527,7 @@ files:
 - app/assets/stylesheets/alchemy/_extends.scss
 - app/assets/stylesheets/alchemy/_mixins.scss
 - app/assets/stylesheets/alchemy/_variables.scss
-- app/assets/stylesheets/alchemy/admin.css.scss
+- app/assets/stylesheets/alchemy/admin.scss
 - app/assets/stylesheets/alchemy/archive.scss
 - app/assets/stylesheets/alchemy/base.scss
 - app/assets/stylesheets/alchemy/buttons.scss
@@ -530,14 +540,14 @@ files:
 - app/assets/stylesheets/alchemy/form_fields.scss
 - app/assets/stylesheets/alchemy/forms.scss
 - app/assets/stylesheets/alchemy/frame.scss
-- app/assets/stylesheets/alchemy/icon-font.css.scss
+- app/assets/stylesheets/alchemy/icon-font.scss
 - app/assets/stylesheets/alchemy/icons.scss
 - app/assets/stylesheets/alchemy/jquery-ui.scss
-- app/assets/stylesheets/alchemy/menubar.css.scss
+- app/assets/stylesheets/alchemy/menubar.scss
 - app/assets/stylesheets/alchemy/modules.scss
 - app/assets/stylesheets/alchemy/notices.scss
 - app/assets/stylesheets/alchemy/pagination.scss
-- app/assets/stylesheets/alchemy/print.css.scss
+- app/assets/stylesheets/alchemy/print.scss
 - app/assets/stylesheets/alchemy/search.scss
 - app/assets/stylesheets/alchemy/selects.scss
 - app/assets/stylesheets/alchemy/sitemap.scss
@@ -584,7 +594,6 @@ files:
 - app/controllers/alchemy/api/pages_controller.rb
 - app/controllers/alchemy/attachments_controller.rb
 - app/controllers/alchemy/base_controller.rb
-- app/controllers/alchemy/contents_controller.rb
 - app/controllers/alchemy/elements_controller.rb
 - app/controllers/alchemy/messages_controller.rb
 - app/controllers/alchemy/pages_controller.rb
@@ -874,9 +883,6 @@ files:
 - db/migrate/20130828121054_remove_do_not_index_from_alchemy_essence_texts.rb
 - db/migrate/20130828121120_remove_do_not_index_from_alchemy_essence_richtexts.rb
 - db/migrate/20130918201742_add_published_at_to_alchemy_pages.rb
-- db/migrate/20140107192720_add_missing_unique_indices_to_tags_and_taggings.rb
-- db/migrate/20140701160159_add_taggings_counter_cache_to_tags.rb
-- db/migrate/20140701160225_add_missing_taggable_index.rb
 - lib/alchemy/auth_accessors.rb
 - lib/alchemy/cache_digests/template_tracker.rb
 - lib/alchemy/capistrano.rb
@@ -913,6 +919,7 @@ files:
 - lib/alchemy/touching.rb
 - lib/alchemy/upgrader.rb
 - lib/alchemy/upgrader/three_point_one.rb
+- lib/alchemy/upgrader/three_point_two.rb
 - lib/alchemy/upgrader/three_point_zero.rb
 - lib/alchemy/userstamp.rb
 - lib/alchemy/version.rb
@@ -979,7 +986,6 @@ files:
 - spec/controllers/alchemy/api/pages_controller_spec.rb
 - spec/controllers/attachments_controller_spec.rb
 - spec/controllers/base_controller_spec.rb
-- spec/controllers/contents_controller_spec.rb
 - spec/controllers/elements_controller_spec.rb
 - spec/controllers/messages_controller_spec.rb
 - spec/controllers/pages_controller_spec.rb
@@ -993,7 +999,6 @@ files:
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.gitkeep
 - spec/dummy/app/models/ability.rb
-- spec/dummy/app/models/dummy_model.rb
 - spec/dummy/app/models/dummy_user.rb
 - spec/dummy/app/models/event.rb
 - spec/dummy/app/models/location.rb
@@ -1020,7 +1025,9 @@ files:
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
 - spec/dummy/config/initializers/alchemy.rb
+- spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/cookies_serializer.rb
 - spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
@@ -1028,6 +1035,7 @@ files:
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/routes.rb
+- spec/dummy/config/secrets.yml
 - spec/dummy/db/migrate/20121026104128_create_events.rb
 - spec/dummy/db/migrate/20130328101418_create_locations.rb
 - spec/dummy/db/migrate/20130827094554_alchemy_two_point_six.rb
@@ -1035,10 +1043,10 @@ files:
 - spec/dummy/db/migrate/20130828121120_remove_do_not_index_from_alchemy_essence_richtexts.rb
 - spec/dummy/db/migrate/20130918201742_add_published_at_to_alchemy_pages.rb
 - spec/dummy/db/migrate/20131209225243_create_dummy_users.rb
-- spec/dummy/db/migrate/20140107192720_add_missing_unique_indices_to_tags_and_taggings.rb
-- spec/dummy/db/migrate/20140701160159_add_taggings_counter_cache_to_tags.rb
-- spec/dummy/db/migrate/20140701160225_add_missing_taggable_index.rb
-- spec/dummy/db/migrate/20150412103152_create_dummy_model.rb
+- spec/dummy/db/migrate/20150122213511_acts_as_taggable_on_migration.acts_as_taggable_on_engine.rb
+- spec/dummy/db/migrate/20150122213512_add_missing_unique_indices.acts_as_taggable_on_engine.rb
+- spec/dummy/db/migrate/20150122213513_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb
+- spec/dummy/db/migrate/20150122213514_add_missing_taggable_index.acts_as_taggable_on_engine.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
 - spec/dummy/lib/assets/.gitkeep
@@ -1046,7 +1054,6 @@ files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
-- spec/dummy/spec/javascripts
 - spec/features/admin/dashboard_spec.rb
 - spec/features/admin/language_tree_feature_spec.rb
 - spec/features/admin/legacy_page_url_management_spec.rb
@@ -1112,7 +1119,6 @@ files:
 - spec/models/attachment_spec.rb
 - spec/models/cell_spec.rb
 - spec/models/content_spec.rb
-- spec/models/dummy_model_spec.rb
 - spec/models/element_spec.rb
 - spec/models/essence_boolean_spec.rb
 - spec/models/essence_date_spec.rb
@@ -1135,6 +1141,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/ci/install_phantomjs
 - spec/support/hint_examples.rb
+- spec/support/rspec-activemodel-mocks_patch.rb
 - spec/support/test_tweaks.rb
 - spec/support/transformation_examples.rb
 - spec/tasks/helpers_spec.rb
@@ -1219,16 +1226,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubyforge_project:
-rubygems_version: 2.5.1
+rubygems_version: 2.4.3
 signing_key:
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails 4
@@ -1253,7 +1260,6 @@ test_files:
 - spec/controllers/alchemy/api/pages_controller_spec.rb
 - spec/controllers/attachments_controller_spec.rb
 - spec/controllers/base_controller_spec.rb
-- spec/controllers/contents_controller_spec.rb
 - spec/controllers/elements_controller_spec.rb
 - spec/controllers/messages_controller_spec.rb
 - spec/controllers/pages_controller_spec.rb
@@ -1267,7 +1273,6 @@ test_files:
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.gitkeep
 - spec/dummy/app/models/ability.rb
-- spec/dummy/app/models/dummy_model.rb
 - spec/dummy/app/models/dummy_user.rb
 - spec/dummy/app/models/event.rb
 - spec/dummy/app/models/location.rb
@@ -1294,7 +1299,9 @@ test_files:
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
 - spec/dummy/config/initializers/alchemy.rb
+- spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/cookies_serializer.rb
 - spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
@@ -1302,6 +1309,7 @@ test_files:
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/routes.rb
+- spec/dummy/config/secrets.yml
 - spec/dummy/db/migrate/20121026104128_create_events.rb
 - spec/dummy/db/migrate/20130328101418_create_locations.rb
 - spec/dummy/db/migrate/20130827094554_alchemy_two_point_six.rb
@@ -1309,10 +1317,10 @@ test_files:
 - spec/dummy/db/migrate/20130828121120_remove_do_not_index_from_alchemy_essence_richtexts.rb
 - spec/dummy/db/migrate/20130918201742_add_published_at_to_alchemy_pages.rb
 - spec/dummy/db/migrate/20131209225243_create_dummy_users.rb
-- spec/dummy/db/migrate/20140107192720_add_missing_unique_indices_to_tags_and_taggings.rb
-- spec/dummy/db/migrate/20140701160159_add_taggings_counter_cache_to_tags.rb
-- spec/dummy/db/migrate/20140701160225_add_missing_taggable_index.rb
-- spec/dummy/db/migrate/20150412103152_create_dummy_model.rb
+- spec/dummy/db/migrate/20150122213511_acts_as_taggable_on_migration.acts_as_taggable_on_engine.rb
+- spec/dummy/db/migrate/20150122213512_add_missing_unique_indices.acts_as_taggable_on_engine.rb
+- spec/dummy/db/migrate/20150122213513_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb
+- spec/dummy/db/migrate/20150122213514_add_missing_taggable_index.acts_as_taggable_on_engine.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
 - spec/dummy/lib/assets/.gitkeep
@@ -1320,7 +1328,6 @@ test_files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
-- spec/dummy/spec/javascripts
 - spec/features/admin/dashboard_spec.rb
 - spec/features/admin/language_tree_feature_spec.rb
 - spec/features/admin/legacy_page_url_management_spec.rb
@@ -1386,7 +1393,6 @@ test_files:
 - spec/models/attachment_spec.rb
 - spec/models/cell_spec.rb
 - spec/models/content_spec.rb
-- spec/models/dummy_model_spec.rb
 - spec/models/element_spec.rb
 - spec/models/essence_boolean_spec.rb
 - spec/models/essence_date_spec.rb
@@ -1409,6 +1415,7 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/ci/install_phantomjs
 - spec/support/hint_examples.rb
+- spec/support/rspec-activemodel-mocks_patch.rb
 - spec/support/test_tweaks.rb
 - spec/support/transformation_examples.rb
 - spec/tasks/helpers_spec.rb