Update circleci config & gemfile.lock

Author: pascalwengerter

.circleci/config.yml

@@ -36,15 +36,22 @@ jobs:
             - ./vendor/bundle
           key: v1-dependencies-{{ checksum "Gemfile.lock" }}
 
+<<<<<<< HEAD
       # Database setup
       - run: bundle exec rake db:create
       - run: bundle exec rake db:schema:load
 
+=======
+>>>>>>> master
       # Yarn Update
 
       - run: yarn install
       - run: cd spec/dummy
       - run: yarn install
+      
+      # Database setup
+      - run: bundle exec rake db:create
+      - run: bundle exec rake db:schema:load
 
       # run tests!
       - run:

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    matestack-ui-core (0.6.0.pre.1)
+    matestack-ui-core (0.6.0)
       cells-haml
       cells-rails
       haml
@@ -246,11 +246,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  matestack-ui-core!
   byebug
   capybara
   cells-haml
   cells-rails
+  matestack-ui-core!
   poltergeist
   puma
   rspec-rails (~> 3.8)
@@ -264,4 +264,4 @@ DEPENDENCIES
   webpacker (~> 3.5)
 
 BUNDLED WITH
-   1.17.2
+   1.17.3

README.md

@@ -1,9 +1,10 @@
 [![CircleCI](https://circleci.com/gh/basemate/matestack-ui-core/tree/master.svg?style=shield)](https://circleci.com/gh/basemate/matestack-ui-core/tree/master)
 [![Gitter](https://badges.gitter.im/basemate/community.svg)](https://gitter.im/basemate/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[![Gem Version](https://badge.fury.io/rb/matestack-ui-core.svg)](https://badge.fury.io/rb/matestack-ui-core)
 
 ![matestack logo](./logo.png)
 
-# Matestack: Escape the frontend hustle
+# matestack: Escape the frontend hustle
 
 ## Create maintainable, dynamic and beautiful UIs easily
 
@@ -220,7 +221,7 @@ Scheduled for 0.7.0:
 
 ### Community
 
-TODO: Gitter
+As a low-barrier feedback channel for our early users, we have set up a Gitter chat that can be found [here](https://gitter.im/basemate/community). You are very welcome to ask questions and send us feedback there!
 
 ### Contribution
 

docs/components/link.md

@@ -6,7 +6,7 @@ This component is used to either navigate within your matestack application or t
 
 ## Parameters
 
-This component create a `<a>`-tag and expects a mandatory path input and optional options parameters.
+This component creates an `<a>`-tag and expects a mandatory path input and optional options parameters.
 
 #### # path
 If the path input is a **string** it creates a link to the outside web.
@@ -33,15 +33,15 @@ This example renders a simple link within a `<div`-tag
 
 ```ruby
 div id: "foo", class: "bar" do
-  link path: "https://matestack.io", text: "Here"
+  link path: "https://matestack.org", text: "Here"
 end
 ```
 
 and returns
 
 ```html
 <div id="foo" class="bar">
-  <a href="https://matestack.io">Here</a>
+  <a href="https://matestack.org">Here</a>
 </div>
 ```
 
@@ -50,7 +50,7 @@ This example renders a link without a specific link-text, so it wraps the rest o
 
 ```ruby
 div id: "foo", class: "bar" do
-  link path: "https://matestack.io" do
+  link path: "https://matestack.org" do
     plain "Here"
   end
 end
@@ -60,7 +60,7 @@ returns
 
 ```html
 <div id="foo" class="bar">
-  <a href="https://matestack.io">Here</a>
+  <a href="https://matestack.org">Here</a>
 </div>
 ```
 
@@ -69,7 +69,7 @@ This example renders a link around a div and the link opens in a new tab.
 
 ```ruby
 div id: "foo", class: "bar" do
-  link path: "https://matestack.io", target: "_blank" do
+  link path: "https://matestack.org", target: "_blank" do
     div do
       plain "Here"
     end
@@ -81,7 +81,7 @@ returns
 
 ```html
 <div id="foo" class="bar">
-  <a target="_blank" href="https://matestack.io">
+  <a target="_blank" href="https://matestack.org">
     <div>Here</div>
   </a>
 </div>

spec/usage/base/page_spec.rb

@@ -122,9 +122,7 @@ def response
         components {
           div do
             partial :my_simple_partial
-            br
             partial :my_partial_with_param, "foo"
-            br
             partial :my_partial_with_partial
           end
         }
@@ -179,14 +177,10 @@ def my_action
         some content
       </span>
 
-      <br/>
-
       <span id="my_partial_with_param">
         content with param: foo
       </span>
 
-      <br/>
-
       <span id="my_partial_with_partial">
 
         <span id="my_simple_partial">
@@ -198,7 +192,6 @@ def my_action
     </div>
     HTML
 
-
     expect(stripped(static_output)).to include(stripped(expected_static_output))
 
   end
@@ -225,9 +218,7 @@ def response
         components {
           div do
             partial :my_simple_partial
-            br
             partial :my_partial_with_param, "foo"
-            br
             partial :my_partial_with_partial
           end
         }
@@ -274,14 +265,10 @@ def my_action
         some content
       </span>
 
-      <br/>
-
       <span id="my_partial_with_param">
         content with param: foo
       </span>
 
-      <br/>
-
       <span id="my_partial_with_partial">
 
         <span id="my_simple_partial">
@@ -316,7 +303,6 @@ def response
         components {
           div id: "my-component" do
             slot options[:my_first_slot]
-            br
             slot options[:my_second_slot]
           end
         }
@@ -379,7 +365,6 @@ def my_action
         <span id="my_simple_slot">
           some content
         </span>
-        <br/>
         <span id="my_simple_slot">
           foo from page
         </span>

spec/usage/components/async_spec.rb

@@ -81,7 +81,7 @@ def example
     Rails.application.reload_routes!
 
     visit "/async_specs/in_app/example"
-    
+
     element = page.find("#my-div")
     before_content = element.text
 
@@ -169,7 +169,7 @@ def response
 
   end
 
-  it "Example 4 -show on event with event payload" do
+  it "Example 4: show on event with event payload" do
 
     class ExamplePage < Page::Cell::Page