Merge pull request #101 from basemate/develop

0.7.1 Release

Author: jonasjabari

CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## v0.7.1
+
+[Merged PRs](https://github.com/basemate/matestack-ui-core/milestone/3?closed=1)
+
+### Improvements
+
+- Introduce scaffolder #72 by PasWen
+- Make buttons disableable  enhancement by PasWen
+- Collection Component #98 by jonasjabari
+- Added Async Defer Feature #100 by jonasjabari
+- Added blockquote tag to main component #88 by cameronnorman 
+- Added small tags #87 by cameronnorman
+- Added strong tag #93 by cameronnorman
+- Added Infos that async component can currently only be used on page leve #85 by jonasjabari was merged 10
+- Update span component in 0.7.0 #74 by PasWen
+- Add documented, untested video component #70 by PasWen
+- Added summary details components #76 by bdlb77
+- Add caption with doc and specs  enhancement #68 by michaelrevans
+
+### Bugfixes
+
+- Fixed Link Component #84 by jonasjabari
+
 ## v0.7.0
 
 ### Breaking changes for users

Gemfile

@@ -32,3 +32,7 @@ group :development, :test do
   gem 'byebug'
   gem 'webmock'
 end
+
+group :test do
+  gem "generator_spec"
+end

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    matestack-ui-core (0.6.0)
+    matestack-ui-core (0.7.0)
       cells-haml
       cells-rails
       haml
@@ -99,6 +99,9 @@ GEM
     docile (1.3.1)
     erubi (1.7.1)
     ffi (1.9.25)
+    generator_spec (0.9.4)
+      activesupport (>= 3.0.0)
+      railties (>= 3.0.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     haml (5.0.4)
@@ -250,6 +253,7 @@ DEPENDENCIES
   capybara
   cells-haml
   cells-rails
+  generator_spec
   matestack-ui-core!
   poltergeist
   puma

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

@@ -18,8 +18,16 @@ const componentDef = {
   methods: {
     show: function(event_data){
       const self = this
+      if (this.showing === true){
+        return
+      }
       this.showing = true
       this.event.data = event_data
+      if(this.componentConfig["defer"] != undefined){
+        if(!isNaN(this.componentConfig["defer"])){
+          this.startDefer()
+        }
+      }
       if(this.componentConfig["hide_after"] != undefined){
         self.hide_after_timeout = setTimeout(function () {
           self.hide()
@@ -29,6 +37,12 @@ const componentDef = {
     hide: function(){
       this.showing = false
       this.event.data = {}
+    },
+    startDefer: function(){
+      const self = this
+      setTimeout(function () {
+        self.rerender()
+      }, parseInt(this.componentConfig["defer"]));
     }
   },
   created: function () {
@@ -39,8 +53,12 @@ const componentDef = {
     if(this.componentConfig["show_on"] != undefined){
       this.showing = false
     }
-    if(this.componentConfig["hide_on"] != undefined){
-      this.showing = true
+    if(this.componentConfig["defer"] != undefined){
+      if(!isNaN(this.componentConfig["defer"])){
+        if (this.componentConfig["show_on"] == undefined){
+          this.startDefer()
+        }
+      }
     }
   },
   beforeDestroy: function() {

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

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

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

@@ -0,0 +1,9 @@
+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.rb

@@ -1,5 +1,11 @@
 module Matestack::Ui::Core::Button
   class Button < Matestack::Ui::Core::Component::Static
 
+    def setup
+      @tag_attributes.merge!({
+        "disabled": options[:disabled] ||= nil
+      })
+    end
+
   end
 end

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

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

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

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

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

@@ -0,0 +1,100 @@
+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'
+
+const componentDef = {
+  mixins: [componentMixin, asyncMixin],
+  data: function(){
+    return {
+      currentLimit: null,
+      currentOffset: null,
+      currentFilteredCount: null,
+      currentBaseCount: null
+    }
+  },
+  methods: {
+    next: function(){
+      if (this.currentTo() < this.currentCount()){
+        this.currentOffset += this.currentLimit
+        var url = queryParamsHelper.updateQueryParams(this.componentConfig["id"] + "-offset", this.currentOffset)
+        window.history.pushState({matestackApp: true, url: url}, null, url);
+        matestackEventHub.$emit(this.componentConfig["id"] + "-update")
+      }
+    },
+    previous: function(){
+      if ((this.currentOffset - this.currentLimit)*-1 != this.currentLimit){
+        if((this.currentOffset - this.currentLimit) < 0){
+          this.currentOffset = 0
+        } else {
+          this.currentOffset -= this.currentLimit
+        }
+        var url = queryParamsHelper.updateQueryParams(this.componentConfig["id"] + "-offset", this.currentOffset)
+        window.history.pushState({matestackApp: true, url: url}, null, url);
+        matestackEventHub.$emit(this.componentConfig["id"] + "-update")
+      }
+    },
+    currentTo: function(){
+      var to = parseInt(this.currentOffset) + parseInt(this.currentLimit)
+      if (to > parseInt(this.currentCount())){
+        return this.currentCount();
+      } else {
+        return to;
+      }
+    },
+    currentCount: function(){
+      if (this.currentFilteredCount != null || this.currentFilteredCount != undefined){
+        return this.currentFilteredCount;
+      } else {
+        return this.currentBaseCount;
+      }
+    },
+    goToPage: function(page){
+      this.currentOffset = parseInt(this.currentLimit) * (parseInt(page)-1)
+      var url = queryParamsHelper.updateQueryParams(this.componentConfig["id"] + "-offset", this.currentOffset)
+      window.history.pushState({matestackApp: true, url: url}, null, url);
+      matestackEventHub.$emit(this.componentConfig["id"] + "-update")
+    }
+  },
+  mounted: function(){
+    if(queryParamsHelper.getQueryParam(this.componentConfig["id"] + "-offset") != null){
+        this.currentOffset = parseInt(queryParamsHelper.getQueryParam(this.componentConfig["id"] + "-offset"))
+    } else {
+      if(this.componentConfig["init_offset"] != undefined){
+        this.currentOffset = this.componentConfig["init_offset"]
+      } else {
+        this.currentOffset = 0
+      }
+    }
+
+    if(queryParamsHelper.getQueryParam(this.componentConfig["id"] + "-limit") != null){
+        this.currentOffset = parseInt(queryParamsHelper.getQueryParam(this.componentConfig["id"] + "-limit"))
+    } else {
+      if(this.componentConfig["init_limit"] != undefined){
+        this.currentLimit = this.componentConfig["init_limit"]
+      } else {
+        this.currentLimit = 10
+      }
+    }
+
+    if(this.componentConfig["filtered_count"] != undefined){
+      this.currentFilteredCount = this.componentConfig["filtered_count"]
+      if(this.currentOffset >= this.currentFilteredCount){
+        this.previous()
+      }
+    }
+    if(this.componentConfig["base_count"] != undefined){
+      this.currentBaseCount = this.componentConfig["base_count"]
+      if(this.currentOffset >= this.currentBaseCount){
+        this.previous()
+      }
+    }
+  }
+}
+
+let component = Vue.component('matestack-ui-core-collection-content', componentDef)
+
+export default componentDef