matestack-ui-core 0.7.2.1 → 0.7.3

data/app/concepts/matestack/ui/core/label/label.rb

@@ -1,5 +1,10 @@
 module Matestack::Ui::Core::Label
   class Label < Matestack::Ui::Core::Component::Static
-
+    def setup
+      @tag_attributes.merge!({
+        for: options[:for],
+        form: options[:form]
+      })
+    end
   end
 end

data/app/concepts/matestack/ui/core/legend/legend.haml

@@ -0,0 +1,5 @@
+%legend{@tag_attributes}
+  - if options[:text].nil? && block_given?
+    = yield
+  - else
+    = options[:text]

data/app/concepts/matestack/ui/core/legend/legend.rb

@@ -0,0 +1,5 @@
+module Matestack::Ui::Core::Legend
+  class Legend < Matestack::Ui::Core::Component::Static
+
+  end
+end

data/app/concepts/matestack/ui/core/link/link.rb

@@ -9,7 +9,8 @@ module Matestack::Ui::Core::Link
         "id": component_id,
         "method": options[:method],
         "target": options[:target] ||= nil,
-        "href": link_path
+        "href": link_path,
+        "title": options[:title]
       })
     end
 

data/app/concepts/matestack/ui/core/map/map.haml

@@ -0,0 +1,3 @@
+%map{@tag_attributes}
+  - if block_given?
+    = yield

data/app/concepts/matestack/ui/core/map/map.rb

@@ -0,0 +1,11 @@
+module Matestack::Ui::Core::Map
+  class Map < Matestack::Ui::Core::Component::Static
+    REQUIRED_KEYS = [:name]
+
+    def setup
+      @tag_attributes.merge!({
+        name: options[:name]
+      })
+    end
+  end
+end

data/app/concepts/matestack/ui/core/mark/mark.haml

@@ -0,0 +1,5 @@
+%mark{@tag_attributes}
+  - if options[:text].blank? && block_given?
+    = yield
+  - else
+    = options[:text]

data/app/concepts/matestack/ui/core/mark/mark.rb

@@ -0,0 +1,4 @@
+module Matestack::Ui::Core::Mark
+  class Mark < Matestack::Ui::Core::Component::Static
+  end
+end

data/app/concepts/matestack/ui/core/meter/meter.haml

@@ -0,0 +1,4 @@
+%meter{@tag_attributes}
+  - if block_given?
+    = yield
+    

data/app/concepts/matestack/ui/core/meter/meter.rb

@@ -0,0 +1,14 @@
+module Matestack::Ui::Core::Meter
+  class Meter < Matestack::Ui::Core::Component::Static
+    def setup
+      @tag_attributes.merge!({
+        value: options[:value],
+        min: options[:min],
+        max: options[:max],
+        low: options[:low],
+        high: options[:high],
+        optimum: options[:optimum]
+      })
+    end
+  end
+end

data/app/concepts/matestack/ui/core/noscript/noscript.haml

@@ -0,0 +1,5 @@
+%noscript{@tag_attributes}
+  - if options[:text].nil? && block_given?
+    = yield
+  - else
+    = options[:text]

data/app/concepts/matestack/ui/core/noscript/noscript.rb

@@ -0,0 +1,5 @@
+module Matestack::Ui::Core::Noscript
+  class Noscript < Matestack::Ui::Core::Component::Static
+
+  end
+end

data/app/concepts/matestack/ui/core/object/object.haml

@@ -0,0 +1 @@
+%object{@tag_attributes}

data/app/concepts/matestack/ui/core/object/object.rb

@@ -0,0 +1,15 @@
+module Matestack::Ui::Core::Object
+  class Object < Matestack::Ui::Core::Component::Static
+    def setup
+      @tag_attributes.merge!({
+        width: options[:width],
+        height: options[:height],
+        data: options[:data],
+        form: options[:form],
+        name: options[:name],
+        type: options[:type],
+        usemap: options[:usemap]
+      })
+    end
+  end
+end

