trestle 0.10.0.pre → 0.10.0

data/lib/trestle/toolbar/menu.rb

@@ -28,13 +28,17 @@ module Trestle
       end
 
       class Builder
-        delegate :admin_link_to, :content_tag, to: :@template
+        delegate :admin_link_to, :content_tag, :tag, to: :@template
 
         def initialize(menu, template)
           @menu, @template = menu, template
         end
 
         def link(content, instance_or_url=nil, options={}, &block)
+          if instance_or_url.is_a?(Hash)
+            instance_or_url, options = nil, instance_or_url
+          end
+
           options[:class] = Array(options[:class])
           options[:class] << "dropdown-item"
 
@@ -42,16 +46,15 @@ module Trestle
         end
 
         def header(text)
-          item(class: "dropdown-header") { text }
+          item { content_tag(:h6, text, class: "dropdown-header") }
         end
 
         def divider
-          item(class: "divider")
+          item { tag(:hr, class: "dropdown-divider") }
         end
 
         def item(options={}, &block)
-          opts = { role: "presentation" }.merge(options)
-          item = block_given? ? content_tag(:li, opts, &block) : content_tag(:li, "", opts)
+          item = block_given? ? content_tag(:li, options, &block) : content_tag(:li, "", options)
 
           @menu.items << item
 

data/lib/trestle/version.rb

@@ -1,3 +1,3 @@
 module Trestle
-  VERSION = "0.10.0.pre"
+  VERSION = "0.10.0"
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trestle",
-  "version": "0.10.0.pre",
+  "version": "0.10.0",
   "description": "A modern, responsive admin framework for Ruby on Rails",
   "homepage": "https://trestle.io",
   "repository": "https://github.com/TrestleAdmin/trestle.git",

data/trestle.gemspec

@@ -18,19 +18,15 @@ Gem::Specification.new do |spec|
 
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.2.2"
+  spec.required_ruby_version = ">= 2.6.0"
 
-  spec.add_dependency "railties",        ">= 5.2.0"
-  spec.add_dependency "activemodel",     ">= 5.2.0"
-  spec.add_dependency "kaminari",        ">= 1.1.0"
+  spec.add_dependency "railties",    ">= 6.0.0"
+  spec.add_dependency "activemodel", ">= 6.0.0"
+  spec.add_dependency "turbo-rails", ">= 2.0.6"
+  spec.add_dependency "kaminari",    ">= 1.1.0"
 
   spec.add_development_dependency "rspec-rails",         ">= 5.1.2"
   spec.add_development_dependency "rspec-html-matchers", "~> 0.10.0"
   spec.add_development_dependency "database_cleaner",    "~> 2.0.2"
   spec.add_development_dependency "ammeter",             "~> 1.1.5"
-  spec.add_development_dependency "i18n-js",             "~> 4.2.3"
-
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "sqlite3"
 end