playbook_ui 2.9.5 → 2.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 538626b25c8cfe2a426a8cb708a5bc832dc50e5cac5fc73d1c2c6f5eb7a9bafc
-  data.tar.gz: 02ec4a247e32c0e92372b0da5fd4a2060daa333b86a6dc410b9047e3749b3526
+  metadata.gz: 468316bdb9eaf492b0e250410de1241ffd0ab4c38f8a605ce42665d59924bb8d
+  data.tar.gz: 7bcf743ce36bfa07ff916bd44be34b84d3de0beb78891292c317c36c5523c91b
 SHA512:
-  metadata.gz: c7a4624ab3daffb11381327e70a0bee6e9ec820a831b0989b3637b872f07da29dc763f51218ae2f512c65e61f906adb8385bb9dbeed8f1846d5d8c75b792d19b
-  data.tar.gz: 02d4a3bf6b766d826e2cba344bcee3c918657e62e393ded122617144f7e8bd12844e96d06ee80f716fe76396d528d10f62de7186f92ab0a767586cb91694ea62
+  metadata.gz: 2cc3c3454e5a37b857b03642b4b2b0f2a9667e4ca0b6ca26285bd8be6f89cb0babe6c617ef4cb8b6bedd63fdcbc82f78f4fc8760274e947a0bc1473016913130
+  data.tar.gz: 1532380e45d62b933b33172925672f560b608e12125901cab907555fe4d4a6e588c11ac61658fe53152e8e1d5895868de400855b8c078b01e8433f7e25d80f58

data/app/pb_kits/playbook/pb_avatar/_avatar.html.erb

@@ -1,12 +1,12 @@
 <%= content_tag(:div,
     id: object.id,
-    data: object.data(initials: object.initials),
-    class: object.classname(object.kit_class),
+    data: object.data.merge(initials: object.initials),
+    class: object.classname,
     aria: object.aria) do %>
   <%= content_tag(:div,
       data: { initials: object.initials },
       class: "avatar_wrapper") do %>
-    <%= object.image %>
-  <% end %>
-  <%= object.status %>
+       <%= pb_rails("image", props: object.image) if object.image.present? %>
+      <% end %>
+       <%= pb_rails("online_status", props: object.online_status_props) if object.status %>
 <% end %>

data/app/pb_kits/playbook/pb_avatar/avatar.rb

@@ -2,78 +2,29 @@
 
 module Playbook
   module PbAvatar
-    class Avatar < Playbook::PbKit::Base
-      PROPS = %i[configured_aria
-                 configured_classname
-                 configured_data
-                 configured_id
-                 configured_image
-                 configured_name
-                 configured_size
-                 configured_status].freeze
+    class Avatar
+      include Playbook::Props
 
-      def initialize(aria: default_configuration,
-                     classname: default_configuration,
-                     data: default_configuration,
-                     id: default_configuration,
-                     image: default_configuration,
-                     name: default_configuration,
-                     size: default_configuration,
-                     status: default_configuration)
-        self.configured_aria = aria
-        self.configured_classname = classname
-        self.configured_data = data
-        self.configured_id = id
-        self.configured_image = image
-        self.configured_name = name
-        self.configured_size = size
-        self.configured_status = status
-      end
+      partial "pb_avatar/avatar"
 
-      def image
-        if is_set? configured_image
-          pb_image = Playbook::PbImage::Image.new(configured_image)
-          ApplicationController.renderer.render(partial: pb_image, as: :object)
-        end
-      end
+      prop :image, type: Playbook::Props::Hash, default: {}
+      prop :name, default: ""
+      prop :size, type: Playbook::Props::Enum,
+                  values: %w[xs sm md base lg xl],
+                  default: "md"
+      prop :status
 
       def initials
-        adjusted_value(configured_name, configured_name.split.map(&:first).join.downcase, "")
+        name.split.map(&:first).join.downcase
       end
 
-      def size
-        size_options = %w[xs sm md base lg xl]
-        one_of_value(configured_size, size_options, "md")
+      def classname
+        generate_classname("pb_avatar_kit", size)
       end
 
-      def status
-        if is_set? configured_status
-          online_status_props = { status: configured_status, classname: "size_#{size}" }
-          pb_status = Playbook::PbOnlineStatus::OnlineStatus.new(online_status_props)
-          ApplicationController.renderer.render(partial: pb_status, as: :object)
-        end
-      end
-
-      def kit_class
-        avatar_options = [
-          "pb_avatar_kit",
-          size,
-        ]
-        avatar_options.join("_")
-      end
-
-      def to_partial_path
-        "pb_avatar/avatar"
-      end
-
-    private
-
-      DEFAULT = Object.new
-      private_constant :DEFAULT
-      def default_configuration
-        DEFAULT
+      def online_status_props
+        { status: status, classname: "size_#{size}" }
       end
