Merge pull request #398 from matestack/develop

0.7.5 Release

Author: jonasjabari

.github/workflows/dockerpush.yml

@@ -12,4 +12,4 @@ jobs:
       - name: Run tests
         run: |
           docker-compose run --rm test bundle exec rake db:schema:load
-          docker-compose run --rm test bundle exec rspec spec/usage
+          docker-compose run --rm test bundle exec rspec spec/usage spec/lib

CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## v0.7.5
+
+[Merged PRs](https://github.com/basemate/matestack-ui-core/pulls?q=is%3Apr+is%3Aclosed+milestone%3A0.7.5)
+
+[Solved Issues](https://github.com/basemate/matestack-ui-core/issues?q=is%3Aissue+is%3Aclosed+milestone%3A0.7.5)
+
+### Security Fixes
+
+* Various dependency version bumps by dependabot
+
+### Improvements
+
+* Added `datalist` component
+* Added `range` type for `form_input`
+* Integrated generator specs in CI spec run
+* Added `turbolinks` support
+* Form component: Add support for `redirect_to` in the controller
+* HasViewContext: Check in advance whether the view context would respond to a missing method.
+
+### Bugfixes
+
+* Fixed broken history button behavior introduced in `0.7.4` #386
+
 ## v0.7.4
 
 [Merged PRs](https://github.com/basemate/matestack-ui-core/pulls?q=is%3Apr+is%3Aclosed+milestone%3A0.7.4)
@@ -10,7 +33,7 @@
 
 XSS/Script injection vulnerablilty fixed in 0.7.4
 
-* matestack-ui-core was vulnerable to XSS/Script injection 
+* matestack-ui-core was vulnerable to XSS/Script injection
 * matestack-ui-core did not excape strings by default and did not cover this in the docs
 * matestack-ui-core should have escaped strings by default in order to prevent XSS/Script injection vulnerability
 * 0.7.4 fixes that by performing string escaping by default now
@@ -88,9 +111,9 @@ reported by @PragTob
 * New webpacker features by fiedl
 
   * make webpacker create es5 code instead of es6 code
-  
+
   * Switch to Vue Production Mode if RAILS_ENV=staging or production
-  
+
   * Establish webpack(er) and asset-pipeline workflows
 
 --> webpacker now builds assets for asset pipline usage AND webpacker usage (both usage approaches are described in the installation docs)
@@ -101,22 +124,22 @@ reported by @PragTob
 
 --> when used via asset pipeline, the minified version of matestack-ui-core together with the production build of vue.js is automatically required
 
---> when used via webpacker, matestack-ui-core can be used within a modern javascript workflow, importing and extending 
+--> when used via webpacker, matestack-ui-core can be used within a modern javascript workflow, importing and extending
 single matestack module for example
 
 * New components
   * Add HTML `<picture>` tag to core components by pascalwengerter
   * Add HTML `<option>` tag to core components by pascalwengerter
   * Add HTML `<optgroup>` tag to core components by pascalwengerter
-  * Add HTML `<iframe>` tag to core components by pascalwengerter 
-  * Add HTML `<dfn>` tag to core components by pascalwengerter 
+  * Add HTML `<iframe>` tag to core components by pascalwengerter
+  * Add HTML `<dfn>` tag to core components by pascalwengerter
   * Add HTML `<del>` tag to core components by pascalwengerter
   * Add HTML `<data>` tag to core components by pascalwengerter
   * Add HTML `<bdo>` tag to core components by pascalwengerter
   * Add HTML `<bdi>` tag to core components by pascalwengerter
   * Add HTML `<wbr>` tag to core components by pascalwengerter
   * Add HTML `<samp>` tag to core components by pascalwengerter
-  * Add HTML `<u>` tag to core components by pascalwengerter 
+  * Add HTML `<u>` tag to core components by pascalwengerter
   * Add HTML `<template>` tag to core components by pascalwengerter
 
 

Gemfile

@@ -26,10 +26,10 @@ group :development, :test do
   gem 'puma'
   gem 'simplecov', require: false, group: :test
   gem 'byebug'
-  gem 'pry-byebug'
   gem 'webmock'
   gem 'pry-rails'
   gem 'pry-byebug'
+  gem 'turbolinks'
 end
 
 group :test do

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    matestack-ui-core (0.7.3)
+    matestack-ui-core (0.7.4)
       cells-haml
       cells-rails
       haml
@@ -121,7 +121,7 @@ GEM
     mini_portile2 (2.4.0)
     minitest (5.14.0)
     nio4r (2.5.2)
-    nokogiri (1.10.7)
+    nokogiri (1.10.8)
       mini_portile2 (~> 2.4.0)
     pipetree (0.1.1)
     pry (0.12.2)
@@ -133,7 +133,7 @@ GEM
     pry-rails (0.3.9)
       pry (>= 0.10.4)
     public_suffix (4.0.3)
-    puma (4.3.1)
+    puma (4.3.3)
       nio4r (~> 2.0)
     rack (2.2.1)
     rack-proxy (0.6.5)
@@ -237,6 +237,9 @@ GEM
       reform-rails (>= 0.1.4, < 0.2.0)
       trailblazer (~> 2.0.0)
       trailblazer-loader (>= 0.1.0)
+    turbolinks (5.2.1)
+      turbolinks-source (~> 5.2)
+    turbolinks-source (5.2.0)
     tzinfo (1.2.6)
       thread_safe (~> 0.1)
     uber (0.1.0)
@@ -276,6 +279,7 @@ DEPENDENCIES
   trailblazer
   trailblazer-cells
   trailblazer-rails
+  turbolinks
   webmock
   webpacker (~> 4.0)
 

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

@@ -10,12 +10,20 @@ const componentDef = {
   },
   computed: Vuex.mapState({
     asyncTemplate: state => state.pageTemplate,
+    currentPathName: state => state.currentPathName,
+    currentSearch: state => state.currentSearch,
+    currentOrigin: state => state.currentOrigin,
   }),
   mounted: function(){
+    const self = this;
     window.onpopstate = (event) => {
-      if (isNavigatingToAnotherPage(document.location, event)) {
-        this.$store.dispatch("navigateTo", {url: document.location.pathname, backwards: true} );
-      };
+      if (isNavigatingToAnotherPage({
+          origin: self.currentOrigin,
+          pathName: self.currentPathName,
+          search: self.currentSearch
+        }, document.location)){
+        self.$store.dispatch("navigateTo", {url: document.location.pathname, backwards: true} );
+      }
     }
   },
   components: {

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

@@ -1,8 +1,7 @@
-const isNavigatingToAnotherPage = function(currentLocation, popstateEvent) {
-  const targetLocation = popstateEvent.target.location;
+const isNavigatingToAnotherPage = function(currentLocation, targetLocation) {
 
   // omits hash by design
-  return currentLocation.pathname !== targetLocation.pathname ||
+  return currentLocation.pathName !== targetLocation.pathname ||
     currentLocation.origin !== targetLocation.origin ||
     currentLocation.search !== targetLocation.search
 }

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

@@ -8,14 +8,21 @@ Vue.use(Vuex)
 const store = new Vuex.Store({
   state: {
     pageTemplate: null,
-    currentPath: document.location.pathname
+    currentPathName: document.location.pathname,
+    currentSearch: document.location.search,
+    currentOrigin: document.location.origin
   },
   mutations: {
     setPageTemplate (state, serverResponse){
       state.pageTemplate = serverResponse
     },
-    setCurrentPath (state, path){
-      state.currentPath = path
+    setCurrentLocation (state, current){
+      state.currentPathName = current.path
+      state.currentSearch = current.search
+      state.currentOrigin = current.origin
+    },
+    resetPageTemplate (state) {
+      state.pageTemplate = null;
     }
   },
   actions: {
@@ -46,7 +53,7 @@ const store = new Vuex.Store({
           setTimeout(function () {
             resolve(response["data"])
             commit('setPageTemplate', response["data"])
-            commit('setCurrentPath', url)
+            commit('setCurrentLocation', { path: url, search: document.location.search, origin: document.location.origin })
             matestackEventHub.$emit("page_loaded", url);
             if (typeof matestackUiCoreTransitionSuccess !== 'undefined') {
               matestackUiCoreTransitionSuccess(url);

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

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

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

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

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

@@ -137,7 +137,7 @@ const componentDef = {
           && self.componentConfig["success"]["transition"]["follow_response"] === true
           && self.$store != undefined
         ) {
-          let path = response.data["transition_to"]
+          let path = response.data["transition_to"] || response.request.responseURL
           self.$store.dispatch('navigateTo', {url: path, backwards: false})
           return;
         }

app/concepts/matestack/ui/core/form/input/input.haml

@@ -1,27 +1,38 @@
-- if options[:label]
-  %label=options[:label]
+- if label
+  %label=label
 
-- if [:text, :number, :email, :date, :password].include?(options[:type])
-  %input{@tag_attributes,
-    "v-model#{'.number' if options[:type] == :number}": input_key,
-    type: options[:type],
+- if [:text, :number, :email, :date, :password].include?(type)
+  %input{ @tag_attributes,
+    "v-model#{'.number' if type == :number}": input_key,
+    type: type,
     "@change": "inputChanged(\"#{attr_key}\")",
     ref: "input.#{attr_key}",
-    placeholder: options[:placeholder],
-    "init-value": init_value}
-  %span{class: "errors", "v-if": error_key }
-    %span{class: "error", "v-for": "error in  #{error_key}"}
-      {{ error }}
+    placeholder: placeholder,
+    "init-value": init_value }
 
-- if options[:type] == :textarea
-  %textarea{@tag_attributes,
+- if type == :textarea
+  %textarea{ @tag_attributes,
     "v-model": input_key,
     "@change": "inputChanged(\"#{attr_key}\")",
     ref: "input.#{attr_key}",
-    placeholder: options[:placeholder],
+    placeholder: placeholder,
     "init-value": init_value,
     rows: options[:rows],
-    cols: options[:cols]}
-  %span{class: "errors", "v-if": error_key }
-    %span{class: "error", "v-for": "error in  #{error_key}"}
-      {{ error }}
+    cols: options[:cols] }
+
+- if type == :range
+  %input{ @tag_attributes,
+    "v-model": input_key,
+    type: :range,
+    "@change": "inputChanged(\"#{attr_key}\")",
+    ref: "input.#{attr_key}",
+    placeholder: placeholder,
+    "init-value": init_value,
+    min: options[:min],
+    max: options[:max],
+    step: options[:step],
+    list: options[:list] }
+
+%span{ class: "errors", "v-if": error_key }
+  %span{ class: "error", "v-for": "error in #{error_key}" }
+    {{ error }}

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

@@ -7,21 +7,35 @@ def custom_options_validation
       raise "included form config is missing, please add ':include' to parent form component" if @included_config.nil?
     end
 
+    def key
+      options[:key]
+    end
+
+    def label
+      options[:label]
+    end
+
+    def type
+      options[:type]
+    end
+
+    def placeholder
+      options[:placeholder]
+    end
+
     def input_key
-      'data["' + options[:key].to_s + '"]'
+      "data['#{key.to_s}']"
     end
 
     def error_key
-      'errors["' + options[:key].to_s + '"]'
+      "errors['#{key.to_s}']"
     end
 
     def input_wrapper
       case options[:for]
       when nil
         return nil
-      when Symbol
-        return options[:for]
-      when String
+      when Symbol, String
         return options[:for]
       end
       if options[:for].respond_to?(:model_name)
@@ -31,44 +45,37 @@ def input_wrapper
 
     def attr_key
       if input_wrapper.nil?
-        return options[:key].to_s
+        return key.to_s
       else
-        return "#{input_wrapper}.#{options[:key].to_s}"
+        return "#{input_wrapper}.#{key.to_s}"
       end
     end
 
     def init_value
-      unless options[:init].nil?
-        return options[:init]
-      end
+      return options[:init] unless options[:init].nil?
 
       unless options[:for].nil?
-        value = options[:for].send(options[:key])
-        if [true, false].include? value
-          value ? 1 : 0
-        else
-          return value
-        end
+        value = parse_value(options[:for].send key)
       else
         unless @included_config.nil? && @included_config[:for].nil?
-          if @included_config[:for].respond_to?(options[:key])
-            value = @included_config[:for].send(options[:key])
-            if [true, false].include? value
-              value ? 1 : 0
-            else
-              return value
-            end
+          if @included_config[:for].respond_to?(key)
+            value = parse_value(@included_config[:for].send key)
           else
-            if @included_config[:for].is_a?(Symbol) || @included_config[:for].is_a?(String)
-              return nil
-            end
-            if @included_config[:for].is_a?(Hash)
-              return @included_config[:for][options[:key]]
-            end
+            @included_config[:for][key] if @included_config[:for].is_a?(Hash)
           end
         end
       end
     end
 
+    private
+
+    def parse_value(value)
+      if [true, false].include? value
+        value ? 1 : 0
+      else
+        return value
+      end
+    end
+
   end
 end

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

@@ -1,3 +1,2 @@
-%input{@tag_attributes}
-  - if block_given?
-    = yield
+%input{ @tag_attributes,
+  type: type }