trestle 0.8.13 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bf56a27669452c89b5d5c46780c9b8761108f199a0947c3ab59b769fef98991
-  data.tar.gz: a4981f671dd0caced318b2baa9435cba7716a6c1b804649f5b9324ecf1bb0172
+  metadata.gz: c79f7b5d12b485966fe7c165b5481e00f9e411e353a74818d91dc9d17c4dd6f2
+  data.tar.gz: 8502c2dee447e7ad01ccb3df23d3b17dc1e02db3e8f1de5049cbb3a245655a43
 SHA512:
-  metadata.gz: 1bd4353bb458f9ab766bdd1491675ee9f2ed3449c381441ba4a8954beda81104505d1f3c98b726a229af11b4cfaf422b43583f72f0f1b4e0d0d0f403a400c654
-  data.tar.gz: fa626e505ecb79fab31abe00d19ba31c260626773b0098bda9f3af51d366d6753850cc20f918de5ed204770f8711f1493b83a0234d35fa3b8e8a86ad8623212e
+  metadata.gz: 8c86b38910a39e0c8cc45625db9b34860074491b4f6b8033c7ac54d17706ca2efae535d9657efb6725b744adcb5c91b4854e84c6e58ff34a79f8648328dc36be
+  data.tar.gz: e597539d8dc3285a710da28be1b935d2c0c0ef2d555d193dd03d402f109929a93c63db9b3e5d518846e33a69ad4e52be712b5a7f3aefb9bc02d3cd2ae5303a0d

data/.babelrc

@@ -0,0 +1,5 @@
+{
+	"presets": [
+		["@babel/preset-env"]
+	]
+}

data/.browserslistrc

@@ -0,0 +1 @@
+> 0.25%

data/.gitattributes

@@ -0,0 +1 @@
+app/assets/bundle/**/* -diff

data/.gitignore

@@ -16,3 +16,4 @@
 /spec/dummy/*.sqlite3-journal
 /spec/dummy/log/*.log
 /spec/dummy/tmp/*
+/node_modules

data/.travis.yml

@@ -1,26 +1,25 @@
 language: ruby
 
+cache: bundler
+
 before_install:
   - gem update --system
   - gem install bundler
 
 rvm:
-  - 2.6.3
+  - 2.6.5
+  - 2.7.1
 
 gemfile:
-  - gemfiles/rails-4.2.gemfile
   - gemfiles/rails-5.0.gemfile
   - gemfiles/rails-5.1.gemfile
   - gemfiles/rails-5.2.gemfile
-  - gemfiles/rails-edge.gemfile
+  - gemfiles/rails-6.0.gemfile
 
 addons:
   chrome: stable
 
-matrix:
-  exclude:
-    gemfile: gemfiles/rails-4.2.gemfile
-
+jobs:
   include:
     gemfile: gemfiles/rails-4.2.gemfile
     before_install:

data/Gemfile

@@ -4,9 +4,8 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
-  gem 'coveralls',   require: false
-  gem 'simplecov',   require: false
-  gem 'guard-rspec', require: false
+  gem 'coveralls_reborn', require: false
+  gem 'guard-rspec',      require: false
 
   gem 'capybara'
   gem 'capybara-selenium'
@@ -16,3 +15,5 @@ group :test do
 end
 
 gem 'haml'
+gem 'sassc-rails'
+gem 'sqlite3', '~> 1.4'

data/README.md

@@ -28,7 +28,7 @@ Run `bundle install`, and then run the install generator to create the initial c
 
     $ rails generate trestle:install
 
-Then create your first admin resource:
+Then create your first admin resource (assuming you have an existing `Article` model):
 
     $ rails generate trestle:resource Article
 
@@ -104,6 +104,8 @@ The following plugins are currently available:
 | *trestle-sidekiq* | [Sidekiq](http://sidekiq.org/) integration | [GitHub](https://github.com/TrestleAdmin/trestle-sidekiq) \| [RubyGems](https://rubygems.org/gems/trestle-sidekiq) |
 | *trestle-active_storage* | [Active Storage](https://guides.rubyonrails.org/active_storage_overview.html) integration | [GitHub](https://github.com/richardvenneman/trestle-active_storage) \| [RubyGems](https://rubygems.org/gems/trestle-active_storage) |
 | *trestle-mobility* | [Mobility](https://github.com/shioyama/mobility) integration | [GitHub](https://github.com/richardvenneman/trestle-mobility) \| [RubyGems](https://rubygems.org/gems/trestle-mobility) |
+| *trestle-omniauth* | OmniAuth authentication plugin | [GitHub](https://github.com/airhorns/trestle-omniauth) \| [RubyGems](https://rubygems.org/gems/trestle-omniauth) |
+| *trestle-auth-otp* | 2FA/OTP user authentication | [GitHub](https://github.com/McRipper/trestle-auth-otp) \| [RubyGems](https://rubygems.org/gems/trestle-auth-otp) |
 
 
 ## License

data/app/assets/javascripts/trestle/admin.js

@@ -1,24 +1,3 @@
-//= require trestle/jquery
-//= require trestle/jquery_ujs
-//= require trestle/bootstrap
-//= require trestle/bootstrap-confirmation
-//= require trestle/magnific-popup
-//= require trestle/flatpickr
-//= require trestle/select2
-//
-//= require_self
-//
-//= require_tree ./core
-//= require_tree ./components
-//
+//= require trestle/bundle
+//= require trestle/i18n
 //= require trestle/custom
-
-var Trestle = {
-  // Is Turbolinks enabled?
-  turbolinks: typeof(Turbolinks) !== 'undefined' && Turbolinks.supported,
-
-  // Store for i18n translations used within JS
-  i18n: {}
-};
-
-window.Trestle = Trestle;

data/app/assets/javascripts/trestle/i18n.js.erb

@@ -0,0 +1,8 @@
+<% flatpickr_locale_conversions = { ca: "cat", el: "gr", nb: "no", vi: "vn" } %>
+
+<% I18n.available_locales.each do |locale| %>
+  <% Trestle.i18n_fallbacks(locale).each do |candidate| %>
+    <% candidate = flatpickr_locale_conversions[candidate] || candidate %>
+    <% require_asset("trestle/flatpickr/#{candidate}") rescue nil %>
+  <% end %>
+<% end %>

data/app/assets/stylesheets/trestle/_custom.css

@@ -0,0 +1,6 @@
+/*
+ * This file is left as an extension point for user customization.
+ *
+ * It will be overridden by the similarly named file within
+ * the app/assets folder of the Rails application.
+ */

