activeadmin_settings_cached 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3736a48cf8b4b7548d4910266581a3fc9eebcba3
-  data.tar.gz: de7634b92e52bbfa8b31e6e208d58a8400b8afe4
+  metadata.gz: 603aca9e3f4f9203e5615d4d1a6de0971c712bd0
+  data.tar.gz: 9479bedf926819b92387a229c3a86f82d0bc47d3
 SHA512:
-  metadata.gz: 6f4d640a6c4eed94608f5b8478bc81c40217b7c656d2db06571da6045f70a08c77e5e3c809b822a2353e3b734838d44f1bd7a01c6fa92883694e48f47a16db07
-  data.tar.gz: 25d94d5d0e3ed2ebb2384be24793a004b0d295df0eccf244d8ae2552ba63bd3dad1ceca9ce15b196653aeb74913d613c6e51107d10c291da240a7d9c55efce7d
+  metadata.gz: 93838c32f20dffc07cd5089f91b5c95587286b078ca8769b0768b55c40d90c36b22b332edcb6c58805a6fd6bf58bb4504e58b5bfcecf49c1f1faa644255ad17b
+  data.tar.gz: 2c7b7968c14440954dce41f50b02ac8b3f2e2ef787e02512212a6c2df7fb9fc38d56928b4ad17c39726037e9e6dde55a849191edc1d863667500ffbb1f53560e

data/.travis.yml

@@ -4,6 +4,7 @@ cache: bundler
 gemfile:
   - gemfiles/rails4.2.gemfile
   - gemfiles/rails5.0.gemfile
+  - gemfiles/rails5.1.gemfile
 
 before_script:
   - bundle exec rake setup
@@ -13,4 +14,4 @@ script:
 
 rvm:
   - 2.2.6
-  - 2.3.3
+  - 2.3.4

data/Appraisals

@@ -1,9 +1,17 @@
-appraise "rails4.2" do
-  gem "rails", "~> 4.2.0"
+# frozen_string_literal: true
+
+appraise 'rails4.2' do
+  gem 'rails', '~> 4.2.0'
+end
+
+appraise 'rails5.0' do
+  gem 'rails', '~> 5.0.1'
+  gem 'inherited_resources', git: 'https://github.com/activeadmin/inherited_resources.git'
+  gem 'listen'
 end
 
-appraise "rails5.0" do
-  gem "rails", "~> 5.0.1"
+appraise 'rails5.1' do
+  gem 'rails', '~> 5.1.0'
   gem 'inherited_resources', git: 'https://github.com/activeadmin/inherited_resources.git'
   gem 'listen'
 end

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v2.2.0 2017-12-22
+
+## Added
+
+- Add `after_save` callback (Alexander Merkulov)
+
 # v2.1.1 2017-08-07
 
 ## Fixed

data/Gemfile

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 group :test do
   gem 'pry-byebug'
   gem 'therubyracer'
-  gem 'activeadmin', git: 'https://github.com/activeadmin/activeadmin.git'
 end
 
 gemspec

data/README.md

@@ -74,6 +74,7 @@ Tool                    | Description
 :template_object				|object passing to view (default: ActiveadminSettingsCached::Model instance)
 :display    |Hash, display settings override (default: {})
 :title			|String, title value override (default: I18n.t('settings.menu.label'))
+:after_save |Proc, callback for action after POST request, (default: nil)
  
 
 ## Localization

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler'
 require 'rake'
 Bundler.setup

data/activeadmin_settings_cached.gemspec

@@ -1,35 +1,36 @@
-# coding: utf-8
+# frozen_string_literal: true
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'activeadmin_settings_cached/version'
 
 Gem::Specification.new do |s|
-  s.name          = "activeadmin_settings_cached"
+  s.name          = 'activeadmin_settings_cached'
   s.version       = ActiveadminSettingsCached::VERSION
-  s.authors       = ["Semyon Pupkov"]
-  s.email         = ["semen.pupkov@gmail.com"]
-  s.summary       = "UI interface for rails-settings-cached in active admin"
-  s.description   = "UI interface for rails-settings-cached in active admin"
-  s.homepage      = "https://github.com/artofhuman/activeadmin_settings_cached"
-  s.license       = "MIT"
+  s.authors       = ['Semyon Pupkov']
+  s.email         = ['mail@semyonpupkov.com']
+  s.summary       = 'UI interface for rails-settings-cached in active admin'
+  s.description   = 'UI interface for rails-settings-cached in active admin'
+  s.homepage      = 'https://github.com/artofhuman/activeadmin_settings_cached'
+  s.license       = 'MIT'
 
   s.files         = `git ls-files -z`.split("\x0")
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
-  s.require_paths = ["lib"]
+  s.require_paths = ['lib']
 
-  s.add_dependency 'activeadmin', '>= 1.0.0.pre4', '< 1.2.0'
-  s.add_dependency 'rails-settings-cached', '>= 0.5.3', '< 0.6.6'
+  s.add_dependency 'activeadmin'
   s.add_dependency 'dry-types', '>= 0.8.1'
+  s.add_dependency 'rails-settings-cached', '>= 0.5.3', '< 0.6.7'
 
-  s.add_development_dependency "bundler"
-  s.add_development_dependency "rake"
-  s.add_development_dependency "coveralls"
-  s.add_development_dependency "appraisal"
-  s.add_development_dependency "database_cleaner"
-  s.add_development_dependency "sqlite3"
-  s.add_development_dependency "rspec-rails"
-  s.add_development_dependency "capybara"
-  s.add_development_dependency "selenium-webdriver"
-  s.add_development_dependency "poltergeist"
+  s.add_development_dependency 'appraisal'
+  s.add_development_dependency 'bundler'
+  s.add_development_dependency 'capybara'
+  s.add_development_dependency 'coveralls'
+  s.add_development_dependency 'database_cleaner'
+  s.add_development_dependency 'poltergeist'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec-rails'
+  s.add_development_dependency 'selenium-webdriver'
+  s.add_development_dependency 'sqlite3'
 end

data/gemfiles/rails4.2.gemfile

@@ -7,7 +7,6 @@ gem "rails", "~> 4.2.0"
 group :test do
   gem "pry-byebug"
   gem "therubyracer"
-  gem "activeadmin", :git => "https://github.com/activeadmin/activeadmin.git"
 end
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails5.0.gemfile

@@ -3,13 +3,12 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 5.0.1"
-gem "inherited_resources", :git => "https://github.com/activeadmin/inherited_resources.git"
+gem "inherited_resources", git: "https://github.com/activeadmin/inherited_resources.git"
 gem "listen"
 
 group :test do
   gem "pry-byebug"
   gem "therubyracer"
-  gem "activeadmin", :git => "https://github.com/activeadmin/activeadmin.git"
 end
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails5.1.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 5.1.0"
+gem "inherited_resources", git: "https://github.com/activeadmin/inherited_resources.git"
+gem "listen"
+
+group :test do
+  gem "pry-byebug"
+  gem "therubyracer"
+end
+
+gemspec path: "../"

data/lib/activeadmin_settings_cached.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'activeadmin_settings_cached/engine'
 
 module ActiveadminSettingsCached

data/lib/activeadmin_settings_cached/coercions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dry-types'
 
 module ActiveadminSettingsCached

data/lib/activeadmin_settings_cached/dsl.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveadminSettingsCached
   module DSL
     # Declares settings function.
@@ -8,16 +10,17 @@ module ActiveadminSettingsCached
     # @option options [String] :model_name, settings model name override (default: uses name from global config.)
     # @option options [String] :starting_with, each key must starting with, (default: nil)
     # @option options [String] :key, root key can be replacement for starting_with, (default: nil)
-    # @option options [String] :tempalte custom, template rendering (default: 'admin/settings/index')
+    # @option options [String] :template custom, template rendering (default: 'admin/settings/index')
     # @option options [String] :template_object, object to use in templates (default: ActiveadminSettingsCached::Model instance)
     # @option options [String] :display, display settings override (default: nil)
     # @option options [String] :title, title value override (default: I18n.t('settings.menu.label'))
+    # @option options [Proc] :after_save, callback for action after page update, (default: nil)
     def active_admin_settings_page(options = {}, &block)
       options.assert_valid_keys(*ActiveadminSettingsCached::Options::VALID_OPTIONS)
 
       options = ActiveadminSettingsCached::Options.options_for(options)
       coercion =
-          ActiveadminSettingsCached::Coercions.new(options[:template_object].defaults, options[:template_object].display)
+        ActiveadminSettingsCached::Coercions.new(options[:template_object].defaults, options[:template_object].display)
 
       content title: options[:title] do
         render partial: options[:template], locals: { settings_model: options[:template_object] }
@@ -32,6 +35,7 @@ module ActiveadminSettingsCached
 
         flash[:success] = t('activeadmin_settings_cached.settings.update.success'.freeze)
         Rails.version.to_i >= 5 ? redirect_back(fallback_location: admin_root_path) : redirect_to(:back)
+        options[:after_save].call if options[:after_save].respond_to?(:call)
       end
 
       instance_eval(&block) if block_given?

data/lib/activeadmin_settings_cached/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails-settings-cached'
 require 'active_admin'
 

data/lib/activeadmin_settings_cached/model.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveadminSettingsCached
   class Model
     include ::ActiveModel::Model

data/lib/activeadmin_settings_cached/options.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveadminSettingsCached
   module Options
     VALID_OPTIONS = [
@@ -7,12 +9,14 @@ module ActiveadminSettingsCached
       :template_object,
       :display,
       :key,
-      :title
+      :title,
+      :after_save
     ].freeze
 
     def self.options_for(options = {})
-      options[:template_object] =
-          ::ActiveadminSettingsCached::Model.new(options) unless options[:template_object]
+      unless options[:template_object]
+        options[:template_object] = ::ActiveadminSettingsCached::Model.new(options)
+      end
 
       {
         template: 'admin/settings/index',

data/lib/activeadmin_settings_cached/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveadminSettingsCached
-  VERSION = '2.1.1'
+  VERSION = '2.2.0'
 end

data/lib/generators/active_admin/settings_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveAdmin
   module Generators
     class SettingsGenerator < Rails::Generators::NamedBase

data/lib/generators/active_admin/templates/settings.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ActiveAdmin.register_page '<%= class_name %>' do
   title = '<%= class_name %>'
   menu label: title

data/spec/coercions_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe ActiveadminSettingsCached::Coercions do
   let(:display) do
     Hash[

data/spec/model_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe ActiveadminSettingsCached::Model do
   include ActiveModel::Lint::Tests
 
@@ -37,6 +39,10 @@ RSpec.describe ActiveadminSettingsCached::Model do
   end
 
   context '#attributes' do
+    before do
+      ActiveadminSettingsCached.config.display = {}
+    end
+
     it 'set options' do
       object = described_class.new(all_options)
       expect(object.attributes).to eq({

data/spec/settings_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe 'settings', type: :feature, js: true do
   before do
     Setting['some'] = {
@@ -135,6 +137,62 @@ RSpec.describe 'settings', type: :feature, js: true do
     end
   end
 
+  describe 'with after_save' do
+    context 'when right object' do
+      before do
+        after_save = ->() {}
+        display_settings = {
+          'base.first_setting'    => 'string',
+          'base.second_setting'   => 'boolean',
+          'base.third_setting'    => 'number',
+          'base.four_setting'     => 'number',
+          'base.five_setting'     => 'string',
+          'second.first_setting'  => 'boolean',
+          'second.second_setting' => 'string'
+        }
+
+        expect(after_save).to receive(:call).and_call_original
+
+        add_some_setting_resource(
+          template_object: ActiveadminSettingsCached::Model.new(display: display_settings),
+          after_save: after_save
+        )
+
+        visit '/admin/some_settings'
+
+        submit
+      end
+
+      it_behaves_like 'render input with value', 'AAA'
+    end
+
+    context 'when only open' do
+      before do
+        after_save = ->() {}
+
+        expect(after_save).not_to receive(:call)
+
+        add_some_setting_resource(template_object: nil,
+                                  after_save: after_save)
+
+        visit '/admin/some_settings'
+      end
+
+      it_behaves_like 'render input with value', 'CCC'
+    end
+
+    context 'when wrong object' do
+      before do
+        add_some_setting_resource(template_object: nil,
+                                  after_save: 'some')
+
+        visit '/admin/some_settings'
+      end
+
+      it_behaves_like 'render input with value', 'CCC'
+    end
+  end
+
   context 'when settings on different pages' do
     before do
       ActiveadminSettingsCached.configure do |config|

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'database_cleaner'
 
 require 'coveralls'

data/spec/support/admin.rb

@@ -1,5 +1,6 @@
-def add_setting_resource(options = {}, &block)
-  options.merge!({model_name: 'Setting', starting_with: 'base.', title: 'Base Settings'})
+# frozen_string_literal: true
+
+def base_add_resource(options = {}, &block)
   ActiveAdmin.register_page options[:title] do
     menu label: options[:title], priority: 99, parent: 'settings'
     active_admin_settings_page(options, &block)
@@ -7,29 +8,26 @@ def add_setting_resource(options = {}, &block)
   Rails.application.reload_routes!
 end
 
+def add_setting_resource(options = {}, &block)
+  options = { model_name: 'Setting', starting_with: 'base.', title: 'Base Settings',
+              after_save: -> {} }.merge!(options)
+  base_add_resource(options, &block)
+end
+
 def add_second_setting_resource(options = {}, &block)
-  options.merge!({model_name: 'Setting', starting_with: 'second.', title: 'Second Settings'})
-  ActiveAdmin.register_page options[:title] do
-    menu label: options[:title], priority: 99, parent: 'settings'
-    active_admin_settings_page(options, &block)
-  end
-  Rails.application.reload_routes!
+  options = { model_name: 'Setting', starting_with: 'second.',
+              title: 'Second Settings' }.merge!(options)
+  base_add_resource(options, &block)
 end
 
 def add_some_setting_resource(options = {}, &block)
-  options.merge!({model_name: 'Setting', title: 'Some Settings', key: 'some'})
-  ActiveAdmin.register_page options[:title] do
-    menu label: options[:title], priority: 99, parent: 'settings'
-    active_admin_settings_page(options, &block)
-  end
-  Rails.application.reload_routes!
+  options = { model_name: 'Setting', title: 'Some Settings', key: 'some',
+              after_save: -> {} }.merge!(options)
+  base_add_resource(options, &block)
 end
 
 def add_all_setting_resource(options = {}, &block)
-  options.merge!({model_name: 'Setting', title: 'Settings'})
-  ActiveAdmin.register_page options[:title] do
-    menu label: options[:title], priority: 99, id: 'settings'
-    active_admin_settings_page(options, &block)
-  end
-  Rails.application.reload_routes!
+  options[:model_name] = 'Setting'
+  options[:title] = 'Settings'
+  base_add_resource(options, &block)
 end

data/spec/support/rails_template.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Rails template to build the sample app for specs
 
 generate :settings, 'Setting'

data/tasks/test.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 desc 'Creates a test rails app for the specs to run against'
 task :setup do
   require 'rails/version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin_settings_cached
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Semyon Pupkov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-07 00:00:00.000000000 Z
+date: 2017-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
@@ -16,56 +16,50 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre4
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre4
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails-settings-cached
+  name: dry-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.6.6
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.6.6
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
-  name: dry-types
+  name: rails-settings-cached
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.5.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.6.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.5.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.6.7
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -79,7 +73,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -93,7 +87,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -107,7 +101,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -135,7 +129,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: poltergeist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -149,7 +143,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -163,7 +157,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -191,7 +185,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: poltergeist
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -206,7 +200,7 @@ dependencies:
         version: '0'
 description: UI interface for rails-settings-cached in active admin
 email:
-- semen.pupkov@gmail.com
+- mail@semyonpupkov.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -230,6 +224,7 @@ files:
 - docker-compose.yml
 - gemfiles/rails4.2.gemfile
 - gemfiles/rails5.0.gemfile
+- gemfiles/rails5.1.gemfile
 - lib/activeadmin_settings_cached.rb
 - lib/activeadmin_settings_cached/coercions.rb
 - lib/activeadmin_settings_cached/dsl.rb
@@ -267,7 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: UI interface for rails-settings-cached in active admin