settingson 1.7.10 → 1.7.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f386d06c5ca9c9f4bc53680acde702b3c220b9dc
-  data.tar.gz: 0dd5979d1f284281186bf6bfb5c53fe4df11cd4a
+SHA256:
+  metadata.gz: 77416ee44fa51d80f97005138cfa2a6a10ab2e50f02e076842521bfe322ae5bc
+  data.tar.gz: e92a08a7ccb71b9330cce083f5792642eab0d97d9af740f40587e9eb375fb976
 SHA512:
-  metadata.gz: 28731bc9f03371ff13bfaa45dcf3ab0bea0b896d532607c55ec3df27aeae7cbcdf254714f13bb71e4eb58aac45cf357d1f55f8db3adf7a6076606e63b1924e3d
-  data.tar.gz: 7b901c14b6d6d31409fe334db1fd7266ebad1b5206527f45f681cd4ae0a845261ad2a7d215af470fe40a16e4456ed87e7925c82c8e6bfbd450bde1b5fb7295b8
+  metadata.gz: 135b6c8757682993c6f7fced3bd4cf89ea4cbc1543ef4218bbe2ec903e9e1831fe85604f1aedbe0f2f4ba4d42ccff8acc43be12235147ba26d7d437acbfdd529
+  data.tar.gz: 8cdfeb69e3bd6da679c0614792dff85c0bddacc5950f5faccd9daa5d606e960d7b123a7427b296945aa55538c53a1166d02d9fe21250e7facaad2aeaf2059eb9

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
+cache: bundler
 
 sudo: false
 #cache: bundler
@@ -6,13 +7,16 @@ sudo: false
 script: "bundle exec rspec && bundle exec codeclimate-test-reporter"
 
 rvm:
-  - 2.2.2
-  - 2.4.1
+  - 2.2
+  - 2.3
+  - 2.4
+  - 2.6
 
 gemfile:
   - gemfiles/4.2.gemfile
   - gemfiles/5.0.gemfile
   - gemfiles/5.1.gemfile
+  - gemfiles/5.2.gemfile
 
 env:
   - CODECLIMATE_REPO_TOKEN=620b22e287791de2c9f8a522182ddf57098302ff8958768f8192eaaa7d8a685d

data/Appraisals

@@ -1,11 +1,15 @@
 appraise "4.2" do
-  gem "rails", "~> 4.2.0"
+  gem "rails", "~> 4.2"
 end
 
 appraise "5.0" do
-  gem "rails", "~> 5.0.0"
+  gem "rails", "~> 5.0"
 end
 
 appraise "5.1" do
-  gem "rails", "~> 5.1.0"
+  gem "rails", "~> 5.1"
+end
+
+appraise "5.2" do
+  gem "rails", "~> 5.1"
 end

data/README.md

@@ -120,9 +120,9 @@ end
 ## The initial values
 in config/initializers/settingson.rb
 ```ruby
-Settings.defaults do |conf|
-  conf.server.smtp.host = 'host'
-  conf.server.smtp.port = 25
+Settings.defaults do |default|
+  default.server.smtp.host = 'host'
+  default.server.smtp.port = 25
 end
 
 Settings.server.smtp.host # => 'host'
@@ -136,11 +136,14 @@ in config/initializers/settingson.rb
 if Rails.env.development?
   Settings.configure.debug         = true
   Settings.configure.trace         = 3
-  Settings.configure.cache.enabled = false (default: true)
+  Settings.configure.cache.enabled = false # default: true
 end
-
-Caching is disabled by default only in test environment.
 ```
+Caching is disabled by default only in test environment.
+
+## TODO:
+* Skip key search when assignment requested
+
 
 ## Contributing
 

data/app/models/concerns/settingson/base.rb

@@ -64,7 +64,7 @@ module Settingson::Base
   end # module ClassMethods
 
   included do
-    serialize      :value
+    serialize      :value, coder: JSON
     before_destroy :__delete_cached
   end
 

data/gemfiles/4.2.gemfile

@@ -3,6 +3,6 @@
 source "https://rubygems.org"
 
 gem "codeclimate-test-reporter", group: :test, require: nil
-gem "rails", "~> 4.2.0"
+gem "rails", "~> 4.2"
 
 gemspec path: "../"

