activeadmin_settings_cached 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3942b06c09451668f69cdebc55fd60ba0fbc06fc
-  data.tar.gz: 82244fce68d448d8b9a42d25da86c5d00473afda
+  metadata.gz: 66b215e385891ca9912114999fb2f1503e0ea964
+  data.tar.gz: 144d18fd399db01299913ffde456ba1d758dd875
 SHA512:
-  metadata.gz: 5433274987531047bae38d9459083252691675114dde5bd271d3c9d4be6c07b8a6ec337dd726d7c92305017524e757b00763138a5b616e0e97500715aa5aadac
-  data.tar.gz: 37593953667ae4262a21fe5025bce352839f813f2c503a9932076670121c209075c68d3453e92a4ddb6f7a9f233c6fda7890cf762db20f28aa03a3a810d495eb
+  metadata.gz: 86461b1090024fbbd1be6754c99de2f3e8f31bffeb9bf80d099227063052db47f8a7fc36e996197cbcdb2622252b3c63cb7f7e1bb14cc1950f16229c46ae09ff
+  data.tar.gz: bee99e56e562d814c492c1055052b9895bd37465b07780a52e662e275590568fd2bf995148d50fe1378937ebdd39f91b3438f17d24e5e7169f7447557c4598d5

data/.gitignore

@@ -15,3 +15,4 @@
 .ruby-version
 .idea
 mkmf.log
+/gemfiles

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/.travis.yml

@@ -1,11 +1,10 @@
+language: ruby
+cache: bundler
+
 script:
-  - bundle exec rspec spec
+  - make
+
 rvm:
-  - 2.0.0
-  - 2.1.5
-  - 2.2.0
+  #- 2.1.5
+  #- 2.2.0
   - 2.3.0
-before_install:
-  - gem install bundler -v '= 1.9.3'
-  - gem update --system
-  - gem --version

data/Appraisals

@@ -0,0 +1,11 @@
+appraise "rails4.2" do
+  gem "rails", "~> 4.2.0"
+end
+
+#appraise "rails5.0" do
+  #gem "rails", "~> 5.0.0"
+  #gem 'inherited_resources', github: 'activeadmin/inherited_resources'
+  #gem 'ransack',             github: 'activerecord-hackery/ransack'
+  #gem 'draper',              '> 3.x'
+  #gem 'sass-rails',          github: 'rails/sass-rails' # For Sprockets 4
+#end

data/Dockerfile

@@ -0,0 +1,26 @@
+FROM ruby:2.3-slim
+
+ENV PHANTOMJS_VERSION 1.9.8
+
+RUN apt-get update -qq && \
+  DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
+  make \
+  gcc \
+  g++ \
+  libsqlite3-dev \
+  git-core \
+  wget \
+  libfreetype6 \
+  libfontconfig \
+  bzip2 && \
+  apt-get clean
+
+RUN \
+  wget -q --no-check-certificate -O /tmp/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2 https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2 && \
+  mkdir -p /srv/var && \
+  tar -xjf /tmp/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2 -C /tmp && \
+  rm -f /tmp/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2 && \
+  mv /tmp/phantomjs-$PHANTOMJS_VERSION-linux-x86_64/ /srv/var/phantomjs && \
+  ln -s /srv/var/phantomjs/bin/phantomjs /usr/bin/phantomjs
+
+WORKDIR /app

data/Gemfile

@@ -1,8 +1,9 @@
 source 'https://rubygems.org'
 
 group :test do
-  #gem 'turbolinks'
-  gem 'activeadmin', github: 'activeadmin/activeadmin', branch: 'ab1d8d1a4a1af748ae7009d9d725193d780d0059'
+  gem 'pry-byebug'
+  gem 'therubyracer'
+  gem 'activeadmin', github: 'activeadmin/activeadmin'
 end
 
 gemspec

data/Makefile

@@ -1,3 +1,16 @@
-all:
+default: test
+
+test: appraisals
+	bundle exec appraisal rspec ${T}
+
+appraisals: setup
+	bundle exec appraisal install
+
+setup:
+	gem install bundler --no-ri --no-rdoc
+	bundle check || bundle install -j 2
+
+clean:
+	rm -f Gemfile.lock
 	rm -rf spec/rails
-	bundle exec rspec
+	rm -rf gemfiles

data/README.md

@@ -20,7 +20,7 @@ And then execute:
 
 Create your settings model:
 
-    $ rails g settings Settings
+    $ rails g settings:install
     $ bundle exec rake db:migrate
 
 Create your settings page:
@@ -52,7 +52,8 @@ end
 Tool                    | Description
 ---------------------   | -----------
 :model_name					|String, settings model name override (default: uses name from global config.)
