trestle 0.9.0 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3cdfde7b217d044ec9cfa2792d0ce3eb85ee4e36ca9e91da68c45badf94ec9a
-  data.tar.gz: a774edd80c3bacf623615285aff172b042de6cdaf81617149bd9707be5cee767
+  metadata.gz: 0fbbf8844e06a0b7770f4754ae4b9082d2718705a4636072f5b02b8920cfed43
+  data.tar.gz: 03311a6ef3ef6fc6e95abdb956de744347f44bacdfc0c25253eb6185a1855235
 SHA512:
-  metadata.gz: bf9890c72d39514f4d8133054098d63d4e8fad36bc88c287a58853c77fd814a328538b88d13f30ee9112df6ed31359efcac96cbd0ffc88221cf391350d3859f3
-  data.tar.gz: 670a009ba4de473a84d2b9570bca583d15ae76ea48d90b5fb72b7bc3df08ff9fa64c555aa171539e7cd234cc9ea29f33340569a168d5917d13b9211a969e81ad
+  metadata.gz: 5c3935441a6a9bde8ed536cdd08b3642c7114ac697a1e986d5f189da4ce61c3705df26d7de1383e4644c7391f7cb33be5baf2ddac949a5115ad4ef589f5c505a
+  data.tar.gz: ab4b6fb774080b47600871f008cd3f3cd6aa1a2c2f0b4f9f9cd9536223147c97b8567c67732d2496941a0441535ab0c5e7020f9a5dc62dd465e1a1199110d914

data/.travis.yml

@@ -1,27 +1,33 @@
 language: ruby
 
+cache: bundler
+
 before_install:
   - gem update --system
   - gem install bundler
 
 rvm:
-  - 2.6.3
+  - 2.6.6
+  - 2.7.2
 
 gemfile:
-  - gemfiles/rails-4.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
 
-matrix:
-  exclude:
-    gemfile: gemfiles/rails-4.2.gemfile
-
+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

@@ -4,12 +4,12 @@ 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'
+  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)
 
@@ -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,2 +1,3 @@
 //= require trestle/bundle
+//= require trestle/i18n
 //= require trestle/custom

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/{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