system_settings 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 5f17765421feae9372577a362a6529227d3286f667c59733dd326dacc3fc65f6
-  data.tar.gz: bfcd048964c1b8fdf99b91e6c88abae1cf89e3c7bc9e888c55c7827b4556b008
+SHA1:
+  metadata.gz: 47a6c44afe9d52cf548c130a71dc763879c5aa47
+  data.tar.gz: fbeb661a76b0efbbaaf477cc739919175efc0241
 SHA512:
-  metadata.gz: 8c6f652967fa2c4b7db860c7b4b0a596ce85822f8ecef8ca3b2a77fd20856b33757a54dfb13f98fcab5f5546f013722b1b871426c38fecca3ffeb6d6da0be355
-  data.tar.gz: 3206825f36333adbbfcde4c1af5424423f0c2824b9c4c25a8fe506ef68018b5aa299c67392b2e97914808713a133211ef6ed04c22e9d65fbd6eabe7e4bb16931
+  metadata.gz: 2d18357fdecc7756e53716380910ac2fd8731b6999453c7c458f176fc8a94dc4cfdb43404004c688d64b4d544ee6b099191d01e97060727fa27b13218442ca28
+  data.tar.gz: 26f09571be71f63f1526c6e2dd9cd8c31615ecba1222319ab7d9e9eab0bc8b95d3b05560de85974deede6bdd3c07909bf618c02cff30c9279dc5f82e0a70ed5b

data/app/models/system_settings/configurator.rb

@@ -1,13 +1,14 @@
 module SystemSettings
   class Configurator
     class << self
-      def from_file(path)
-        path_str = path.to_s
-        raise SystemSettings::Errors::SettingsReadError, "#{path_str} file does not exist" unless File.exist?(path_str)
-        raise SystemSettings::Errors::SettingsReadError, "#{path_str} file not readable" unless File.readable?(path_str)
-        file_content = File.read(path_str)
+      def from_file(file_name)
+        file_name = file_name.to_path if file_name.respond_to?(:to_path)
+        raise Errors::SettingsReadError, "The file name must either be a String or implement #to_path" unless file_name.is_a?(String)
+        raise Errors::SettingsReadError, "#{file_name} file does not exist" unless File.exist?(file_name)
+        raise Errors::SettingsReadError, "#{file_name} file not readable" unless File.readable?(file_name)
+        file_content = File.read(file_name)
         new.tap do |obj|
-          obj.instance_eval(file_content, path_str, 1)
+          obj.instance_eval(file_content, file_name, 1)
         end
       end
 
@@ -54,7 +55,7 @@ module SystemSettings
           @items.each do |entry|
             persisted_record = entry[:class].find_by(name: entry[:name])
             if persisted_record
-              persisted_record.update_attributes!(description: entry[:description])
+              persisted_record.update!(description: entry[:description])
             else
               entry[:class].create!(name: entry[:name], value: entry[:value], description: entry[:description])
             end

data/app/models/system_settings/errors/error.rb

@@ -0,0 +1,6 @@
+module SystemSettings
+  module Errors
+    class Error < StandardError
+    end
+  end
+end

data/app/models/system_settings/errors/not_found_error.rb

@@ -0,0 +1,6 @@
+module SystemSettings
+  module Errors
+    class NotFoundError < Error
+    end
+  end
+end

data/app/models/system_settings/errors/settings_read_error.rb

@@ -1,6 +1,6 @@
 module SystemSettings
   module Errors
-    class SettingsReadError < StandardError
+    class SettingsReadError < Error
     end
   end
 end

data/app/models/system_settings/type/integer_list.rb

@@ -21,15 +21,19 @@ module SystemSettings
         case value
         when Array
           value.map do |v|
-            v.to_i
-          rescue StandardError
-            nil
+            begin
+              v.to_i
+            rescue StandardError
+              nil
+            end
           end
         when String
           value.split(SEPARATOR).map do |v|
-            v.to_i
-          rescue StandardError
-            nil
+            begin
+              v.to_i
+            rescue StandardError
+              nil
+            end
           end
         end
       end

data/lib/system_settings.rb

@@ -1,18 +1,13 @@
 require "system_settings/engine"
 
 module SystemSettings
-  @@settings_file_path = nil
-
-  def self.settings_file_path
-    @@settings_file_path
-  end
-
-  def self.settings_file_path=(value)
-    @@settings_file_path = value
+  class << self
+    attr_accessor :settings_file_path
   end
 
   def self.[](name)
-    Setting.find_by!(name: name).value
+    record = Setting.find_by(name: name) || raise(Errors::NotFoundError, "Couldn't find system setting #{name}")
+    record.value
   end
 
   def self.load

data/lib/system_settings/version.rb

@@ -1,3 +1,3 @@
 module SystemSettings
-  VERSION = "0.3.0".freeze
+  VERSION = "0.4.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: system_settings
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Krists Ozols
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-25 00:00:00.000000000 Z
+date: 2019-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -41,6 +41,8 @@ files:
 - app/models/system_settings/application_record.rb
 - app/models/system_settings/boolean_setting.rb
 - app/models/system_settings/configurator.rb
+- app/models/system_settings/errors/error.rb
+- app/models/system_settings/errors/not_found_error.rb
 - app/models/system_settings/errors/settings_read_error.rb
 - app/models/system_settings/integer_list_setting.rb
 - app/models/system_settings/integer_setting.rb
@@ -79,14 +81,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.6.14.4
 signing_key: 
 specification_version: 4
 summary: Settings for your Rails application