-:starting_with			|String, each key must starting with, (default: nil) 
+:starting_with			|String, each key must starting with, (default: nil)
+:key			|String, Symbol root key, can be replacement for starting_with, (default: nil)
 :template				|String, custom template rendering (default: 'admin/settings/index')
 :template_object				|object passing to view (default: ActiveadminSettingsCached::Model instance)
 :display    |Hash, display settings override (default: {})

data/activeadmin_settings_cached.gemspec

@@ -19,12 +19,13 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency 'activeadmin'
-  s.add_dependency 'rails-settings-cached', '>= 0.5.3', '< 0.5.5'
+  s.add_dependency 'rails-settings-cached', '>= 0.5.3', '< 0.6.6'
+  s.add_dependency 'dry-types', '>= 0.8.1'
 
   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"

data/app/views/admin/settings/_index.html.erb

@@ -9,11 +9,12 @@
       </thead>
       <tbody>
         <% settings_model.settings.each_pair do |name, _| %>
+          <% field_name = settings_model.field_name(name) %>
           <tr class="odd">
-            <td><strong><%= f.label t("settings.attributes.#{name}", default: name) %></strong></td>
+            <td><strong><%= f.label t("settings.attributes.#{field_name}", default: field_name) %></strong></td>
             <td>
               <div class='form'>
-                <ol><%= f.input name, settings_model.field_options(name) %></ol>
+                <ol><%= f.input field_name, settings_model.field_options(field_name, name) %></ol>
               </div>
             </td>
           </tr>

data/config/locales/de.yml

@@ -0,0 +1,16 @@
+de:
+  activeadmin_settings_cached:
+    settings:
+      update:
+        success: Konfiguration wurde gespeichert.
+
+  activerecord:
+    models:
+      settings: 'Konfiguration'
+
+  settings:
+    menu:
+      label: 'Konfiguration'
+    index:
+      name: 'Name'
+      value: 'Wert'

data/docker-compose.yml

@@ -0,0 +1,13 @@
+version: '2'
+
+services:
+  app:
+    build: '.'
+    command: 'make test'
+    volumes:
+      - '.:/app'
+      - gems:/usr/local/bundle
+
+volumes:
+  gems:
+    external: true

data/lib/activeadmin_settings_cached.rb

@@ -5,7 +5,7 @@ module ActiveadminSettingsCached
     attr_accessor :model_name, :display
 
     def model_name
-      (@model_name ||= 'Settings').constantize
+      (@model_name ||= 'Setting').constantize
     end
 
     def display

data/lib/activeadmin_settings_cached/coercions.rb

@@ -1,17 +1,15 @@
+require 'dry-types'
+
 module ActiveadminSettingsCached
+  # Coerce user input values to defined types
+  #
+  # @api private
   class Coercions
-    SIMPLE_COERCIONS = {
-      float: :to_f,
-      integer: :to_i,
-      symbol: :to_sym
-    }
     attr_reader :defaults, :display
 
     def initialize(defaults, display)
       @defaults = defaults
       @display = display
-
-      init_methods
     end
 
     def cast_params(params)
@@ -22,39 +20,36 @@ module ActiveadminSettingsCached
       return coerced_params unless block_given?
 
       coerced_params.each do |name, value|
-        yield(name, value.call)
+        yield(name, value.call) unless value.nil?
       end
     end
 
     private
 
-    def coerce(m, &block)
-      define_singleton_method :"string_to_#{m.to_s}", &block
-    end
-
-    def init_methods
-      coerce :boolean do |value|
-        value && %w(true 1 yes y t).include?(value)
-      end
-
-      SIMPLE_COERCIONS.each do |k, v|
-        coerce(k) { |value| String(value).send(v) }
-      end
-    end
-
     def cast_value(name, value)
       case defaults[name]
       when TrueClass, FalseClass
-        display[name].to_s == 'boolean' ? -> { string_to_boolean(value) } : -> { value }
+        -> { value_or_default('bool', value, false) }
       when Integer
-        -> { string_to_integer(value) }
+        -> { value_or_default('int', value, 0) }
       when Float
-        -> { string_to_float(value) }
+        -> { value_or_default('float', value, 0.0) }
+      when Hash, 'ActiveSupport::HashWithIndifferentAccess'
+        nil
       when Symbol
-        -> { string_to_symbol(value) }
+        -> { value.to_sym }
       else
         -> { value }
       end
     end
+
+    def value_or_default(type, value, default)
+      result = Dry::Types["form.#{type}"].call(value)
+      if Dry::Types[type].valid?(result)
+        result
+      else
+        default
+      end
+    end
   end
 end

data/lib/activeadmin_settings_cached/dsl.rb

