matestack-ui-core 0.7.0 → 0.7.4

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

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

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

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

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

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

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/li/li.haml

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

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

@@ -1,6 +1,5 @@
-- if options[:text].nil?
-  = link_to link_path, @tag_attributes do
-    - if block_given?
-      = yield
-- else
-  = link_to options[:text], link_path, @tag_attributes
+%a{@tag_attributes}
+  - if options[:text].nil? && block_given?
+    = yield
+  - else
+    = options[:text]

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

@@ -4,10 +4,13 @@ module Matestack::Ui::Core::Link
     REQUIRED_KEYS = [:path]
 
     def setup
-      @tag_attributes.merge!({ "class": options[:class],
+      @tag_attributes.merge!({
+        "class": options[:class],
         "id": component_id,
         "method": options[:method],
-        "target": options[:target] ||= nil
+        "target": options[:target] ||= nil,
+        "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/onclick/onclick.haml

@@ -1,2 +1,2 @@
-%div{"@click": "perform"}
+%div{@tag_attributes, "@click": "perform"}
   = yield

data/app/concepts/matestack/ui/core/onclick/onclick.js

@@ -1,8 +1,7 @@
 import Vue from 'vue/dist/vue.esm'
 
-import matestackEventHub from 'js/event-hub'
-
-import componentMixin from 'component/component'
+import matestackEventHub from '../js/event-hub'
+import componentMixin from '../component/component'
 
 const componentDef = {
   mixins: [componentMixin],

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

@@ -1,6 +1,5 @@
 module Matestack::Ui::Core::Onclick
     class Onclick < Matestack::Ui::Core::Component::Dynamic
 
-
-    end
   end
+end

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

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

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

@@ -0,0 +1,10 @@
+module Matestack::Ui::Core::Optgroup
+  class Optgroup < Matestack::Ui::Core::Component::Static
+    def setup
+      @tag_attributes.merge!(
+        disabled: options[:disabled] ||= nil,
+        label: options[:label]
+      )
+    end
+  end
+end

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

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

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

@@ -0,0 +1,12 @@
+module Matestack::Ui::Core::Option
+  class Option < Matestack::Ui::Core::Component::Static
+    def setup
+      @tag_attributes.merge!(
+        disabled: options[:disabled] ||= nil,
+        selected: options[:selected] ||= nil,
+        label: options[:label],
+        value: options[:value]
+      )
+    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/content.js

@@ -1,6 +1,6 @@
 import Vue from 'vue/dist/vue.esm'
 import Vuex from 'vuex'
-import componentMixin from 'component/component'
+import componentMixin from '../component/component'
 
 const componentDef = {
   mixins: [componentMixin],

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

@@ -2,9 +2,10 @@ module Matestack::Ui::Core::Page
   class Page < Trailblazer::Cell
 
     include ActionView::Helpers::TranslationHelper
-    include ::Cell::Haml
+    include Matestack::Ui::Core::Cell
     include Matestack::Ui::Core::ApplicationHelper
     include Matestack::Ui::Core::ToCell
+    include Matestack::Ui::Core::HasViewContext
 
     view_paths << "#{Matestack::Ui::Core::Engine.root}/app/concepts"
 
@@ -48,28 +49,32 @@ module Matestack::Ui::Core::Page
     end
 
     def components(&block)
-      @nodes = Matestack::Ui::Core::PageNode.build(self, nil, &block)
+      @nodes = Matestack::Ui::Core::PageNode.build(self, nil, context[:params], &block)
     end
 
     def nodes_to_cell
       @nodes.each do |key, node|
-        @cells[key] = to_cell(key, node["component_name"], node["config"], node["argument"], node["components"], node["included_config"])
+        @cells[key] = to_cell(key, node["component_name"], node["config"], node["argument"], node["components"], node["included_config"], node["cached_params"])
       end
     end
 
     def partial(&block)
       return block
-      # Matestack::Ui::Core::PageNode.build(self, included, &block)
     end
 
     def slot(&block)
-      # return block
-      Matestack::Ui::Core::PageNode.build(self, nil, &block)
+      Matestack::Ui::Core::PageNode.build(self, nil, context[:params], &block)
+    end
+
+    def isolate(&block)
+      return block
     end
 
 
     def show(component_key=nil, only_page=false)
       prepare
+      return resolve_isolated_component(component_key) if !component_key.nil? && component_key.include?("isolate")
+
       response
 
       render_mode = nil
@@ -82,36 +87,73 @@ module Matestack::Ui::Core::Page
 
       when :only_page
         nodes_to_cell
-        # keys_array = ["div_2","components", "partial_1", "components", "form_1"]
-        # puts @nodes.dig(*keys_array)
         render :page
       when :render_page_with_app
         concept(@app_class).call(:show, @page_id, @nodes)
       when :render_component
-        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)
+        begin
+          render_child_component component_key
+        rescue => e
+          raise "Component '#{component_key}' could not be resolved, because of #{e},\n#{e.backtrace.join("\n")}"
+        end
+      end
+    end
+
+    def page_id
+      @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"])
-          return cell.render_content
+          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[component_key]
-          cell = to_cell(component_key, node["component_name"], node["config"], node["argument"], node["components"], node["included_config"])
+          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
 
 
-    def page_id
-      @custom_page_id ||= @page_id
-    end
-
     private
 
+      def resolve_isolated_component component_key
+        keys_array = component_key.gsub("__", "__components__").split("__").map {|k| k.to_s}
+        isolate_keys = keys_array.select{|key| key.match(/^isolate_/)}
+        keys_array = keys_array.drop(keys_array.find_index(isolate_keys[0])+2)
+        isolated_scope_method = keys_array[0]
+        if isolated_scope_method.include?("(")
+          isolated_scope_method_name = isolated_scope_method.split("(").first
+          isolated_scope_method_argument = isolated_scope_method.split("(").last.split(")").first
+          isolated_scope_method_argument = JSON.parse(isolated_scope_method_argument)
+          isolated_block = self.send(isolated_scope_method_name, isolated_scope_method_argument.with_indifferent_access)
+        else
+          isolated_block = self.send(isolated_scope_method)
+        end
+        nodes = Matestack::Ui::Core::PageNode.build(
+          self, nil, context[:params], &isolated_block
+        )
+        node = nodes.dig(*keys_array.drop(2))
+        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
+
       def generate_page_name
         name_parts = self.class.name.split("::").map { |name| name.underscore }
         @page_id = name_parts.join("_")
@@ -144,7 +186,5 @@ module Matestack::Ui::Core::Page
         end
       end
 
-
   end
-
 end

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

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

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/pg/pg.haml

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