zadok 0.5.6.5 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4107efc88b11cdc408750cb94adf934aee036c053b56b2b332484716238ccc5a
-  data.tar.gz: aa061fd6783cc17c4b72a167aba82a21246a07a36d355e08b9c323d3efc5488a
+  metadata.gz: ab6f67c51d346a3feed0f8d8d5e0a9d0b34dc6b64da83e45e50085d3dede6af4
+  data.tar.gz: 1e22cf1ae831563251c381f98074a2586c6b35a0f4511ed80c311d569b561dfa
 SHA512:
-  metadata.gz: 2ef393cd67bd19631842fdeb0660148054fce8dd3baaa64cccd9cc3daf5304f8ac6fe9b068edeb1d1d3e6bebfc083a9fe1d679c34e8dd75ce3567c22e6bb6ece
-  data.tar.gz: da773c2c89f01d6c55fe29068b99090e3f594af125e9a043d084dc79254e3a94e3ad3ba6e2826ac3a1a9e485e44ae196af0e75b12dfd39dfc3b30c3d6837dcc6
+  metadata.gz: c493bf7949bdf6f665092bb95b8877a42e4bca4c3b71487c04a2e43ba586a1ce8e7c8589a1d8d49f8d7143dc15f61af17c2591ac5b16154cf5b42bd2db3eac86
+  data.tar.gz: 032b48c83767b45b35c5eac9fca4b52f092e23cd0fcfee0c95b24b1b3dd4991208f71da5f5504995a3f57bf1944cf6750b62fbe408046ae4b8b799957d7708cd

data/.rubocop.yml

@@ -1,13 +1,13 @@
-AllCops:
-  TargetRailsVersion: 5.1
-  TargetRubyVersion: 2.4
-
-Rails:
-  Enabled: true
-
-Style/StringLiterals:
-  EnforcedStyle: double_quotes
-
-# Disabled failing Cops
-Documentation:
-  Enabled: false
+AllCops:
+  TargetRailsVersion: 5.1
+  TargetRubyVersion: 2.4
+
+Rails:
+  Enabled: true
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+# Disabled failing Cops
+Documentation:
+  Enabled: false

data/Gemfile

@@ -1,5 +1,5 @@
-# frozen_string_literal: true
-
-source "https://rubygems.org"
-
-gemspec
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zadok (0.5.6.5)
+    zadok (0.5.7)
       bootstrap (~> 4.0)
       bundler-audit (~> 0.6)
       cancancan (~> 2.1)
@@ -69,9 +69,10 @@ GEM
       tzinfo (~> 1.1)
     arel (8.0.0)
     ast (2.4.0)
-    autoprefixer-rails (8.1.0)
+    autoprefixer-rails (8.2.0)
       execjs
     bcrypt (3.1.11)
+    bcrypt (3.1.11-x64-mingw32)
     bootstrap (4.0.0)
       autoprefixer-rails (>= 6.0.3)
       popper_js (>= 1.12.9, < 2)
@@ -83,10 +84,10 @@ GEM
     cancancan (2.1.3)
     concurrent-ruby (1.0.5)
     crass (1.0.3)
-    devise (4.4.1)
+    devise (4.4.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 5.2)
+      railties (>= 4.1.0, < 6.0)
       responders
       warden (~> 1.2.3)
     devise-i18n (1.6.1)
@@ -99,6 +100,7 @@ GEM
     erubi (1.7.1)
     execjs (2.7.0)
     ffi (1.9.23)
+    ffi (1.9.23-x64-mingw32)
     font-awesome-rails (4.7.0.3)
       railties (>= 3.2, < 5.2)
     globalid (0.4.1)
@@ -118,7 +120,7 @@ GEM
     localer (0.1.1)
       dry-initializer (~> 2.3.0)
       thor (~> 0.20.0)
-    loofah (2.2.0)
+    loofah (2.2.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.0)
@@ -127,22 +129,25 @@ GEM
     mini_mime (1.0.0)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
-    newrelic_rpm (4.8.0.341)
-    nio4r (2.2.0)
+    newrelic_rpm (5.0.0.342)
+    nio4r (2.3.0)
     nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
+    nokogiri (1.8.2-x64-mingw32)
+      mini_portile2 (~> 2.3.0)
     orm_adapter (0.5.0)
     parallel (1.12.1)
-    parser (2.5.0.3)
+    parser (2.5.0.5)
       ast (~> 2.4.0)
     pg (1.0.0)
+    pg (1.0.0-x64-mingw32)
     polyamorous (1.3.3)
       activerecord (>= 3.0)
     popper_js (1.12.9)
     powerpack (0.1.1)
     puma (3.11.3)
     rack (2.0.4)
-    rack-test (0.8.3)
+    rack-test (1.0.0)
       rack (>= 1.0, < 3)
     rails (5.1.5)
       actioncable (= 5.1.5)
@@ -159,8 +164,8 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
     rails-i18n (5.1.1)
       i18n (>= 0.7, < 2)
       railties (>= 5.0, < 6)
@@ -171,8 +176,8 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (3.0.0)
-    rake (12.3.0)
-    ransack (1.8.7)
+    rake (12.3.1)
+    ransack (1.8.8)
       actionpack (>= 3.0)
       activerecord (>= 3.0)
       activesupport (>= 3.0)