@@ -1,30 +1,33 @@
 module ActiveadminSettingsCached
   module DSL
-    # Declares settings function
+    # Declares settings function.
     #
-    # Options:
-    # +model_name+:: settings model name override (default: uses name from global config.)
-    # +starting_with+:: each key must starting with, (default: nil)
-    # +template+:: custom template rendering (default: 'admin/settings/index')
-    # +template_object+:: object to use in templates (default: ActiveadminSettingsCached::Model instance)
-    # +display+:: display settings override (default: nil)
-    # +title+:: title value override (default: I18n.t('settings.menu.label'))
+    # @api public
     #
+    # @param [Hash] options
+    # @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_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'))
     def active_admin_settings_page(options = {}, &block)
-      options.assert_valid_keys(*Options::VALID_OPTIONS)
+      options.assert_valid_keys(*ActiveadminSettingsCached::Options::VALID_OPTIONS)
 
-      options = Options.options_for(options)
-      coercion = Coercions.new(options[:template_object].defaults, options[:template_object].display)
+      options = ActiveadminSettingsCached::Options.options_for(options)
+      coercion =
+          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] }
       end
 
       page_action :update, method: :post do
-        settings_params = params.require(:settings).permit(options[:template_object].defaults.keys)
+        settings_params = params.require(:settings).permit!
 
         coercion.cast_params(settings_params) do |name, value|
-          options[:template_object][name] = value
+          options[:template_object].save(name, value)
         end
 
         flash[:success] = t('activeadmin_settings_cached.settings.update.success'.freeze)

data/lib/activeadmin_settings_cached/engine.rb

@@ -7,7 +7,7 @@ module ActiveadminSettingsCached
     config.autoload_paths += Dir["#{config.root}/lib"]
 
     initializer 'activeadmin_settings_cached' do
-      ActiveAdmin::DSL.send(:include, ActiveadminSettingsCached::DSL)
+      ::ActiveAdmin::DSL.send(:include, ::ActiveadminSettingsCached::DSL)
     end
   end
 end

data/lib/activeadmin_settings_cached/model.rb

@@ -1,6 +1,6 @@
 module ActiveadminSettingsCached
   class Model
-    include ActiveModel::Model
+    include ::ActiveModel::Model
 
     attr_reader :attributes
 
@@ -11,9 +11,13 @@ module ActiveadminSettingsCached
       assign_attributes(merge_attributes(args))
     end
 
-    def field_options(settings_name)
+    def field_name(settings_name)
+      has_key? ? "#{attributes[:key]}.#{settings_name}" : settings_name
+    end
+
+    def field_options(settings_name, key_name)
       default_value = defaults[settings_name]
-      value = settings[settings_name]
+      value = settings[key_name]
 
       input_opts = if default_value.is_a?(Array)
                      {
@@ -36,12 +40,22 @@ module ActiveadminSettingsCached
     end
 
     def settings
-      data = load_settings
-      ActiveSupport::OrderedHash[data.to_a.sort { |a, b| a.first <=> b.first }] if data
+      data = has_key? ? load_settings_by_key : load_settings
+      return unless data
+
+      ::ActiveSupport::OrderedHash[data.to_a.sort { |a, b| a.first <=> b.first }]
     end
 
     def defaults
-      settings_model.defaults
+      settings_model.respond_to?(:defaults) ?
+          settings_model.defaults :
+          ::RailsSettings::Default
+    end
+
+    def defaults_keys
+      settings_model.respond_to?(:defaults) ?
+          settings_model.defaults.keys :
+          ::RailsSettings::Default.instance.keys
     end
 
     def display
@@ -56,6 +70,14 @@ module ActiveadminSettingsCached
       settings_model[param] = value
     end
 
+    def save(key, value)
+      if has_key?
+        settings_model.merge!(attributes[:key], { clean_key(key) => value })
+      else
+        self[key] = value
+      end
+    end
+
     def persisted?
       false
     end
@@ -68,6 +90,18 @@ module ActiveadminSettingsCached
       settings_model.public_send(meth, attributes[:starting_with])
     end
 
+    def load_settings_by_key
+      self[attributes[:key]]
+    end
+
+    def has_key?
+      attributes[:key].present?
+    end
+
+    def clean_key(key)
+      key.is_a?(Symbol) ? key : "#{key.sub("#{attributes[:key]}.", '')}"
+    end
+
     def assign_attributes(args = {})
       @attributes.merge!(args)
     end
@@ -75,8 +109,9 @@ module ActiveadminSettingsCached
     def default_attributes
       {
         starting_with: nil,
-        model_name: ActiveadminSettingsCached.config.model_name,
-        display: ActiveadminSettingsCached.config.display
+        key: nil,
+        model_name: ::ActiveadminSettingsCached.config.model_name,
+        display: ::ActiveadminSettingsCached.config.display
       }
     end
 

data/lib/activeadmin_settings_cached/options.rb

@@ -6,11 +6,13 @@ module ActiveadminSettingsCached
       :template,
       :template_object,
       :display,
+      :key,
       :title
     ].freeze
 
     def self.options_for(options = {})
-      options[:template_object] = ActiveadminSettingsCached::Model.new(options) unless options[:template_object]
+      options[:template_object] =
+          ::ActiveadminSettingsCached::Model.new(options) unless options[:template_object]
 
       {
         template: 'admin/settings/index',

data/lib/activeadmin_settings_cached/version.rb

@@ -1,3 +1,3 @@
 module ActiveadminSettingsCached
-  VERSION = '2.0.1'
+  VERSION = '2.1.0'
 end

data/spec/coercions_spec.rb

@@ -1,42 +1,78 @@
-require 'spec_helper'
-
 RSpec.describe ActiveadminSettingsCached::Coercions do
-  let(:display) { Hash['base.first_setting' => 'string', 'base.second_setting' => 'boolean',
-                   'base.third_setting' => 'number', 'base.four_setting' => 'number',
-                   'second.first_setting' => 'boolean', 'second.second_setting' => 'string'].with_indifferent_access }
-  let(:defaults) { Hash['base.first_setting' => 'AAA', 'base.second_setting' => true, 'base.third_setting' => 5,
-                        'base.four_setting' => 5.5, 'base.five_setting' => :aaa, 'second.first_setting' => false,
-                        'second.second_setting' => 'BBB'].with_indifferent_access }
-  let(:right_params) { ActionController::Parameters.new(Hash['base.first_setting' => 'BBB', 'base.second_setting' => 'false', 'base.third_setting' => '155',
-                      'base.four_setting' => '55.5', 'base.five_setting' => 'bbb', 'second.first_setting' => 'true',
-                      'second.second_setting' => 'AAA']) }
-  let(:wrong_params) { ActionController::Parameters.new(Hash['base.second_setting' => 'hjgj', 'base.third_setting' => 'fhfh',
-                      'base.four_setting' => 'gjfhg', 'second.first_setting' => 'ggf']) }
+  let(:display) do
+    Hash[
+      'base.first_setting'    => 'string',
+      'base.second_setting'   => 'boolean',
+      'base.third_setting'    => 'number',
+      'base.four_setting'     => 'number',
+      'second.first_setting'  => 'boolean',
+      'second.second_setting' => 'string'
+    ].with_indifferent_access
+  end
+
+  let(:defaults) do
+    Hash[
+      'base.first_setting'    => 'AAA',
+      'base.second_setting'   => true,
+      'base.third_setting'    => 5,
+      'base.four_setting'     => 5.5,
+      'base.five_setting'     => :aaa,
+      'second.first_setting'  => false,
+      'second.second_setting' => 'BBB',
+      'some'                  => Hash.new
+    ].with_indifferent_access
+  end
+
+  let(:right_params) do
+    ActionController::Parameters.new(
+      Hash[
+        'base.first_setting'    => 'BBB',
+        'base.second_setting'   => 'false',
+        'base.third_setting'    => '155',
+        'base.four_setting'     => '55.5',
+        'base.five_setting'     => 'bbb',
+        'second.first_setting'  => 'true',
+        'second.second_setting' => 'AAA'
+      ]
+    )
+  end
+
+  let(:wrong_params) do
+    ActionController::Parameters.new(
+      Hash['base.second_setting'  => 'hjgj',
+           'base.third_setting'   => 'fhfh',
+           'base.four_setting'    => 'gjfhg',
+           'second.first_setting' => 'ggf',
+           'some'                 => Hash.new
+    ])
+  end
+
   let(:no_params) { ActionController::Parameters.new(Hash[]) }
 
-  before do
-    @coercions = ActiveadminSettingsCached::Coercions.new(defaults, display)
+  subject(:coercions) do
+    ActiveadminSettingsCached::Coercions.new(defaults, display)
   end
 
   it 'when good params' do
-    expect { |b|
-      @coercions.cast_params right_params, &b
-    }.to yield_successive_args(['base.first_setting', 'BBB'], ['base.second_setting', false],
-                               ['base.third_setting', 155], ['base.four_setting', 55.5],
-                               ['base.five_setting', :bbb], ['second.first_setting', true],
-                               ['second.second_setting', 'AAA'])
+    expect { |b| coercions.cast_params(right_params, &b) }
+      .to yield_successive_args(['base.first_setting', 'BBB'],
+                                ['base.second_setting', false],
+                                ['base.third_setting', 155],
+                                ['base.four_setting', 55.5],
+                                ['base.five_setting', :bbb],
+                                ['second.first_setting', true],
+                                ['second.second_setting', 'AAA'])
   end
 
   it 'when wrong params' do
-    expect { |b|
-      @coercions.cast_params wrong_params, &b
-    }.to yield_successive_args(['base.second_setting', false], ['base.third_setting', 0],
-                               ['base.four_setting', 0.0], ['second.first_setting', false])
+    expect { |b| coercions.cast_params(wrong_params, &b) }
+      .to yield_successive_args(['base.second_setting', false],
+                                ['base.third_setting', 0],
+                                ['base.four_setting', 0.0],
+                                ['second.first_setting', false])
   end
 
   it 'when no params' do
-    expect { |b|
-      @coercions.cast_params no_params, &b
-    }.not_to yield_control
+    expect { |b| coercions.cast_params(no_params, &b) }.not_to yield_control
   end
 end

data/spec/model_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 RSpec.describe ActiveadminSettingsCached::Model do
   include ActiveModel::Lint::Tests
 
@@ -9,6 +7,164 @@ RSpec.describe ActiveadminSettingsCached::Model do
     end
   end
 
+  before(:all) do
+    Setting.merge!('some', {
+      'first_setting' => 'CCC',
+      'second_setting' => true
+    })
+  end
+
+  let(:all_options) do
+    {
+      model_name: 'Setting',
+      starting_with: 'base.',
+      key: nil,
+      display: {'base.first_setting' => 'string', 'base.second_setting' => 'boolean'}
+    }
+  end
+
+  let(:key_options) do
+    {
+      model_name: 'Setting',
+      starting_with: nil,
+      key: 'some',
+      display: {'some.first_setting' => 'string', 'base.second_setting' => 'boolean'}
+    }
+  end
+
+  let(:no_options) do
+    {}
+  end
+
+  context '#attributes' do
+    it 'set options' do
+      object = described_class.new(all_options)
+      expect(object.attributes).to eq({
+                                         starting_with: all_options[:starting_with],
+                                         key: nil,
+                                         model_name: Setting,
+                                         display: all_options[:display]
+                                       })
+    end
+
+    it 'set default options' do
+      object = described_class.new(no_options)
+      expect(object.attributes).to eq({
+                                         starting_with: nil,
+                                         key: nil,
+                                         model_name: Setting,
+                                         display: {}
+                                       })
+    end
+
+    it 'set key options' do
+      object = described_class.new(key_options)
+      expect(object.attributes).to eq({
+                                         starting_with: nil,
+                                         key: key_options[:key],
+                                         model_name: Setting,
+                                         display: key_options[:display]
+                                       })
+    end
+  end
+
+  context '#field_name' do
+    it 'with keyed name' do
+      object = described_class.new(key_options)
+      expect(object.field_name('first_setting')).to eq('some.first_setting')
+    end
+
+    it 'with normal name' do
+      object = described_class.new(all_options)
+      expect(object.field_name('base.first_setting')).to eq('base.first_setting')
+    end
+  end
+
+  context '#field_options' do
+    it 'with default element' do
+      object = described_class.new(all_options)
+      expect(object.field_options('base.first_setting', 'base.first_setting')).to eq({as: 'string',
+                                                                label: false,
+                                                                input_html: {value: 'AAA', placeholder: 'AAA'}
+                                                               })
+    end
+
+    it 'with keyed element' do
+      object = described_class.new(key_options)
+      expect(object.field_options('some.first_setting', 'first_setting')).to eq({as: 'string',
+                                                                label: false,
+                                                                input_html: {value: 'CCC', placeholder: 'AAA'}
+                                                               })
+    end
+
+    it 'with array element' do
+      object = described_class.new(all_options.merge({display: {'base.first_setting' => 'string',
+                                                                'base.second_setting' => 'boolean',
+                                                                'base.six_setting' => 'array'}}))
+      expect(object.field_options('base.six_setting', 'base.six_setting')).to eq({as: 'array',
+                                                              label: false,
+                                                              collection: %w(a b),
+                                                              selected: %w(a b)
+                                                             })
+    end
+
+    it 'with boolean element' do
+      object = described_class.new(all_options)
+      expect(object.field_options('base.second_setting', 'base.second_setting')).to eq({as: 'boolean',
+                                                                 label: '',
+                                                                 input_html: {checked: true},
+                                                                 checked_value: 'true',
+                                                                 unchecked_value: 'false'
+                                                                })
+    end
+  end
+
+  context '#settings' do
+    it 'normal settings' do
+      object = described_class.new(all_options)
+      expect(object.settings).to eq(Setting.get_all('base.'))
+    end
+
+    it 'settings by key' do
+      object = described_class.new(key_options)
+      expect(object.settings).to eq(Setting['some'])
+    end
+  end
+
+  context '#save' do
+    it 'normal settings' do
+      object = described_class.new(all_options)
+      object.save('base.first_setting', 'DDD')
+      expect(Setting['base.first_setting']).to eq('DDD')
+    end
+
+    it 'settings by key' do
+      object = described_class.new(key_options)
+      object.save('some.first_setting', 'LLL')
+      expect(Setting['some']['first_setting']).to eq('LLL')
+    end
+  end
+
+  context '#defaults' do
+    it 'normal defaults' do
+      object = described_class.new(all_options)
+      expect(object.defaults).to eq(RailsSettings::Default)
+    end
+
+    it 'old defaults' do
+      allow(Setting).to receive(:defaults).and_return(RailsSettings::Default.instance)
+      object = described_class.new(all_options)
+      expect(object.defaults).to be_an_instance_of(RailsSettings::Default)
+    end
+  end
+
+  context '#defaults_keys' do
+    it 'normal defaults keys' do
+      object = described_class.new(all_options)
+      expect(object.defaults_keys).to eq(RailsSettings::Default.instance.keys)
+    end
+  end
+
   def model
     subject
   end

data/spec/settings_spec.rb

@@ -1,176 +1,216 @@
-require 'spec_helper'
-
 RSpec.describe 'settings', type: :feature, js: true do
   before do
-    Setting.defaults['base.first_setting'] = 'AAA'
-    Setting.defaults['base.second_setting'] = true
-    Setting.defaults['base.third_setting'] = 5
-    Setting.defaults['base.four_setting'] = 5.50
-    Setting.defaults['base.five_setting'] = :aaa
-    Setting.defaults['second.first_setting'] = false
-    Setting.defaults['second.second_setting'] = 'BBB'
+    Setting['some'] = {
+      'first_setting' => 'CCC',
+      'second_setting' => false
+    }
     Setting['base.first_setting'] = 'AAA'
     Setting['base.second_setting'] = true
     Setting['second.first_setting'] = false
     Setting['second.second_setting'] = 'BBB'
   end
 
+  let(:initial_some_settings) do
+    {
+      first_setting: 'CCC',
+      second_setting: false
+    }.with_indifferent_access
+  end
+
+  shared_examples_for 'render input with value' do |input_value|
+    it 'has input with value' do
+      expect(page).to have_selector("input[value='#{input_value}']")
+    end
+  end
+
+  shared_examples_for 'fill and save base settings to db' do
+    it 'saves base settings to db' do
+      fill_in('settings_base.first_setting', with: 'First')
+      uncheck('settings_base.second_setting')
+      fill_in('settings_base.third_setting', with: '100')
+      fill_in('settings_base.four_setting', with: '50.5')
+      fill_in('settings_base.five_setting', with: 'five')
+
+      submit
+
+      expect(Setting['base.first_setting']).to eq 'First'
+      expect(Setting['base.second_setting']).to eq false
+      expect(Setting['base.third_setting']).to eq 100
+      expect(Setting['base.four_setting']).to eq 50.5
+      expect(Setting['base.five_setting']).to eq :five
+    end
+  end
+
+  shared_examples_for 'fill and save second settings to db' do
+    it 'saves settings to db' do
+      fill_in('settings_second.second_setting', with: 'Awesome second')
+      check('settings_second.first_setting')
+
+      submit
+
+      expect(Setting['second.second_setting']).to eq 'Awesome second'
+      expect(Setting['second.first_setting']).to eq true
+      expect(Setting.some.with_indifferent_access).to eq(initial_some_settings)
+    end
+  end
+
+  shared_examples_for 'fill and save some settings to db' do
+    it 'save some settings to db' do
+      fill_in('settings_some.first_setting', with: 'Awesome value')
+      check('settings_some.second_setting')
+
+      submit
+
+      expect(Setting['some']['first_setting']).to eq 'Awesome value'
+      expect(Setting['some']['second_setting']).to eq true
+    end
+  end
+
   context 'global config' do
     before do
       ActiveadminSettingsCached.configure do |config|
-        config.display = {'base.first_setting' => 'string', 'base.second_setting' => 'boolean',
-                          'base.third_setting' => 'number', 'base.four_setting' => 'number',
-                          'second.first_setting' => 'boolean', 'second.second_setting' => 'string'}
+        config.display = {
+          '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',
+          'some.first_setting'    => 'string',
+          'some.second_setting'   => 'boolean'
+        }
       end
+
       add_setting_resource
       add_second_setting_resource
+      add_some_setting_resource
       add_all_setting_resource
     end
 
     context 'all setting index' do
-      it 'when list' do
-        visit '/admin/settings'
-        check_base_setting
-        check_second_setting
-      end
+      before { visit '/admin/settings' }
 
-      it 'when save' do
-        visit '/admin/settings'
-        check_base_setting
-        check_second_setting
-        fill_base_setting
-        fill_second_setting
-        submit
-        fill_base_setting_check
-        fill_second_setting_check
-      end
+      it_behaves_like 'render input with value', 'AAA'
+      it_behaves_like 'render input with value', 'BBB'
+
+      # TODO: fixme
+      # it_behaves_like 'render input with value', Setting['some'].with_indifferent_access
+      it_behaves_like 'fill and save base settings to db'
+      it_behaves_like 'fill and save second settings to db'
     end
   end
 
   context 'with custom template_object' do
     context 'when right object' do
       before do
-        template_object = ActiveadminSettingsCached::Model.new(display: {'base.first_setting' => 'string', 'base.second_setting' => 'boolean',
-                                                                         'base.third_setting' => 'number', 'base.four_setting' => 'number',
-                                                                         'second.first_setting' => 'boolean', 'second.second_setting' => 'string'})
-        add_all_setting_resource(template_object: template_object)
-      end
+        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'
+        }
+
+        add_all_setting_resource(
+          template_object: ActiveadminSettingsCached::Model.new(display: display_settings)
+        )
 