-      attr_accessor(*PROPS)
     end
   end
 end

data/app/pb_kits/playbook/pb_bar_graph/_bar_graph.html.erb

@@ -6,15 +6,7 @@
 <% content_for :pb_js do %>
   <%= javascript_tag do %>
     window.addEventListener('DOMContentLoaded', function() {
-      new pbChart('.selector', {
-        id: "<%= object.id %>",
-        chartData: <%= object.sanitized_chart_data %>,
-        type: "<%= object.chart_type %>",
-        title: "<%= object.title %>",
-        subtitle: "<%= object.subtitle %>",
-        axisTitle: "<%= object.axis_title %>",
-        pointStart: <%= object.point_start %>,
-      })
+      new pbChart('.selector', <%= object.chart_options %>)
     })
   <% end %>
 <% end %>

data/app/pb_kits/playbook/pb_bar_graph/bar_graph.rb

@@ -12,7 +12,7 @@ module Playbook
       prop :orientation, type: Playbook::Props::Enum,
                          values: %w[vertical horizontal],
                          default: "vertical"
-      prop :point_start
+      prop :point_start, type: Playbook::Props::Numeric
       prop :subtitle
       prop :title
 
@@ -20,12 +20,20 @@ module Playbook
         orientation == "horizontal" ? "bar" : "column"
       end
 
-      def classname
-        generate_classname("pb_bar_graph")
+      def chart_options
+        {
+          id: id,
+          chartData: chart_data,
+          type: chart_type,
+          title: title,
+          subtitle: subtitle,
+          axisTitle: axis_title,
+          pointStart: point_start
+        }.to_json.html_safe
       end
 
-      def sanitized_chart_data
-        chart_data.to_json.html_safe
+      def classname
+        generate_classname("pb_bar_graph")
       end
     end
   end

data/app/pb_kits/playbook/pb_bar_graph/docs/_bar_graph_default.html.erb

@@ -19,7 +19,7 @@
     axis_title: 'Number of Employees',
     chart_data: data,
     id: "bar-test",
-    point_start: "2012",
+    point_start: 2012,
     subtitle: 'Source: thesolarfoundation.com',
     title: 'Solar Employment Growth by Sector, 2010-2016'
 }) %>

data/app/pb_kits/playbook/pb_dashboard_value/docs/_dashboard_value_align.html.erb

@@ -1,6 +1,6 @@
 <%= pb_rails("dashboard_value", props: {
   stat_label: {label: "Top Title Value"},
-  stat_value: {value: "1,428", unit: "appts"},
+  stat_value: {value: 1428, unit: "appts"},
   stat_change: {change: "decrease", value: "26.1%"}
 }) %>
 
@@ -9,7 +9,7 @@
 <%= pb_rails("dashboard_value", props: {
   align: "center",
   stat_label: {label: "Top Title Value"},
-  stat_value: {value: "1,428", unit: "appts"},
+  stat_value: {value: 1428, unit: "appts"},
   stat_change: {change: "decrease", value: "26.1%"}
 }) %>
 
@@ -18,6 +18,6 @@
 <%= pb_rails("dashboard_value", props: {
   align: "right",
   stat_label: {label: "Top Title Value"},
-  stat_value: {value: "1,428", unit: "appts"},
+  stat_value: {value: 1428, unit: "appts"},
   stat_change: {change: "decrease", value: "26.1%"}
 }) %>

data/app/pb_kits/playbook/pb_dashboard_value/docs/_dashboard_value_default.html.erb

@@ -1,6 +1,6 @@
 <%= pb_rails("dashboard_value", props: {
   stat_label: {label: "Decreased Value"},
-  stat_value: {value: "1,428", unit: "appts"},
+  stat_value: {value: 1428, unit: "appts"},
   stat_change: {change: "decrease", value: "26.1%"}
 }) %>
 
@@ -8,7 +8,7 @@
 
 <%= pb_rails("dashboard_value", props: {
   stat_label: {label: "Increased Value"},
-  stat_value: {value: "938", unit: "homes"},
+  stat_value: {value: 938, unit: "homes"},
   stat_change: {change: "increase", value: "26.1%"}
 }) %>
 
@@ -16,6 +16,6 @@
 
 <%= pb_rails("dashboard_value", props: {
   stat_label: {label: "Neutral Value"},
-  stat_value: {value: "261", unit: "windows"},
+  stat_value: {value: 261, unit: "windows"},
   stat_change: {value: "26.1%"}
 }) %>