data/app/concepts/matestack/ui/core/output/output.haml

@@ -0,0 +1,5 @@
+%output{@tag_attributes}
+  - if options[:text].blank? && block_given?
+    = yield
+  - else
+    = options[:text]

data/app/concepts/matestack/ui/core/output/output.rb

@@ -0,0 +1,11 @@
+module Matestack::Ui::Core::Output
+  class Output < Matestack::Ui::Core::Component::Static
+    def setup
+      @tag_attributes.merge!(
+        name: options[:name],
+        for: options[:for],
+        form: options[:form]
+      )
+    end
+  end
+end

data/app/concepts/matestack/ui/core/page/page.rb

@@ -91,23 +91,9 @@ module Matestack::Ui::Core::Page
         concept(@app_class).call(:show, @page_id, @nodes)
       when :render_component
         begin
-          if component_key.include?("__")
-            keys_array = component_key.gsub("__", "__components__").split("__").map {|k| k.to_s}
-            page_content_keys = keys_array.select{|key| key.match(/^page_content_/)}
-            if page_content_keys.any?
-              keys_array = keys_array.drop(keys_array.find_index(page_content_keys[0])+2)
-            end
-            node = @nodes.dig(*keys_array)
-            cell = to_cell(component_key, node["component_name"], node["config"], node["argument"], node["components"], node["included_config"], node["cached_params"])
-            return cell.render_content
-          else
-            node = @nodes[component_key]
-            cell = to_cell(component_key, node["component_name"], node["config"], node["argument"], node["components"], node["included_config"], node["cached_params"])
-            return cell.render_content
-          end
-        rescue
-          raise "Component '#{component_key}' could not be resolved. Notice: Rerendering currently works only on page-level. \
-          You are therefore currently not able to use 'async' within a component for example!"
+          render_child_component component_key
+        rescue => e
+          raise "Component '#{component_key}' could not be resolved."
         end
       end
     end
@@ -116,6 +102,34 @@ module Matestack::Ui::Core::Page
       @custom_page_id ||= @page_id
     end
 
+    def render_child_component component_key
+      if component_key.include?("__")
+        keys_array = component_key.gsub("__", "__components__").split("__").map {|k| k.to_s}
+        page_content_keys = keys_array.select{|key| key.match(/^page_content_/)}
+        if page_content_keys.any?
+          keys_array = keys_array.drop(keys_array.find_index(page_content_keys[0])+2)
+        end
+        if @nodes.dig(*keys_array) == nil
+          rest = []
+          while @nodes.dig(*keys_array) == nil
+            rest << keys_array.pop
+          end
+          node = @nodes.dig(*keys_array)
+          cell = to_cell(component_key, node["component_name"], node["config"], node["argument"], node["components"], node["included_config"], node["cached_params"])
+          return cell.render_child_component component_key, rest.reverse[1..-1]
+        else
+          node = @nodes.dig(*keys_array)
+          cell = to_cell(component_key, node["component_name"], node["config"], node["argument"], node["components"], node["included_config"], node["cached_params"])
+          return cell.render_content
+        end
+      else
+        node = @nodes[component_key]
+        cell = to_cell(component_key, node["component_name"], node["config"], node["argument"], node["components"], node["included_config"], node["cached_params"])
+        return cell.render_content
+      end
+    end
+
+
     private
 
       def resolve_isolated_component component_key

data/app/concepts/matestack/ui/core/param/param.haml

@@ -0,0 +1 @@
+%param{@tag_attributes}

data/app/concepts/matestack/ui/core/param/param.rb

@@ -0,0 +1,10 @@
+module Matestack::Ui::Core::Param
+  class Param < Matestack::Ui::Core::Component::Static
+    def setup
+      @tag_attributes.merge!({
+        name: options[:name],
+        value: options[:value]
+      })
+    end
+  end
+end

data/app/concepts/matestack/ui/core/pre/pre.haml

@@ -0,0 +1,5 @@
+%pre{@tag_attributes}
+  - if options[:text].nil? && block_given?
+    = yield
+  - else
+    = options[:text]

