shipyard-framework 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1eba9b663f45366fc84d75ad142eac6af37a3d60
-  data.tar.gz: cfeed210cf0c3ef595e830b33d65641ff6d84fd7
+  metadata.gz: 777bd0cb3ddd5256b5c8b7160abd550fdb621990
+  data.tar.gz: 5ba5cad0b8607e9821380cfd128205962cd99e91
 SHA512:
-  metadata.gz: 4363af91b88a8aec6bdfc67dae5cae3b2e06856d4f1277588f567c833371d33261eec1a0a2b45114d4b8f0a9dd6a8ded4ccfa60a5bab55f631528fc03ec3ebdf
-  data.tar.gz: c9e9bf434d61f11e9cd30e1d01d1ada6b9b877ef2af56577dc6382cc6f50579bfcc3140c9170a90f3118dfdeb6b46eec16fc417dbaaf09be6d668c7e8c36c505
+  metadata.gz: 5021d2cab6d69a5de25ad262e8c5583a392b83a61007d8579a4c97d48be33477beeab6ea610123148f01cc3975277488674cdeedbf7ed76074b3c63073d509f2
+  data.tar.gz: c77c094a593cc6923072f9d9be3969bcb3734d7c58e24d00b271b9079df7caecaf045b451dab983649cc5243addcd99360140e2c1adcf61d6ab3e79c9287b899

data/app/helpers/shipyard/alert_helper.rb

@@ -0,0 +1,52 @@
+module Shipyard
+  module AlertHelper
+    include ActionView::Context
+    include ActionView::Helpers::TagHelper
+    include ActionView::Helpers::TextHelper
+
+    def flash_alert(*args, &block)
+      alert_txt = capture(&block) if block_given?
+      options = {}
+      options[:role] ||= 'alert'
+      options[:data] ||= {}
+      options[:data][:shipyard] = 'alert'
+      options['v-show'] = 'visible'
+      class_list = ['alert']
+
+      args.each do |arg|
+        if arg.is_a? Symbol
+          class_list << "alert-#{alert_type(arg)}"
+        elsif arg.is_a? Hash
+          options = options.merge(arg) if arg.is_a?(Hash)
+        else
+          alert_txt = arg
+        end
+      end
+
+      options[:class] = "#{class_list.join(' ')} #{options[:class]}"
+
+      content_tag :div, options do
+        concat content_tag(:p, raw(alert_txt), class: 'alert-txt')
+        if defined? icon
+          svg_html = icon('x', class: 'alert-close-icon icon-outline-inverse center')
+        else
+          svg_html = 'x'
+        end
+        concat content_tag(:button,
+                           svg_html,
+                           class: 'alert-close v-center',
+                           '@click': 'close')
+      end
+    end
+
+    private
+
+    def alert_type(type)
+      case type.to_sym
+      when :notice then :success
+      when :alert then :error
+      else type.to_s.tr('_', '-')
+      end
+    end
+  end
+end

data/app/helpers/shipyard/button_helper.rb

@@ -0,0 +1,34 @@
+module Shipyard
+  module ButtonHelper
+    include ActionView::Helpers::TagHelper
+
+    def btn(text, *args, &block)
+      if block_given?
+        args << text
+        text = capture(&block)
+      end
+
+      # Save any options that were passed in.
+      options = {}
+      args.each do |arg|
+        options = options.merge(arg) if arg.is_a?(Hash)
+      end
+
+      # Output the appropriate button.
+      tag = options.key?(:href) ? :a : :button
+      content_tag tag, text, btn_options(args, options)
+    end
+
+    private
+
+    def btn_options(args, options)
+      options[:class] ||= ''
+      options[:class] += ' btn'
+      args.each do |arg|
+        options[:class] += " btn-#{arg.to_s.tr('_', '-')}" if arg.is_a?(Symbol)
+      end
+      options[:class].strip!
+      options
+    end
+  end
+end

data/app/helpers/shipyard/form_helper.rb