data/app/pb_kits/playbook/pb_icon/_icon.html.erb

@@ -1,7 +1,5 @@
-<% if !object.icon_class.nil? %>
-  <%= content_tag(:i, nil,
-      id: object.id,
-      data: object.data,
-      class: object.classname(object.kit_class),
-      aria: object.aria) %>
-<% end %>
+<%= content_tag(:i, nil,
+    id: object.id,
+    data: object.data,
+    class: object.classname,
+    aria: object.aria) %>

data/app/pb_kits/playbook/pb_icon/icon.rb

@@ -2,159 +2,108 @@
 
 module Playbook
   module PbIcon
-    class Icon < Playbook::PbKit::Base
-      PROPS = %i[configured_aria
-                 configured_border
-                 configured_classname
-                 configured_data
-                 configured_fixed_width
-                 configured_flip
-                 configured_icon
-                 configured_id
-                 configured_inverse
-                 configured_list_item
-                 configured_pull
-                 configured_pulse
-                 configured_rotation
-                 configured_size
-                 configured_spin].freeze
-
-      def initialize(aria: default_configuration,
-                     border: default_configuration,
-                     classname: default_configuration,
-                     data: default_configuration,
-                     fixed_width: default_configuration,
-                     flip: default_configuration,
-                     icon: default_configuration,
-                     id: default_configuration,
-                     inverse: default_configuration,
-                     list_item: default_configuration,
-                     pull: default_configuration,
-                     pulse: default_configuration,
-                     rotation: default_configuration,
-                     size: default_configuration,
-                     spin: default_configuration)
-        self.configured_aria = aria
-        self.configured_border = border
-        self.configured_classname = classname
-        self.configured_data = data
-        self.configured_fixed_width = fixed_width
-        self.configured_flip = flip
-        self.configured_icon = icon
-        self.configured_id = id
-        self.configured_inverse = inverse
-        self.configured_list_item = list_item
-        self.configured_pull = pull
-        self.configured_pulse = pulse
-        self.configured_rotation = rotation
-        self.configured_size = size
-        self.configured_spin = spin
+    class Icon
+      include Playbook::Props
+
+      partial "pb_icon/icon"
+
+      prop :border, type: Playbook::Props::Boolean,
+                    default: false
+      prop :fixed_width, type: Playbook::Props::Boolean,
+                         default: false
+      prop :flip, type: Playbook::Props::Enum,
+                  values: ["horizontal", "vertical", "both", nil],
+                  default: nil
+      prop :icon, required: true
+      prop :inverse, type: Playbook::Props::Boolean,
+                     default: false
+      prop :list_item, type: Playbook::Props::Boolean,
+                       default: false
+      prop :pull, type: Playbook::Props::Enum,
+                  values: ["left", "right", nil],
+                  default: nil
+      prop :pulse, type: Playbook::Props::Boolean,
+                   default: false
+      prop :rotation, type: Playbook::Props::Enum,
+                      values: [90, 180, 270, nil],
+                      default: nil
+      prop :size, type: Playbook::Props::Enum,
+                  values: ["lg", "xs", "sm", "1x", "2x", "3x", "4x", "5x", "6x", "7x", "8x", "9x", "10x", nil],
+                  default: nil
+      prop :spin, type: Playbook::Props::Boolean,
+                  default: false
+
+      def classname
+        generate_classname(
+          "pb_icon_kit",
+          "far",
+          icon_class,
+          border_class,
+          fixed_width_class,
+          flip_class,
+          inverse_class,
+          list_item_class,
+          pull_class,
+          pulse_class,
+          rotation_class,
+          size_class,
+          spin_class,
+          separator: " "
+        )
       end
 
+    private
+
       def border_class
-        true_value(configured_border, "fa-border", nil)
+        border ? "fa-border" : nil
       end
 
       def fixed_width_class
-        true_value(configured_fixed_width, "fa-fw", nil)
-      end
-
-      def flip
-        flip_options = %w[horizontal vertical both]
-        one_of_value(configured_flip, flip_options, nil)
-      end
-
-      def flip_class
-        h_class = "fa-flip-horizontal"
-        v_class = "fa-flip-vertical"
-        case flip
-        when "horizontal"
-          h_class
-        when "vertical"
-          v_class
-        when "both"
-          [h_class, v_class].join(" ")
-        end
+        fixed_width ? "fa-fw" : nil
       end
 
       def icon_class
-        adjusted_value(configured_icon, "fa-#{configured_icon}", nil)
+        icon ? "fa-#{icon}" : nil
       end
 
       def inverse_class
