trestle 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c79f7b5d12b485966fe7c165b5481e00f9e411e353a74818d91dc9d17c4dd6f2
-  data.tar.gz: 8502c2dee447e7ad01ccb3df23d3b17dc1e02db3e8f1de5049cbb3a245655a43
+  metadata.gz: 0fbbf8844e06a0b7770f4754ae4b9082d2718705a4636072f5b02b8920cfed43
+  data.tar.gz: 03311a6ef3ef6fc6e95abdb956de744347f44bacdfc0c25253eb6185a1855235
 SHA512:
-  metadata.gz: 8c86b38910a39e0c8cc45625db9b34860074491b4f6b8033c7ac54d17706ca2efae535d9657efb6725b744adcb5c91b4854e84c6e58ff34a79f8648328dc36be
-  data.tar.gz: e597539d8dc3285a710da28be1b935d2c0c0ef2d555d193dd03d402f109929a93c63db9b3e5d518846e33a69ad4e52be712b5a7f3aefb9bc02d3cd2ae5303a0d
+  metadata.gz: 5c3935441a6a9bde8ed536cdd08b3642c7114ac697a1e986d5f189da4ce61c3705df26d7de1383e4644c7391f7cb33be5baf2ddac949a5115ad4ef589f5c505a
+  data.tar.gz: ab4b6fb774080b47600871f008cd3f3cd6aa1a2c2f0b4f9f9cd9536223147c97b8567c67732d2496941a0441535ab0c5e7020f9a5dc62dd465e1a1199110d914

data/.travis.yml

@@ -7,20 +7,27 @@ before_install:
   - gem install bundler
 
 rvm:
-  - 2.6.5
-  - 2.7.1
+  - 2.6.6
+  - 2.7.2
 
 gemfile:
   - gemfiles/rails-5.0.gemfile
   - gemfiles/rails-5.1.gemfile
   - gemfiles/rails-5.2.gemfile
   - gemfiles/rails-6.0.gemfile
+  - gemfiles/rails-6.1.gemfile
 
 addons:
   chrome: stable
 
 jobs:
   include:
-    gemfile: gemfiles/rails-4.2.gemfile
-    before_install:
-      - gem install bundler -v '< 2'
+    - gemfile: gemfiles/rails-4.2.gemfile
+      before_install:
+        - gem install bundler -v '< 2'
+
+    # - gemfile: gemfiles/rails-6.0.gemfile
+    #   rvm: 3.0.0
+
+    - gemfile: gemfiles/rails-6.1.gemfile
+      rvm: 3.0.0

data/Gemfile

@@ -9,6 +9,7 @@ group :test do
 
   gem 'capybara'
   gem 'capybara-selenium'
+  gem 'rexml'
   gem 'selenium-webdriver'
   gem 'webdrivers'
   gem 'puma'

data/README.md