data/app/concepts/matestack/ui/core/pre/pre.rb

@@ -0,0 +1,5 @@
+module Matestack::Ui::Core::Pre
+  class Pre < Matestack::Ui::Core::Component::Static
+
+  end
+end

data/app/concepts/matestack/ui/core/q/q.haml

@@ -0,0 +1,5 @@
+%q{@tag_attributes}
+  - if options[:text].nil? && block_given?
+    = yield
+  - else
+    = options[:text]

data/app/concepts/matestack/ui/core/q/q.rb

@@ -0,0 +1,11 @@
+module Matestack::Ui::Core::Q
+  class Q < Matestack::Ui::Core::Component::Static
+
+    def setup
+      @tag_attributes.merge!({
+        "cite": options[:cite]
+        })
+    end
+
+  end
+end

data/app/concepts/matestack/ui/core/rp/rp.haml

@@ -0,0 +1,5 @@
+%rp{@tag_attributes}
+  - if options[:text].nil? && block_given?
+    = yield
+  - else
+    = options[:text]

data/app/concepts/matestack/ui/core/rp/rp.rb

@@ -0,0 +1,5 @@
+module Matestack::Ui::Core::Rp
+  class Rp < Matestack::Ui::Core::Component::Static
+
+  end
+end

data/app/concepts/matestack/ui/core/rt/rt.haml

@@ -0,0 +1,5 @@
+%rt{@tag_attributes}
+  - if options[:text].nil? && block_given?
+    = yield
+  - else
+    = options[:text]

data/app/concepts/matestack/ui/core/rt/rt.rb

@@ -0,0 +1,5 @@
+module Matestack::Ui::Core::Rt
+  class Rt < Matestack::Ui::Core::Component::Static
+
+  end
+end

data/app/concepts/matestack/ui/core/ruby/ruby.haml

@@ -0,0 +1,5 @@
+%ruby{@tag_attributes}
+  - if options[:text].nil? && block_given?
+    = yield
+  - else
+    = options[:text]

data/app/concepts/matestack/ui/core/ruby/ruby.rb

@@ -0,0 +1,5 @@
+module Matestack::Ui::Core::Ruby
+  class Ruby < Matestack::Ui::Core::Component::Static
+
+  end
+end

data/app/concepts/matestack/ui/core/s/s.haml

@@ -0,0 +1,5 @@
+%s{@tag_attributes}
+  - if options[:text].nil? && block_given?
+    = yield
+  - else
+    = options[:text]

data/app/concepts/matestack/ui/core/s/s.rb

@@ -0,0 +1,6 @@
+module Matestack::Ui::Core::S
+  class S < Matestack::Ui::Core::Component::Static
+  
+  end
+end
+  

data/app/concepts/matestack/ui/core/sup/sup.haml

@@ -0,0 +1,5 @@
+%sup{@tag_attributes}
+  - if options[:text].nil? && block_given?
+    = yield
+  - else
+    = options[:text]

data/app/concepts/matestack/ui/core/sup/sup.rb

@@ -0,0 +1,5 @@
+module Matestack::Ui::Core::Sup
+  class Sup < Matestack::Ui::Core::Component::Static
+
+  end
+end

data/app/concepts/matestack/ui/core/var/var.haml

@@ -0,0 +1,5 @@
+%var{@tag_attributes}
+  - if options[:text].nil? && block_given?
+    = yield
+  - else
+    = options[:text]

data/app/concepts/matestack/ui/core/var/var.rb

@@ -0,0 +1,4 @@
+module Matestack::Ui::Core::Var
+  class Var < Matestack::Ui::Core::Component::Static
+  end
+end

data/app/concepts/matestack/ui/core/video/video.haml

@@ -1 +1,3 @@
-= video_tag(@tag_attributes, ActionController::Base.helpers.asset_path(options[:path]), height: options[:height], width: options[:width], preload: options[:preload], autoplay: options[:autoplay], muted: options[:muted], playsinline: options[:playsinline], loop: options[:loop], controls: options[:controls])
+%video{@tag_attributes}
+  %source{:src => @source, :type => @type}
+  Your browser does not support the video tag.