data/gemfiles/4.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    settingson (1.7.9)
+    settingson (1.7.10)
       rails (>= 4.0)
 
 GEM
@@ -150,7 +150,7 @@ DEPENDENCIES
   codeclimate-test-reporter
   database_cleaner
   faker
-  rails (~> 4.2.0)
+  rails (~> 4.2)
   rails-dummy
   rspec (~> 3.5)
   rspec-rails (~> 3.5)
@@ -158,4 +158,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.15.4
+   1.16.6

data/gemfiles/5.0.gemfile

@@ -3,6 +3,6 @@
 source "https://rubygems.org"
 
 gem "codeclimate-test-reporter", group: :test, require: nil
-gem "rails", "~> 5.0.0"
+gem "rails", "~> 5.0"
 
 gemspec path: "../"

data/gemfiles/5.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    settingson (1.7.9)
+    settingson (1.7.10)
       rails (>= 4.0)
 
 GEM
@@ -157,7 +157,7 @@ DEPENDENCIES
   codeclimate-test-reporter
   database_cleaner
   faker
-  rails (~> 5.0.0)
+  rails (~> 5.0)
   rails-dummy
   rspec (~> 3.5)
   rspec-rails (~> 3.5)
@@ -165,4 +165,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.15.4
+   1.16.6

data/gemfiles/5.1.gemfile

@@ -3,6 +3,6 @@
 source "https://rubygems.org"
 
 gem "codeclimate-test-reporter", group: :test, require: nil
-gem "rails", "~> 5.1.0"
+gem "rails", "~> 5.1"
 
 gemspec path: "../"

data/gemfiles/5.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    settingson (1.7.9)
+    settingson (1.7.10)
       rails (>= 4.0)
 
 GEM
@@ -157,7 +157,7 @@ DEPENDENCIES
   codeclimate-test-reporter
   database_cleaner
   faker
-  rails (~> 5.1.0)
+  rails (~> 5.1)
   rails-dummy
   rspec (~> 3.5)
   rspec-rails (~> 3.5)
@@ -165,4 +165,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.15.4
+   1.16.6

data/gemfiles/5.2.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "codeclimate-test-reporter", group: :test, require: nil
+gem "rails", "~> 5.1"
+
+gemspec path: "../"

data/gemfiles/5.2.gemfile.lock

