trestle 0.8.11 → 0.8.12

data/lib/trestle/toolbar/menu.rb

@@ -0,0 +1,63 @@
+module Trestle
+  class Toolbar
+    class Menu
+      delegate :content_tag, :safe_join, to: :@template
+
+      attr_reader :items
+
+      def initialize(template)
+        @template = template
+        @items = []
+      end
+
+      def build(&block)
+        builder = Builder.new(self, @template)
+
+        result = @template.capture { @template.instance_exec(builder, &block) }
+        items << result if result.present?
+      end
+
+      def render_toggle(options={})
+        content_tag(:button, type: "button", class: Array(options[:class]) + ["dropdown-toggle"], data: { toggle: "dropdown" }) do
+          safe_join([
+            content_tag(:span, "", class: "caret"),
+            content_tag(:span, I18n.t("trestle.ui.toggle_dropdown", default: "Toggle dropdown"), class: "sr-only")
+          ])
+        end
+      end
+
+      def render_items
+        content_tag(:ul, safe_join(items, "\n"), class: "dropdown-menu dropdown-menu-right", role: "menu")
+      end
+
+      class Builder
+        delegate :admin_link_to, :content_tag, to: :@template
+
+        def initialize(menu, template)
+          @menu, @template = menu, template
+        end
+
+        def link(*args)
+          item { admin_link_to(*args) }
+        end
+
+        def header(text)
+          item(class: "dropdown-header") { text }
+        end
+
+        def divider
+          item(class: "divider")
+        end
+
+        def item(options={}, &block)
+          opts = { role: "presentation" }.merge(options)
+          item = block_given? ? content_tag(:li, opts, &block) : content_tag(:li, "", opts)
+
+          @menu.items << item
+
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/trestle/version.rb

@@ -1,3 +1,3 @@
 module Trestle
-  VERSION = "0.8.11"
+  VERSION = "0.8.12"
 end

data/trestle.gemspec

@@ -39,12 +39,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency "autoprefixer-rails", ">= 7.1.2"
   spec.add_dependency "kaminari",           "~> 1.1.0"
 
-  spec.add_development_dependency "bundler",     "~> 1.12"
-  spec.add_development_dependency "rake",        "~> 10.0"
-  spec.add_development_dependency "rspec-rails", "~> 3.5"
+  spec.add_development_dependency "rspec-rails",         "~> 3.5"
   spec.add_development_dependency "rspec-html-matchers", "~> 0.7.1"
   spec.add_development_dependency "database_cleaner",    "~> 1.6.2"
 
-  spec.add_development_dependency "sqlite3"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "sqlite3", "~> 1.3.6"
   spec.add_development_dependency "turbolinks"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trestle
 version: !ruby/object:Gem::Version
-  version: 0.8.11
+  version: 0.8.12
 platform: ruby
 authors:
 - Sam Pohlenz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-19 00:00:00.000000000 Z
+date: 2019-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -81,89 +81,89 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec-html-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 0.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: 1.6.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: 1.6.2
 - !ruby/object:Gem::Dependency
-  name: rspec-html-matchers
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: turbolinks
   requirement: !ruby/object:Gem::Requirement
@@ -319,6 +319,8 @@ files:
 - config/locales/es.yml
 - config/locales/fr.rb
 - config/locales/fr.yml
+- config/locales/ko.rb
+- config/locales/ko.yml
 - config/locales/lv.rb
 - config/locales/lv.yml
 - config/locales/nl.rb
@@ -361,6 +363,7 @@ files:
 - lib/trestle/configuration.rb
 - lib/trestle/display.rb
 - lib/trestle/engine.rb
+- lib/trestle/evaluation_context.rb
 - lib/trestle/form.rb
 - lib/trestle/form/automatic.rb
 - lib/trestle/form/builder.rb
@@ -412,7 +415,9 @@ files:
 - lib/trestle/resource/builder.rb
 - lib/trestle/resource/collection.rb
 - lib/trestle/resource/controller.rb
-- lib/trestle/scope.rb
+- lib/trestle/scopes.rb
+- lib/trestle/scopes/block.rb
+- lib/trestle/scopes/scope.rb
 - lib/trestle/tab.rb
 - lib/trestle/table.rb
 - lib/trestle/table/actions_column.rb
@@ -424,6 +429,8 @@ files:
 - lib/trestle/toolbar.rb
 - lib/trestle/toolbar/builder.rb
 - lib/trestle/toolbar/context.rb
+- lib/trestle/toolbar/item.rb
+- lib/trestle/toolbar/menu.rb
 - lib/trestle/version.rb
 - trestle.gemspec
 - vendor/assets/bower_components/trestle/bootstrap-confirmation2/bootstrap-confirmation.js
@@ -636,8 +643,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: A modern, responsive admin framework for Ruby on Rails

data/lib/trestle/scope.rb

@@ -1,47 +0,0 @@
-module Trestle
-  class Scope
-    attr_reader :name, :options, :block
-
-    def initialize(admin, name, options={}, &block)
-      @admin, @name, @options, @block = admin, name, options, block
-    end
-
-    def to_param
-      name
-    end
-
-    def label
-      @options[:label] || I18n.t("admin.scopes.#{name}", default: name.to_s.humanize.titleize)
-    end
-
-    def default?
-      @options[:default] == true
-    end
-
-    def apply(collection)
-      if @block
-        if @block.arity == 1
-          @admin.instance_exec(collection, &@block)
-        else
-          @admin.instance_exec(&@block)
-        end
-      else
-        collection.public_send(name)
-      end
-    end
-
-    def count(collection)
-      @admin.count(@admin.merge_scopes(collection, apply(collection)))
-    end
-
-    def active?(params)
-      active_scopes = Array(params[:scope])
-
-      if active_scopes.any?
-        active_scopes.include?(to_param.to_s)
-      else
-        default?
-      end
-    end
-  end
-end