rails-settings-cached 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 944395ff037e8219792760352c87d03acb83c111
-  data.tar.gz: b06a446b00755294b28d807d77aaae1827926031
+  metadata.gz: 63487ca0f7161c9c7f7e4cb6241bf07551882055
+  data.tar.gz: 2498ef10d3a2a6d16f5b75ba1444f8ffeab5bf31
 SHA512:
-  metadata.gz: bca7d11860ccea2577c2f484cac61b16ae5cdc57a639812926a3029c67dcac2e9200eb0091472d275211cf620363088ab8e4489f036eb5f24d332137c4376ed5
-  data.tar.gz: ff2156a8c94b94b47e1327dabc6cf227e8c53b0a60ad9d0690959b030e8ee3cd73c4bf964f269108a2f522bab8a391fdd989819c98591a51027dcbf1828e89bc
+  metadata.gz: 67341b519564882fa590bbd1a535a8192095b85ded29646e9ee00e6b29bb9a8985c78d07a3f41fdfef57bb51ae5df9ba07bf51fd198bef5200a8c64c816df85c
+  data.tar.gz: fcbeaae817222dd48f874ab7b0c09ffca3b79ce19d4265e9ca57018012314a0228cc493d870efd167d957d0a23d5dd47c387dbfe788b733b8ae3b36e4df92e5e

data/README.md

@@ -9,7 +9,7 @@ of object. Strings, numbers, arrays, or any object.
 
 ## Status
 
