trestle 0.9.2 → 0.9.3

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trestle
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Sam Pohlenz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-27 00:00:00.000000000 Z
+date: 2020-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -56,14 +56,14 @@ dependencies:
   name: kaminari
   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
@@ -86,28 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 1.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 1.8.3
 - !ruby/object:Gem::Dependency
   name: ammeter
   requirement: !ruby/object:Gem::Requirement
@@ -280,7 +280,22 @@ files:
 - app/assets/stylesheets/trestle/admin.css
 - app/assets/stylesheets/trestle/custom.css
 - app/assets/stylesheets/trestle/icons/_font-awesome.css.erb
+- app/controllers/concerns/trestle/controller/breadcrumbs.rb
+- app/controllers/concerns/trestle/controller/callbacks.rb
+- app/controllers/concerns/trestle/controller/dialog.rb
+- app/controllers/concerns/trestle/controller/helpers.rb
+- app/controllers/concerns/trestle/controller/layout.rb
+- app/controllers/concerns/trestle/controller/location.rb
+- app/controllers/concerns/trestle/controller/title.rb
+- app/controllers/concerns/trestle/controller/toolbars.rb
+- app/controllers/concerns/trestle/resource/controller/actions.rb
+- app/controllers/concerns/trestle/resource/controller/data_methods.rb
+- app/controllers/concerns/trestle/resource/controller/redirection.rb
+- app/controllers/concerns/trestle/resource/controller/toolbar.rb
+- app/controllers/trestle/admin_controller.rb
+- app/controllers/trestle/application_controller.rb
 - app/controllers/trestle/dashboard_controller.rb
+- app/controllers/trestle/resource_controller.rb
 - app/helpers/trestle/avatar_helper.rb
 - app/helpers/trestle/card_helper.rb
 - app/helpers/trestle/container_helper.rb
@@ -465,21 +480,11 @@ files:
 - lib/trestle/adapters/sequel_adapter.rb
 - lib/trestle/admin.rb
 - lib/trestle/admin/builder.rb
-- lib/trestle/admin/controller.rb
-- lib/trestle/application_controller.rb
 - lib/trestle/attribute.rb
 - lib/trestle/breadcrumb.rb
 - lib/trestle/builder.rb
 - lib/trestle/configurable.rb
 - lib/trestle/configuration.rb
-- lib/trestle/controller/breadcrumbs.rb
-- lib/trestle/controller/callbacks.rb
-- lib/trestle/controller/dialog.rb
-- lib/trestle/controller/helpers.rb
-- lib/trestle/controller/layout.rb
-- lib/trestle/controller/location.rb
-- lib/trestle/controller/title.rb
-- lib/trestle/controller/toolbars.rb
 - lib/trestle/display.rb
 - lib/trestle/engine.rb
 - lib/trestle/evaluation_context.rb
@@ -535,11 +540,6 @@ files:
 - lib/trestle/resource/adapter_methods.rb
 - lib/trestle/resource/builder.rb
 - lib/trestle/resource/collection.rb
-- lib/trestle/resource/controller.rb
-- lib/trestle/resource/controller/actions.rb
-- lib/trestle/resource/controller/data_methods.rb
-- lib/trestle/resource/controller/redirection.rb
-- lib/trestle/resource/controller/toolbar.rb
 - lib/trestle/resource/toolbar.rb
 - lib/trestle/scopes.rb
 - lib/trestle/scopes/block.rb
@@ -581,7 +581,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: A modern, responsive admin framework for Ruby on Rails

data/lib/trestle/admin/controller.rb

@@ -1,35 +0,0 @@
-module Trestle
-  class Admin
-    class Controller < Trestle::ApplicationController
-      def index
-      end
-
-      class << self
-        attr_reader :admin
-
-      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
-
-    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
-    end
-  end
-end

data/lib/trestle/resource/controller.rb

@@ -1,17 +0,0 @@
-module Trestle
-  class Resource
-    class Controller < Admin::Controller
-      extend ActiveSupport::Autoload
-
-      autoload :Actions
-      autoload :DataMethods
-      autoload :Redirection
-      autoload :Toolbar
-
-      include Actions
-      include DataMethods
-      include Redirection
-      include Toolbar
-    end
-  end
-end