Skip to content

0.7.2 Release #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 84 commits into from
Sep 5, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
8fc458c
drafting the isolate component in order to boost performance while re…
jonasjabari Jul 18, 2019
b7a2077
Adds docs and tests for onclick component
cameronnorman Jul 26, 2019
3c6a911
Bump lodash.mergewith from 4.6.1 to 4.6.2 in /spec/dummy
dependabot[bot] Aug 1, 2019
aacfd39
Bump nokogiri from 1.8.4 to 1.10.3
dependabot[bot] Aug 1, 2019
5fad38e
Bump loofah from 2.2.2 to 2.2.3
dependabot[bot] Aug 1, 2019
e19c3ed
Bump rack from 2.0.5 to 2.0.7
dependabot[bot] Aug 1, 2019
ce13182
Bump actionview from 5.2.1 to 5.2.3
dependabot[bot] Aug 1, 2019
cfbfcd3
Bump railties from 5.2.1 to 5.2.3
dependabot[bot] Aug 1, 2019
5291108
Bump lodash.mergewith from 4.6.1 to 4.6.2 in /builder
dependabot[bot] Aug 1, 2019
f05c875
Add abbr component with specs and documentation
michaelrevans Aug 3, 2019
e503b59
Add thead, tbody and tfoot components with specs and docs
michaelrevans Aug 3, 2019
1ddf3f1
Give extra info in table documentation
michaelrevans Aug 3, 2019
cecae31
Add address tag, specs and documentation
michaelrevans Aug 4, 2019
a1bb875
Depelete changes in development.sqlite3
pascalwengerter Aug 5, 2019
5a46de3
Add article component with docs and specs
michaelrevans Aug 4, 2019
c125449
Bump webpack-dev-server from 2.11.2 to 3.1.11 in /spec/dummy
dependabot[bot] Aug 5, 2019
111081d
Bump lodash.template from 4.4.0 to 4.5.0 in /spec/dummy
dependabot[bot] Aug 5, 2019
c0bffcf
Bump yarn from 1.15.2 to 1.17.3
dependabot[bot] Aug 5, 2019
618502e
Bump webpack-dev-server from 2.11.2 to 3.1.11 in /builder
dependabot[bot] Aug 5, 2019
865de56
Merge pull request #125 from basemate/extra-table-components
pascalwengerter Aug 5, 2019
ac783f2
Implement PR comments
michaelrevans Aug 5, 2019
3ca0bce
Implement PR comments
michaelrevans Aug 5, 2019
1a201d7
Merge pull request #128 from basemate/dependabot/npm_and_yarn/yarn-1.…
pascalwengerter Aug 5, 2019
c575388
Merge pull request #113 from basemate/dependabot/npm_and_yarn/builder…
pascalwengerter Aug 5, 2019
cccd00d
Bump axios from 0.18.0 to 0.18.1
dependabot[bot] Aug 5, 2019
78f712b
Bump fstream from 1.0.11 to 1.0.12 in /spec/dummy
dependabot[bot] Aug 5, 2019
2c87340
Merge pull request #107 from basemate/dependabot/bundler/nokogiri-1.10.3
pascalwengerter Aug 5, 2019
f081862
Merge pull request #106 from basemate/dependabot/npm_and_yarn/spec/du…
pascalwengerter Aug 5, 2019
c99cdee
Merge pull request #108 from basemate/dependabot/bundler/loofah-2.2.3
pascalwengerter Aug 5, 2019
1398151
Merge branch 'develop' into dependabot/bundler/actionview-5.2.3
pascalwengerter Aug 5, 2019
8d08e9e
Merge pull request #110 from basemate/dependabot/bundler/actionview-5…
pascalwengerter Aug 5, 2019
fc4d43f
Merge pull request #103 from basemate/dependabot/npm_and_yarn/spec/du…
pascalwengerter Aug 5, 2019
c566cd6
Merge pull request #109 from basemate/dependabot/bundler/rack-2.0.7
pascalwengerter Aug 5, 2019
a7e090f
Merge branch 'develop' into dependabot/npm_and_yarn/axios-0.18.1
pascalwengerter Aug 5, 2019
6a800b9
Merge branch 'develop' into dependabot/npm_and_yarn/spec/dummy/lodash…
pascalwengerter Aug 5, 2019
74dcecf
Merge pull request #104 from basemate/dependabot/npm_and_yarn/spec/du…
pascalwengerter Aug 5, 2019
5164899
Merge pull request #111 from basemate/dependabot/bundler/railties-5.2.3
pascalwengerter Aug 5, 2019
45e4b5a
Merge branch 'develop' into dependabot/npm_and_yarn/builder/lodash.me…
pascalwengerter Aug 5, 2019
1619862
Merge pull request #114 from basemate/dependabot/npm_and_yarn/builder…
pascalwengerter Aug 5, 2019
7d2022a
Merge pull request #102 from basemate/dependabot/npm_and_yarn/axios-0…
pascalwengerter Aug 5, 2019
32bc1df
Merge pull request #105 from basemate/dependabot/npm_and_yarn/spec/du…
pascalwengerter Aug 5, 2019
1ab80b4
add sub tag
pascalwengerter Aug 5, 2019
5a0a3a4
add text param to docs and fix inheritance error
pascalwengerter Aug 6, 2019
d3f38c4
update gemfile.lock
pascalwengerter Aug 6, 2019
e9c9a5d
Made the tests and documents far easier to understand for the onclick…
cameronnorman Aug 7, 2019
522f75e
Merge pull request #127 from basemate/add-article-tag
pascalwengerter Aug 7, 2019
0581977
Merge pull request #124 from basemate/add-abbr-tag
pascalwengerter Aug 7, 2019
fb4a897
refactor some static core components (save LOC and reformat)
pascalwengerter Aug 7, 2019
0ff7668
Add class option to dropdown form selects
3wille Aug 13, 2019
6f42c9e
Merge pull request #135 from 3wille/fw-fix-class-on-form-select
jonasjabari Aug 15, 2019
cdee927
update yarn and fix controller action name
pascalwengerter Aug 16, 2019
b383aab
add working component
pascalwengerter Aug 16, 2019
0687a9b
add documentation to youtube component
pascalwengerter Aug 16, 2019
082b669
Merge pull request #96 from basemate/add-onlick-docs-and-tests
jonasjabari Aug 17, 2019
c2fc8c8
add youtube component tests
pascalwengerter Aug 20, 2019
a2bb47f
Merge pull request #144 from basemate/add_youtube_component
jonasjabari Aug 20, 2019
f3a1bd1
Merge pull request #134 from basemate/refactor_core_components_v2
jonasjabari Aug 20, 2019
a32e586
Merge pull request #141 from basemate/fix_issue_138
jonasjabari Aug 20, 2019
2a95161
Bump nokogiri from 1.8.4 to 1.10.4
dependabot[bot] Aug 20, 2019
04b68ed
Merge branch 'develop' into dependabot/bundler/nokogiri-1.10.4
pascalwengerter Aug 27, 2019
d2da68b
Merge pull request #145 from basemate/dependabot/bundler/nokogiri-1.10.4
pascalwengerter Aug 27, 2019
d7784b0
Bump mixin-deep from 1.3.1 to 1.3.2 in /builder
dependabot[bot] Aug 28, 2019
cebcd16
add integration doc for pundit&cancancan&devise
pascalwengerter Aug 28, 2019
a7b624a
Bump mixin-deep from 1.3.1 to 1.3.2 in /spec/dummy
dependabot[bot] Aug 28, 2019
368b478
Merge pull request #150 from basemate/dependabot/npm_and_yarn/spec/du…
jonasjabari Sep 2, 2019
2dcc3d8
Merge pull request #132 from basemate/add_sub_tag
jonasjabari Sep 2, 2019
ba433e8
Merge pull request #149 from basemate/update_integration_docs
jonasjabari Sep 2, 2019
535b5ad
Merge branch 'develop' into dependabot/npm_and_yarn/builder/mixin-dee…
jonasjabari Sep 2, 2019
59f0e62
Merge pull request #148 from basemate/dependabot/npm_and_yarn/builder…
jonasjabari Sep 2, 2019
674051f
added missing @tag_attributes
jonasjabari Sep 2, 2019
43237d6
Merge pull request #151 from basemate/resolving_issue_136
pascalwengerter Sep 2, 2019
1c5bf6a
added init_show option to async component in order to enable inital s…
jonasjabari Sep 3, 2019
66eea9a
added inline edit demo to dummy app
jonasjabari Sep 3, 2019
663f30b
added isolate component and specs
jonasjabari Sep 5, 2019
8bb3d1c
cleanup
jonasjabari Sep 5, 2019
9c5d740
Merge branch 'develop' into isolate_component_drafting
jonasjabari Sep 5, 2019
fb7f28e
added isolate docs
jonasjabari Sep 5, 2019
759f9fe
Merge pull request #152 from basemate/resolving_issue_140
jonasjabari Sep 5, 2019
ac16725
Merge branch 'develop' into implementing_issue_153
jonasjabari Sep 5, 2019
5d0dec2
fixed isolate component after merging
jonasjabari Sep 5, 2019
6a2f857
Merge pull request #154 from basemate/implementing_issue_153
jonasjabari Sep 5, 2019
a960c9c
Update address.md
jonasjabari Sep 5, 2019
3a02970
Merge pull request #126 from basemate/add-address-tag
jonasjabari Sep 5, 2019
6dd7fe5
Bump matestack-ui-core to 0.7.2
jonasjabari Sep 5, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 51 additions & 51 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
matestack-ui-core (0.7.0)
matestack-ui-core (0.7.1)
cells-haml
cells-rails
haml
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)