@@ -184,7 +189,7 @@ GEM
     responders (2.4.0)
       actionpack (>= 4.2.0, < 5.3)
       railties (>= 4.2.0, < 5.3)
-    rubocop (0.53.0)
+    rubocop (0.54.0)
       parallel (~> 1.10)
       parser (>= 2.5)
       powerpack (~> 0.1)
@@ -199,7 +204,7 @@ GEM
       highline
       newrelic_rpm
       railties
-    sass (3.5.5)
+    sass (3.5.6)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -233,7 +238,7 @@ GEM
     turbolinks-source (5.1.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    uglifier (4.1.6)
+    uglifier (4.1.8)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.3.0)
     warden (1.2.7)
@@ -246,6 +251,7 @@ GEM
 
 PLATFORMS
   ruby
+  x64-mingw32
 
 DEPENDENCIES
   zadok!

data/app/controllers/zadok_controller.rb

@@ -17,7 +17,7 @@ class ZadokController < ApplicationController
       format.csv { send_data(generate_csv) }
       format.html do
         filter_and_paginate_resources!
-        render "zadok/index"
+        render resource_template(:index)
       end
       format.json { render json: resources, root: false }
       format.xml { render xml: resources.map(&:attributes), root: controller_name }
@@ -26,14 +26,14 @@ class ZadokController < ApplicationController
 
   def show
     respond_to do |format|
-      format.html { render "zadok/show" }
+      format.html { render resource_template(:show) }
       format.json { render json: resource, root: false }
       format.xml { render xml: resource.attributes, root: controller_name.singularize }
     end
   end
 
   def new
-    render "zadok/new"
+    render resource_template(:new)
   end
 
   def create
@@ -43,12 +43,12 @@ class ZadokController < ApplicationController
       redirect_to url_for(controller: controller_name, action: :index)
     else
       flash.now[:danger] = resource.errors.full_messages.join("<br />")
-      render "zadok/new"
+      render resource_template(:new)
     end
   end
 
   def edit
-    render "zadok/edit"
+    render resource_template(:edit)
   end
 
   def update
@@ -57,7 +57,7 @@ class ZadokController < ApplicationController
     else
       flash.now[:danger] = resource.errors.full_messages.join("<br />")
     end
-    render "zadok/edit"
+    render resource_template(:edit)
   end
 
   def destroy
@@ -142,6 +142,14 @@ class ZadokController < ApplicationController
     end
   end
 
+  def resource_template(action)
+    if template_exists?("#{controller_name}/#{action}")
+      "#{controller_name}/#{action}"
+    else
+      "zadok/#{action}"
+    end
+  end
+
   def page_title
     t("#{controller_name}.#{action_name}")
   end

data/app/views/zadok/filters/_numeric_range_field.html.slim

@@ -1,13 +1,13 @@
-.textfield.numeric_range_field
-  = text_field_tag filter.name, filter.value(params),
-    placeholder: I18n.t("filter_labels.numeric_range.placeholder"),
-    pattern: ' *- *\d+|\d+( *- *(\d+)?)?',
-    "data-role" => "numeric_range",
-    "data-left" => filter.params[0],
-    "data-right" => filter.params[1],
-    "data-content" => filter.popover_content,
-    "data-trigger" => "focus",
-    "data-html" => "true",
-    class: "form-control"
-  = f.hidden_field filter.params[0]
-  = f.hidden_field filter.params[1]
+.textfield.numeric_range_field
+  = text_field_tag filter.name, filter.value(params),
+    placeholder: I18n.t("filter_labels.numeric_range.placeholder"),
+    pattern: ' *- *\d+|\d+( *- *(\d+)?)?',
+    "data-role" => "numeric_range",
+    "data-left" => filter.params[0],
+    "data-right" => filter.params[1],
+    "data-content" => filter.popover_content,
+    "data-trigger" => "focus",
+    "data-html" => "true",
+    class: "form-control"
+  = f.hidden_field filter.params[0]
+  = f.hidden_field filter.params[1]

data/app/views/zadok/filters/_options.html.slim

@@ -1,5 +1,5 @@
-- filter.options.each do |value, label|
-  .radio
-    label
-      = f.radio_button filter.param, value
-      = label
+- filter.options.each do |value, label|
+  .radio
+    label
+      = f.radio_button filter.param, value
+      = label

data/app/views/zadok/filters/_textfield.html.slim

@@ -1,2 +1,2 @@
-.textfield
-  = f.text_field filter.param, class: "form-control"
+.textfield
+  = f.text_field filter.param, class: "form-control"

data/lib/zadok/version.rb

@@ -3,8 +3,8 @@
 module Zadok
   VERSION_MAJOR = 0
   VERSION_MINOR = 5
-  VERSION_TINY = 6
-  VERSION_PRE = 5
+  VERSION_TINY = 7
+  VERSION_PRE = nil
 
   VERSION = [
     VERSION_MAJOR,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zadok
 version: !ruby/object:Gem::Version
-  version: 0.5.6.5
+  version: 0.5.7
 platform: ruby
 authors:
 - Leon Hooijer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-07 00:00:00.000000000 Z
+date: 2018-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap
@@ -438,7 +438,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: A data management gem.