@@ -0,0 +1,16 @@
+module Shipyard
+  module FormHelper
+    def input_text(name, value=nil, options={})
+      options[:class] = "input input-text #{options[:class]}"
+      text_field_tag name, value, options
+    end
+
+    def input_select_tag(name, choices, container_options={}, select_options={})
+      container_options[:class] = "input-select-container #{container_options[:class]}"
+      content_tag :div, container_options do
+        select_options[:class] = "input input-select #{select_options[:class]}"
+        select_tag name, choices, select_options
+      end
+    end
+  end
+end

data/app/helpers/shipyard/icon_helper.rb

@@ -0,0 +1,49 @@
+module Shipyard
+  module IconHelper
+    include ActionView::Context
+    include ActionView::Helpers::TagHelper
+
+    def icon(name, options={})
+      if name.is_a? Symbol
+        svg = Icons.instance.find_by(symbol: name)
+        svg_use_tag svg, options
+      else
+        svg = Icons.instance.find_by(id: name)
+        svg_tag svg, options
+      end
+    end
+
+    private
+
+    def svg_options(svg, options)
+      options[:class] = svg_classes(svg, options)
+      options[:viewBox] ||= svg[:view_box]
+      options[:preserveAspectRatio] ||= 'xMinYMin meet'
+      options.delete(:prefix)
+      options
+    end
+
+    def svg_classes(svg, options)
+      css_classes = []
+      css_classes << 'icon'
+      css_classes << "icon-#{svg[:id]}"
+      css_classes << 'icon-outline' if svg[:is_outlined] == true
+      css_classes << "#{options[:prefix]}-icon" if options[:prefix]
+      css_classes << "#{options[:prefix]}-icon-#{svg[:id]}" if options[:prefix]
+      css_classes << options[:class]
+      css_classes.join(' ').strip
+    end
+
+    def svg_use_tag(svg, options)
+      content_tag :svg, svg_options(svg, options) do
+        content_tag :use, nil, 'xlink:href' => Icons.instance.asset_path(svg[:id])
+      end
+    end
+
+    def svg_tag(svg, options)
+      html = svg[:inner_html]
+      html = html.gsub(/class="([\s\w-]+)"/, "class=\"#{options[:prefix]}-\\1 \\1\"") if options[:prefix]
+      content_tag :svg, raw(html), svg_options(svg, options)
+    end
+  end
+end

data/app/helpers/shipyard/layout_helper.rb

@@ -0,0 +1,31 @@
+module Shipyard
+  module LayoutHelper
+    def shipyard_css_classes
+      css_classes = []
+      css_classes << current_page
+      css_classes << current_controller
+      css_classes << "env-#{::Rails.env}"
+      css_classes.join(' ')
+    end
+
+    def current_controller
+      controller.controller_name.dasherize
+    end
+
+    def current_action
+      controller.action_name.dasherize
+    end
+
+    def current_page
+      "#{current_controller}-#{current_action}"
+    end
+
+    def current_route
+      "#{controller.controller_name}##{controller.action_name}"
+    end
+
+    def current_route_is?(routes)
+      routes.tr(' ', '').split(',').include? current_route
+    end
+  end
+end

data/assets/stylesheets/shipyard/components/_alerts.sass

@@ -51,6 +51,7 @@
       position: absolute
       transform: translatey(-50%)
   &-close
+    color: #fff
     position: absolute
     display: inline-block
     transition: opacity 300ms ease

data/assets/stylesheets/shipyard/components/_boxes.sass

@@ -13,6 +13,9 @@
   &-secondary
     background: $gray-lighter
 
+  &-rounded
+    border-radius: 50%
+
   &-link
     color: $blue
     cursor: pointer

data/assets/stylesheets/shipyard/components/_tooltips.sass

@@ -1,4 +1,4 @@
-+component('tooltip')
+[tooltip]
   overflow: visible
   position: relative
   &:before

data/assets/stylesheets/shipyard/core/_type.sass

@@ -62,7 +62,7 @@ button
   color: desaturate(darken($purple, 15%), 25%)
   background: darken($gray-lightest, 3%)
   border: 1px solid darken($gray-lighter, 5%)
-  border-radius: 3px
+  border-radius: 4px
   padding: 2px 4px
   margin: 0 2px
 
@@ -136,6 +136,8 @@ h1, h2, h3, h4, h5, h6
         overflow: visible
 
   // Font Colors
+  &-normal
+    color: $text-color
   &-light
     color: $text-color-light
   &-lighter