-      it do
         visit '/admin/base_settings'
-        check_base_setting
       end
+
+      it_behaves_like 'render input with value', 'AAA'
     end
 
     context 'when wrong object' do
       before do
-        template_object = nil
-        add_all_setting_resource(template_object: template_object)
-      end
+        add_all_setting_resource(template_object: nil)
 
-      it do
         visit '/admin/base_settings'
-        check_base_setting
       end
+
+      it_behaves_like 'render input with value', 'AAA'
     end
   end
 
-  context 'per page' do
+  context 'when settings on different pages' do
     before do
       ActiveadminSettingsCached.configure do |config|
         config.display = {}
       end
-      add_setting_resource(display: {'base.first_setting' => 'string', 'base.second_setting' => 'boolean',
-                                     'base.third_setting' => 'number', 'base.four_setting' => 'number'})
-      add_second_setting_resource(display: {'second.first_setting' => 'boolean', 'second.second_setting' => 'string'})
-      add_all_setting_resource(display: {'base.first_setting' => 'string', 'base.second_setting' => 'boolean',
-                                         'base.third_setting' => 'number', 'base.four_setting' => 'number',
-                                         'second.first_setting' => 'boolean', 'second.second_setting' => 'string'})
-    end
-
-    context 'setting index' do
-      it 'when list' do
-        visit '/admin/base_settings'
-        check_base_setting
-      end
 
-      it 'when save' do
-        visit '/admin/base_settings'
-        check_base_setting
-        fill_base_setting
-        submit
-        fill_base_setting_check
-      end
+      add_setting_resource(
+        display: {
+          'base.first_setting'  => 'string',
+          'base.second_setting' => 'boolean',
+          'base.third_setting'  => 'number',
+          'base.four_setting'   => 'number',
+          'base.five_setting'   => 'string'
+        }
+      )
+
+      add_second_setting_resource(
+        display: {
+          'second.first_setting'  => 'boolean',
+          'second.second_setting' => 'string'
+        }
+      )
+
+      add_some_setting_resource(
+        display: {
+          'some.first_setting'  => 'string',
+          'some.second_setting' => 'boolean'
+        }
+      )
+
+      add_all_setting_resource(
+        display: {
+          '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'
+        }
+      )
     end
 
-    context 'second setting index' do
-      it 'when list' do
-        visit '/admin/second_settings'
-        check_second_setting
-      end
+    context 'base settings page' do
+      before { visit '/admin/base_settings' }
 
-      it 'when save' do
-        visit '/admin/second_settings'
-        check_second_setting
-        fill_second_setting
-        submit
-        fill_second_setting_check
-      end
+      it_behaves_like 'render input with value', 'AAA'
+      it_behaves_like 'fill and save base settings to db'
     end
 
-    context 'all setting index' do
-      it 'when list' do
-        visit '/admin/settings'
-        check_base_setting
-        check_second_setting
-      end
+    context 'second setting page' do
+      before { visit '/admin/second_settings' }
 
-      it 'when save' do
-        visit '/admin/settings'
-        check_base_setting
-        check_second_setting
-        fill_base_setting
-        fill_second_setting
-        submit
-        fill_base_setting_check
-        fill_second_setting_check
-      end
+      it_behaves_like 'render input with value', 'BBB'
+      it_behaves_like 'fill and save second settings to db'
     end
-  end
-
-  def check_base_setting
-    expect(page).to have_selector("input[value='#{Setting['base.first_setting']}']")
-  end
-
-  def check_second_setting
-    expect(page).to have_selector("input[value='#{Setting['second.second_setting']}']")
-  end
 
-  def fill_base_setting
-    fill_in('settings_base.first_setting', with: 'BBB')
-    uncheck('settings_base.second_setting')
-    fill_in('settings_base.third_setting', with: 100)
-    fill_in('settings_base.four_setting', with: 150.55)
-    fill_in('settings_base.five_setting', with: 'bbb')
+    context 'some setting index' do
+      before { visit '/admin/some_settings' }
 
-  end
+      it_behaves_like 'render input with value', 'CCC'
+      it_behaves_like 'fill and save some settings to db'
+    end
 
-  def fill_second_setting
-    fill_in('settings_second.second_setting', with: 'AAA')
-    check('settings_second.first_setting')
-  end
+    context 'all setting index' do
+      before { visit '/admin/settings' }
 
-  def fill_base_setting_check
-    expect(Setting['base.first_setting']).to eq 'BBB'
-    expect(Setting['base.second_setting']).to eq false
-    expect(Setting['base.third_setting']).to eq 100
-    expect(Setting['base.four_setting']).to eq 150.55
-    expect(Setting['base.five_setting']).to eq :bbb
-  end
+      it_behaves_like 'render input with value', 'AAA'
+      it_behaves_like 'render input with value', 'BBB'
+      # FIXME
+      #it_behaves_like 'render input with value', Setting['some'].with_indifferent_access
 
-  def fill_second_setting_check
-    expect(Setting['second.second_setting']).to eq 'AAA'
-    expect(Setting['second.first_setting']).to eq true
+      it_behaves_like 'fill and save base settings to db'
+      it_behaves_like 'fill and save second settings to db'
+      it { expect(Setting.some.with_indifferent_access).to eq(initial_some_settings) }
+    end
   end
 
   def submit

data/spec/support/admin.rb

@@ -16,6 +16,15 @@ def add_second_setting_resource(options = {}, &block)
   Rails.application.reload_routes!
 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!
+end
+
 def add_all_setting_resource(options = {}, &block)
   options.merge!({model_name: 'Setting', title: 'Settings'})
   ActiveAdmin.register_page options[:title] do

data/spec/support/rails_template.rb

@@ -4,8 +4,9 @@ generate :settings, 'Setting'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-generate :'active_admin:install --skip-users'
+generate :'active_admin:install --skip --skip-users'
 generate :'formtastic:install'
+generate :'settings:install'
 
 # Configure Setup
 inject_into_file 'config/initializers/active_admin.rb', <<-RUBY, before: "ActiveAdmin.setup do |config|"
@@ -14,6 +15,21 @@ inject_into_file 'config/initializers/active_admin.rb', <<-RUBY, before: "Active
   end
 RUBY
 
+# Default Settings
+inject_into_file 'config/app.yml', <<-YAML, after: "defaults: &defaults\n"
+  some:
+    first_setting: AAA
+    second_setting: true
+  'base.first_setting': AAA
+  'base.second_setting': true
+  'base.third_setting': 5
+  'base.four_setting': 5.50
+  'base.five_setting': :aaa
+  'base.six_setting': ['a', 'b']
+  'second.first_setting': false
+  'second.second_setting': BBB
+YAML
+
 route "root :to => 'admin/dashboard#index'"
 
 rake 'db:migrate'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin_settings_cached
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Semyon Pupkov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-25 00:00:00.000000000 Z
+date: 2016-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
@@ -33,7 +33,7 @@ dependencies:
         version: 0.5.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 0.6.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,21 @@ dependencies:
         version: 0.5.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 0.6.6
+- !ruby/object:Gem::Dependency
+  name: dry-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +100,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  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'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -178,7 +206,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
+- Appraisals
+- Dockerfile
 - Gemfile
 - LICENSE.txt
 - Makefile
@@ -186,8 +217,10 @@ files:
 - Rakefile
 - activeadmin_settings_cached.gemspec
 - app/views/admin/settings/_index.html.erb
+- config/locales/de.yml
 - config/locales/en.yml
 - config/locales/ru.yml
+- docker-compose.yml
 - lib/activeadmin_settings_cached.rb
 - lib/activeadmin_settings_cached/coercions.rb
 - lib/activeadmin_settings_cached/dsl.rb
@@ -225,7 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: UI interface for rails-settings-cached in active admin