-        true_value(configured_inverse, "fa-inverse", nil)
+        inverse ? "fa-inverse" : nil
       end
 
       def list_item_class
-        true_value(configured_list_item, "fa-li", nil)
+        list_item ? "fa-li" : nil
       end
 
-      def pull
-        pull_options = %w[left right]
-        one_of_value(configured_pull, pull_options, default_configuration)
+      def flip_class
+        case flip
+        when "horizontal"
+          "fa-flip-horizontal"
+        when "vertical"
+          "fa-flip-vertical"
+        when "both"
+          "fa-flip-horizontal fa-flip-vertical"
+        end
       end
 
       def pull_class
-        adjusted_value(pull, "fa-pull-#{pull}", nil)
+        pull ? "fa-pull-#{pull}" : nil
       end
 
       def pulse_class
-        true_value(configured_pulse, "fa-pulse", nil)
-      end
-
-      def rotation
-        rotation_options = [90, 180, 270]
-        one_of_value(configured_rotation, rotation_options, default_configuration)
+        pulse ? "fa-pulse" : nil
       end
 
       def rotation_class
-        adjusted_value(rotation, "fa-rotate-#{rotation}", nil)
-      end
-
-      def size
-        size_options = %w[lg xs sm 1x 2x 3x 4x 5x 6x 7x 8x 9x 10x]
-        one_of_value(configured_size, size_options, default_configuration)
+        rotation ? "fa-rotate-#{rotation}" : nil
       end
 
       def size_class
-        adjusted_value(size, "fa-#{size}", nil)
+        size ? "fa-#{size}" : nil
       end
 
       def spin_class
-        true_value(configured_spin, "fa-spin", nil)
-      end
-
-      def kit_class
-        icon_options = [
-          "pb_icon_kit",
-          "far",
-          icon_class,
-          border_class,
-          fixed_width_class,
-          flip_class,
-          inverse_class,
-          list_item_class,
-          pull_class,
-          pulse_class,
-          rotation_class,
-          size_class,
-          spin_class,
-        ]
-        icon_options.reject(&:nil?).join(" ")
-      end
-
-      def to_partial_path
-        "pb_icon/icon"
-      end
-
-    private
-
-      DEFAULT = Object.new
-      private_constant :DEFAULT
-      def default_configuration
-        DEFAULT
+        spin ? "fa-spin" : nil
       end
-      attr_accessor(*PROPS)
     end
   end
 end

data/app/pb_kits/playbook/pb_label_pill/_label_pill.html.erb

@@ -1,7 +1,7 @@
 <%= content_tag(:div,
     id: object.id,
     data: object.data,
-    class: object.classname("pb_label_pill_kit")) do %>
-  <%= object.label %>
-  <%= object.pill %>
+    class: object.classname) do %>
+      <%= pb_rails("caption", props: { text: object.label, classname: "pb_label_pill_label"}) %>
+      <%= pb_rails("pill", props: { text: object.pill_value, variant: object.variant, classname: "pb_label_pill_pill" }) %>
 <% end %>

data/app/pb_kits/playbook/pb_label_pill/label_pill.rb

@@ -2,58 +2,20 @@
 
 module Playbook
   module PbLabelPill
-    class LabelPill < Playbook::PbKit::Base
-      PROPS = %i[configured_classname
-                 configured_data
-                 configured_id
-                 configured_label
-                 configured_pill_value
-                 configured_variant].freeze
+    class LabelPill
+      include Playbook::Props
 
-      def initialize(classname: default_configuration,
-                     data: default_configuration,
-                     id: default_configuration,
-                     label: default_configuration,
-                     pill_value: default_configuration,
-                     variant: default_configuration)
-        self.configured_classname = classname
-        self.configured_data = data
-        self.configured_id = id
-        self.configured_label = label
-        self.configured_pill_value = pill_value
-        self.configured_variant = variant
-      end
-
-      def label
-        if is_set? configured_label
-          pb_caption = Playbook::PbCaption::Caption.new(text: configured_label, classname: "pb_label_pill_label")
-          ApplicationController.renderer.render(partial: pb_caption, as: :object)
-        end
-      end
-
-      def pill
-        if is_set? configured_pill_value
-          pb_pill = Playbook::PbPill::Pill.new(text: configured_pill_value, variant: variant, classname: "pb_label_pill_pill")
-          ApplicationController.renderer.render(partial: pb_pill, as: :object)
-        end
-      end
-
-      def variant
-        default_value(configured_variant, "neutral")
-      end
-
-      def to_partial_path
-        "pb_label_pill/label_pill"
-      end
+      partial "pb_label_pill/label_pill"
 
