Merge pull request #1386 from tvdeyen/gutentag-update

Update Gutentag

alchemy_cms.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'coffee-rails',                     ['~> 4.0']
   gem.add_runtime_dependency 'dragonfly',                        ['~> 1.0', '>= 1.0.7']
   gem.add_runtime_dependency 'dragonfly_svg',                    ['~> 0.0.4']
-  gem.add_runtime_dependency 'gutentag',                         ['~> 2.1.0']
+  gem.add_runtime_dependency 'gutentag',                         ['~> 2.2', '>= 2.2.1']
   gem.add_runtime_dependency 'handlebars_assets',                ['~> 0.23']
   gem.add_runtime_dependency 'jquery-rails',                     ['~> 4.0', '>= 4.0.4']
   gem.add_runtime_dependency 'jquery-ui-rails',                  ['~> 5.0.0']

spec/dummy/app/controllers/admin/locations_controller.rb

@@ -0,0 +1,3 @@
+class Admin::LocationsController < Alchemy::Admin::ResourcesController
+
+end

spec/dummy/app/models/ability.rb

@@ -4,6 +4,7 @@ class Ability
   def initialize(user)
     can :manage, Event
     can :index, :admin_events
+    can :manage, Location
+    can :index, :admin_locations
   end
-
 end

spec/dummy/app/models/event.rb

@@ -1,10 +1,19 @@
 class Event < ActiveRecord::Base
+  include Alchemy::Taggable
+
   validates_presence_of :name
   belongs_to :location
 
+  scope :starting_today, -> { where(starts_at: Time.current.at_midnight..Date.tomorrow.at_midnight) }
+  scope :future, -> { where("starts_at > ?", Date.tomorrow.at_midnight) }
+
   def self.alchemy_resource_relations
     {
       location: {attr_method: 'name', attr_type: 'string'}
     }
   end
+
+  def self.alchemy_resource_filters
+    %w(starting_today future)
+  end
 end

spec/dummy/app/models/location.rb

@@ -1,3 +1,4 @@
 class Location < ActiveRecord::Base
+  include Alchemy::Taggable
   has_many :events
 end

spec/dummy/config/initializers/alchemy.rb

@@ -1,3 +1,21 @@
 Alchemy.register_ability Ability
 Alchemy.user_class_name = 'DummyUser'
 Alchemy.signup_path = '/admin/pages' unless Rails.env.test?
+Alchemy::Modules.register_module(
+  name: 'events',
+  navigation: {
+    name: 'Events',
+    controller: '/admin/events',
+    action: 'index',
+    icon: 'calendar-alt',
+    sub_navigation: [{
+      name: 'Events',
+      controller: '/admin/events',
+      action: 'index'
+    }, {
+      name: 'Locations',
+      controller: '/admin/locations',
+      action: 'index'
+    }]
+  }
+)

spec/dummy/config/locales/en.yml

@@ -22,3 +22,14 @@ en:
       essence_richtext: This content type (Essence) represents richtext
       essence_select: This content type (Essence) represents values the editor can choose from
       essence_text: This content type (Essence) represents a simple line of text
+
+  activerecord:
+    models:
+      event:
+        one: Event
+        other: Events
+    attributes:
+      event:
+        tag_names: Tags
+      location:
+        tag_names: Tags

spec/dummy/config/routes.rb

@@ -6,6 +6,7 @@
 
   namespace :admin do
     resources :events
+    resources :locations
   end
 
   mount Alchemy::Engine => "/"

spec/features/admin/modules_integration_spec.rb

@@ -5,19 +5,13 @@
     before { authorize_user(:as_admin) }
 
     it "should have a button in main_navigation, pointing to the configured controller" do
-      Alchemy::Modules.register_module(
-        {
-          name: 'events',
-          navigation: {
-            icon: 'icon events',
-            name: 'Events',
-            controller: '/admin/events',
-            action: 'index'
-          }
-        })
       visit '/admin'
-      click_on 'Events'
-      expect(page).not_to have_content('Upps!')
+      within '#main_navi' do
+        first('a', text: 'Events').click
+      end
+      within '#main_content' do
+        expect(page).to have_content('0 Events')
+      end
     end
   end
 end

spec/features/admin/resources_integration_spec.rb

@@ -1,10 +1,5 @@
 require 'spec_helper'
 
-def reload_event_class
-  Object.send(:remove_const, :Event)
-  load "spec/dummy/app/models/event.rb"
-end
-
 describe "Resources" do
   let(:event)        { create(:event) }
   let(:second_event) { create(:event, name: 'My second Event', entrance_fee: 12.32) }
@@ -135,12 +130,6 @@ def reload_event_class
   end
 
   context "with event that acts_as_taggable" do
-    around do |example|
-      Event.class_eval { include Alchemy::Taggable }
-      example.run
-      reload_event_class
-    end
-
     it "shows an autocomplete tag list in the form" do
       visit "/admin/events/new"
       expect(page).to have_selector('input#event_tag_list[type="text"][data-autocomplete="/admin/tags/autocomplete"]')
@@ -174,19 +163,6 @@ def reload_event_class
   end
 
   context "with event that has filters defined" do
-    around do |example|
-      Event.class_eval do
-        def self.alchemy_resource_filters
-          %w(starting_today future)
-        end
-
-        scope :starting_today, -> { where(starts_at: Time.current.at_midnight..Date.tomorrow.at_midnight) }
-        scope :future, -> { where("starts_at > ?", Date.tomorrow.at_midnight) }
-      end
-      example.run
-      reload_event_class
-    end
-
     let!(:past_event) { create(:event, name: "Horse Expo", starts_at: Time.current - 100.years) }
     let!(:today_event) { create(:event, name: "Car Expo", starts_at: Time.current.at_noon) }
     let!(:future_event) { create(:event, name: "Hovercar Expo", starts_at: Time.current + 30.years) }

spec/libraries/resource_spec.rb

@@ -345,7 +345,7 @@ module Alchemy
 
       describe '#model_association_names' do
         it 'returns an array of association names' do
-          expect(resource.model_association_names).to eq [:location]
+          expect(resource.model_association_names).to include(:location)
         end
       end