@@ -5,7 +5,7 @@
 # Trestle
 
 [![RubyGem](https://img.shields.io/gem/v/trestle.svg?style=flat&colorB=4065a9)](https://rubygems.org/gems/trestle)
-[![Travis](https://img.shields.io/travis/TrestleAdmin/trestle.svg?style=flat)](https://travis-ci.org/TrestleAdmin/trestle)
+[![Travis](https://img.shields.io/travis/TrestleAdmin/trestle.svg?style=flat)](https://travis-ci.com/github/TrestleAdmin/trestle)
 [![Coveralls](https://img.shields.io/coveralls/TrestleAdmin/trestle.svg?style=flat)](https://coveralls.io/github/TrestleAdmin/trestle)
 [![Code Climate](https://api.codeclimate.com/v1/badges/c529a7a9c500ed81baed/maintainability)](https://codeclimate.com/github/TrestleAdmin/trestle)
 

data/app/controllers/trestle/admin_controller.rb

@@ -1,33 +1,31 @@
-module Trestle
-  class AdminController < ApplicationController
-    def index
-    end
+class Trestle::AdminController < Trestle::ApplicationController
+  def index
+  end
 
-    class << self
-      attr_reader :admin
+  class << self
+    attr_reader :admin
 
-    private
-      def local_prefixes
-        return admin.view_path_prefixes if admin
-        [controller_path.sub(/\/$/, "")]
-      end
+  private
+    def local_prefixes
+      return admin.view_path_prefixes if admin
+      [controller_path.sub(/\/$/, "")]
     end
+  end
 
-    def admin
-      @_admin ||= self.class.admin.new(self)
-    end
-    helper_method :admin
+  def admin
+    @_admin ||= self.class.admin.new(self)
+  end
+  helper_method :admin
 
-  protected
-    def breadcrumbs
-      @_breadcrumbs ||= admin.breadcrumbs.dup
-    end
+protected
+  def breadcrumbs
+    @_breadcrumbs ||= admin.breadcrumbs.dup
+  end
 
-    def flash_message(type, title:, message:)
-      {
-        title:   admin.t("flash.#{type}.title", default: title),
-        message: admin.t("flash.#{type}.message", default: message)
-      }
-    end
+  def flash_message(type, title:, message:)
+    {
+      title:   admin.t("flash.#{type}.title", default: title),
+      message: admin.t("flash.#{type}.message", default: message)
+    }
   end
 end

data/app/controllers/trestle/application_controller.rb

@@ -1,14 +1,12 @@
-module Trestle
-  class ApplicationController < ActionController::Base
-    protect_from_forgery
+class Trestle::ApplicationController < ActionController::Base
+  protect_from_forgery
 
-    include Controller::Breadcrumbs
-    include Controller::Callbacks
-    include Controller::Dialog
-    include Controller::Helpers
-    include Controller::Layout
-    include Controller::Location
-    include Controller::Title
-    include Controller::Toolbars
-  end
+  include Trestle::Controller::Breadcrumbs
+  include Trestle::Controller::Callbacks
+  include Trestle::Controller::Dialog
+  include Trestle::Controller::Helpers
+  include Trestle::Controller::Layout
+  include Trestle::Controller::Location
+  include Trestle::Controller::Title
+  include Trestle::Controller::Toolbars
 end

data/app/controllers/trestle/dashboard_controller.rb

@@ -1,17 +1,15 @@
-module Trestle
-  class DashboardController < ApplicationController
-    def index
-      admin = primary_admin
-      redirect_to admin.path if admin
-    end
+class Trestle::DashboardController < Trestle::ApplicationController
+  def index
+    admin = primary_admin
+    redirect_to admin.path if admin
+  end
 
-  private
-    def primary_admin
-      if navigation = Trestle.navigation(self).first
-        navigation.admin
-      elsif Trestle.admins.values.any?
-        Trestle.admins.values.first
-      end
+private
+  def primary_admin
+    if navigation = Trestle.navigation(self).first
+      navigation.admin
+    elsif Trestle.admins.values.any?
+      Trestle.admins.values.first
     end
   end
 end

data/app/controllers/trestle/resource_controller.rb

@@ -1,8 +1,6 @@
-module Trestle
-  class ResourceController < AdminController
-    include Resource::Controller::Actions
-    include Resource::Controller::DataMethods
-    include Resource::Controller::Redirection
-    include Resource::Controller::Toolbar
-  end
+class Trestle::ResourceController < Trestle::AdminController
+  include Trestle::Resource::Controller::Actions
+  include Trestle::Resource::Controller::DataMethods
+  include Trestle::Resource::Controller::Redirection
+  include Trestle::Resource::Controller::Toolbar
 end

data/app/helpers/trestle/layout_helper.rb

@@ -0,0 +1,20 @@
+module Trestle
+  module LayoutHelper
+    SIDEBAR_CLASSES = {
+      "expanded"  => "sidebar-expanded",
+      "collapsed" => "sidebar-collapsed"
+    }
+
+    def body_attributes
+      {
+        class: body_classes
+      }.reject { |k, v| v.blank? }
+    end
+
+    def body_classes
+      [
+        SIDEBAR_CLASSES[cookies["trestle:sidebar"]]
+      ].compact
+    end
+  end
+end

data/app/helpers/trestle/navigation_helper.rb

@@ -7,5 +7,28 @@ module Trestle
     def current_admin?(admin)
       respond_to?(:admin) && self.admin && self.admin.name == admin.name
     end
+
+    def navigation_group_collapsed?(group)
+      if collapsed_navigation_groups.include?(group.id)
+        # Explicitly collapsed by user
+        true
+      elsif group.collapse?
+        # Default to collapsed unless expanded by user
+        !expanded_navigation_groups.include?(group.id)
+      end
+    end
+
+  private
+    def collapsed_navigation_groups
+      @collapsed_navigation_groups ||= navigation_groups(:collapsed)
+    end
+
+    def expanded_navigation_groups
+      @expanded_navigation_groups ||= navigation_groups(:expanded)
+    end
+
+    def navigation_groups(state)
+      cookies["trestle:navigation:#{state}"].try(:split, ",") || []
+    end
   end
 end

data/app/views/layouts/trestle/admin.html.erb

@@ -40,7 +40,7 @@
     <%= hook :head %>
   </head>
 
-  <body<%=raw " class=\"sidebar-#{cookies["trestle:sidebar"]}\"" if cookies["trestle:sidebar"] %>>
+  <%= content_tag :body, body_attributes do %>
     <div class="app-wrapper">
       <%= render "trestle/shared/sidebar" %>
 
@@ -54,5 +54,5 @@
         <%= render "trestle/shared/footer" %>
       </div>
     </div>
-  </body>
+  <% end %>
 </html>