fatcow 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85cc2dfc6707b0ebdb4c97798477071d7d7da0fdc050b9dc4c67e7098551ae78
-  data.tar.gz: c4699fb1961b119529a2cd23ec2641b31afdd2945921c7c4de14a60fcdc65ac9
+  metadata.gz: 2ce51b7283b6d2b8fdbcc0186ecbf52ded0d45e5dc0eb52728bed6be9ca616c5
+  data.tar.gz: a417404eb455ab6c5af6d9f651b4e83325193c878dda9462764feae569d1511d
 SHA512:
-  metadata.gz: e95144f6bd31adb65f321f39a74e8232206bee1b97914bbcd44ed8a285b7ecfb0e7bcd567d792eef0f4afab4295dbf96759f167fe79b94edf4576902a58f0274
-  data.tar.gz: 35591624846a9dcad4ba46362a34e3b04f3a79ba6b52c28cdf386e578b8661d8a72b0d8526cfa55ac634315cb0c4359883512bbe7fff545445387d39a79ef7a2
+  metadata.gz: 7521fdb3002cfb91f5ed976d47876cd3f1c5cfe537d6bb0f95eaa32157792521c089b1697e0b8eedc1dbd1c1c66fa86e90d3f48207cd96decd73fd84ed62eed7
+  data.tar.gz: '0896205527bf40cc57a76b9211f37e18ba81df2f7800a6c63d0a232f9d0fce03b22ae5cf6c96a5c5863184f9e0873c7a7bd0f3899a1b42081927da0df84d0e9f'

data/README.md