-    private
+      prop :variant, type: Playbook::Props::Enum,
+                     values: %w[success warning error info neutral],
+                     default: "neutral"
+      prop :label
+      prop :pill_value
 
-      DEFAULT = Object.new
-      private_constant :DEFAULT
-      def default_configuration
-        DEFAULT
+      def classname
+        generate_classname("pb_label_pill_kit", variant)
       end
-      attr_accessor(*PROPS)
     end
   end
 end

data/app/pb_kits/playbook/pb_label_value/_label_value.html.erb

@@ -1,7 +1,7 @@
 <%= content_tag(:div,
     id: object.id,
     data: object.data,
-    class: object.classname(object.kit_class)) do %>
-  <%= object.label %>
-  <%= object.value %>
+    class: object.classname) do %>
+  <%= pb_rails("caption", props: { text: object.label }) %>
+  <%= pb_rails("body", props: { text: object.value }) %>
 <% end %>

data/app/pb_kits/playbook/pb_label_value/label_value.rb

@@ -2,55 +2,17 @@
 
 module Playbook
   module PbLabelValue
-    class LabelValue < Playbook::PbKit::Base
-      PROPS = %i[configured_classname
-                 configured_data
-                 configured_id
-                 configured_label
-                 configured_value].freeze
+    class LabelValue
+      include Playbook::Props
 
-      def initialize(classname: default_configuration,
-                     data: default_configuration,
-                     id: default_configuration,
-                     label: default_configuration,
-                     value: default_configuration)
-        self.configured_classname = classname
-        self.configured_data = data
-        self.configured_id = id
-        self.configured_label = label
-        self.configured_value = value
-      end
-
-      def label
-        if is_set? configured_label
-          pb_label = Playbook::PbCaption::Caption.new(text: configured_label)
-          ApplicationController.renderer.render(partial: pb_label, as: :object)
-        end
-      end
-
-      def value
-        pb_body = Playbook::PbBody::Body.new do
-          default_value(configured_value, "")
-        end
-        ApplicationController.renderer.render(partial: pb_body, as: :object)
-      end
-
-      def kit_class
-        "pb_label_value_kit"
-      end
-
-      def to_partial_path
-        "pb_label_value/label_value"
-      end
+      partial "pb_label_value/label_value"
 
-    private
+      prop :label, required: true
+      prop :value, required: true
 
-      DEFAULT = Object.new
-      private_constant :DEFAULT
-      def default_configuration
-        DEFAULT
+      def classname
+        generate_classname("pb_label_value_kit")
       end
-      attr_accessor(*PROPS)
     end
   end
 end

data/app/pb_kits/playbook/pb_line_graph/_line_graph.html.erb

@@ -2,20 +2,12 @@
     aria: object.aria,
     id: object.id,
     data: object.data,
-    class: object.classname("pb_line_graph") 
+    class: object.classname
     ) %>
 <% content_for :pb_js do %>
   <%= javascript_tag do %>
     window.addEventListener('DOMContentLoaded', function() {
-      new pbChart('.selector', {
-        id: "<%= object.id %>",
-        chartData: <%= object.chart_data %>,
-        type: "<%= object.chart_type %>",
-        title: "<%= object.title %>",
-        subtitle: "<%= object.subtitle %>",
-        axisTitle: "<%= object.axis_title %>",
-        pointStart: <%= object.point_start %>,
-      })
+      new pbChart('.selector', <%= object.chart_options %>)
     })
   <% end %>
 <% end %>

data/app/pb_kits/playbook/pb_line_graph/docs/_line_graph_default.html.erb

@@ -15,7 +15,7 @@
     data: [12908, 5948, 8105, 11248, 8989, 11816, 18274, 18111]
 }] %>
 
-<%= pb_rails("line_graph", props: { id: "line-test", gradient: false, chart_data: data, point_start: "1", title: 'Solar Employment Growth by Sector, 2010-2016', subtitle: 'Source: thesolarfoundation.com', axis_title: 'Number of Employees' }  ) %>
+<%= pb_rails("line_graph", props: { id: "line-test", gradient: false, chart_data: data, point_start: 1, title: 'Solar Employment Growth by Sector, 2010-2016', subtitle: 'Source: thesolarfoundation.com', axis_title: 'Number of Employees' }  ) %>
 
 
 

data/app/pb_kits/playbook/pb_line_graph/line_graph.rb

@@ -2,84 +2,39 @@
 
 module Playbook
   module PbLineGraph
