trestle 0.8.8 → 0.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53abdb7410eddcbc8964772c60fb759385fd0cc94574234473d29613e3dc62ef
-  data.tar.gz: a204be909209b9d159d1c6939911ccd7b5cddaf8437d7e20158c68c2051e3528
+  metadata.gz: d5f74ea1864e543221e224711053214f59d7ebaaa302ae105a566e6105dc8486
+  data.tar.gz: a3fd93cbc5acb0bacd23cc4354a0c6d2875709c20f84222d5c6a461e38b19505
 SHA512:
-  metadata.gz: 7542b845d75753fd65f9908674a9728977f11657babfdf4a59489f5c023778ae29ce0a38d423d6fff4dc2249cb264cbe541b5e530ca5d9f60bfe0d06b901c1f6
-  data.tar.gz: 4a16e94cc8a64ad8691f99243b137ea897258ac4fa2595d7ce45573e1cc2ffd96dcba6e801c2e587f910587e89713fe671fa62209f79cd6c3f1cda8f6964ce65
+  metadata.gz: a821671d5f9f3d1fc49ce3bde54890957c0562def8d512f016c8860ad6aa8f39bdbeb38dd821f587819db3e90bb2f239f187d81fdb22dfc28ec2be58b20790d3
+  data.tar.gz: 49fc89e2f174f9988ca56ba168b2b229b72bde4a8de88d2936b8e9712cbe87fa166d52211d11576d6dfe5e2ea0ed3a8f2393b250c2a7424bbf19fbe89c401d30

data/.travis.yml

@@ -12,3 +12,6 @@ gemfile:
   - gemfiles/rails-5.1.gemfile
   - gemfiles/rails-5.2.gemfile
   - gemfiles/rails-edge.gemfile
+
+addons:
+  chrome: stable

data/Gemfile

@@ -10,6 +10,8 @@ group :test do
   gem 'capybara'
   gem 'capybara-selenium'
   gem 'selenium-webdriver'
+  gem 'chromedriver-helper'
+  gem 'puma'
 end
 
 gem 'haml'

data/app/assets/stylesheets/trestle/components/_avatar.scss

@@ -5,7 +5,7 @@
   width: 40px;
   height: 40px;
 
-  background: #fafafa;
+  background: #ccc;
   border-radius: 50%;
   box-shadow: rgba(black, 0.25) 0 1px 0;
 
@@ -28,7 +28,6 @@
     right: 0;
     border-radius: 50%;
 
-    background: #ccc;
     color: white;
 
     display: flex;

data/app/helpers/trestle/avatar_helper.rb

@@ -1,8 +1,10 @@
 module Trestle
   module AvatarHelper
     def avatar(options={})
-      content_tag(:div, class: "avatar") do
-        concat content_tag(:span, options[:fallback], class: "avatar-fallback") if options[:fallback]
+      fallback = options.delete(:fallback) if options[:fallback]
+
+      content_tag(:div, options.reverse_merge(class: "avatar")) do
+        concat content_tag(:span, fallback, class: "avatar-fallback") if fallback
         concat yield if block_given?
       end
     end

data/app/helpers/trestle/{debug_helper.rb → flash_helper.rb}

@@ -1,5 +1,9 @@
 module Trestle
-  module DebugHelper
+  module FlashHelper
+    def normalize_flash_alert(flash)
+      flash.is_a?(Hash) ? flash.with_indifferent_access : { message: flash }
+    end
+
     def debug_form_errors?
       Trestle.config.debug_form_errors && instance_has_errors?
     end

data/app/views/trestle/application/_dialog.html.erb

@@ -4,7 +4,7 @@
 </div>
 
 <div class="modal-flash">
-  <%= render "flash" %>
+  <%= render "trestle/flash/flash" %>
 </div>
 
 <div class="modal-tabs">

data/app/views/trestle/flash/_alert.html.erb

