asbru 0.0.7 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aeb659c7586894cee347b85ddb88c84437a6f0e355051af176e07f33191a5171
-  data.tar.gz: 187577433b2cf87d1e0c54c295e1c815db1d9729a9536671d0b76f47776a726c
+  metadata.gz: 45ab6b9c6737f74c9bc7b395f1bd7df468feb923ccdc07b09f51ddd9d39c90fd
+  data.tar.gz: ef4da4d80683a0bfb4a24701ce22d4f2bb231f2c6b8f530e048cc3bfa372118a
 SHA512:
-  metadata.gz: fb0804165ccad3401cb34dce86650703e81eea1da6c32c944029c8b55a915f11233282d285b3ed81dbc713ee19cc4a4e8bc412a661210210843de0661e528f5a
-  data.tar.gz: 8c6b8ff326ee00768f773b7b3189026d531d75b00e359a6a96be08f2b235a4d0b460ff55696f501c9c1b0fcedefa754f8d633d4d0d98ba50919eec4482b3aa6f
+  metadata.gz: c924577583ce3eeb2734aa77d90c13de7a3866b7a0626f737c7015151cca29c05d307c131bf3c624092d1232257caa9db8adaa3832eed5f03d8fcf1aa697d960
+  data.tar.gz: f600444f70190663de4c021da4bc0f353aec551be1b151cbfab95754c0bf32d1d12b273ab5a886c5238006d7d00a52b2081fd97a701f44903a01065c0944cd54

data/lib/asbru/cml.rb

@@ -1,88 +1,65 @@
 require 'asbru/components/savage'
 
 module Asbru
-  # This module defines a bunch of methods that
-  module CML
-    C = Asbru::Components::Savage
+  # This module defines a bunch of methods that make component based pages
+  # appear more similar to HTML.
+  # The limitation is that nested components won't work.
+  module Cml
+    C = Asbru::Config.component_mode.tap(&:setup)
 
-    # Problems:
-    # How can we make this module work with Sage/Savage depending on config?
-    # Do we want to do that?
-
-    # Ideas:
-    # 1. We can make Sage implement to exactly the same interface as Savage and
-    #  somehow inject it.
-    # 2. We could also ALWAYS load the sage classed needed here and call these
-    # required.
-    #
-    # I think I prefer 1 even though the syntax of Sage is nicer imo.
     class << self
       def p text, **opts
-        C.send "#{component_prefix}_content",
+        C.send "#{prefix(opts)}_content",
             text: text,
             **opts
       end
 
       def h1 text, **opts
-        C.send "#{component_prefix}_title",
+        C.send "#{prefix(opts)}_title",
             size: 'h1',
             text: text
       end
 
       def h2 text, **opts
-        C.send "#{component_prefix}_title",
+        C.send "#{prefix(opts)}_title",
             size: 'h2',
             text: text
       end
 
       def h3 text, **opts
-        C.send "#{component_prefix}_title",
+        C.send "#{prefix(opts)}_title",
             size: 'h3',
             text: text
       end
 
       def h4 text, **opts
-        C.send "#{component_prefix}_title",
+        C.send "#{prefix(opts)}_title",
             size: 'h4',
             text: text
       end
 
       def h5 text, **opts
-        C.send "#{component_prefix}_title",
+        C.send "#{prefix(opts)}_title",
             size: 'h5',
             text: text
       end
 
-      def hr color: 'stable-500'
-        C.send "#{component_prefix}_divider",
+      def hr color: 'stable-500', **opts
+        C.send "#{prefix}_divider",
             color: color,
             height: 1
       end
 
-      def vertical_spacer height
-        C.send "#{component_prefix}_divider",
+      def vertical_spacer height, **opts
+        C.send "#{prefix(opts)}_divider",
             color: :transparent,
             height: height
       end
 
-      def table_row(*cells)
-        { data: cells }
-      end
-
-      def table_cell(text, action: nil, method: nil, confirm: nil, color: nil)
-        cell = { text: text}
-        cell[:color] = color if color.present?
-        cell[:action] = action if action.present?
-        cell[:customData] = {}
-        cell[:customData]['data-method'] = method if method.present?
-        cell[:customData]['data-confirm'] = confirm if confirm.present?
-        cell
-      end
-
       private
 
-      def component_prefix
-        Asbru.config.component_prefix
+      def prefix(opts)
+        opts[:module] || Asbru.config.component_prefix
       end
     end
   end

data/lib/asbru/components/sage.rb

@@ -1,3 +1,5 @@
+require 'react/rails/view_helper'
+
 module Asbru
   module Components
     # This module uses components.json to see what components are available to
@@ -9,6 +11,7 @@ module Asbru
       extend ::React::Rails::ViewHelper
       class << self
         def setup
+          debugger
           file = File.open(Rails.root.join('app',
               'javascript',
               'components',

data/lib/asbru/components/savage.rb

@@ -1,3 +1,5 @@
+require 'react/rails/view_helper'
+
 module Asbru
   module Components
     # This module is used to generate react components in the views and loads
@@ -6,6 +8,10 @@ module Asbru
     class Savage
       extend ::React::Rails::ViewHelper
       class << self
+        def setup
+          # No-op
+        end
+
         def method_missing(method_id, **opts)
           if self.respond_to? :method_id
             super

data/lib/asbru/form_builder.rb

@@ -35,7 +35,7 @@ module Asbru
       { check_box: { type: 'checkbox' } },
       { file_field: { type: 'file' } },
       { text_field: {} },
-      { telephone_field: { type: 'tel '}}
+      { telephone_field: { type: 'tel'}}
     ].freeze
 
     def errors(name)
@@ -54,10 +54,11 @@ module Asbru
     end
 
     def render_form_element(attribute, options)
-      new_options = options.merge(
+      new_options = options.reverse_merge(
         {
           name: tag_name_for(attribute),
-          errors: errors(attribute)
+          errors: errors(attribute),
+          errorIcon: error_icon
         }
       )
 
@@ -210,5 +211,11 @@ module Asbru
           )
       )
     end
+
+    private
+
+    def error_icon
+      Asbru.config.default_form_error_icon
+    end
   end
 end

data/lib/asbru/ragna.rb

@@ -5,8 +5,8 @@ require 'asbru/cml'
 
 # We use the C for binding components. We might want to make this configurable
 # later on
-::C = Asbru::Components::Sage.tap(&:setup)
-::CML = Asbru::CML
+::C = Asbru.config.component_mode.tap(&:setup)
+::Cml = Asbru::Cml
 
 module Asbru
   module Ragna

data/lib/asbru/version.rb

@@ -1,3 +1,3 @@
 module Asbru
-  VERSION = '0.0.7'
+  VERSION = '0.0.11'
 end

data/lib/asbru.rb

@@ -1,8 +1,14 @@
 require "asbru/railtie"
 require 'dry-configurable'
+require 'asbru/components/savage'
+require 'asbru/components/sage'
 
 module Asbru
   extend Dry::Configurable
-  setting :component_prefix,'app'
-  setting :form_builder_prefix, 'app'
+  setting :component_prefix, default: 'app'
+  setting :form_builder_prefix, default: 'app'
+  setting :default_form_error_icon, default: 'icon-error'
+  setting :component_mode, default: Asbru::Components::Savage
+
+  Config = self.config
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asbru
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.11
 platform: ruby
 authors:
 - Stev-0
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-13 00:00:00.000000000 Z
+date: 2022-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails