kadmin 0.6.19 → 0.6.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa35b62934941a72c116c6e988af5eb708fa82db
-  data.tar.gz: 49d900bc1df849af9f03f41c06c75851c078430f
+  metadata.gz: 98456b6564d2ed7360237ee63add4224c3657332
+  data.tar.gz: b5ab9f55d662438bd78d20a773fd1d6e9f0d69f5
 SHA512:
-  metadata.gz: 5d56bca021b9ebf5f7f2ea0014cc6c8b9dedad91e0db2e523e77d010d0e5f65aca697408513862abec25f0c7c3a125587430024c3e8ecaea1924cefaf40d634c
-  data.tar.gz: 6020f7064197a8e1dccf9d35c86f62d87fa47095012267f79326e5bdd1049c2e5e2902d9273394a01c0213762ee910129277d1561d30134a5c5c07903720d595
+  metadata.gz: 492c06c2e1de2da68377bd30d0da378dadd9b2d8306525d2899ac879d8a5b13c412c7dab2aab020318fcc8edaa5ef7fe14799a264733aee19f6cf643044f81c7
+  data.tar.gz: c51a21974ec0d7cd74fb3bba05c11e7b1c8100cd3783b084032a5385a7615bfb884261a759c408403e1728a4a2c7cef40a4c9980d8052e67db1bedb0e409f8b2

data/Rakefile

@@ -33,118 +33,3 @@ begin
 rescue LoadError
   puts 'yard not present, disabling Rake task'
 end
-
-require 'kadmin/version'
-
-namespace :cim do
-  desc 'Tags, updates README, and CHANGELOG and pushes to Github. Requires ruby-git'
-  task :release do
-    tasks = ['cim:assert_clean_repo', 'cim:git_fetch', 'cim:set_new_version', 'cim:update_readme', 'cim:update_changelog', 'cim:commit_changes', 'cim:tag']
-    begin
-      tasks.each { |task| Rake::Task[task].invoke }
-      `git push && git push origin '#{Kadmin::VERSION}'`
-    rescue => error
-      puts ">>> ERROR: #{error}; might want to reset your repository"
-    end
-  end
-
-  desc 'Fails if the current repository is not clean'
-  task :assert_clean_repo do
-    status = `git status -s`.chomp.strip
-    if status.strip.empty?
-      status = `git log origin/master..HEAD`.chomp.strip # check if we have unpushed commits
-      if status.strip.empty?
-        puts '>>> Repository is clean!'
-      else
-        puts '>>> Please push your committed changes before releasing!'
-        exit(-1)
-      end
-    else
-      puts '>>> Please stash or commit your changes before releasing!'
-      exit(-1)
-    end
-  end
-
-  desc 'Fetches latest tags/commits'
-  task :git_fetch do
-    puts '>>> Fetching latest git refs'
-    `git fetch --tags`
-  end
-
-  desc 'Requests the new version number'
-  task :set_new_version do
-    STDOUT.print(">>> New version number (current: #{Kadmin::VERSION}; leave blank if already updated): ")
-    input = STDIN.gets.strip.tr("'", "\'")
-
-    current = if input.empty?
-      Kadmin::VERSION
-    else
-      unless input =~ /[0-9]+\.[0-9]+\.[0-9]+/
-        puts '>>> Please use semantic versioning!'
-        exit(-1)
-      end
-
-      input
-    end
-
-    latest = `git describe --abbrev=0`.chomp.strip
-    unless Gem::Version.new(current) > Gem::Version.new(latest)
-      puts ">>> Latest tagged version is #{latest}; make sure gem version (#{current}) is greater!"
-      exit(-1)
-    end
-
-    if !input.empty?
-      `sed -i -u "s@VERSION = '#{Kadmin::VERSION}'@VERSION = '#{input}'@" #{File.expand_path('../lib/kadmin/version.rb', __FILE__)}`
-      $VERBOSE = nil
-      Kadmin.const_set('VERSION', input)
-      $VERBOSE = false
-
-      `bundle check` # force updating version
-    end
-  end
-
-  desc 'Updates README with latest version'
-  task :update_readme do
-    puts '>>> Updating README.md'
-    replace = %([![GitHub release](https://img.shields.io/badge/release-#{Kadmin::VERSION}-blue.png)](https://github.com/barcoo/kadmin/releases/tag/#{Kadmin::VERSION}))
-
-    `sed -i -u 's@^\\[\\!\\[GitHub release\\].*$@#{replace}@' README.md`
-  end
-
-  desc 'Updates CHANGELOG with commit log from last tag to this one'
-  task :update_changelog do
-    puts '>>> Updating CHANGELOG.md'
-    latest = `git describe --abbrev=0`.chomp.strip
-    range = $CHILD_STATUS.success? && !latest.empty? ? "'#{latest}'..HEAD" : ''
-
-    log = `git log --pretty=format:'- [%h](https://github.com/barcoo/kadmin/commit/%h) *%ad* __%s__ (%an)' --date=short #{range}`.chomp
-
-    changelog = File.open('.CHANGELOG.md', 'w')
-    changelog.write("# Changelog\n\n###{Kadmin::VERSION}\n\n#{log}\n\n")
-    File.open('CHANGELOG.md', 'r') do |file|
-      file.readline # skip first two lines
-      file.readline
-
-      while buffer = file.read(2048) # rubocop: disable Lint/AssignmentInCondition
-        changelog.write(buffer)
-      end
-    end
-
-    changelog.close
-    `mv '.CHANGELOG.md' 'CHANGELOG.md'`
-  end
-
-  desc 'Commits the README/CHANGELOG changes'
-  task :commit_changes do
-    puts '>>> Committing updates to README/CHANGELOG'
-    `git commit -am'Updated README.md and CHANGELOG.md on new release'`
-  end
-
-  desc 'Creates and pushes the tag to git'
-  task :tag do
-    puts '>>> Tagging'
-    STDOUT.print('>>> Please enter a tag message: ')
-    input = STDIN.gets.strip.tr("'", "\'")
-    `git tag -a '#{Kadmin::VERSION}' -m '#{input}'`
-  end
-end

data/app/assets/javascripts/kadmin/select2.js

@@ -1,19 +1,20 @@
 //= require select2
-$(document).ready(function() {
-  $.fn.select2.defaults.set("theme", "bootstrap");
-  $.fn.select2.defaults.set("ajax", {
+/* global jQuery */
+jQuery(document).ready(function() {
+  jQuery.fn.select2.defaults.set("theme", "bootstrap");
+  jQuery.fn.select2.defaults.set("ajax", {
     cache: true,
     dataType: "json",
     delay: 300,
     data: transformRequest,
     processResults: transformResponse
   });
-  $.fn.select2.defaults.set("allowClear", true);
+  jQuery.fn.select2.defaults.set("allowClear", true);
 
   function transformRequest(params) {
     var page = params.page || 0;
-    var page_size = this.data('kadmin--page-size') || 10;
-    var filter_param = this.data('kadmin--filter-param') || null;
+    var page_size = this.data("kadmin--page-size") || 10;
+    var filter_param = this.data("kadmin--filter-param") || null;
     var options = {
       page_offset: page * page_size,
       page_size: page_size
@@ -23,37 +24,75 @@ $(document).ready(function() {
       options[filter_param] = params.term;
     }
 
-    return options;
+    return transform(options, this.data("kadmin--transform-request"));
   }
 
   function transformResponse(data, params) {
     var items = data.data || data.items;
     var options = this.options.options.kadmin || {}; // weird but it is what it is
-    var displayProperty = options.displayProperty || 'text';
-    var valueProperty = options.valueProperty || 'id';
-
+    var displayProperty = options.displayProperty || "text";
+    var valueProperty = options.valueProperty || "id";
     var results = [];
-    $(items).each(function(index, item) {
+    var response = {};
+
+    jQuery(items).each(function(index, item) {
       results.push({ text: item[displayProperty], id: item[valueProperty] });
     });
 
-    return {
+    response = {
       results: results,
       pagination: { more: data.more }
     };
+
+    return transform(response, this.$element.data("kadmin--transform-response"));
   }
 
   function optionsForSelect2(element) {
     return {
-      minimumInputLength: $(element).data('kadmin--minimum-input-length') || 2,
+      minimumInputLength: jQuery(element).data("kadmin--minimum-input-length") || 2,
+    };
+  }
+
+  // Data callbacks
+  var gFunctions = {};
+  function transform(initial, name) {
+    var transformed = initial;
+
+    if (name) {
+      var callback = lookup(name);
+      if (jQuery.isFunction(callback)) {
+        transformed = callback(initial);
+      }
     }
+
+    return transformed;
+  }
+
+  function lookup(path) {
+    if (gFunctions[path]) return gFunctions[path];
+
+    var namespaces = path.split(".");
+    var functionName = namespaces.pop();
+    var context = window;
+    var func = null;
+
+    for (var i = 0; context && i < namespaces.length; i++) {
+      context = context[namespaces[i]];
+    }
+
+    if (jQuery.isFunction(context[functionName])) {
+      func = context[functionName];
+      gFunctions[path] = func;
+    }
+
+    return func;
   }
 
   // Need to delay a bit otherwise we have issues
   // TODO: Figure out why this happens?
   setTimeout(function() {
-    $('select.kadmin-select2').each(function() {
-      $(this).select2(optionsForSelect2(this));
+    jQuery("select.kadmin-select2").each(function() {
+      jQuery(this).select2(optionsForSelect2(this));
     });
   }, 300);
 

data/app/components/kadmin/finder.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Kadmin
   class Finder
     include Kadmin::Presentable

data/app/components/kadmin/finder/presenter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Kadmin
   class Finder
     class Presenter < Kadmin::Presenter

data/app/components/kadmin/form.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Kadmin
   # Parsing is done by using attribute setters. If you have an attribute called
   # name, then add a reader/writer for it, name and name=, and perform the

data/app/components/kadmin/navbar/link.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Kadmin
   # TODO: Figure out how to have access to a properly scoped routing proxy
   module Navbar
@@ -45,7 +46,7 @@ module Kadmin
           css_classes = self.css_classes.dup << 'active' if @view.controller.request.path == path
 
           contents = @view.link_to(self.text.to_s.html_safe, path)
-          contents << captured unless captured.blank?
+          contents << captured if captured.present?
 
           return %(<li class="#{css_classes.join(' ')}">#{contents}</li>).html_safe
         end

data/app/components/kadmin/navbar/section.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Kadmin
   # TODO: Clearly some functionality between Navbar::Link and Navbar::Section is shared and
   # could be refactored into Navbar::Item one day.

data/app/components/kadmin/pager.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Kadmin
   # Simple Pager structure, used to paginate collections
   class Pager

data/app/components/kadmin/pager/presenter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Kadmin
   class Pager
     # Generates HTML code to present the given pager
@@ -74,14 +75,14 @@ module Kadmin
       private :page_links
 
       def list_text(text, css_classes = nil)
-        classes = %w(btn btn-default) + Array.wrap(css_classes)
+        classes = %w[btn btn-default] + Array.wrap(css_classes)
         return "<div class='#{classes.join(' ')}'>#{text}</div>".html_safe
       end
       private :list_text
 
       def list_link(text, options = {})
         link_options = @view.controller.request.query_parameters.merge(options)
-        return @view.link_to(text.to_s.html_safe, link_options, class: %w(btn btn-default).join(' '))
+        return @view.link_to(text.to_s.html_safe, link_options, class: %w[btn btn-default].join(' '))
       end
       private :list_link
 

data/app/components/kadmin/select2.rb

@@ -5,7 +5,10 @@ module Kadmin
     include Kadmin::Presentable
 
     CSS_CLASS_MARKER = 'kadmin-select2'
-    DATA_ATTRIBUTES = %i[placeholder data_url filter_param display_property value_property page_size minimum_input_length].freeze
+    DATA_ATTRIBUTES = %i[
+      placeholder data_url filter_param display_property value_property
+      page_size minimum_input_length transform_request transform_response
+    ].freeze
 
     # @return [String] will be used as a placeholder if given
     attr_reader :placeholder
@@ -30,6 +33,12 @@ module Kadmin
     # @return [Integer] the minimum input length before trying to fetch remote data
     attr_reader :minimum_input_length
 
+    # @return [String] name of callback to a globally-accessible function that can transform the request
+    attr_reader :transform_request
+
+    # @return [String] name of the callback to a globally-accessible function that can transform the response
+    attr_reader :transform_response
+
     def initialize(options = {})
       @placeholder = options[:placeholder].to_s.freeze
       extract_ajax_options!(options).freeze if options.present?
@@ -42,6 +51,8 @@ module Kadmin
       @value_property = options.fetch(:value_property, 'id')
       @page_size = options.fetch(:page_size, 10)
       @minimum_input_length = options.fetch(:minimum_input_length, 2)
+      @transform_request = options[:transform_request]
+      @transform_response = options[:transform_response]
 
       raise ArgumentError, 'missing data URL for remote fetching' if @data_url.blank?
     end
@@ -55,8 +66,10 @@ module Kadmin
         'kadmin--display-property' => display_property,
         'kadmin--value-property' => value_property,
         'kadmin--page-size' => page_size,
-        'kadmin--minimum-input-length' => minimum_input_length
-      }
+        'kadmin--minimum-input-length' => minimum_input_length,
+        'kadmin--transform-request' => transform_request,
+        'kadmin--transform-response' => transform_response
+      }.compact
     end
 
     class << self

data/app/controllers/kadmin/application_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Kadmin
   class ApplicationController < ActionController::Base
     layout 'kadmin/application'
@@ -19,7 +20,7 @@ module Kadmin
 
     # @!group Error Handling
 
-    if Kadmin.config.handle_errors && !defined?(BetterErrors)
+    if Kadmin.config.handle_errors
       rescue_from StandardError, with: :handle_unexpected_error
       rescue_from ActiveRecord::RecordNotFound, with: :not_found
       rescue_from ActionController::ParameterMissing, with: :params_missing

data/app/controllers/kadmin/auth_controller.rb

@@ -67,7 +67,7 @@ module Kadmin
     def valid_redirect_url?(url)
       valid = false
 
-      unless url.blank?
+      if url.present?
         paths = [auth_login_path, auth_logout_path]
         valid = paths.none? { |invalid| url == invalid }
       end
@@ -92,7 +92,7 @@ module Kadmin
         end
       end
 
-      provider_link = "#{provider_link}?origin=#{CGI.escape(origin)}" unless origin.blank?
+      provider_link = "#{provider_link}?origin=#{CGI.escape(origin)}" if origin.present?
       return provider_link
     end
     helper_method :omniauth_provider_link

data/app/controllers/kadmin/dash_controller.rb

@@ -3,8 +3,7 @@ module Kadmin
     # @!group Endpoints
 
     # GET /
-    def index
-    end
+    def index; end
 
     # @!endgroup
 

data/app/helpers/kadmin/alert_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Kadmin
   # Provide helpers for displaying alerts, as well as matching those alerts to
   # different flash keys.
@@ -13,7 +14,7 @@ module Kadmin
       dismissible = options.fetch(:dismissible, true)
       text_content = options.fetch(:content, '')
 
-      css_classes = %W(alert alert-#{type})
+      css_classes = %W[alert alert-#{type}]
       css_classes << 'alert-dismissible' if options.fetch(:dismissible, true)
       block_content = capture(&block) if block_given?
 
@@ -27,17 +28,17 @@ module Kadmin
           content.concat(button)
         end
 
-        content.concat(block_content.html_safe) unless block_content.blank?
+        content.concat(block_content.html_safe) if block_content.present?
         content
       end
     end
 
     Type = Struct.new(:flash_keys, :css_class, :glyphicon)
     TYPES = [
-      Type.new(['danger', 'alert'], 'danger', 'exclamation-sign'),
+      Type.new(%w[danger alert], 'danger', 'exclamation-sign'),
       Type.new(['success'], 'success', 'ok-sign'),
-      Type.new(['notice', 'info'], 'info', 'info-sign'),
-      Type.new(['warn', 'warning'], 'warning', 'question-sign')
+      Type.new(%w[notice info], 'info', 'info-sign'),
+      Type.new(%w[warn warning], 'warning', 'question-sign')
     ].freeze
     def render_flash_alerts
       alerts = AlertHelper::TYPES.map do |type|
@@ -48,7 +49,7 @@ module Kadmin
       return safe_join(alerts)
     end
 
-    def render_flash_alert(type, &block)
+    def render_flash_alert(type)
       messages = type.flash_keys.map { |key| Array.wrap(flash[key]).compact }.flatten
       return '' if messages.blank?
 

data/app/helpers/kadmin/application_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Kadmin
   module ApplicationHelper
     REDMINE_URL = 'https://redmine.offerista.com/projects/apps-services/issues/new'

data/config/initializers/assets.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-%w(app vendor).each do |folder|
+%w[app vendor].each do |folder|
   path = Kadmin::Engine.root.join(folder, 'assets', '**', '*')
-  Rails.application.config.assets.paths.concat(Dir.glob(path).select { |path| File.directory?(path) })
-  Rails.application.config.assets.precompile.concat(Dir.glob(path).select { |path| File.file?(path) })
+  Rails.application.config.assets.paths.concat(Dir.glob(path).select { |p| File.directory?(p) })
+  Rails.application.config.assets.precompile.concat(Dir.glob(path).select { |p| File.file?(p) })
 end
 Rails.application.config.assets.precompile << /\.(?:svg|eot|woff|ttf)$/

data/config/routes.rb

@@ -4,7 +4,7 @@ Kadmin::Engine.routes.draw do
   scope '/auth', controller: :auth, as: 'auth', defaults: { format: 'html' } do
     get '/login', action: :login, as: :login
     get '/logout', action: :logout, as: :logout
-    match '/:provider/callback', action: :save, as: :callback, via: [:get, :post]
+    match '/:provider/callback', action: :save, as: :callback, via: %i[get post]
     get '/failure', action: :failure, as: :failure
     get '/unauthorized', action: :unauthorized, as: :unauthorized
     get '/', action: :login

data/lib/kadmin/configuration.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Kadmin
   class Configuration
     # @return [Logger] An instance of a Ruby compatible logger

data/lib/kadmin/presentable.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Kadmin
   module Presentable
     extend ActiveSupport::Concern

data/lib/kadmin/presenter/test_case.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Kadmin
   class Presenter
     # Test class for Presenters. While this will not be common, it highlights how much

data/lib/kadmin/version.rb

@@ -1,3 +1,3 @@
 module Kadmin
-  VERSION = '0.6.19'.freeze
+  VERSION = '0.6.21'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kadmin
 version: !ruby/object:Gem::Version
-  version: 0.6.19
+  version: 0.6.21
 platform: ruby
 authors:
 - Nicolas Pepin-Perreault
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-10 00:00:00.000000000 Z
+date: 2017-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -74,6 +74,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: barcoop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Collection of utility, configuration, etc., for admin areas in a Rails
   application. Provides a boostrap environment, standard layout, authentication, and
   more.
@@ -172,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Collection of utility, configuration, etc., for admin areas