refinerycms-core 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b66220b4f74303327aea521ea84d4f55d04f2ed0
-  data.tar.gz: e8973e66118a66affbd539d3c977d5f8fde7dd06
+  metadata.gz: fa69c80ba92533a1d3f40570315e835397c7635f
+  data.tar.gz: 43b2204819e877802ffedbd655ab90ebcbc0a070
 SHA512:
-  metadata.gz: 4dad9797f9c4657a32d88d53f24d7e8a572725052de48f74696040fb1025e1b563b880d0388fba44412f5527729d106a00416a6d253db59c5e887b88e6961c26
-  data.tar.gz: b67575d0d484ecdf99edba59dca4f87be0fda8e94dd198b409b8772c6d4f7a2a54753dcd35ae0bae3de255f4aa53c5210b61cb82c37e59681824273e4fafe048
+  metadata.gz: dcbf6c99e35e1e908f9f8f266229f957132c1b3cba6a79e1362e93e1c7723ae80ec929bc3e1a590126702c378076d10c1c1562a87a57b41303ee68b3a7f8d0ab
+  data.tar.gz: 419e5eeb7e5a2288c47696fae277510fcb7d346717804ec006ad4d518c0a479861d7355db61043ee336214fc6ab2f3a5c7a9596d9366297dd0f4cdb271631e4c

data/app/views/refinery/admin/_head.html.erb

@@ -6,10 +6,10 @@
   <%= csrf_meta_tags %>
   <%= stylesheet_link_tag 'refinery/refinery' %>
   <% visual_editor_stylesheets.each do |css| %>
-    <%= stylesheet_link_tag css.path, { skip_pipeline: true }.merge(css.options) %>
+    <%= stylesheet_link_tag css.path, css.options %>
   <% end %>
   <% custom_stylesheets.each do |css| %>
-    <%= stylesheet_link_tag css.path, { skip_pipeline: true }.merge(css.options) %>
+    <%= stylesheet_link_tag css.path, css.options %>
   <% end %>
   <%= yield :stylesheets %>
   <%= render 'refinery/admin/javascripts' %>

data/app/views/refinery/admin/_javascripts.html.erb

@@ -10,6 +10,6 @@
 <% end %>
 <%= yield :after_javascript_libraries -%>
 <% custom_javascripts.each do |js| %>
-  <%= javascript_include_tag js, skip_pipeline: true %>
+  <%= javascript_include_tag js %>
 <% end %>
 <%= yield :javascripts %>

data/lib/refinery/core/authorisation_adapter.rb

@@ -1,3 +1,5 @@
+require 'refinery/core/nil_user'
+
 module Refinery
   module Core
     class AuthorisationAdapter < Zilch::Authorisation::Adapters::Default

data/lib/refinery/version.rb

@@ -2,7 +2,7 @@ module Refinery
   class Version
     @major = 4
     @minor = 0
-    @tiny  = 0
+    @tiny  = 1
     @build = nil
 
     class << self

data/spec/features/refinery/admin/custom_assets_spec.rb

@@ -1,32 +1,40 @@
 require "spec_helper"
 
 module Refinery
-  describe "custom", :type => :feature do
+  describe "custom", type: :feature do
     refinery_login
+
+    let(:custom_js){ Refinery.roots('refinery/core').join('spec/support/fixtures/custom_js.js') }
+    let(:custom_css){ Refinery.roots('refinery/core').join('spec/support/fixtures/custom_css.css') }
+
+    before do
+      Rails.application.config.assets.precompile += %W( #{custom_js} #{custom_css} )
+    end
+
     after do
-      Refinery::Core.javascripts.reject! { |j| %w[custom_js].include?(j) }
-      Refinery::Core.stylesheets.reject! { |s| %w[custom_css].include?(s.path) }
+      Refinery::Core.javascripts.reject! { |j| %W[#{custom_js}].include?(j) }
+      Refinery::Core.stylesheets.reject! { |s| %W[#{custom_css}].include?(s.path) }
     end
 
     context "javascripts" do
       before do
-        ::Refinery::Core.config.register_javascript('custom_js')
+        ::Refinery::Core.config.register_javascript(custom_js)
       end
 
       it "should be rendered when specified" do
         visit Refinery::Core.backend_path
-        expect(page.body.include?('custom_js.js')).to be
+        expect(page.body.include?('custom_js')).to be
       end
     end
 
     context "stylesheets" do
       before do
-        ::Refinery::Core.config.register_stylesheet('custom_css')
+        ::Refinery::Core.config.register_stylesheet(custom_css)
       end
 
       it "should be rendered when specified" do
         visit Refinery::Core.backend_path
-        expect(page.body).to include('custom_css.css')
+        expect(page.body.include?('custom_css')).to be
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-core
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Philip Arndt
@@ -32,7 +32,7 @@ cert_chain:
   jOQmH9VbgbfUrXYM1YOKdlwW5sPR1f4PKLDlvEE+bppIUgKOgLOIv3i7KwrGvFOq
   5r7Wz/HY31SM47mkK21saPJG4NvUFEycf0wlpzP657Pl9aVo47aKKbxX
   -----END CERTIFICATE-----
-date: 2017-09-29 00:00:00.000000000 Z
+date: 2017-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: refinerycms-i18n
@@ -658,6 +658,8 @@ files:
 - spec/lib/refinery/users_manager_spec.rb
 - spec/presenters/refinery/translated_field_presenter_spec.rb
 - spec/support/database_cleaner.rb
+- spec/support/fixtures/custom_css.css
+- spec/support/fixtures/custom_js.js
 - spec/support/fixtures/invalid_engine.rb
 - spec/support/fixtures/valid_engine.rb
 - spec/support/refinery.rb
@@ -729,6 +731,8 @@ test_files:
 - spec/lib/refinery/users_manager_spec.rb
 - spec/presenters/refinery/translated_field_presenter_spec.rb
 - spec/support/database_cleaner.rb
+- spec/support/fixtures/custom_css.css
+- spec/support/fixtures/custom_js.js
 - spec/support/fixtures/invalid_engine.rb
 - spec/support/fixtures/valid_engine.rb
 - spec/support/refinery.rb