-    class LineGraph < Playbook::PbKit::Base
-      PROPS = %i[
-        configured_aria
-        configured_axis_title
-        configured_chart_data
-        configured_classname
-        configured_data
-        configured_gradient
-        configured_id
-        configured_point_start
-        configured_subtitle
-        configured_title
-      ].freeze
+    class LineGraph
+      include Playbook::Props
 
-      def initialize(
-        aria: default_configuration,
-        axis_title: default_configuration,
-        chart_data: default_configuration,
-        classname: default_configuration,
-        data: default_configuration,
-        gradient: default_configuration,
-        id: default_configuration,
-        point_start: default_configuration,
-        subtitle: default_configuration,
-        title: default_configuration
-      )
-        self.configured_aria = aria
-        self.configured_axis_title = axis_title
-        self.configured_chart_data = chart_data
-        self.configured_classname = classname
-        self.configured_data = data
-        self.configured_gradient = gradient
-        self.configured_id = id
-        self.configured_point_start = point_start
-        self.configured_subtitle = subtitle
-        self.configured_title = title
-      end
+      partial "pb_line_graph/line_graph"
 
-      def gradient
-        is_true? configured_gradient
-      end
+      prop :axis_title
+      prop :chart_data, type: Playbook::Props::Array,
+                        default: []
+      prop :gradient, type: Playbook::Props::Boolean,
+                      default: false
+      prop :point_start, type: Playbook::Props::Numeric
+      prop :subtitle
+      prop :title
 
       def chart_type
-        gradient == true ? "area" : "line"
-      end
-
-      def title
-        default_value(configured_title, "")
+        gradient ? "area" : "line"
       end
 
-      def subtitle
-        default_value(configured_subtitle, "")
+      def chart_options
+        {
+          id: id,
+          chartData: chart_data,
+          type: chart_type,
+          title: title,
+          subTitle: subtitle,
+          axisTitle: axis_title,
+          pointStart: point_start,
+        }.to_json.html_safe
       end
 
-      def axis_title
-        default_value(configured_axis_title, "")
-      end
-
-      def to_partial_path
-        "pb_line_graph/line_graph"
-      end
-
-      def point_start
-        default_value(configured_point_start, "")
-      end
-
-      def chart_data
-        adjusted_value(configured_chart_data, configured_chart_data.to_json.html_safe, {})
-      end
-
-    private
-
-      DEFAULT = Object.new
-      private_constant :DEFAULT
-      def default_configuration
-        DEFAULT
+      def classname
+        generate_classname("pb_line_graph")
       end
-      attr_accessor(*PROPS)
     end
   end
 end

data/app/pb_kits/playbook/pb_stat_value/_stat_value.html.erb

@@ -1,10 +1,16 @@
 <%= content_tag(:div,
     id: object.id,
     data: object.data,
-    class: object.classname(object.kit_class)) do %>
+    class: object.classname) do %>
   <div class="pb_stat_value_wrapper">
-    <%= object.display_value %>
-    &nbsp;
-    <%= object.display_unit %>
+    <%= pb_rails "title", props: {
+      classname: "pb_stat_value_kit",
+      size: 1,
+      text: object.value } %>
+      &nbsp;
+      <%= pb_rails "title", props: {
+      classname: "pb_stat_value_kit",
+      size: 3,
+      text: object.unit } %>
   </div>
 <% end %>

data/app/pb_kits/playbook/pb_stat_value/docs/_stat_value_unit.html.erb

@@ -1 +1 @@
-<%= pb_rails("stat_value", props: { value: "5,294", unit: "appt" }) %>
+<%= pb_rails("stat_value", props: { value: 5294, unit: "appt" }) %>

data/app/pb_kits/playbook/pb_stat_value/stat_value.rb

@@ -2,61 +2,17 @@
 
 module Playbook
   module PbStatValue
-    class StatValue < Playbook::PbKit::Base
-      PROPS = %i[configured_classname
-                 configured_data
-                 configured_id
-                 configured_unit
-                 configured_value].freeze
+    class StatValue
+      include Playbook::Props
 
-      def initialize(classname: default_configuration,
-                     data: default_configuration,
-                     id: default_configuration,
-                     unit: default_configuration,
-                     value: default_configuration)
-        self.configured_classname = classname
-        self.configured_data = data
-        self.configured_id = id
-        self.configured_unit = unit
-        self.configured_value = value
-      end
-
-      def value
-        default_value(configured_value, 0)
-      end
-
-      def display_value
-        pb_title = Playbook::PbTitle::Title.new(size: 1, text: value)
-        ApplicationController.renderer.render(partial: pb_title, as: :object)
-      end
-
-      def unit
-        default_value(configured_unit, nil)
-      end
-
-      def display_unit
-        unless unit.nil?
-          pb_unit = Playbook::PbTitle::Title.new(size: 3, text: unit)
-          ApplicationController.renderer.render(partial: pb_unit, as: :object)
-        end
-      end
-
-      def kit_class
-        "pb_stat_value_kit"
-      end
-
-      def to_partial_path
-        "pb_stat_value/stat_value"
-      end
+      partial "pb_stat_value/stat_value"
 
