material_icons-rails 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cd5c5528091a8f16e585041aa505a3d1ac9d149
-  data.tar.gz: 362452d6d8c6f2787e51a781da9c87c9734d86dd
+  metadata.gz: 0e2532c41d26aca45e0978cc5d9c2c2cb43e5dec
+  data.tar.gz: 33c17ad102c472adc506c06e7ed7d9455e604929
 SHA512:
-  metadata.gz: a76c4cf8c6315d856961ceceae91d0afa6dd2f728faf29b22036b71d81671821cc40e402910ee06a5949306a4c2fd4716a2e6cc19c0181f9b2d764fb7c91d6cc
-  data.tar.gz: 1e23e437984c966c2fbec3c4cdb50849b26cb5b1552d5b9379b91790be55380640f254722d741cd484ac6edb87bb6b29ceca6a5c07105255bba8130e917442b4
+  metadata.gz: 4d9553732dab37be9a9c2289d4bba4c12ff07dfc2f0864946e8cdb332c796caf4ba448a51fbb1d7f0578d5c5f98533270631f37ba2feef61f73c3084c5259d00
+  data.tar.gz: bcc19bb764fbcc0153d0caa06bf5b9ecc942aabeaaeb0b21eb248ef0d9de08faa0591e360afdc56447040f056221f33d47bcb45f8a7a4c8db8feebd7ac9577af

data/app/assets/stylesheets/material-icons.css

@@ -14,7 +14,7 @@
   font-family: 'Material Icons';
   font-weight: normal;
   font-style: normal;
-  font-size: 18px;
+  font-size: 1em;
   display: inline-block;
   width: 1em;
   height: 1em;

data/app/helpers/material_icons/rails/icon_helper.rb

@@ -2,7 +2,7 @@ module MaterialIcons
   module Rails
     module IconHelper
       def material_icon(icon, options = {})
-        build_icon_content_tag(icon, options)
+        MaterialIcon.new(icon, options).to_html
       end
 
       # TO-DO:
@@ -16,100 +16,9 @@ module MaterialIcons
       # http://codepen.io/joereza/pen/ufswb
 
       def material_icon_stack(icons, stack_options = {})
-        build_icon_container_content_tag(normalize_stack_icons(icons), stack_options)
-      end
-
-      # def material_icon_with_badge(icon, options = {})
-        # options = options.with_indifferent_access
-        # count = options.delete(:count)
-        # content_tag(:span, fa_icon(icon, options), :'data-count' => count)
-      # end
-
-      # def material_icon_stack_with_badge(icon, options = {})
-        # options = options.with_indifferent_access
-        # count = options.delete(:count)
-        # content_tag(:span, fa_stacked_icon(icon, options), :'data-count' => count)
-      # end
-
-      private
-
-      def normalize_stack_icons(icons)
-        case icons
-        when String, Symbol
-          [icons]
-        when Array
-          icons.zip(icons.length.times.collect{ {} })
-        when Hash
-          icons
-        else
-          # add error message here
-          raise ArgumentError
-        end
-      end
-
-      def merge_default_icon_options(options)
-        {
-          tag: 'i',
-          size: '18px',
-          text: '',
-        }.merge(options.symbolize_keys)
-      end
-
-      def normalize_icon_options(options)
-        options[:size] = {'1x' => '18px', '2x' => '24px', '3x' => '36px', '4x' => '48px'}[options[:size]] if options[:size].match(/^[1-4]x$/)
-        options[:size] = "#{options[:size]}px" if options[:size].to_i.to_s == options[:size]
-        options[:class] = Array(options[:class]).concat(['material-icons']).join(' ')
-        options
-      end
-
-      def prep_icon_options(options)
-        normalize_icon_options(merge_default_icon_options(options))
-      end
-
-      def build_icon_content_tag(icon, options)
-        options = prep_icon_options(options)
-
-        content_tag(options[:tag], icon, {
-          class: options[:class],
-          style: "font-size: #{options[:size]};",
-        }) + options[:text]
-      end
-
-
-      def merge_default_icon_container_options(options)
-        {
-          tag: 'span',
-          text: '',
-        }.merge(options.symbolize_keys)
-      end
-
-      def normalize_icon_container_options(options)
-        options[:class] = Array(options[:class]).concat(['material-icons-stack']).join(' ')
-        options
-      end
-
-      def prep_icon_container_options(options)
-        normalize_icon_container_options(merge_default_icon_container_options(options))
-      end
-
-      def build_icon_container_content_tag(icons, options)
-        options = prep_icon_container_options(options)
-
-        content_tag(
-          options[:tag], 
-          icons.collect do |icon, options|
-            # add error message here
-            raise ArgumentError unless options.is_a?(Hash)
-            # ignore text per icon on a stack
-            build_icon_content_tag(icon, options.except(:text))
-          end.join.html_safe + options[:text],
-          {
-            class: options[:class],
-            style: "font-size: #{options[:size]};",
-          }
-        )
+        MaterialIconStack.new(icons, stack_options).to_html
       end
 
     end
   end
