rbexy 1.0.1 → 2.0.0.beta3

data/lib/rbexy/rails/component_template_resolver.rb

@@ -1,8 +1,8 @@
-require "action_view"
-
 module Rbexy
   module Rails
     class ComponentTemplateResolver < ActionView::FileSystemResolver
+      VIRTUAL_ROOT = "rbexy_component".freeze
+
       # Rails 6 requires us to override `_find_all` in order to hook
       def _find_all(name, prefix, partial, details, key, locals)
         find_templates(name, prefix, partial, details, locals)
@@ -19,7 +19,7 @@ module Rbexy
         Dir["#{templates_path}.*{#{extensions}}"].map do |template_path|
           source = File.binread(template_path)
           handler = ActionView::Template.handler_for_extension(File.extname(template_path)[1..-1])
-          virtual_path = ["rbexy_component", prefix, name].join("/")
+          virtual_path = File.join(VIRTUAL_ROOT, prefix, name)
 
           ActionView::Template.new(
             source,

data/lib/rbexy/rails/controller_helper.rb

@@ -1,17 +1,18 @@
-require "active_support/concern"
-
 module Rbexy
   module Rails
     module ControllerHelper
       extend ActiveSupport::Concern
+      include ComponentContext
 
-      def rbexy_component_provider; end
+      included do
+        helper_method :rbexy_context, :create_context, :use_context
+      end
 
       class_methods do
         def inherited(klass)
           super
           Rbexy.configuration.template_paths.each do |path|
-            prepend_view_path(Rbexy::Rails::ComponentTemplateResolver.new(path))
+            prepend_view_path(ComponentTemplateResolver.new(path))
           end
         end
       end

data/lib/rbexy/rails/engine.rb

@@ -4,25 +4,15 @@ module Rbexy
   module Rails
     class Engine < ::Rails::Engine
       initializer "rbexy" do |app|
-        template_handler = ::Rails.version.to_f >= 6.0 ?
-          proc { |template, source| Rbexy.compile(source) } :
-          proc { |template| Rbexy.compile(template.source) }
+        template_handler = proc { |template, source| Rbexy.compile(template) }
 
         ActionView::Template.register_template_handler(:rbx, template_handler)
 
         ActiveSupport.on_load :action_controller_base do
-          helper Rbexy::ViewContextHelper
-          helper_method :rbexy_component_provider
           include ControllerHelper
         end
 
-        if defined?(ViewComponent)
-          ViewComponent::Base.include Rbexy::ViewContextHelper
-        end
-
         Rbexy.configure do |config|
-          require "rbexy/component_providers/rbexy_provider"
-          config.component_provider = Rbexy::ComponentProviders::RbexyProvider.new
           config.template_paths << ::Rails.root.join("app", "components")
           config.enable_context = true
         end

data/lib/rbexy/refinements.rb

@@ -0,0 +1,5 @@
+module Rbexy
+  module Refinements
+    autoload :Array, "rbexy/refinements/array"
+  end
+end

data/lib/rbexy/refinements/array.rb

@@ -0,0 +1,9 @@
+module Rbexy
+  module Refinements
+    module Array
+      autoload :FindMap, "rbexy/refinements/array/find_map"
+      autoload :InsertBetweenTypes, "rbexy/refinements/array/insert_between_types"
+      autoload :MapTypeWhenNeighboringType, "rbexy/refinements/array/map_type_when_neighboring_type"
+    end
+  end
+end

data/lib/rbexy/refinements/array/find_map.rb

@@ -0,0 +1,13 @@
+module Rbexy
+  module Refinements
+    module Array
+      module FindMap
+        refine ::Array do
+          def find_map
+            lazy.map { |i| yield(i) }.reject { |v| !v }.first
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rbexy/refinements/array/insert_between_types.rb

@@ -0,0 +1,26 @@
+module Rbexy
+  module Refinements
+    module Array
+      module InsertBetweenTypes
+        refine ::Array do
+          def insert_between_types(type1, type2, &block)
+            map.with_index do |curr, i|
+              prev_i = i - 1
+
+              if prev_i >= 0 && InsertBetweenTypes.one_of_each_type?([self[prev_i], curr], [type1, type2])
+                [block.call, curr]
+              else
+                [curr]
+              end
+            end.flatten
+          end
+        end
+
+        def self.one_of_each_type?(items_pair, types_pair)
+          items_pair[0].is_a?(types_pair[0]) && items_pair[1].is_a?(types_pair[1]) ||
+            items_pair[0].is_a?(types_pair[1]) && items_pair[1].is_a?(types_pair[0])
+        end
+      end
+    end
+  end
+end

data/lib/rbexy/refinements/array/map_type_when_neighboring_type.rb

@@ -0,0 +1,26 @@
+module Rbexy
+  module Refinements
+    module Array
+      module MapTypeWhenNeighboringType
+        refine ::Array do
+          def map_type_when_neighboring_type(map_type, neighboring_type, &block)
+            map.with_index do |curr, i|
+              prev_i = i - 1
+              next_i = i + 1
+
+              if !curr.is_a?(map_type)
+                curr
+              elsif prev_i >= 0 && self[prev_i].is_a?(neighboring_type)
+                block.call(curr)
+              elsif next_i < length && self[next_i].is_a?(neighboring_type)
+                block.call(curr)
+              else
+                curr
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rbexy/runtime.rb

@@ -1,36 +1,29 @@
-require "active_support/all"
-require "action_view/helpers"
-require "action_view/context"
-require "action_view/buffers"
-
 module Rbexy
   class Runtime
     include ActionView::Context
     include ActionView::Helpers::TagHelper
-    include ViewContextHelper
-
-    DefaultTagBuilder = ActionView::Helpers::TagHelper::TagBuilder
+    include ComponentContext
 
-    def self.create_tag_builder(context, provider = nil)
-      provider = provider ||
-        provider_from_context(context) ||
-        Rbexy.configuration.component_provider
+    def self.tag_builder
+      # TagBuilder requires a view_context arg, but it's only used in #tag_string.
+      # Since all we need is #tag_options, we pass in a nil view_context.
+      @tag_builder ||= TagBuilder.new(nil)
+    end
 
-      if provider
-        ComponentTagBuilder.new(context, provider)
-      else
-        ActionView::Helpers::TagHelper::TagBuilder.new(context)
-      end
+    def self.splat_attrs(attrs_hash)
+      tag_builder.tag_options(attrs_hash).html_safe
     end
 
-    def self.provider_from_context(context)
-      if context.respond_to?(:rbexy_component_provider)
-        context.rbexy_component_provider
-      end
+    def self.expr_out(*value)
+      return if value.length == 0
+      value = value.first
+
+      value = html_safe_array?(value) ? value.join.html_safe : value
+      [nil, false].include?(value) ? "" : value.to_s
     end
 
-    def initialize(component_provider = nil)
-      @rbexy_tag = self.class.create_tag_builder(self, component_provider)
+    def self.html_safe_array?(value)
+      value.is_a?(Array) && value.all? { |v| v.respond_to?(:html_safe?) && v.html_safe? }
     end
 
     def evaluate(code)

data/lib/rbexy/template.rb

@@ -0,0 +1,12 @@
+module Rbexy
+  class Template
+    attr_reader :source, :identifier
+
+    Anonymous = Class.new(String).new.freeze
+
+    def initialize(source, identifier = Anonymous)
+      @source = source
+      @identifier = identifier
+    end
+  end
+end

data/lib/rbexy/version.rb

@@ -1,3 +1,3 @@
 module Rbexy
-  VERSION = "1.0.1"
+  VERSION = "2.0.0.beta3"
 end

data/rbexy.gemspec

@@ -25,9 +25,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activesupport", ">= 5.0", "< 7.0"
-  spec.add_dependency "actionview", ">= 5.0", "< 7.0"
-  spec.add_dependency "railties", ">= 5.0", "< 7.0"
+  spec.add_dependency "activesupport", ">= 6.0", "< 7.0"
+  spec.add_dependency "actionview", ">= 6.0", "< 7.0"
 
   spec.add_development_dependency "rails", ">= 6.0", "< 7.0"
   spec.add_development_dependency "rspec", "~> 3.9"
@@ -37,4 +36,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "sqlite3"
+  spec.add_development_dependency "memory_profiler", "~> 0.9.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbexy
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0.beta3
 platform: ruby
 authors:
 - Nick Giancola
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-11 00:00:00.000000000 Z
+date: 2021-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.0'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.0'
@@ -36,27 +36,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.0'
-- !ruby/object:Gem::Dependency
-  name: railties
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.0'
@@ -66,7 +46,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.0'
@@ -200,6 +180,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: memory_profiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.14
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.14
 description: 
 email:
 - patbenatar@gmail.com
@@ -221,26 +215,43 @@ files:
 - bin/console
 - bin/setup
 - docker-compose.yml
-- example.rb
 - lib/rbexy.rb
+- lib/rbexy/ast_transformer.rb
 - lib/rbexy/component.rb
 - lib/rbexy/component/backtrace_cleaner.rb
-- lib/rbexy/component_providers/namespaced_rbexy_provider.rb
-- lib/rbexy/component_providers/rbexy_provider.rb
-- lib/rbexy/component_providers/view_component_provider.rb
-- lib/rbexy/component_tag_builder.rb
+- lib/rbexy/component_context.rb
+- lib/rbexy/component_resolver.rb
 - lib/rbexy/configuration.rb
-- lib/rbexy/hash_mash.rb
 - lib/rbexy/lexer.rb
 - lib/rbexy/nodes.rb
+- lib/rbexy/nodes/abstract_attr.rb
+- lib/rbexy/nodes/abstract_element.rb
+- lib/rbexy/nodes/abstract_node.rb
+- lib/rbexy/nodes/component_element.rb
+- lib/rbexy/nodes/component_prop.rb
+- lib/rbexy/nodes/declaration.rb
+- lib/rbexy/nodes/expression.rb
+- lib/rbexy/nodes/expression_group.rb
+- lib/rbexy/nodes/html_attr.rb
+- lib/rbexy/nodes/html_element.rb
+- lib/rbexy/nodes/newline.rb
+- lib/rbexy/nodes/raw.rb
+- lib/rbexy/nodes/root.rb
+- lib/rbexy/nodes/text.rb
+- lib/rbexy/nodes/util.rb
 - lib/rbexy/parser.rb
 - lib/rbexy/rails.rb
 - lib/rbexy/rails/component_template_resolver.rb
 - lib/rbexy/rails/controller_helper.rb
 - lib/rbexy/rails/engine.rb
+- lib/rbexy/refinements.rb
+- lib/rbexy/refinements/array.rb
+- lib/rbexy/refinements/array/find_map.rb
+- lib/rbexy/refinements/array/insert_between_types.rb
+- lib/rbexy/refinements/array/map_type_when_neighboring_type.rb
 - lib/rbexy/runtime.rb
+- lib/rbexy/template.rb
 - lib/rbexy/version.rb
-- lib/rbexy/view_context_helper.rb
 - rbexy.gemspec
 homepage: https://github.com/patbenatar/rbexy
 licenses:
@@ -260,9 +271,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.2
 signing_key: 

data/example.rb

@@ -1,113 +0,0 @@
-require "bundler"
-Bundler.require
-
-require "active_support/all"
-require "action_view/helpers"
-require "action_view/context"
-require "action_view/buffers"
-
-template_string = <<-RBX
-# A comment here
-<div>
-  <h1 {**{ class: "myClass" }} {**splat_attrs}>Hello world</h1>
-  <div {**{ class: "myClass" }}></div>
-  Some words
-  # A comment here
-  # A comment here
-  <p>Lorem ipsum</p>
-  <input type="submit" value={@ivar_val} disabled />
-  {true && <p>Is true</p>}
-  {false && <p>Is false</p>}
-  {true ? <p {**{ class: "myClass" }}>Ternary is {'true'.upcase}</p> : <p>Ternary is false</p>}
-  <Button prop1="val1" prop2={true && "val2"} multi-word-prop="value">the content</Button>
-  <Forms.TextField label={->(n) { <label id={n}>Something</label> }} note={<p>the note</p>} />
-  <ul>
-    # A comment here
-    {["hi", "there", "nick"].map { |val| <li>{val}</li> }}
-  </ul>
-  <p
-    class="something">Text</p>
-  <input
-    class="foobar"
-    />
-  <div
-    with="lots"
-    of="attributes"
-  >
-    Content
-  </div>
-  # comment
-</div>
-# comment
-RBX
-
-module Components
-  class ButtonComponent
-    def initialize(prop1:, prop2:, multi_word_prop:)
-      @prop1 = prop1
-      @prop2 = prop2
-      @multi_word_prop = multi_word_prop
-    end
-
-    def render
-      # Render it yourself, call one of Rails view helpers (link_to,
-      # content_tag, etc), or use a template file. Be sure to render
-      # children by yielding to the given block.
-      "<button class=\"#{[@prop1, @prop2, @multi_word_prop].join("-")}\">#{yield}</button>"
-    end
-  end
-
-  module Forms
-    class TextFieldComponent
-      def initialize(label:, note:, **attrs)
-        @label = label
-        @note = note
-      end
-
-      def render
-        "#{@label.call(2)} <input type=\"text\" />#{@note}"
-      end
-    end
-  end
-end
-
-class ComponentProvider
-  def match?(name)
-    find(name) != nil
-  end
-
-  def render(context, name, **attrs, &block)
-    props = attrs.transform_keys { |k| ActiveSupport::Inflector.underscore(k.to_s).to_sym }
-    find(name).new(**props).render(&block)
-  end
-
-  private
-
-  def find(name)
-    ActiveSupport::Inflector.constantize("Components::#{name}Component")
-  rescue NameError => e
-    raise e unless e.message =~ /constant/
-    nil
-  end
-end
-
-class MyRuntime < Rbexy::Runtime
-  def initialize(component_provider)
-    super(component_provider)
-    @ivar_val = "ivar value"
-  end
-
-  def splat_attrs
-    {
-      key1: "val1",
-      key2: "val2"
-    }
-  end
-end
-
-puts "=============== Compiled ruby code ==============="
-code = Rbexy.compile(template_string)
-puts code
-
-puts "=============== Result of eval ==============="
-puts MyRuntime.new(ComponentProvider.new).evaluate(code)