-    private
+      prop :unit
+      prop :value, type: Playbook::Props::Number
 
-      DEFAULT = Object.new
-      private_constant :DEFAULT
-      def default_configuration
-        DEFAULT
+      def classname
+        generate_classname("pb_stat_value_kit")
       end
-      attr_accessor(*PROPS)
     end
   end
 end

data/app/pb_kits/playbook/pb_title_count/_title_count.html.erb

@@ -1,7 +1,10 @@
 <%= content_tag(:div,
     id: object.id,
     data: object.data,
-    class: object.classname(object.kit_class)) do %>
-  <%= object.title %>
-  <%= object.count %>
+    class: object.classname) do %>
+  <%= pb_rails("title", props: {
+    size: object.title_size,
+    text: object.title,
+    classname: "pb_title_count_text" }) if object.title %>
+  <%= pb_rails("body", props: { color: "light" }) { object.format_count } if object.count %>
 <% end %>

data/app/pb_kits/playbook/pb_title_count/docs/_title_count_default.html.erb

@@ -1,6 +1,6 @@
 <%= pb_rails("title_count", props: {
   title: "Appointments",
-  count: "7,399"
+  count: 35.78
 }) %>
 
 <br>

data/app/pb_kits/playbook/pb_title_count/title_count.rb

@@ -2,91 +2,31 @@
 
 module Playbook
   module PbTitleCount
-    class TitleCount < Playbook::PbKit::Base
-      PROPS = %i[configured_align
-                 configured_classname
-                 configured_count
-                 configured_data
-                 configured_id
-                 configured_size
-                 configured_title].freeze
+    class TitleCount
+      include Playbook::Props
 
-      def initialize(align: default_configuration,
-                     classname: default_configuration,
-                     count: default_configuration,
-                     data: default_configuration,
-                     id: default_configuration,
-                     size: default_configuration,
-                     title: default_configuration)
-        self.configured_align = align
-        self.configured_classname = classname
-        self.configured_count = count
-        self.configured_data = data
-        self.configured_id = id
-        self.configured_size = size
-        self.configured_title = title
-      end
+      partial "pb_title_count/title_count"
 
-      def align
-        align_options = %w[left center right]
-        one_of_value(configured_align, align_options, "left")
-      end
+      prop :align, type: Playbook::Props::Enum,
+           values: %w[left center right],
+           default: "left"
+      prop :size, type: Playbook::Props::Enum,
+                  values: %w[lg sm],
+                  default: "sm"
+      prop :title
+      prop :count, type: Playbook::Props::Numeric
 
-      def size
-        size_options = %w[lg sm]
-        one_of_value(configured_size, size_options, "sm")
+      def classname
+        generate_classname("pb_title_count_kit", align, size)
       end
 
       def title_size
         size == "lg" ? 3 : 4
       end
 
-      def title
-        if is_set? configured_title
-          pb_title = Playbook::PbTitle::Title.new(size: title_size, text: configured_title, classname: "pb_title_count_text")
-          ApplicationController.renderer.render(partial: pb_title, as: :object)
-        end
-      end
-
-      def count
-        if is_set? configured_count
-          value = if configured_count.is_a?(Integer) || configured_count.is_a?(Float)
-                    format_number(configured_count)
-                  else
-                    configured_count
-                  end
-
-          pb_count = Playbook::PbBody::Body.new(color: "light") do
-            value.to_s
-          end
-          ApplicationController.renderer.render(partial: pb_count, as: :object)
-        end
-      end
-
-      def format_number(number)
-        number.to_s.gsub(/(\d)(?=\d{3}+(?:\.|$))(\d{3}\..*)?/, '\1,\2')
-      end
-
-      def kit_class
-        kit_options = [
-          "pb_title_count_kit",
-          align,
-        ]
-        kit_options.join("_")
-      end
-
-      def to_partial_path
-        "pb_title_count/title_count"
-      end
-
-    private
-
-      DEFAULT = Object.new
-      private_constant :DEFAULT
-      def default_configuration
-        DEFAULT
+      def format_count
+        count.to_s.gsub(/(\d)(?=\d{3}+(?:\.|$))(\d{3}\..*)?/, '\1,\2')
       end
