Merge pull request #155 from basemate/develop

0.7.2 Release

Author: jonasjabari

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    matestack-ui-core (0.7.0)
+    matestack-ui-core (0.7.1)
       cells-haml
       cells-rails
       haml
@@ -13,43 +13,43 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.1)
-      actionpack (= 5.2.1)
+    actioncable (5.2.3)
+      actionpack (= 5.2.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.1)
-      actionpack (= 5.2.1)
-      actionview (= 5.2.1)
-      activejob (= 5.2.1)
+    actionmailer (5.2.3)
+      actionpack (= 5.2.3)
+      actionview (= 5.2.3)
+      activejob (= 5.2.3)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.1)
-      actionview (= 5.2.1)
-      activesupport (= 5.2.1)
+    actionpack (5.2.3)
+      actionview (= 5.2.3)
+      activesupport (= 5.2.3)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.1)
-      activesupport (= 5.2.1)
+    actionview (5.2.3)
+      activesupport (= 5.2.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.1)
-      activesupport (= 5.2.1)
+    activejob (5.2.3)
+      activesupport (= 5.2.3)
       globalid (>= 0.3.6)
-    activemodel (5.2.1)
-      activesupport (= 5.2.1)
-    activerecord (5.2.1)
-      activemodel (= 5.2.1)
-      activesupport (= 5.2.1)
+    activemodel (5.2.3)
+      activesupport (= 5.2.3)
+    activerecord (5.2.3)
+      activemodel (= 5.2.3)
+      activesupport (= 5.2.3)
       arel (>= 9.0)
-    activestorage (5.2.1)
-      actionpack (= 5.2.1)
-      activerecord (= 5.2.1)
+    activestorage (5.2.3)
+      actionpack (= 5.2.3)
+      activerecord (= 5.2.3)
       marcel (~> 0.3.1)
-    activesupport (5.2.1)
+    activesupport (5.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -81,7 +81,7 @@ GEM
     childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
     cliver (0.3.2)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.5)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.4)
@@ -97,7 +97,7 @@ GEM
       representable (>= 2.4.0, <= 3.1.0)
       uber (< 0.2.0)
     docile (1.3.1)
-    erubi (1.7.1)
+    erubi (1.8.0)
     ffi (1.9.25)
     generator_spec (0.9.4)
       activesupport (>= 3.0.0)
@@ -108,61 +108,61 @@ GEM
       temple (>= 0.8.0)
       tilt
     hashdiff (0.3.8)
-    i18n (1.1.0)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     json (2.1.0)
-    loofah (2.2.2)
+    loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
-    method_source (0.9.0)
+    method_source (0.9.2)
     mimemagic (0.3.3)
     mini_mime (1.0.1)
-    mini_portile2 (2.3.0)
+    mini_portile2 (2.4.0)
     minitest (5.11.3)
-    nio4r (2.3.1)
-    nokogiri (1.8.4)
-      mini_portile2 (~> 2.3.0)
+    nio4r (2.4.0)
+    nokogiri (1.10.3)
+      mini_portile2 (~> 2.4.0)
     pipetree (0.1.1)
     poltergeist (1.18.1)
       capybara (>= 2.1, < 4)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
     public_suffix (3.0.3)
     puma (3.12.0)
-    rack (2.0.5)
+    rack (2.0.7)
     rack-proxy (0.6.5)
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.1)
-      actioncable (= 5.2.1)
-      actionmailer (= 5.2.1)
-      actionpack (= 5.2.1)
-      actionview (= 5.2.1)
-      activejob (= 5.2.1)
-      activemodel (= 5.2.1)
-      activerecord (= 5.2.1)
-      activestorage (= 5.2.1)
-      activesupport (= 5.2.1)
+    rails (5.2.3)
+      actioncable (= 5.2.3)
+      actionmailer (= 5.2.3)
+      actionpack (= 5.2.3)
+      actionview (= 5.2.3)
+      activejob (= 5.2.3)
+      activemodel (= 5.2.3)
+      activerecord (= 5.2.3)
+      activestorage (= 5.2.3)
+      activesupport (= 5.2.3)
       bundler (>= 1.3.0)
-      railties (= 5.2.1)
+      railties (= 5.2.3)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.4)
       loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.1)
-      actionpack (= 5.2.1)
-      activesupport (= 5.2.1)
+    railties (5.2.3)
+      actionpack (= 5.2.3)
+      activesupport (= 5.2.3)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
-    rake (12.3.2)
+    rake (12.3.3)
     reform (2.2.4)
       disposable (>= 0.4.1)
       representable (>= 2.4.0, < 3.1.0)
@@ -210,7 +210,7 @@ GEM
       sprockets (>= 3.0.0)
     sqlite3 (1.3.13)
     temple (0.8.0)