-end
+end

data/lib/material_icons-rails.rb

@@ -1,5 +1,7 @@
 module MaterialIcons
   module Rails
-    require_relative 'material_icons-rails/engine'
+    require_relative 'material_icons/rails/engine'
+    require_relative 'material_icons/rails/material_icon'
+    require_relative 'material_icons/rails/material_icon_stack'
   end
 end

data/lib/material_icons/rails/material_icon.rb

@@ -0,0 +1,51 @@
+module MaterialIcons
+  module Rails
+    class MaterialIcon < OpenStruct
+
+      include ActionView::Helpers::TagHelper
+
+      cattr_accessor(:style_options_attributes) { [:class, :style] }
+
+      def initialize(icon, options = {})
+        super(options.merge({icon: icon.to_sym}))
+        fill_defaults
+        normalize
+      end
+
+      def to_html
+        content_tag(self[:tag], self[:icon], style_options_attributes.collect{ |a| [a, self[a] || self.send(a)] }.to_h) + self[:text]
+      end
+
+      def style
+        {
+          'font-size': size,
+        }.collect{ |k, v| "#{k}: #{v}"}.join('; ')
+      end
+
+      private
+
+      def fill_defaults
+        {
+          tag: 'i',
+          text: '',
+          size: '1em',
+        }.each{ |k, v| self[k] = v unless self[k].present? }
+      end
+
+      def normalize
+        self[:size] = case self[:size]
+        when /^\d+x$/ then "#{size.to_i}em"
+        when self[:size].to_i.to_s then "#{size}px"
+        else self[:size]
+        end
+
+        self[:class] = case self[:class]
+        when Array then self[:class]
+        when String then self[:class].split(' ')
+        else []
+        end.concat(['material-icons'])
+      end
+
+    end
+  end
+end

data/lib/material_icons/rails/material_icon_stack.rb

@@ -0,0 +1,46 @@
+module MaterialIcons
+  module Rails
+    class MaterialIconStack < OpenStruct
+
+      include ActionView::Helpers::TagHelper
+
+      cattr_accessor(:style_options_attributes) { [:class, :style] }
+
+      def initialize(icons, options = {})
+        material_icons = icons.collect{ |icon, options| MaterialIcon.new(icon, options.except(:text)) }
+        super(options.merge({icons: material_icons}))
+        fill_defaults
+        normalize
+      end
+
+      def to_html
+        content_tag(self[:tag], self[:icons].collect(&:to_html).join.html_safe + self[:text], style_options_attributes.collect{ |a| [a, self[a] || self.send(a)] }.to_h)
+      end
+
+      private
+
+      def fill_defaults
+        {
+          tag: 'span',
+          text: '',
+          size: '1em',
+        }.each{ |k, v| self[k] = v unless self[k].present? }
+      end
+
+      def normalize
+        self[:size] = case self[:size]
+        when /^\d+x$/ then "#{size.to_i}em"
+        when self[:size].to_i.to_s then "#{size}px"
+        else self[:size]
+        end
+
+        self[:class] = case self[:class]
+        when Array then self[:class]
+        when String then self[:class].split(' ')
+        else []
+        end.concat(['material-icons-stack'])
+      end
+
+    end
+  end
+end

data/lib/version.rb

@@ -1,6 +1,6 @@
 module MaterialIcons
   module Rails
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
     FONT_VERSION = '2.2.0'
   end
 end

data/spec/dummy/log/test.log

@@ -44,3 +44,83 @@
    (0.1ms)  rollback transaction
    (0.2ms)  begin transaction
    (0.1ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.3ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.3ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.3ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.3ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.0ms)  rollback transaction

data/spec/lib/material_icons-rails/icon_helper_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 RSpec.describe MaterialIcons::Rails::IconHelper, type: :helper do
   describe 'material_icon' do
     it 'builds icon tag' do
-      expect(material_icon(:face)).to eq('<i class="material-icons" style="font-size: 18px;">face</i>')
+      expect(material_icon(:face)).to eq('<i class="material-icons" style="font-size: 1em">face</i>')
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: material_icons-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - chaunce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-21 00:00:00.000000000 Z
+date: 2016-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -83,7 +83,9 @@ files:
 - app/assets/stylesheets/material-icons.css
 - app/helpers/material_icons/rails/icon_helper.rb
 - lib/material_icons-rails.rb
-- lib/material_icons-rails/engine.rb
+- lib/material_icons/rails/engine.rb
+- lib/material_icons/rails/material_icon.rb
+- lib/material_icons/rails/material_icon_stack.rb
 - lib/version.rb
 - spec/Rakefile
 - spec/dummy/Rakefile