Expand Down
5 changes: 5 additions & 0 deletions app/concepts/matestack/ui/core/abbr/abbr.haml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
%abbr{@tag_attributes}
- if options[:text].blank? && block_given?
= yield
- else
= options[:text]
12 changes: 12 additions & 0 deletions app/concepts/matestack/ui/core/abbr/abbr.rb
Original file line number Diff line number Diff line change
@@ -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
5 changes: 5 additions & 0 deletions app/concepts/matestack/ui/core/address/address.haml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
%address{@tag_attributes}
- if options[:text].nil? && block_given?
= yield
- else
= options[:text]
5 changes: 5 additions & 0 deletions app/concepts/matestack/ui/core/address/address.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module Matestack::Ui::Core::Address
class Address < Matestack::Ui::Core::Component::Static

end
end
3 changes: 1 addition & 2 deletions app/concepts/matestack/ui/core/app/app.rb
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ def self.views_dir
return ""
end


def initialize(model=nil, options={})
super
@nodes = {}
Expand Down Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion app/concepts/matestack/ui/core/app/store.js
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
5 changes: 5 additions & 0 deletions app/concepts/matestack/ui/core/article/article.haml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
%article{@tag_attributes}
- if options[:text].nil? && block_given?
= yield
- else
= options[:text]
5 changes: 5 additions & 0 deletions app/concepts/matestack/ui/core/article/article.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module Matestack::Ui::Core::Article
class Article < Matestack::Ui::Core::Component::Static