-    thor (0.20.0)
+    thor (0.20.3)
     thread_safe (0.3.6)
     tilt (2.0.8)
     trailblazer (2.0.7)
@@ -239,9 +239,9 @@ GEM
       activesupport (>= 4.2)
       rack-proxy (>= 0.6.1)
       railties (>= 4.2)
-    websocket-driver (0.7.0)
+    websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
+    websocket-extensions (0.1.4)
     xpath (3.2.0)
       nokogiri (~> 1.8)
 

app/concepts/matestack/ui/core/abbr/abbr.haml

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

app/concepts/matestack/ui/core/abbr/abbr.rb

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

app/concepts/matestack/ui/core/address/address.haml

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

app/concepts/matestack/ui/core/address/address.rb

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

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

@@ -53,7 +53,6 @@ def self.views_dir
       return ""
     end
 
-
     def initialize(model=nil, options={})
       super
       @nodes = {}
@@ -87,7 +86,7 @@ def components(&block)
       @nodes = Matestack::Ui::Core::AppNode.build(self, &block)
 
       @nodes.each do |key, node|
-        @cells[key] = to_cell(key, node["component_name"], node["config"], node["argument"], node["components"], nil)
+        @cells[key] = to_cell(key, node["component_name"], node["config"], node["argument"], node["components"], nil, node["cached_params"])
       end
     end
 

app/concepts/matestack/ui/core/app/store.js

@@ -1,7 +1,6 @@
 import Vue from 'vue/dist/vue.esm'
 import Vuex from 'vuex'
 import axios from 'axios'
-
 import matestackEventHub from 'js/event-hub'
 
 Vue.use(Vuex)

app/concepts/matestack/ui/core/article/article.haml

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

app/concepts/matestack/ui/core/article/article.rb

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

app/concepts/matestack/ui/core/async/async.haml

@@ -1,2 +1,2 @@
-%div{"v-if": "showing"}
+%div{@tag_attributes}
   = yield

app/concepts/matestack/ui/core/async/async.js

@@ -1,7 +1,5 @@
 import Vue from 'vue/dist/vue.esm'
-
 import matestackEventHub from 'js/event-hub'
-
 import componentMixin from 'component/component'
 
 const componentDef = {
@@ -60,6 +58,9 @@ const componentDef = {
         }
       }
     }
+    if(this.componentConfig["init_show"] == true){
+      this.showing = true
+    }
   },
   beforeDestroy: function() {
     const self = this

app/concepts/matestack/ui/core/async/async.rb

@@ -1,10 +1,12 @@
 module Matestack::Ui::Core::Async
-    class Async < Matestack::Ui::Core::Component::Dynamic
-
-      def setup
-        @rerender = true
-      end
-
+  class Async < Matestack::Ui::Core::Component::Dynamic
 
+    def setup
+      @rerender = true
+      @tag_attributes.merge!({
+        "v-if": "showing"
+      })
     end
+
   end
+end

app/concepts/matestack/ui/core/blockquote/blockquote.rb

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

app/concepts/matestack/ui/core/button/button.haml

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

app/concepts/matestack/ui/core/caption/caption.haml

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

app/concepts/matestack/ui/core/collection/content/content.js

@@ -1,8 +1,6 @@
 import Vue from 'vue/dist/vue.esm'
-
 import matestackEventHub from 'js/event-hub'
 import queryParamsHelper from 'js/helpers/query-params-helper'
-
 import componentMixin from 'component/component'
 import asyncMixin from 'async/async'
 

app/concepts/matestack/ui/core/collection/content/content.rb

@@ -8,7 +8,7 @@ def setup
 
     def response
       components {
-        div do
+        div @tag_attributes do
           yield_components
         end
       }

app/concepts/matestack/ui/core/collection/filter/filter.js

@@ -1,8 +1,6 @@
 import Vue from 'vue/dist/vue.esm'
-
 import matestackEventHub from 'js/event-hub'
 import queryParamsHelper from 'js/helpers/query-params-helper'
-
 import componentMixin from 'component/component'
 
 const componentDef = {

app/concepts/matestack/ui/core/collection/filter/filter.rb

@@ -7,7 +7,7 @@ def setup
 
     def response
       components {
-        div do
+        div @tag_attributes do
           yield_components
         end
       }

app/concepts/matestack/ui/core/collection/filter/input/input.haml

@@ -1,8 +1,2 @@
 - if [:text, :number, :email, :date, :password].include?(options[:type])
-  %input{"v-model#{'.number' if options[:type] == :number}": input_key,
-    type: options[:type],
-    class: options[:class],
-    id: component_id,
-    "@keyup.enter": "submitFilter()",
-    ref: "filter.#{attr_key}",
-    placeholder: options[:placeholder]}
+  %input{@tag_attributes}