asbru 0.0.6 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbe8a87c74d02a2012130ec1e2e93f3a5d5c52fe32aedfd9d85578e272e866b8
-  data.tar.gz: 831326c07be46d075d2f71ae17e4b86511278bdc3382368a8d0efb4602d7737d
+  metadata.gz: 90a72c9539babb635d139212a66f008dd633e1e0b40182458120600e6c83b59f
+  data.tar.gz: 912bf88b22c9ef7db0314833d44d29948b17c07f4722d64ae85700f865d705f8
 SHA512:
-  metadata.gz: 19fc868817266c527262c39a589bc5e5a0947de20063bfc613a6c40fa8b71a377b11d9cc7e1963ca12c86ab69ce833f462805a19dbe38c7cc56ebb1791faf360
-  data.tar.gz: 106625b4ace1db59f41f2060e592793ed05ba07ac18fa20d986171fe8070aff1b88c764678905ba48c3c941b880c2e63b8fe9e35fad382da58c82d0cd295f1ee
+  metadata.gz: 077f11f12bb28b2e5fb95834b1321fa5881bf7c90018d5916173c1ab2974aabf41fb7884a1a471cd6133b4c048fcdf922f3e2ff15347b0a5fc68c145caf25b05
+  data.tar.gz: f08c131767f75e4be30a40b3fbb9288750c147ead03c09df39dad80db864aa8af12db3d8ad7931ecce406dc21b92b9fd4961a8033965522558d021be6e535ba2

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

@@ -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/links.rb

@@ -7,9 +7,9 @@ module Asbru
           url,
           method: nil,
           link: true,
+          remote: false,
           confirm: nil,
           **options)
-
         options[:text] = text
         options[:action] = url
         options[:link] = link
@@ -17,7 +17,9 @@ module Asbru
         options[:customData] = {}
         options[:customData][:'data-method'] = method if method.present?
         options[:customData][:'data-confirm'] = confirm if confirm.present?
-        options[:customData].merge(options[:custom_data]) if options[:custom_data]
+        options[:customData][:'data-remote'] = remote if remote.present?
+        options[:customData].merge!(options[:custom_data]) if options[:custom_data]
+
         Asbru::Components::Savage.send "#{Asbru.config.component_prefix}_button",
           **options
       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.6'
+  VERSION = '0.0.10'
 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.6
+  version: 0.0.10
 platform: ruby
 authors:
 - Stev-0
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-19 00:00:00.000000000 Z
+date: 2021-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Creating component based webpages with short hand syntax.
 email:
 - skemp@adflow.io
@@ -94,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Asbru is a tool for creating component based webpages.