matestack-ui-core 0.7.4 → 1.0.1

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

@@ -1,9 +1,3 @@
-- if context[:params][:only_page] == "true"
-  %div{class: "matestack_page_content"}
-    - @cells.each do |key, cell|
-      = cell.call(:show)
-- else
-  %div{class: "matestack_page"}
-    %div{class: "matestack_page_content"}
-      - @cells.each do |key, cell|
-        = cell.call(:show)
+%div{ class: "matestack-page-root" }
+  - @children.each do |child|
+    = child.show

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

@@ -1,190 +1,30 @@
 module Matestack::Ui::Core::Page
-  class Page < Trailblazer::Cell
 
+  # TODO: Most of the functionality is shared but some initialize stuff a page probably doesn't need
+  class Page < Matestack::Ui::Core::Component::Static
     include ActionView::Helpers::TranslationHelper
-    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"
-
-    extend ViewName::Flat
-
-    def self.prefixes
-      _prefixes = super
-      modified_prefixes = _prefixes.map do |prefix|
-        prefix_parts = prefix.split("/")
-
-        if prefix_parts.last.include?(self.name.split("::")[-1].downcase)
-          prefix_parts[0..-2].join("/")
-        else
-          prefix
-        end
-
-      end
-
-      return modified_prefixes + _prefixes
-    end
-
-    def self.views_dir
-      return ""
-    end
-
-    def initialize(model=nil, options={})
-      super
-      generate_page_name
-      set_app_class
-      @nodes = {}
-      @cells = {}
-      options[:controller_instance].instance_variables.each do |controller_instance_var_key|
-        unless controller_instance_var_key.to_s.start_with?("@_")
-          self.instance_variable_set(controller_instance_var_key, options[:controller_instance].instance_variable_get(controller_instance_var_key))
-        end
-      end
-    end
-
-    def prepare
-      true
-    end
-
-    def components(&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"], node["cached_params"])
-      end
-    end
-
-    def partial(&block)
-      return block
-    end
-
-    def slot(&block)
-      Matestack::Ui::Core::PageNode.build(self, nil, context[:params], &block)
-    end
-
-    def isolate(&block)
-      return block
+    def initialize(options = {})
+      super(nil, options)
+      copy_controller_instance_variables(options.fetch(:controller_instance))
     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
-      render_mode = :only_page if only_page == true
-      render_mode = :render_page_with_app if !@app_class.nil? && only_page == false
-      render_mode = :only_page if @app_class.nil? && only_page == false
-      render_mode = :render_component if !component_key.nil?
-
-      case render_mode
-
-      when :only_page
-        nodes_to_cell
-        render :page
-      when :render_page_with_app
-        concept(@app_class).call(:show, @page_id, @nodes)
-      when :render_component
-        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
+    def show
+      render :page
     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
-        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("_")
-      end
-
-      def set_app_class
-        class_name = self.class.name
-        name_parts = class_name.split("::")
-        if name_parts.count <= 2
-          @app_class = nil
-          return
-        end
-
-        app_name = "#{name_parts[1]}"
-        begin
-          app_class = Apps.const_get(app_name)
-          if app_class.is_a?(Class)
-            @app_class = app_class
-          else
-            require_dependency "apps/#{app_name.underscore}"
-            app_class = Apps.const_get(app_name)
-            if app_class.is_a?(Class)
-              @app_class = app_class
-            else
-              @app_class = nil
-            end
+      def copy_controller_instance_variables(controller)
+        controller.instance_variables.each do |controller_instance_var_key|
+          unless controller_instance_var_key.to_s.start_with?("@_")
+            # TODO BUG: We might override our own instance variables here.
+            # Solution 1: Check against own instance variables and don't do
+            # Solution 2: Create own context object and don't pollute instance variables
+            # Solution 3: Prefix own instance varibale @_mate or so to circumvent conflicts
+            self.instance_variable_set(controller_instance_var_key, controller.instance_variable_get(controller_instance_var_key))
           end
-        rescue
-          @app_class = nil
         end
       end
-
   end
 end

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

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

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

@@ -1,5 +1,5 @@
 module Matestack::Ui::Core::Paragraph
   class Paragraph < Matestack::Ui::Core::Component::Static
-
+    optional :text
   end
 end

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

@@ -1 +1 @@
-%param{@tag_attributes}
+%param{ html_attributes }

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

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

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

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

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

@@ -1,3 +1,3 @@
-%picture{@tag_attributes}
+%picture{ html_attributes }
   - if block_given?
     = yield

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

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

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

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

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

@@ -1,3 +1,3 @@
-%progress{@tag_attributes}
+%progress{ html_attributes }
   - if block_given?
     = yield

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

@@ -1,14 +1,5 @@
 module Matestack::Ui::Core::Progress
   class Progress < Matestack::Ui::Core::Component::Static
-
-    REQUIRED_KEYS = [:max]
-
-    def setup
-      @tag_attributes.merge!({
-         'value': options[:value] ||= 0,
-         'max': options[:max]
-      })
-    end
-
+    html_attributes :max, :value
   end
 end

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,5 @@
 module Matestack::Ui::Core::Samp
   class Samp < Matestack::Ui::Core::Component::Static
+    optional :text
   end
 end

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

@@ -1,3 +1,3 @@
-%section{@tag_attributes}
+%section{ html_attributes }
   - if block_given?
     = yield

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

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

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

@@ -1,5 +1,4 @@
 module Matestack::Ui::Core::Slot
-  class Slot < Matestack::Ui::Core::Component::Static
-    
+  class Slot < Matestack::Ui::Core::Component::Base
   end
 end

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

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