-      attr_accessor(*PROPS)
     end
   end
 end

data/app/pb_kits/playbook/pb_title_detail/_title_detail.html.erb

@@ -1,7 +1,7 @@
 <%= content_tag(:div,
     id: object.id,
     data: object.data,
-    class: object.classname(object.kit_class)) do %>
-  <%= object.title %>
-  <%= object.detail %>
+    class: object.classname) do %>
+  <%= pb_rails("title", props: { text: object.title, size: 4 }) %>
+  <%= pb_rails("body", props: { text: object.detail, color: "light" }) %>
 <% end %>

data/app/pb_kits/playbook/pb_title_detail/title_detail.rb

@@ -2,69 +2,20 @@
 
 module Playbook
   module PbTitleDetail
-    class TitleDetail < Playbook::PbKit::Base
-      PROPS = %i[configured_align
-                 configured_classname
-                 configured_data
-                 configured_detail
-                 configured_id
-                 configured_title].freeze
+    class TitleDetail
+      include Playbook::Props
 
-      def initialize(align: default_configuration,
-                     classname: default_configuration,
-                     data: default_configuration,
-                     detail: default_configuration,
-                     id: default_configuration,
-                     title: default_configuration)
-        self.configured_align = align
-        self.configured_classname = classname
-        self.configured_data = data
-        self.configured_detail = detail
-        self.configured_id = id
-        self.configured_title = title
-      end
-
-      def align
-        align_options = %w[left center right]
-        one_of_value(configured_align, align_options, "left")
-      end
-
-      def title
-        if is_set? configured_title
-          pb_title = Playbook::PbTitle::Title.new(size: 4, text: configured_title)
-          ApplicationController.renderer.render(partial: pb_title, as: :object)
-        end
-      end
-
-      def detail
-        if is_set? configured_detail
-          pb_detail = Playbook::PbBody::Body.new(color: "light") do
-            configured_detail
-          end
-          ApplicationController.renderer.render(partial: pb_detail, as: :object)
-        end
-      end
-
-      def kit_class
-        kit_options = [
-          "pb_title_detail_kit",
-          align,
-        ]
-        kit_options.join("_")
-      end
-
-      def to_partial_path
-        "pb_title_detail/title_detail"
-      end
+      partial "pb_title_detail/title_detail"
 
-    private
+      prop :align, type: Playbook::Props::Enum,
+                   values: %w[left center right],
+                   default: "left"
+      prop :detail, required: true
+      prop :title, required: true
 
-      DEFAULT = Object.new
-      private_constant :DEFAULT
-      def default_configuration
-        DEFAULT
+      def classname
+        generate_classname("pb_title_detail_kit", align)
       end
-      attr_accessor(*PROPS)
     end
   end
 end

data/app/pb_kits/playbook/props.rb

@@ -12,9 +12,10 @@ require_relative "./props/hash"
 require_relative "./props/hash_array"
 require_relative "./props/number"
 require_relative "./props/number_array"
-require_relative "./props/string"
+require_relative "./props/numeric"
 require_relative "./props/percentage"
 require_relative "./props/proc"
+require_relative "./props/string"
 
 module Playbook
   module Props

data/app/pb_kits/playbook/props/numeric.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Playbook
+  module Props
+    class Numeric < Playbook::Props::Base
+      def validate(value)
+        value.nil? ||
+          value.is_a?(Integer) ||
+          value.is_a?(Float)
+      end
+    end
+  end
+end

data/app/pb_kits/playbook/props/percentage.rb

@@ -10,7 +10,7 @@ module Playbook
     private
 
       def numeric_in_range?(value)
-        (value.is_a?(Numeric) &&
+        (value.is_a?(::Numeric) &&
           value <= 100 &&
           value >= 0)
       end

data/lib/playbook/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Playbook
-  VERSION = "2.9.5"
+  VERSION = "2.9.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: playbook_ui
 version: !ruby/object:Gem::Version
-  version: 2.9.5
+  version: 2.9.6
 platform: ruby
 authors:
 - Power UX
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-25 00:00:00.000000000 Z
+date: 2019-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -1031,6 +1031,7 @@ files:
 - app/pb_kits/playbook/props/hash_array.rb
 - app/pb_kits/playbook/props/number.rb
 - app/pb_kits/playbook/props/number_array.rb
+- app/pb_kits/playbook/props/numeric.rb
 - app/pb_kits/playbook/props/percentage.rb
 - app/pb_kits/playbook/props/proc.rb
 - app/pb_kits/playbook/props/string.rb