@@ -4,7 +4,10 @@
   <%= icon %>
 
   <div class="alert-content">
-    <h3><%= alert[:title] %></h3>
+    <% if alert[:title] %>
+      <h3><%= alert[:title] %></h3>
+    <% end %>
+
     <p><%= alert[:message] %></p>
 
     <%= yield if block_given? %>

data/app/views/trestle/flash/_flash.html.erb

@@ -1,7 +1,7 @@
 <% if flash[:message] -%>
-  <%= render "trestle/flash/alert", html_class: "alert-success", icon: icon("alert-icon ion-ios-checkmark-outline"), alert: flash[:message].with_indifferent_access %>
+  <%= render "trestle/flash/alert", html_class: "alert-success", icon: icon("alert-icon ion-ios-checkmark-outline"), alert: normalize_flash_alert(flash[:message]) %>
 <% elsif flash[:error] -%>
-  <%= render layout: "trestle/flash/alert", locals: { html_class: "alert-danger", icon: icon("alert-icon ion-ios-close-outline"), alert: flash[:error].with_indifferent_access } do %>
+  <%= render layout: "trestle/flash/alert", locals: { html_class: "alert-danger", icon: icon("alert-icon ion-ios-close-outline"), alert: normalize_flash_alert(flash[:error]) } do %>
     <%= render "trestle/flash/debug" if debug_form_errors? %>
   <% end %>
 <% end -%>

data/gemfiles/rails-4.2.gemfile

@@ -7,6 +7,8 @@ group :test do
   gem 'capybara'
   gem 'capybara-selenium'
   gem 'selenium-webdriver'
+  gem 'chromedriver-helper'
+  gem 'puma'
 end
 
 gem 'rails', '~> 4.2.0'

data/gemfiles/rails-5.0.gemfile

@@ -7,6 +7,8 @@ group :test do
   gem 'capybara'
   gem 'capybara-selenium'
   gem 'selenium-webdriver'
+  gem 'chromedriver-helper'
+  gem 'puma'
 end
 
 gem 'rails', '~> 5.0.0'

data/gemfiles/rails-5.1.gemfile

@@ -7,6 +7,8 @@ group :test do
   gem 'capybara'
   gem 'capybara-selenium'
   gem 'selenium-webdriver'
+  gem 'chromedriver-helper'
+  gem 'puma'
 end
 
 gem 'rails', '~> 5.1.0'

data/gemfiles/rails-5.2.gemfile

@@ -7,6 +7,8 @@ group :test do
   gem 'capybara'
   gem 'capybara-selenium'
   gem 'selenium-webdriver'
+  gem 'chromedriver-helper'
+  gem 'puma'
 end
 
 gem 'rails', '~> 5.2.0'

data/gemfiles/rails-edge.gemfile

@@ -7,6 +7,8 @@ group :test do
   gem 'capybara'
   gem 'capybara-selenium'
   gem 'selenium-webdriver'
+  gem 'chromedriver-helper'
+  gem 'puma'
 end
 
 gem 'rails', github: 'rails/rails'

data/lib/trestle/version.rb

@@ -1,3 +1,3 @@
 module Trestle
-  VERSION = "0.8.8"
+  VERSION = "0.8.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trestle
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.8.9
 platform: ruby
 authors:
 - Sam Pohlenz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-23 00:00:00.000000000 Z
+date: 2018-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -258,8 +258,8 @@ files:
 - app/controllers/trestle/dashboard_controller.rb
 - app/helpers/trestle/avatar_helper.rb
 - app/helpers/trestle/container_helper.rb
-- app/helpers/trestle/debug_helper.rb
 - app/helpers/trestle/display_helper.rb
+- app/helpers/trestle/flash_helper.rb
 - app/helpers/trestle/form_helper.rb
 - app/helpers/trestle/format_helper.rb
 - app/helpers/trestle/grid_helper.rb
@@ -626,7 +626,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A modern, responsive admin framework for Ruby on Rails