-[![Gem Version](https://badge.fury.io/rb/rails-settings-cached.svg)](https://rubygems.org/gems/rails-settings-cached) [![CI Status](https://api.travis-ci.org/huacnlee/rails-settings-cached.svg)](http://travis-ci.org/huacnlee/rails-settings-cached) [![Code Climate](https://codeclimate.com/github/huacnlee/rails-settings-cached/badges/gpa.svg)](https://codeclimate.com/github/huacnlee/rails-settings-cached) [![codecov.io](https://codecov.io/github/huacnlee/rails-settings-cached/coverage.svg?branch=master)](https://codecov.io/github/huacnlee/rails-settings-cached?branch=master)
+[![Gem Version](https://badge.fury.io/rb/rails-settings-cached.svg)](https://rubygems.org/gems/rails-settings-cached) [![CI Status](https://travis-ci.org/huacnlee/rails-settings-cached.svg)](http://travis-ci.org/huacnlee/rails-settings-cached) [![Code Climate](https://codeclimate.com/github/huacnlee/rails-settings-cached/badges/gpa.svg)](https://codeclimate.com/github/huacnlee/rails-settings-cached) [![codecov.io](https://codecov.io/github/huacnlee/rails-settings-cached/coverage.svg?branch=master)](https://codecov.io/github/huacnlee/rails-settings-cached?branch=master)
 
 ## Setup
 
@@ -253,7 +253,7 @@ app/views/admin/settings/edit.html.erb
 ```erb
 <%= form_for(@setting, url: admin_setting_path(@setting.var), method: 'patch') do |f| %>
   <label><%= @setting.var %></label>
-  <%= f.textarea :value, rows: 10 %>
+  <%= f.text_area :value, rows: 10 %>
   <%= f.submit %>
 <% end %>
 ```

data/lib/generators/settings/install_generator.rb

@@ -3,7 +3,7 @@ require 'rails/generators/migration'
 
 module Settings
   class InstallGenerator < Rails::Generators::NamedBase
-    desc "Generate RailsSettings files."
+    desc 'Generate RailsSettings files.'
     include Rails::Generators::Migration
 
     argument :name, type: :string, default: 'setting'
@@ -27,8 +27,16 @@ module Settings
 
     def install_setting
       template 'model.rb', File.join('app/models', class_path, "#{file_name}.rb")
-      template 'app.yml', File.join('config', "app.yml")
-      migration_template 'migration.rb', 'db/migrate/create_settings.rb'
+      template 'app.yml', File.join('config', 'app.yml')
+      migration_template 'migration.rb', 'db/migrate/create_settings.rb', migration_version: migration_version
+    end
+
+    def rails5?
+      Rails.version.start_with? '5'
+    end
+
+    def migration_version
+      "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]" if rails5?
     end
   end
 end

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

@@ -1,4 +1,4 @@
-class CreateSettings < ActiveRecord::Migration
+class CreateSettings < ActiveRecord::Migration<%= migration_version %>
   def self.up
     create_table :settings do |t|
       t.string  :var,        null: false

data/lib/rails-settings/base.rb

@@ -47,7 +47,8 @@ module RailsSettings
       end
 
       def save_default(key, value)
-        Kernel.warn 'DEPRECATION WARNING: RailsSettings save_default is deprecated and it will removed in 0.7.0. ' <<
+        Kernel.warn 'DEPRECATION WARNING: RailsSettings save_default is deprecated ' \
+                    'and it will removed in 0.7.0. ' \
                     'Please use YAML file for default setting.'
         return false unless self[key].nil?
         self[key] = value

data/lib/rails-settings/cached_settings.rb

@@ -1,7 +1,8 @@
 module RailsSettings
   class CachedSettings < Base
     def self.inherited(subclass)
-      Kernel.warn 'DEPRECATION WARNING: RailsSettings::CachedSettings is deprecated and it will removed in 0.7.0. ' <<
+      Kernel.warn 'DEPRECATION WARNING: RailsSettings::CachedSettings is deprecated ' \
+                  'and it will removed in 0.7.0. ' \
                   'Please use RailsSettings::Base instead.'
       super(subclass)
     end

data/lib/rails-settings/default.rb

@@ -19,7 +19,7 @@ module RailsSettings
 
       def [](key)
         # foo.bar.dar Nested fetch value
-        return instance[key] if instance.has_key?(key)
+        return instance[key] if instance.key?(key)
         keys = key.to_s.split('.')
         val = instance
         keys.each do |k|
@@ -40,7 +40,7 @@ module RailsSettings
       content = open(self.class.source_path).read
       hash = content.empty? ? {} : YAML.load(ERB.new(content).result).to_hash
       hash = hash[Rails.env] || {}
-      self.replace hash
+      replace hash
     end
   end
 end

data/lib/rails-settings/settings.rb

@@ -18,6 +18,7 @@ module RailsSettings
 
     class << self
       # get or set a variable with the variable as the called method
+      # rubocop:disable Style/MethodMissing
       def method_missing(method, *args)
         method_name = method.to_s
         super(method, *args)
@@ -47,19 +48,9 @@ module RailsSettings
       def get_all(starting_with = nil)
         vars = thing_scoped.select('var, value')
         vars = vars.where("var LIKE '#{starting_with}%'") if starting_with
-
         result = {}
-        vars.each do |record|
-          result[record.var] = record.value
-        end
-
-        defaults = {}
-        if Default.enabled?
-          defaults = starting_with.nil? ? Default.instance : Default.instance.select { |key, _| key.to_s.start_with?(starting_with) }
-        end
-
-        result.reverse_merge! defaults
-
+        vars.each { |record| result[record.var] = record.value }
+        result.reverse_merge!(default_settings(starting_with))
         result.with_indifferent_access
       end
 
@@ -70,14 +61,9 @@ module RailsSettings
 
       # get a setting value by [] notation
       def [](var_name)
-        if var = object(var_name)
-          val = var.value
-        elsif Default.enabled?
-          val = Default[var_name]
-        else
-          val = nil
-        end
-        val
+        val = object(var_name)
+        return val.value if val
+        return Default[var_name] if Default.enabled?
       end
 
       # set a setting value by [] notation
@@ -120,6 +106,14 @@ module RailsSettings
       def rails_initialized?
         Rails.application && Rails.application.initialized?
       end
+
+      private
+
+      def default_settings(starting_with = nil)
+        return {} unless Default.enabled?
+        return Default.instance if starting_with.nil?
+        Default.instance.select { |key, _| key.to_s.start_with?(starting_with) }
+      end
     end
   end
 end

data/lib/rails-settings/version.rb

@@ -1,7 +1,7 @@
 module RailsSettings
   class << self
     def version
-      '0.6.5'
+      '0.6.6'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-settings-cached
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Jason Lee
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-24 00:00:00.000000000 Z
+date: 2017-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -27,6 +27,76 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  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: rubocop
+  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: simplecov
+  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: rspec
+  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: codecov
+  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: "\n  This is improved from rails-settings, added caching.\n  Settings
   plugin for Rails that makes managing a table of global key,\n  value pairs easy.
   Think of it like a global Hash stored in you database,\n  that uses simple ActiveRecord
@@ -71,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Settings plugin for Rails that makes managing a table of global keys.