end
end
2 changes: 1 addition & 1 deletion app/concepts/matestack/ui/core/async/async.haml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
%div{"v-if": "showing"}
%div{@tag_attributes}
= yield
5 changes: 3 additions & 2 deletions app/concepts/matestack/ui/core/async/async.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import Vue from 'vue/dist/vue.esm'

import matestackEventHub from 'js/event-hub'

import componentMixin from 'component/component'

const componentDef = {
Expand Down Expand Up @@ -60,6 +58,9 @@ const componentDef = {
}
}
}
if(this.componentConfig["init_show"] == true){
this.showing = true
}
},
beforeDestroy: function() {
const self = this
Expand Down
14 changes: 8 additions & 6 deletions app/concepts/matestack/ui/core/async/async.rb
Original file line number Diff line number Diff line change
@@ -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
4 changes: 3 additions & 1 deletion app/concepts/matestack/ui/core/blockquote/blockquote.rb
Original file line number Diff line number Diff line change
@@ -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
10 changes: 4 additions & 6 deletions app/concepts/matestack/ui/core/button/button.haml
Original file line number Diff line number Diff line change
@@ -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]
5 changes: 2 additions & 3 deletions app/concepts/matestack/ui/core/caption/caption.haml
Original file line number Diff line number Diff line change
@@ -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]
2 changes: 0 additions & 2 deletions app/concepts/matestack/ui/core/collection/content/content.js
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ def setup

def response
components {
div do
div @tag_attributes do
yield_components
end
}
Expand Down
2 changes: 0 additions & 2 deletions app/concepts/matestack/ui/core/collection/filter/filter.js
Original file line number Diff line number Diff line change
@@ -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 = {
Expand Down
2 changes: 1 addition & 1 deletion app/concepts/matestack/ui/core/collection/filter/filter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ def setup

def response
components {
div do
div @tag_attributes do
yield_components
end
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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}
Loading