data/app/assets/stylesheets/trestle/admin.css

@@ -0,0 +1,2 @@
+//= require trestle/bundle
+//= require trestle/icons/_font-awesome

data/app/assets/stylesheets/trestle/custom.css

@@ -0,0 +1 @@
+//= require trestle/_custom

data/app/assets/stylesheets/trestle/icons/_font-awesome.css.erb

@@ -0,0 +1,40 @@
+/*!
+ * Font Awesome Free 5.8.1 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+ */
+
+@font-face {
+  font-family: 'Font Awesome 5 Free';
+  font-style: normal;
+  font-weight: 400;
+  src: url(<%= asset_path('trestle/fa-regular-400.eot') %>);
+  src: url(<%= asset_path('trestle/fa-regular-400.eot?#iefix') %>) format('embedded-opentype'),
+       url(<%= asset_path('trestle/fa-regular-400.woff2') %>) format('woff2'),
+       url(<%= asset_path('trestle/fa-regular-400.woff') %>) format('woff'),
+       url(<%= asset_path('trestle/fa-regular-400.ttf') %>) format('truetype'),
+       url(<%= asset_path('trestle/fa-regular-400.svg#fontawesome') %>) format('svg');
+}
+
+@font-face {
+  font-family: 'Font Awesome 5 Free';
+  font-style: normal;
+  font-weight: 900;
+  src: url(<%= asset_path('trestle/fa-solid-900.eot') %>);
+  src: url(<%= asset_path('trestle/fa-solid-900.eot?#iefix') %>) format('embedded-opentype'),
+       url(<%= asset_path('trestle/fa-solid-900.woff2') %>) format('woff2'),
+       url(<%= asset_path('trestle/fa-solid-900.woff') %>) format('woff'),
+       url(<%= asset_path('trestle/fa-solid-900.ttf') %>) format('truetype'),
+       url(<%= asset_path('trestle/fa-solid-900.svg#fontawesome') %>) format('svg');
+}
+
+@font-face {
+  font-family: 'Font Awesome 5 Brands';
+  font-style: normal;
+  font-weight: normal;
+  src: url(<%= asset_path('trestle/fa-brands-400.eot') %>);
+  src: url(<%= asset_path('trestle/fa-brands-400.eot?#iefix') %>) format('embedded-opentype'),
+       url(<%= asset_path('trestle/fa-brands-400.woff2') %>) format('woff2'),
+       url(<%= asset_path('trestle/fa-brands-400.woff') %>) format('woff'),
+       url(<%= asset_path('trestle/fa-brands-400.ttf') %>) format('truetype'),
+       url(<%= asset_path('trestle/fa-brands-400.svg#fontawesome') %>) format('svg');
+}

data/{lib → app/controllers/concerns}/trestle/controller/breadcrumbs.rb

@@ -10,7 +10,7 @@ module Trestle
 
     protected
       def breadcrumbs
-        @breadcrumbs ||= Breadcrumb::Trail.new(Trestle.config.root_breadcrumbs)
+        @_breadcrumbs ||= Breadcrumb::Trail.new(Trestle.config.root_breadcrumbs)
       end
 
       def breadcrumb(label, path=nil)