data/app/concepts/matestack/ui/core/video/video.rb

@@ -1,7 +1,23 @@
 module Matestack::Ui::Core::Video
   class Video < Matestack::Ui::Core::Component::Static
 
-    REQUIRED_KEYS = [:path]
+    REQUIRED_KEYS = [:path, :type]
+
+    def setup
+      @tag_attributes.merge!({
+        autoplay: options[:autoplay],
+        controls: options[:controls],
+        height: options[:height],
+        loop: options[:loop],
+        muted: options[:muted],
+        playsinline: options[:playsinline],
+        preload: options[:preload],
+        width: options[:width]
+      })
+
+      @source = ActionController::Base.helpers.asset_path(options[:path])
+      @type = "video/#{@options[:type]}"
+    end
 
   end
 end

data/app/lib/matestack/ui/core/component_node.rb

@@ -13,10 +13,10 @@ module Matestack::Ui::Core
       @hash = {}
       @node_start_id = 0
       @component_instance = component_instance
-      @included_config = included_config
       component_instance.instance_variables.each do |component_instance_var_key|
         self.instance_variable_set(component_instance_var_key, component_instance.instance_variable_get(component_instance_var_key))
       end
+      @included_config = included_config
     end
 
     def method_missing meth, *args, &block

data/app/lib/matestack/ui/dynamic_actionview_component.rb

@@ -0,0 +1 @@
+Matestack::Ui::DynamicActionviewComponent = Matestack::Ui::Core::Actionview::Dynamic

data/app/lib/matestack/ui/static_actionview_component.rb

@@ -0,0 +1 @@
+Matestack::Ui::StaticActionviewComponent = Matestack::Ui::Core::Actionview::Static

data/config/routes.rb

@@ -1,3 +1,2 @@
 Matestack::Ui::Core::Engine.routes.draw do
-  get '/div', to: 'docs#div'
 end

data/lib/generators/matestack/app/USAGE

@@ -0,0 +1,21 @@
+Description:
+  Stubs out a new matestack app. Pass the app name under_scored.
+
+  If you want so, pass the option '--all_inclusive' to also create
+  a corresponding matestack example_page, a controller, its action
+  and the route in 'config/routes.rb'.
+
+Example 1:
+  `rails generate matestack:app example_app`
+
+  This will create:
+    app/matestack/apps/example_app.rb
+
+Example 2:
+  `rails generate matestack:app example_app --all_inclusive`
+
+  This will create:
+    app/matestack/apps/example_app.rb
+    app/matestack/pages/example_app/example_page.rb
+    app/controllers/example_app_controller.rb
+    route  get 'example_app/example_page', to: 'example_app#example_page'

data/lib/generators/matestack/app/app_generator.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Matestack
+  module Generators
+    class AppGenerator < Rails::Generators::NamedBase
+      source_root File.expand_path('templates', __dir__)
+
+      class_option :all_inclusive, type: :boolean, default: false
+
+      def create_app
+        template 'app/matestack/apps/%file_name%.rb.tt'
+
+        if options[:all_inclusive] == true
+          template 'app/controllers/%file_name%_controller.rb'
+
+          route %{get '#{file_name}/example_page', to: '#{file_name}\#example_page'}
+
+          generate "matestack:page example_page --app_name #{file_name} --called_by_app_generator=true"
+
+          puts "You can visit your new matestack apps' example page under http://localhost:3000/#{file_name}/example_page"
+        end
+      end
+    end
+  end
+end

data/lib/generators/{matestack_app/templates/matestack_app_controller.erb → matestack/app/templates/app/controllers/%file_name%_controller.rb.tt}

@@ -1,7 +1,5 @@
 class <%= class_name %>Controller < ApplicationController
-
   def example_page
     responder_for(Pages::<%= class_name %>::ExamplePage)
   end
-
 end