asbru 0.0.9 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10f68d4052614b4607afdfc06092f1cca7b1c30bc6c887fb495f4eefc82dfafd
-  data.tar.gz: 7ee326d3b5185d510042f8aaf5453a4351d39feb19a0239c3f98e87e7ac99239
+  metadata.gz: 392e033f6644c63cc44f180b0e6d5ad6544db1c1045a7ed6f214e58053d49e84
+  data.tar.gz: 36579ffc30c7b237a3d4610089fe68db7b530b13e1da8e67f0ff785ed12450ab
 SHA512:
-  metadata.gz: 4202a50c75d6d622f096371ba25bee957c03d3a45482af3183d46716798173f88e3b98f1cb4aa9ccb74a315c0fd11feed697e6968cd3bb9aec9c2e0c9b17c3db
-  data.tar.gz: 2326874f64e8ae9d1baa85c1ee7a7c3afb4e399be70e6849249ecd1c0fd6b21e14ae6296986ff809c975949ccd4c40ff730d4e4ad48bc7d792af0e0983a56024
+  metadata.gz: 85318b00ed09b9e5de6c81526c1d3782a6f0a9f9f6d1028d17c02a1ca0e2abe83409be931dc509abc144a7f11f4f4706dcadc1f091c6d27c12e4fcd9c3eb4d7d
+  data.tar.gz: e5e5a20151b86106c7b021f80ad5b5a2c4f100620ae098c5f5665f6b4d324d07032e692c3f611322585762084716bb190cf74b9657ef1c699efa864a9abf46ad

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)
@@ -45,20 +45,12 @@ module Asbru
       end
     end
 
-    def tag_name_for(method, multiple = false)
-      name = ActionView::Helpers::Tags::TextField.new(object_name,
-          method, {})
-        .send(:tag_name)
-      name += '[]' if multiple
-      name
-    end
-
     def render_form_element(attribute, options)
       new_options = options.reverse_merge(
         {
           name: tag_name_for(attribute),
           errors: errors(attribute),
-          errorIcon: error_icon
+          errorIcon: error_icon,
         }
       )
 
@@ -122,12 +114,77 @@ module Asbru
       end
     end
 
+    # def submit(attribute = nil, options = {})
+    #   render_form_element attribute,
+    #       options.reverse_merge(text: 'Submit', type: 'submit')
+    # end
+
+    # def date_field(attribute = nil, options = {})
+    #   render_form_element attribute,
+    #       options.reverse_merge(type: 'datepicker')
+    # end
+
+    # def password_field(attribute = nil, options = {})
+    #   render_form_element attribute,
+    #       options.reverse_merge(type: 'password')
+    # end
+
+    # def text_area(attribute = nil, options = {})
+    #   render_form_element attribute,
+    #       options.reverse_merge(type: 'textarea')
+    # end
+
+    # def email_field(attribute = nil, options = {})
+    #   render_form_element attribute,
+    #       options.reverse_merge(type: 'email')
+    # end
+
+    # def check_box(attribute = nil, options = {})
+    #   render_form_element attribute,
+    #       options.reverse_merge(type: 'check_box')
+    # end
+
+    # def text_field(attribute = nil, options = {})
+    #   render_form_element attribute, options
+    # end
+
+    # def telephone_field
+    #   render_form_element attribute,
+    #       options.reverse_merge(type: 'tel')
+    # end
+
     BASIC_FORM_FIELDS.each do |item|
       define_method item.keys.first do |attribute = nil, options = {}|
         render_form_element(attribute, options.reverse_merge(item.values.first))
       end
     end
 
+    def file_field(attribute = nil, options = {})
+      options =  { name: tag_name_for(attribute),
+          errors: errors(attribute),
+          errorIcon: error_icon,
+          type: 'file',
+          **options
+      }
+      if @object.present? && attribute.present?
+        options[:label] ||= I18n.t(attribute,
+            scope: "activerecord.attributes.#{@object.class.name.downcase}")
+
+        attachment = @object.send(attribute)
+        if attachment.present?
+          options['incommingFile'] = {
+            name: attachment.filename,
+            size: attachment.send('byte_size'),
+            type: attachment.content_type
+          }
+        end
+      end
+
+      Asbru::Components::Savage.send "#{Asbru.config.form_builder_prefix}_element",
+          **options
+    end
+
+
     def collection_radio_buttons(attribute,
         collection,
         value_method,
@@ -217,5 +274,13 @@ module Asbru
     def error_icon
       Asbru.config.default_form_error_icon
     end
+
+    def tag_name_for(method, multiple = false)
+      name = ActionView::Helpers::Tags::TextField.new(object_name,
+          method, {})
+        .send(:tag_name)
+      name += '[]' if multiple
+      name
+    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.9'
+  VERSION = '0.0.12'
 end

data/lib/asbru.rb

@@ -1,9 +1,14 @@
 require "asbru/railtie"
 require 'dry-configurable'
+require 'asbru/components/savage'
+require 'asbru/components/sage'
 
 module Asbru
   extend Dry::Configurable
   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.9
+  version: 0.0.12
 platform: ruby
 authors:
 - Stev-0
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-25 00:00:00.000000000 Z
+date: 2022-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails