ns_settings_ui 1.5.3 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33b7249ab4cc796c9d58b2ea4e44d8fb1b390d7766d2b5bfd7d6645c0eb4639a
-  data.tar.gz: 8f07761e568cb3b8bb2a8d9aa645ed9702c52bc8ba8ede4910f3ffa356aea735
+  metadata.gz: 34c9708a37f9854ca1c79793232fb3a3c4fc32b59de9d7067c7eff9cc80d93a3
+  data.tar.gz: 85168c8174c6e31aee3d7f85e3debc6d189cfcf660c306ae65d79eefb2111f43
 SHA512:
-  metadata.gz: 53e89f206ce9178bddbc49e166a06b9222c2253b16b0564bc1d3fa82488d993bbdf23584010975b1672ce7c56ad803594bf46bc8903e0b99eb84b5fbaebf0ffc
-  data.tar.gz: 5cbc67eaf437014ddd1e9df53b8fed5368c88bbb06f3e330791a4c89ee1a2cc397aa7244ff52e4a7c1840a4bb2392754a7f52e6c7181185999e164171014ffc1
+  metadata.gz: 8b7c677ada5eb305d942dd4086b984d36b2dd12a02da0851942c6380f0685dbcaaad5eb188f4cdf3b3dd6d3b778d8c9892d8d680df9c9212a2e9597c806f0410
+  data.tar.gz: e752b4497976f043a03014c18168f8338f4ab041d7364a84edab1b1bfb2a3597910fa912cfae2e63f04100f52aef3debb3f660efcd846d7e6fa07dddaec698e1

data/Gemfile

@@ -12,6 +12,3 @@ gemspec
 
 # To use debugger
 # gem 'debugger'
-
-gem 'rails', '>= 5.0'
-gem "sprockets", "~> 3.7.2"

data/Jenkinsfile

@@ -1,80 +1,31 @@
-stage 'Checkout'
+pipeline {
+    agent none
 
-setDockerImageName()
-discardOldBuilds()
+    stages {
+        stage('Rubocop') {
+            agent { dockerfile { filename 'docker/ruby-2.6/Dockerfile' } }
 
-node {
-    withCleanup {
-        checkout scm
-        pack()
-    }
-}
-
-def appNode(String rubyVersion) {
-    node('docker') {
-        withEnv(["RUBY_VERSION=${rubyVersion}"]) {
-            withCleanup {
-                unpack()
-
-                setupGemsDockerVolume(rubyVersion, env.EXECUTOR_NUMBER)
-
-                stage "$rubyVersion - Setup"
-                withDockerCompose { compose ->
-                    resolveDependencies(compose, rubyVersion)
+            steps {
+                sh 'bundle exec rake app:ci:rubocop'
+            }
 
-                    test(compose, rubyVersion)
+            post {
+                always { archiveArtifacts artifacts: 'checkstyle.xml' }
+            }
+        }
+        stage('Test') {
+            parallel {
+                stage('Ruby 2.5') {
+                    agent { dockerfile { filename 'docker/ruby-2.5/Dockerfile' } }
 
-                    checkstyle(compose, rubyVersion)
+                    steps { sh 'scripts/test.sh' }
+                }
+                stage('Ruby 2.6') {
+                    agent { dockerfile { filename 'docker/ruby-2.6/Dockerfile' } }
 
-                    stage "$rubyVersion - Cleanup"
+                    steps { sh 'scripts/test.sh' }
                 }
             }
         }
     }
 }
-
-appNode('ruby-2.5')
-appNode('ruby-2.6')
-
-def setupGemsDockerVolume(String rubyVersion, String executorNumber) {
-    stage name: "$rubyVersion - Setup Docker Volume", concurrency: 1
-    setupDockerVolume("gems-$executorNumber-$rubyVersion")
-}
-
-def resolveDependencies(me.knapik.DockerCompose compose, String rubyVersion) {
-    stage "$rubyVersion - Resolve Dependencies"
-    compose.exec('app', "bundle install --quiet")
-    compose.exec('app', "bundle exec appraisal install")
-    compose.exec('app', "bundle exec appraisal list > .rails_versions")
-}
-
-def test(me.knapik.DockerCompose compose, String rubyVersion) {
-    def railsVersions = readFile('.rails_versions').tokenize("\n")
-    for (int i = 0; i < railsVersions.size(); ++i) {
-        def railsVersion = railsVersions[i]
-        stage "$rubyVersion $railsVersion - Tests"
-        compose.exec('app', "bundle exec appraisal $railsVersion rake db:schema:load")
-        compose.exec('app', "bundle exec appraisal $railsVersion rspec spec")
-    }
-}
-
-def checkstyle(me.knapik.DockerCompose compose, String rubyVersion) {
-    stage "$rubyVersion - Static Analysis"
-    try {
-        compose.exec('app', "bundle exec rake app:ci:rubocop")
-    } finally {
-        publishStyleCheckResults()
-    }
-}
-
-def publishStyleCheckResults() {
-    step([$class: 'CheckStylePublisher', pattern: 'checkstyle.xml'])
-}
-
-def pack() {
-    stash name: 'source', useDefaultExcludes: false
-}
-
-def unpack() {
-    unstash 'source'
-}

data/app/assets/stylesheets/ns_settings_ui/settings.css.scss

@@ -9,13 +9,9 @@
   form {
     display: inline;
   }
-  input[type=text] {
+  input[type=text], select {
     width: 130px;
-    display: inline;
-  }
-  table {
-    td {
-      padding: 2px;
-    }
+    display: inline-block;
+    flex: none;
   }
 }

data/app/controllers/ns_settings_ui/settings_controller.rb

@@ -8,9 +8,7 @@ module NsSettingsUi
     end
 
     def update
-      @setting.value = params[:setting][:value]
-      @setting.default_value = params[:setting][:default_value]
-      @setting.save!
+      @setting.update!(setting_params)
       render partial: 'update'
     end
 
@@ -25,5 +23,9 @@ module NsSettingsUi
     def setting_from_id_param
       @setting = Setting.find(params[:id])
     end
+
+    def setting_params
+      params.require(:setting).permit(:value, :default_value)
+    end
   end
 end

data/app/helpers/ns_settings_ui/settings_helper.rb

@@ -17,10 +17,11 @@ module NsSettingsUi
     private
 
     def render_field(form, value_type, name, additional_class = '')
+      base_css_classes = 'form-select form-select-sm'
       if [NsSettingsUi::Setting::TYPES[:boolean], NsSettingsUi::Setting::TYPES[:nullable_boolean]].include?(value_type)
-        form.select(name, [[:true, 'true'], [:false, 'false']], include_blank: true)
+        form.select(name, [[:true, 'true'], [:false, 'false']], {include_blank: true}, class: base_css_classes)
       else
-        form.text_field(name, size: 10, class: "form-control #{additional_class}")
+        form.text_field(name, size: 10, class: "#{base_css_classes} #{additional_class}")
       end
     end
 

data/app/views/ns_settings_ui/settings/_setting_row.html.erb

@@ -1,6 +1,18 @@
-<tr>
-  <td class="setting_key"><h5><%= setting.key -%></h5></td>
-  <td>
-    <%= render partial: 'edit', locals: {setting: setting} -%>
+<tr id="setting_<%= setting.id -%>">
+  <td class="setting_key align-middle"><%= setting.key -%></td>
+  <td class="text-center">
+    <%= form_for(setting, url: ns_settings_ui.setting_path(setting), method: :put, remote: true, html: {class: 'form-inline'}) do |f| %>
+      <%= render_default_value_field(f, setting) %>
+      <%= f.submit('Update', class: 'btn btn-sm btn-primary') %>
+    <% end %>
+  </td>
+  <td class="text-center">
+    <%= form_for(setting, url: ns_settings_ui.setting_path(setting), method: :put, remote: true, html: {class: 'form-inline'}) do |f| %>
+      <%= render_value_field(f, setting) %>
+      <%= f.submit('Update', class: 'btn btn-sm btn-primary') %>
+    <% end %>
+    <%= form_for(setting, url: ns_settings_ui.reset_setting_path(setting), method: :put, remote: true) do |f| %>
+      <%= f.submit('Reset', class: 'btn btn-sm btn-warning', title: 'Reset to default') %>
+    <% end %>
   </td>
 </tr>

data/app/views/ns_settings_ui/settings/_update.js.erb

@@ -1,3 +1,2 @@
-$("#ns_settings_ui #setting_<%= @setting.id -%>").replaceWith("<%= escape_javascript(render partial: 'edit', locals: {setting: @setting}) %>");
-$("#ns_settings_ui #setting_<%= @setting.id -%>").append('<span class="notice text-success">Updated</span>');
-$("#ns_settings_ui #setting_<%= @setting.id -%> .notice").delay(1000).fadeOut('slow');
+$("#ns_settings_ui #setting_<%= @setting.id -%>").replaceWith("<%= escape_javascript(render partial: 'setting_row', locals: {setting: @setting}) %>");
+$("#ns_settings_ui #setting_<%= @setting.id -%>").effect("highlight", {color: '#70ca63'}, 3000);

data/app/views/ns_settings_ui/settings/index.html.erb

@@ -3,14 +3,23 @@
     <%= javascript_include_tag 'ns_settings_ui/application' -%>
 <% end %>
 <div id="ns_settings_ui">
-  <div class="panel panel-default">
-    <div class="panel-heading">
-      <span>Filter: </span>
-      <input class="form-control" id="filter-input" type="text" value=""> (regular expressions are available)
-    </div>
-    <div class="panel-body">
-      <table class="table table-striped table-bordered">
-        <%= render partial: 'setting_row', collection: @settings, as: 'setting' -%>
+  <h1 class="text-white ps-1">Settings</h1>
+  <div class="card">
+    <div class="card-body">
+      <div class="input-group input-group-sm mb-2">
+        <span class="input-group-text">Filter: </span>
+        <input class="form-control form-control-sm" id="filter-input" type="text" value="">
+        <span class="form-text ms-2">(regular expressions are available)</span>
+      </div>
+      <table class="table table-sm table-striped">
+        <thead>
+          <th>Setting key</th>
+          <th class="text-center">Default value</th>
+          <th class="text-center">Current value</th>
+        </thead>
+        <tbody>
+          <%= render partial: 'setting_row', collection: @settings, as: 'setting' -%>
+        </tbody>
       </table>
     </div>
   </div>

data/db/migrate/20151210214903_create_ns_settings_ui_settings.rb

@@ -1,4 +1,4 @@
-class CreateNsSettingsUiSettings < ActiveRecord::Migration
+class CreateNsSettingsUiSettings < ActiveRecord::Migration[4.2]
   def up
     create_table :ns_settings_ui_settings do |t|
       t.string :key, null: false

data/db/migrate/20151215081718_add_value_type_to_ns_settings_ui_settings.rb

@@ -1,4 +1,4 @@
-class AddValueTypeToNsSettingsUiSettings < ActiveRecord::Migration
+class AddValueTypeToNsSettingsUiSettings < ActiveRecord::Migration[4.2]
   def change
     add_column :ns_settings_ui_settings, :value_type, :integer, default: 0
   end

data/docker/ruby-2.5/Dockerfile

@@ -1,22 +1,22 @@
-FROM ruby:2.5
+FROM ruby:2.5-alpine
 MAINTAINER u2i <hello@u2i.com>
 
-RUN wget --quiet --output-document=dumb-init.deb \
-      https://github.com/Yelp/dumb-init/releases/download/v1.1.3/dumb-init_1.1.3_amd64.deb && \
-  dpkg --install dumb-init.deb && \
-  rm dumb-init.deb
+RUN apk add --no-cache dumb-init bash git make gcc libc-dev sqlite sqlite-dev sqlite-libs tzdata
 
-ARG host_uid
-RUN (getent passwd $host_uid > /dev/null) || adduser  --quiet --disabled-password --gecos '' dummy --uid $host_uid
+WORKDIR /code
 
-RUN mkdir -p /gems && chown $host_uid /gems
-VOLUME /gems
+ADD Gemfile ns_settings_ui.gemspec ./
+ADD lib/ns_settings_ui/version.rb lib/ns_settings_ui/
 
-USER $host_uid
+# Install last bundler version that supports ruby < 2.6
+RUN gem install bundler -v 2.3.26
+RUN bundle install
 
-RUN bundle config --global jobs 4
+ADD Appraisals ./
+COPY gemfiles gemfiles
 
-WORKDIR /code
+RUN bundle exec appraisal install
+
+COPY . .
 
 ENTRYPOINT ["/usr/bin/dumb-init", "--"]
-CMD ["tail", "-f", "/dev/null"]

data/docker/ruby-2.6/Dockerfile

@@ -1,22 +1,21 @@
-FROM ruby:2.6
+FROM ruby:2.6-alpine
 MAINTAINER u2i <hello@u2i.com>
 
-RUN wget --quiet --output-document=dumb-init.deb \
-      https://github.com/Yelp/dumb-init/releases/download/v1.1.3/dumb-init_1.1.3_amd64.deb && \
-  dpkg --install dumb-init.deb && \
-  rm dumb-init.deb
+RUN apk add --no-cache dumb-init bash git make gcc libc-dev sqlite sqlite-dev sqlite-libs tzdata
 
-ARG host_uid
-RUN (getent passwd $host_uid > /dev/null) || adduser  --quiet --disabled-password --gecos '' dummy --uid $host_uid
+WORKDIR /code
 
-RUN mkdir -p /gems && chown $host_uid /gems
-VOLUME /gems
+ADD Gemfile ns_settings_ui.gemspec ./
+ADD lib/ns_settings_ui/version.rb lib/ns_settings_ui/
 
-USER $host_uid
+RUN gem install bundler
+RUN bundle install
 
-RUN bundle config --global jobs 4
+ADD Appraisals ./
+COPY gemfiles gemfiles
 
-WORKDIR /code
+RUN bundle exec appraisal install
+
+COPY . .
 
 ENTRYPOINT ["/usr/bin/dumb-init", "--"]
-CMD ["tail", "-f", "/dev/null"]

data/lib/ns_settings_ui/version.rb

@@ -1,3 +1,3 @@
 module NsSettingsUi
-  VERSION = '1.5.3'.freeze
+  VERSION = '1.6.1'.freeze
 end

data/lib/tasks/ns_settings_ui_tasks.rake

@@ -1,4 +1,11 @@
-# desc "Explaining what the task does"
-# task :ns_settings_ui do
-#   # Task goes here
-# end
+require 'rubocop'
+require 'rubocop/rake_task'
+
+namespace :ci do
+  RuboCop::RakeTask.new(:rubocop) do |task|
+    task.requires = %w(rubocop/formatter/checkstyle_formatter)
+    task.formatters = %w(RuboCop::Formatter::CheckstyleFormatter)
+    task.options += %w(--no-color --out=checkstyle.xml)
+    task.fail_on_error = true
+  end
+end

data/ns_settings_ui.gemspec

@@ -30,8 +30,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'bundler', '> 1.17'
   s.add_development_dependency 'rake', '~> 12.3.3'
   s.add_development_dependency 'test-unit', '~> 3.1'
-  s.add_development_dependency 'rubocop-rspec', '~> 1.4.0'
+  s.add_development_dependency 'rubocop-rspec', '~> 1.4.1'
   s.add_development_dependency 'sass', '~> 3.4'
+  s.add_development_dependency 'sprockets', '~> 3.7.2'
   s.add_development_dependency 'rails-controller-testing'
 
   s.add_development_dependency 'guard', '~> 2.13'

data/scripts/test.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+EXIT_CODE=0
+
+while IFS= read -r version; do
+  printf '\n\nTesting %s\n\n' "$version"
+  bundle exec appraisal "$version" rake db:schema:load
+  bundle exec appraisal "$version" rspec spec
+  LAST_EXIT_CODE=$?
+
+  if [ $EXIT_CODE == 0 ]; then
+    EXIT_CODE=$LAST_EXIT_CODE
+  fi
+done <<< "$(bundle exec appraisal list)"
+
+exit $EXIT_CODE

data/spec/controllers/ns_settings_ui/settings_controller_spec.rb

@@ -55,7 +55,6 @@ RSpec.describe NsSettingsUi::SettingsController, type: :controller do
     let(:setting_params) { {value: '5', default_value: '6', key: 'matching.cluster_size'} }
     let(:params) { {id: setting.id, setting: setting_params, format: :js} }
 
-
     before { put :update, params: params }
 
     it 'updates value' do

data/spec/dummy/db/schema.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -9,17 +8,16 @@
 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
-# It's strongly recommended to check this file into your version control system.
+# It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20151215081718) do
-  create_table 'ns_settings_ui_settings', force: true do |t|
+ActiveRecord::Schema.define(version: 2015_12_15_081718) do
+  create_table 'ns_settings_ui_settings', force: :cascade do |t|
     t.string 'key', null: false
     t.string 'value'
     t.string 'default_value'
-    t.datetime 'created_at',                   null: false
-    t.datetime 'updated_at',                   null: false
+    t.datetime 'created_at'
+    t.datetime 'updated_at'
     t.integer 'value_type', default: 0
+    t.index ['key'], name: 'index_ns_settings_ui_settings_on_key'
   end
-
-  add_index 'ns_settings_ui_settings', ['key'], name: 'index_ns_settings_ui_settings_on_key'
 end