@@ -143,6 +145,7 @@ h1, h2, h3, h4, h5, h6
   &-lightest
     color: $text-color-lightest
   &-inverse
+    color: #fff
     &-light
       color: rgba(#fff,.8)
     &-lighter

data/assets/stylesheets/shipyard/utilities/_colors.sass

@@ -3,6 +3,10 @@
     @if $shade == base
       .#{$color}
         color: $value
+      .bg-#{$color}
+        background-color: $value
     @else
       .#{$color}-#{$shade}
         color: $value
+      .bg-#{$color}-#{$shade}
+        background-color: $value

data/assets/stylesheets/shipyard/variables/_colors.scss

@@ -1,11 +1,74 @@
 $colors: (
-  "gray": (base: #788594, light: #bac5d2, lighter: #dfe6eb, lightest: #f2f5f7, dark: #313a44, darkest: #1e252c),
-  "green": (base: #3acc7c, light: #97ffc6, lightest: #b5ffd6, dark: #2c995d, darkest: #1d663e),
-  "blue": (base: #1ca1e3, light: #5eb9e6, lightest: #9ed8f5, dark: #0075b0, darkest: #004d73),
-  "teal": (base: #20a5a8, light: #6ab7b9, lightest: #b2dbdc, dark: #0e6e70, darkest: #00494b),
-  "red": (base: #e06158, light: #f7a09e, lightest: #ffc6cb, dark: #b13b39, darkest: #892120),
-  "yellow": (base: #ffca49, light: #ffd87e, lightest: #ffe7b1, dark: #99782d, darker: #66501e, darkest: #33280f),
-  "orange": (base: #ff9f49, light: #ffba7d, lightest: #ffd6b1, dark: #cc7f3a, darkest: #995f2c),
-  "purple": (base: #bf84ff, light: lighten(#bf84ff, 10%), lighter: lighten(#bf84ff, 15%), lightest: lighten(#bf84ff, 20%), dark: darken(#bf84ff, 10%), darker: darken(#bf84ff, 15%), darkest: darken(#bf84ff, 20%)),
-  "coral": (base: #f9657a, light: lighten(#f9657a, 10%), lighter: lighten(#f9657a, 15%), lightest: lighten(#f9657a, 20%), dark: darken(#f9657a, 10%), darker: darken(#f9657a, 15%), darkest: darken(#f9657a, 20%))
+  "gray": (
+    base: #788594,
+    light: #bac5d2,
+    lighter: #dfe6eb,
+    lightest: #f2f5f7,
+    dark: #313a44,
+    darkest: #1e252c
+  ),
+  "green": (
+    base: #3acc7c,
+    light: #97ffc6,
+    lightest: #b5ffd6,
+    dark: #2c995d,
+    darkest: #1d663e
+  ),
+  "blue": (
+    base: #1ca1e3,
+    light: #5eb9e6,
+    lightest: #9ed8f5,
+    dark: #0075b0,
+    darkest: #004d73
+  ),
+  "teal": (
+    base: #20a5a8,
+    light: #6ab7b9,
+    lightest: #b2dbdc,
+    dark: #0e6e70,
+    darkest: #00494b
+  ),
+  "red": (
+    base: #e06158,
+    light: #f7a09e,
+    lightest: #ffc6cb,
+    dark: #b13b39,
+    darkest: #892120
+  ),
+  "yellow": (
+    base: #ffca49,
+    light: lighten(#ffca49, 7%),
+    lighter: darken(#ffe7b1, 3%),
+    lightest: lighten(#ffe7b1, 7%),
+    dark: darken(#ffca49, 20%),
+    darker: darken(#ffca49, 30%),
+    darkest: darken(#ffca49, 40%)
+  ),
+  "orange": (
+    base: #ff9f49,
+    light: lighten(#ff9f49, 7%),
+    lighter: lighten(#ff9f49, 14%),
+    lightest: lighten(#ff9f49, 21%),
+    dark: desaturate(darken(#ff9f49, 10%), 35%),
+    darker: desaturate(darken(#ff9f49, 20%), 25%),
+    darkest: desaturate(darken(#ff9f49, 30%), 15%)
+  ),
+  "purple": (
+    base: #bf8df6,
+    light: lighten(#bf8df6, 10%),
+    lighter: lighten(#bf8df6, 15%),
+    lightest: lighten(#bf8df6, 20%),
+    dark: desaturate(darken(#bf8df6, 20%), 35%),
+    darker: desaturate(darken(#bf8df6, 35%), 35%),
+    darkest: desaturate(darken(#bf8df6, 50%), 35%)
+  ),
+  "coral": (
+    base: #f9657a,
+    light: lighten(#f9657a, 8%),
+    lighter: lighten(#f9657a, 16%),
+    lightest: lighten(#f9657a, 25%),
+    dark: desaturate(darken(#f9657a, 20%), 35%),
+    darker: desaturate(darken(#f9657a, 30%), 25%),
+    darkest: desaturate(darken(#f9657a, 40%), 15%)
+  )
 ) !default;

data/lib/shipyard-framework.rb

@@ -69,8 +69,10 @@ module Shipyard
 
     def register_jekyll_tags
       require 'shipyard-framework/jekyll/button_tag'
+      require 'shipyard-framework/jekyll/alert_tag'
       require 'shipyard-framework/jekyll/shipyard_version_tag'
       Liquid::Template.register_tag('btn', Shipyard::Jekyll::Button)
+      Liquid::Template.register_tag('alert', Shipyard::Jekyll::Alert)
       Liquid::Template.register_tag('shipyard_version', Shipyard::Jekyll::ShipyardVersion)
     end
   end

data/lib/shipyard-framework/jekyll/alert_tag.rb

@@ -0,0 +1,20 @@
+require '../app/helpers/shipyard/alert_helper'
+
+module Shipyard
+  module Jekyll
+    class Alert < Liquid::Tag
+      include Shipyard::AlertHelper
+
+      def initialize(tag_name, params, options)
+        super
+        @params = params.split(',')
+        @type = @params[0].tr(':','').to_sym
+        @text = @params[1]
+      end
+
+      def render(context)
+        flash_alert @type, @text
+      end
+    end
+  end
+end

data/lib/shipyard-framework/jekyll/button_tag.rb

@@ -1,9 +1,9 @@
-require 'shipyard-framework/rails/button_helper'
+require '../app/helpers/shipyard/button_helper'
 
 module Shipyard
   module Jekyll
     class Button < Liquid::Tag
-      include Shipyard::Rails::ButtonHelper
+      include Shipyard::ButtonHelper
 
       def initialize(tag_name, params, options)
         super

data/lib/shipyard-framework/rails/railtie.rb

@@ -1,20 +1,6 @@
-require 'shipyard-framework/rails/layout_helpers'
-require 'shipyard-framework/rails/icon_helper'
-require 'shipyard-framework/rails/button_helper'
-require 'shipyard-framework/rails/alert_helper'
-require 'shipyard-framework/rails/form_helper'
-
 module Shipyard
   module Rails
     class Railtie < ::Rails::Railtie
-      initializer 'shipyard.view_helpers' do
-        ActionView::Base.send :include, LayoutHelpers
-        ActionView::Base.send :include, IconHelper
-        ActionView::Base.send :include, ButtonHelper
-        ActionView::Base.send :include, AlertHelper
-        ActionView::Base.send :include, FormHelper
-      end
-
       initializer 'shipyard.reload_cached_icons' do
         if ::Rails.env.development?
           ::Rails.application.reloaders << Shipyard::Icons.instance

data/lib/shipyard-framework/version.rb

@@ -1,3 +1,3 @@
 module Shipyard
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
 end

data/shipyard.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   # spec.add_runtime_dependency 'sassc-rails', '~> 1.3', '>= 1.3.0'
   # spec.add_runtime_dependency 'slim-rails', '~> 3.1', '>= 3.1.0'
   # spec.add_runtime_dependency 'sassc', '~> 1.11.4'
-  spec.add_runtime_dependency 'actionview'
+  spec.add_runtime_dependency 'actionview', '~> 0'
 
   spec.add_development_dependency 'bundler', '~> 1.15', '>= 1.15.3'
 

data/styleguide/.gitignore

@@ -0,0 +1,3 @@
+_site
+.sass-cache
+.jekyll-metadata