@@ -70,6 +70,9 @@ You cannot do this on collections, though that may be coming later.
 <%= @alert.show_icon %>
 ```
 
+## All Icons
+![a big list of icons](https://web.archive.org/web/20160324052646if_/http://www.fatcow.com/images/fatcow-icons/fatcow-3926.png)
+
 ## Licensing
 
 FatCow web icons are licensed under

data/lib/fatcow/helpers.rb

@@ -11,8 +11,10 @@ module Fatcow
     def fatcow_style_tag
       content_tag :style do <<~CSS
           .fatcow-icon {
-              display: inline-block;
-              position: relative;
+            display: inline-block;
+            position: relative;
+            image-rendering: crisp-edges;
+            user-select: none;
           }
           
           .fatcow-icon__bullet {
@@ -21,10 +23,29 @@ module Fatcow
             left: 0;
             transform: translate(25%, 25%);
           }
+         
+          .fatcow-icon > img:not(.fatcow-icon__bullet--hack) {
+            width: 100%;
+          }
             
           .fatcow-icon__bullet--pre-aligned {
             transform: none;
           }
+
+          .fatcow-icon--small .fatcow-icon__bullet--hack {
+            display: inline-block;
+            position: static;
+            transform: none;
+            margin-left: 4px;
+          }
+
+          .fatcow-icon:not(.fatcow-icon--small) .fatcow-icon__bullet--hack {
+            transform: none;
+            bottom: 0;
+            right: 0;
+            top: initial;
+            left: initial;
+          }
         CSS
       end
     end

data/lib/fatcow/icon.rb

@@ -4,12 +4,14 @@ require 'nokogiri'
 
 module Fatcow
   class Icon
-    attr_reader :name, :status, :app
+    attr_reader :name, :status, :app, :size
 
-    def initialize(app, name, status = nil)
+    def initialize(app, name, status = nil, **options)
       @app = app
       @name = name
       @status = status
+
+      @size = options[:size] || :regular
     end
 
     def status=(new_status)
@@ -27,6 +29,11 @@ module Fatcow
       clear_document
     end
 
+    def size=(new_size)
+      @size = new_size
+      clear_document
+    end
+
     def to_html
       document.to_html.html_safe
     end
@@ -45,22 +52,28 @@ module Fatcow
 
     def asset_path
       return base_icon_path unless status
-      "/assets/normal/FatCow_Icons32x32/#{name}_#{status}.png" if status
+      "/assets/normal/#{subdirectory}/#{name}_#{status}.png" if status
     end
 
     def base_icon_path
-      "/assets/normal/FatCow_Icons32x32/#{name}.png"
+      "/assets/normal/#{subdirectory}/#{name}.png"
     end
 
     def bullet_icon_path
-      "/assets/normal/FatCow_Icons32x32/bullet_#{status}.png"
+      return "/assets/normal/#{subdirectory}/bullet_#{status}.png" if bullet_exists?
+      "/assets/normal/FatCow_Icons16x16/#{status}.png"
+    end
+
+    def bullet_exists?
+      bullets = %i[archive attach back bell brush bug bulb_off bulb_on burn camera cd chart code_red code connect database document down dvd edit excel find flash gear lightning link magnify medal office palette php powerpoint table textfield up valid vector word world user blue purple pink red orange yellow green white black add delete go error key wrench toggle_minus toggle_plus feed picture disk star arrow_bottom arrow_down arrow_left_2 arrow_left arrow_right_2 arrow_right arrow_top arrow_up]
+      bullets.include? status
     end
 
     def document
       return @document if @document
 
       @document ||= Nokogiri::HTML::Builder.new do |doc|
-        doc.div(class: "fatcow-icon fatcow-icon--#{name}") {
+        doc.div(class: container_class) {
           if status && composite?
             doc.parent << Nokogiri::HTML.fragment(@app.image_tag(base_icon_path))
             doc.parent << Nokogiri::HTML.fragment(@app.image_tag(bullet_icon_path, class: bullet_class))
@@ -77,10 +90,21 @@ module Fatcow
       @document = nil
     end
 
+    def container_class
+      return "fatcow-icon fatcow-icon--#{name}" if size == :regular
+      "fatcow-icon fatcow-icon--small fatcow-icon--#{name}"
+    end
+
     def bullet_class
       prealigned_bullets = %i[archive attach back bell brush bug bulb_off bulb_on burn camera cd chart code_red code connect database document down dvd edit excel find flash gear lightning link magnify medal office palette php powerpoint table textfield up valid vector word world user]
       return 'fatcow-icon__bullet fatcow-icon__bullet--pre-aligned' if prealigned_bullets.include? status
-      return 'fatcow-icon__bullet'
+      return 'fatcow-icon__bullet' if bullet_exists?
+      'fatcow-icon__bullet fatcow-icon__bullet--hack'
+    end
+
+    def subdirectory
+      return 'FatCow_Icons32x32' if size == :regular
+      'FatCow_Icons16x16'
     end
   end
 end

data/lib/fatcow/model.rb

@@ -16,33 +16,38 @@ module Fatcow
     }
 
     included do
-      def show_icon
-        current_state = find_icon_status(:FATCOW_ICON_SHOW_STATUSES)
+      def show_icon(**options)
+        current_state = find_icon_status(:FATCOW_ICON_SHOW_STATUSES, :DEFAULT_SHOW_STATUSES)
 
-        return custom_icon(current_state) if current_state
-        custom_icon(nil) if current_state.nil?
+        return custom_icon(current_state, **options) if current_state
+        custom_icon(nil, **options) if current_state.nil?
       end
 
-      def form_icon
-        current_state = find_icon_status(:FATCOW_ICON_FORM_STATUSES)
+      def form_icon(**options)
+        current_state = find_icon_status(:FATCOW_ICON_FORM_STATUSES, :DEFAULT_FORM_STATUSES)
 
-        return custom_icon(current_state) if current_state
-        custom_icon(nil) if current_state.nil?
+        return custom_icon(current_state, **options) if current_state
+        custom_icon(nil, **options) if current_state.nil?
       end
 
-      def find_icon_status(statuses_const_key)
+      def find_icon_status(statuses_const_key, fallback_const_key)
         statuses = self.class.const_get statuses_const_key
+        fallback = self.class.const_get fallback_const_key
+
         current_status = statuses.find { |status, proc| instance_exec(&proc) }
+        current_status = fallback.find { |status, proc| instance_exec(&proc) } if current_status.nil?
 
         return nil if current_status.nil?
         current_status[0]
       end
 
-      def custom_icon(status)
+      def custom_icon(status, **options)
         icon = self.class.const_get :FATCOW_ICON
 
         icon.app = self if icon.app.nil?
         icon.status = status if icon.status != status
+        icon.size = options[:size] if options[:size] && icon.size != options[:size]
+        icon.size = :regular unless options[:size] && icon.size != :regular
 
         icon
       end
@@ -51,8 +56,8 @@ module Fatcow
     class_methods do
       def has_icon (icon_name, **statuses)
         const_set :FATCOW_ICON, Fatcow::Icon.new(nil, icon_name)
-        const_set :FATCOW_ICON_SHOW_STATUSES, DEFAULT_SHOW_STATUSES.dup.merge(statuses[:show] || {})
-        const_set :FATCOW_ICON_FORM_STATUSES, DEFAULT_FORM_STATUSES.dup.merge(statuses[:form] || {})
+        const_set :FATCOW_ICON_SHOW_STATUSES, statuses[:show] || {}
+        const_set :FATCOW_ICON_FORM_STATUSES, statuses[:form] || {}
       end
     end
   end

data/lib/fatcow/version.rb

@@ -1,5 +1,5 @@
 module Fatcow
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 
   ASSET_ROOT = File.expand_path("assets", __dir__)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fatcow
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Gray