@@ -0,0 +1,168 @@
+PATH
+  remote: ..
+  specs:
+    settingson (1.7.10)
+      rails (>= 4.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (5.1.4)
+      actionpack (= 5.1.4)
+      nio4r (~> 2.0)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.1.4)
+      actionpack (= 5.1.4)
+      actionview (= 5.1.4)
+      activejob (= 5.1.4)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.1.4)
+      actionview (= 5.1.4)
+      activesupport (= 5.1.4)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.1.4)
+      activesupport (= 5.1.4)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.1.4)
+      activesupport (= 5.1.4)
+      globalid (>= 0.3.6)
+    activemodel (5.1.4)
+      activesupport (= 5.1.4)
+    activerecord (5.1.4)
+      activemodel (= 5.1.4)
+      activesupport (= 5.1.4)
+      arel (~> 8.0)
+    activesupport (5.1.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (8.0.0)
+    builder (3.2.3)
+    codeclimate-test-reporter (1.0.8)
+      simplecov (<= 0.13)
+    concurrent-ruby (1.0.5)
+    crass (1.0.3)
+    database_cleaner (1.6.2)
+    diff-lcs (1.3)
+    docile (1.1.5)
+    erubi (1.7.0)
+    faker (1.8.4)
+      i18n (~> 0.5)
+    globalid (0.4.1)
+      activesupport (>= 4.2.0)
+    i18n (0.9.1)
+      concurrent-ruby (~> 1.0)
+    json (2.1.0)
+    loofah (2.1.1)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
+    method_source (0.9.0)
+    mini_mime (1.0.0)
+    mini_portile2 (2.3.0)
+    minitest (5.11.3)
+    nio4r (2.1.0)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
+    rack (2.0.3)
+    rack-test (0.8.2)
+      rack (>= 1.0, < 3)
+    rails (5.1.4)
+      actioncable (= 5.1.4)
+      actionmailer (= 5.1.4)
+      actionpack (= 5.1.4)
+      actionview (= 5.1.4)
+      activejob (= 5.1.4)
+      activemodel (= 5.1.4)
+      activerecord (= 5.1.4)
+      activesupport (= 5.1.4)
+      bundler (>= 1.3.0)
+      railties (= 5.1.4)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-dummy (0.0.4)
+      rails
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (5.1.4)
+      actionpack (= 5.1.4)
+      activesupport (= 5.1.4)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (12.3.2)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-rails (3.7.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.0)
+    simplecov (0.13.0)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    sprockets (3.7.1)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.3.13)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.4)
+      thread_safe (~> 0.1)
+    websocket-driver (0.6.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  bundler (>= 1.6)
+  codeclimate-test-reporter
+  database_cleaner
+  faker
+  rails (~> 5.1)
+  rails-dummy
+  rspec (~> 3.5)
+  rspec-rails (~> 3.5)
+  settingson!
+  sqlite3
+
+BUNDLED WITH
+   1.17.2

data/lib/generators/{settingson/settingson_generator.rb → settingson_generator.rb}

@@ -8,18 +8,12 @@ class SettingsonGenerator < Rails::Generators::NamedBase
   def settingson_migration
     klass = name.camelize
     say "Searching for #{klass} class"
-    if Object.const_defined?(klass)
 
-      settingson_inject_lines(name)
-
-      if klass.constantize.column_names.include?('name')
-        migration_template 'migrations/rename_name_to_key_on_settings.rb', 'db/migrate/rename_name_to_key_on_settings.rb'
-      end
-
-    else
+    unless Object.const_defined?(klass)
       generate(:model, "#{klass} key:string:uniq value:text --force-plural")
-      settingson_inject_lines(name)
     end
+
+    settingson_inject_lines(name)
   end
 
   def self.next_migration_number dirname
@@ -28,8 +22,9 @@ class SettingsonGenerator < Rails::Generators::NamedBase
 
   private
   def settingson_inject_lines(name)
-    if File.readlines("app/models/#{name.downcase}.rb").grep(/\A\s*include Settingson::Base\z/).blank?
-      inject_into_class "app/models/#{name.downcase}.rb", name.camelize, "\tinclude Settingson::Base\n"
+    file = Rails.root.join("app/models/#{name.downcase}.rb")
+    if File.readlines(file).grep(/\A\s*include Settingson::Base\z/).blank?
+      inject_into_class file, name.camelize, "\tinclude Settingson::Base\n"
     end
   end
-end
+end

data/lib/settingson/version.rb

@@ -1,3 +1,3 @@
 module Settingson
-  VERSION = "1.7.10"
+  VERSION = "1.7.15"
 end

data/settingson.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib", "app/models/concerns"]
 
   spec.required_ruby_version = ">= 2.0"
-  spec.add_runtime_dependency "rails", ">= 4.0"
+  spec.add_runtime_dependency "rails", ">= 7.1"
   spec.add_development_dependency "appraisal"
   spec.add_development_dependency "bundler", ">= 1.6"
   spec.add_development_dependency "rails-dummy"

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: settingson
 version: !ruby/object:Gem::Version
-  version: 1.7.10
+  version: 1.7.15
 platform: ruby
 authors:
 - dan
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-25 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -161,8 +160,9 @@ files:
 - gemfiles/5.0.gemfile.lock
 - gemfiles/5.1.gemfile
 - gemfiles/5.1.gemfile.lock
-- lib/generators/settingson/settingson_generator.rb
-- lib/generators/settingson/templates/migrations/rename_name_to_key_on_settings.rb
+- gemfiles/5.2.gemfile
+- gemfiles/5.2.gemfile.lock
+- lib/generators/settingson_generator.rb
 - lib/settingson.rb
 - lib/settingson/config.rb
 - lib/settingson/default.rb
@@ -227,7 +227,6 @@ homepage: https://github.com/daanforever/settingson
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -243,9 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Settings management for Ruby on Rails applications (with ActiveRecord)
 test_files:

data/lib/generators/settingson/templates/migrations/rename_name_to_key_on_settings.rb

@@ -1,5 +0,0 @@
-class RenameNameToKeyOnSettings < ActiveRecord::Migration
-  def change
-    rename_column :settings, :name, :key
-  end
-end