data/app/controllers/concerns/trestle/controller/title.rb

@@ -0,0 +1,20 @@
+module Trestle
+  module Controller
+    module Title
+      extend ActiveSupport::Concern
+
+      included do
+        helper_method :default_title
+      end
+
+    protected
+      def title(title=nil)
+        @_title = title if title
+      end
+
+      def default_title
+        @_title || action_name.titleize
+      end
+    end
+  end
+end

data/app/controllers/concerns/trestle/controller/toolbars.rb

@@ -0,0 +1,30 @@
+module Trestle
+  module Controller
+    module Toolbars
+      extend ActiveSupport::Concern
+
+      included do
+        helper_method :toolbars
+        helper_method :toolbar
+      end
+
+    protected
+      def toolbars
+        @_toolbars ||= {}
+      end
+
+      def toolbar(name, options={}, &block)
+        builder = options[:builder] || default_toolbar_builder
+
+        toolbar = (toolbars[name.to_s] ||= Toolbar.new(builder))
+        toolbar.clear! if options[:clear]
+        toolbar.prepend(&block) if block_given?
+        toolbar
+      end
+
+      def default_toolbar_builder
+        Toolbar::Builder
+      end
+    end
+  end
+end

data/app/controllers/concerns/trestle/resource/controller/actions.rb

@@ -0,0 +1,133 @@
+module Trestle
+  class Resource
+    module Controller
+      module Actions
+        def index
+          respond_to do |format|
+            format.html
+            format.json { render json: collection }
+
+            yield format if block_given?
+          end
+        end
+
+        def new
+          respond_to do |format|
+            format.html
+            format.json { render json: instance }
+
+            yield format if block_given?
+          end
+        end
+
+        def create
+          if save_instance
+            respond_to do |format|
+              format.html do
+                flash[:message] = flash_message("create.success", title: "Success!", message: "The %{lowercase_model_name} was successfully created.")
+                redirect_to_return_location(:create, instance, default: admin.instance_path(instance))
+              end
+              format.json { render json: instance, status: :created, location: admin.instance_path(instance) }
+
+              yield format if block_given?
+            end
+          else
+            respond_to do |format|
+              format.html do
+                flash.now[:error] = flash_message("create.failure", title: "Warning!", message: "Please correct the errors below.")
+                render "new", status: :unprocessable_entity
+              end
+              format.json { render json: instance.errors, status: :unprocessable_entity }
+
+              yield format if block_given?
+            end
+          end
+        end
+
+        def show
+          if admin.singular? && instance.nil?
+            respond_to do |format|
+              format.html { redirect_to action: :new }
+              format.json { head :not_found }
+
+              yield format if block_given?
+            end
+          else
+            respond_to do |format|
+              format.html
+              format.json { render json: instance }
+
+              yield format if block_given?
+            end
+          end
+        end
+
+        def edit
+          if admin.singular? && instance.nil?
+            respond_to do |format|
+              format.html { redirect_to action: :new }
+              format.json { head :not_found }
+
+              yield format if block_given?
+            end
+          else
+            respond_to do |format|
+              format.html
+              format.json { render json: instance }
+
+              yield format if block_given?
+            end
+          end
+        end
+
+        def update
+          if update_instance
+            respond_to do |format|
+              format.html do
+                flash[:message] = flash_message("update.success", title: "Success!", message: "The %{lowercase_model_name} was successfully updated.")
+                redirect_to_return_location(:update, instance, default: admin.instance_path(instance))
+              end
+              format.json { render json: instance, status: :ok }
+
+              yield format if block_given?
+            end
+          else
+            respond_to do |format|
+              format.html do
+                flash.now[:error] = flash_message("update.failure", title: "Warning!", message: "Please correct the errors below.")
+                render "show", status: :unprocessable_entity
+              end
+              format.json { render json: instance.errors, status: :unprocessable_entity }
+
+              yield format if block_given?
+            end
+          end
+        end
+
+        def destroy
+          success = delete_instance
+
+          respond_to do |format|
+            format.html do
+              if success
+                flash[:message] = flash_message("destroy.success", title: "Success!", message: "The %{lowercase_model_name} was successfully deleted.")
+                redirect_to_return_location(:destroy, instance, default: admin.path(:index))
+              else
+                flash[:error] = flash_message("destroy.failure", title: "Warning!", message: "Could not delete %{lowercase_model_name}.")
+
+                if load_instance
+                  redirect_to_return_location(:update, instance, default: admin.instance_path(instance))
+                else
+                  redirect_to_return_location(:destroy, instance, default: admin.path(:index))
+                end
+              end
+            end
+            format.json { head :no_content }
+
+            yield format if block_given?
+          end
+        end
+      end
+    end
+  end
+end