active_setting 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d905b6225a4c743215e6f56aee659741c83b4c7
-  data.tar.gz: 6956767bbc1c17ad2a3584fa8ea1790de01467f2
+  metadata.gz: 36b602a83a7757e51d0a71e2aae6b673f5725db0
+  data.tar.gz: 6d5334e081cc113f666f52a351f7cde871dc2bbc
 SHA512:
-  metadata.gz: 3e098853466eceae1c2314305c732de831e83fe1f3eec075b6cb8fc86c6503833c98bd7e424edb9fe6faa4b74d872055026d7d307fabadc4521551d7cd1b79bf
-  data.tar.gz: 9cff93d5a668cae4d80f6107c38db9d69be6612411f54824b420512a524acc02028fb4635ead2c1b68f341c4fc79e8933d91cd4861ff8b3a520adc938d8ff615
+  metadata.gz: ff7d50bdfda6ed4902c7558495afd66a57820cd7a522299c132b70da259f047bff484c30205a1df91eaddd318953e8ae6d3596af3bb02cd2b17bb2797cbd3956
+  data.tar.gz: 61f7b32df626bc0bb834e26fd0892387aa9f0f8239481f47bb2add5ae55631e0908e6245582e0da15d8e07dd68aa77888d29a5580be92f2c38f242e96f7c28a8

data/CHANGELOG.rb

@@ -0,0 +1,5 @@
+# Changelog
+
+## 0.1.0
+
+* Support raw values being non string

data/lib/active_setting/loader.rb

@@ -38,6 +38,7 @@ module ActiveSetting
     def load_settings
       settings_config.each do |category_name, settings|
         settings.each do |setting_name, values|
+          values ||= {}
           attrs = values.merge(
             data_type: values['type'],
             category:  category_name,
@@ -51,6 +52,7 @@ module ActiveSetting
     def build_hash
       settings_config.map.with_object({}) do |(category_name, settings), hash|
         settings.each do |setting_name, values|
+          values ||= {}
           attrs = values.merge(
             data_type: values['type'],
             category:  category_name,

data/lib/active_setting/setting.rb

@@ -80,7 +80,8 @@ module ActiveSetting
     end
 
     def value
-      v = raw_value || default
+      v = raw_value
+      v = default if raw_value.nil?
 
       # TODO: WHY IS the first line here
       return nil if v.nil?
@@ -121,8 +122,8 @@ module ActiveSetting
     end
 
     def csv_value(v)
-      return v if v.empty? # e.g. default = []
-      v.split(',').map(&:strip).map { |e| Setting.convert_value(e, subtype) }
+      return v if v.is_a?(Array) # e.g. default = []
+      v.to_s.split(',').map(&:strip).map { |e| Setting.convert_value(e, subtype) }
     end
   end
 end

data/lib/active_setting/version.rb

@@ -1,3 +1,3 @@
 module ActiveSetting
-  VERSION = '0.0.1'
+  VERSION = '0.1.0'
 end

data/spec/loader_spec.rb

@@ -6,7 +6,7 @@ describe ActiveSetting::Loader do
   it 'should parse a settings file to get settings' do
     ActiveSetting::Loader.load_settings(config_filename)
     settings = ActiveSetting::Setting.registered_settings
-    settings.keys.should include :maximum_percent
+    expect(settings.keys).to include :maximum_percent
   end
 
   context 'when building a settings hash from the settings file' do

data/spec/setting_spec.rb

@@ -1,80 +1,130 @@
 require 'spec_helper'
 
 describe ActiveSetting::Setting, 'with types/casting' do
-  it 'should handle basic types and casting' do
-    s = ActiveSetting::Setting.new(data_type: :integer, raw_value: '6')
-    s.value.should eq 6
+  subject { ActiveSetting::Setting.new(data_type: data_type, raw_value: raw_value).value }
 
-    s = ActiveSetting::Setting.new(data_type: :decimal, raw_value: '7.6')
-    s.value.should eq 7.6
+  context 'when integer 6' do
+    let(:data_type) { :integer }
+    let(:raw_value) { '6' }
+    it { is_expected.to eq 6 }
+  end
 
-    s = ActiveSetting::Setting.new(data_type: :symbol, raw_value: 'hello')
-    s.value.should eq :hello
+  context 'when decimal 7.6' do
+    let(:data_type) { :decimal }
+    let(:raw_value) { '7.6' }
+    it { is_expected.to eq 7.6 }
+  end
 
-    s = ActiveSetting::Setting.new(raw_value: 'hello')
-    s.value.should eq 'hello'
+  context 'when symbol hello' do
+    let(:data_type) { :symbol }
+    let(:raw_value) { 'hello' }
+    it { is_expected.to eq :hello }
   end
 
-  it 'should handle boolean types' do
-    s = ActiveSetting::Setting.new(data_type: :boolean, raw_value: '0')
-    s.value.should be false
+  context 'when unspecified hello' do
+    let(:data_type) { nil }
+    let(:raw_value) { 'hello' }
+    it { is_expected.to eq 'hello' }
+  end
 
-    s = ActiveSetting::Setting.new(data_type: :boolean, raw_value: 'false')
-    s.value.should be false
+  context 'when boolean' do
+    let(:data_type) { :boolean }
 
-    s = ActiveSetting::Setting.new(data_type: :boolean, raw_value: '1')
-    s.value.should be true
+    context 'when 0' do
+      let(:raw_value) { '0' }
+      it { is_expected.to be false }
+    end
 
-    s = ActiveSetting::Setting.new(data_type: :boolean, raw_value: 'true')
-    s.value.should be true
+    context 'when false' do
+      let(:raw_value) { 'false' }
+      it { is_expected.to be false }
+    end
+
+    context 'when boolean false' do
+      let(:raw_value) { false }
+      it { is_expected.to be false }
+    end
+
+    context 'when 1' do
+      let(:raw_value) { '1' }
+      it { is_expected.to be true }
+    end
+
+    context 'when true' do
+      let(:raw_value) { 'true' }
+      it { is_expected.to be true }
+    end
+
+    context 'when boolean true' do
+      let(:raw_value) { true }
+      it { is_expected.to be true }
+    end
   end
 
-  it 'should handle multi value types including subvalue types and handle spacing' do
-    s = ActiveSetting::Setting.new(data_type: :csv, subtype: :integer, raw_value: '1,2,3')
-    s.value.should eq [1, 2, 3]
+  context 'when csv' do
+    subject { ActiveSetting::Setting.new(default: default, data_type: data_type, subtype: subtype, raw_value: raw_value).value }
+    let(:default) { [] }
+    let(:data_type) { :csv }
+    context 'when array of integers' do
+      let(:subtype) { :integer }
+      let(:raw_value) { '1,2,3' }
+      it { is_expected.to eq [1, 2, 3] }
+
+      context 'when raw value is type cast' do
+        let(:raw_value) { 1 }
+        it { is_expected.to eq [1] }
+      end
+
+      context 'when no value, so default' do
+        let(:raw_value) { nil }
+        it { is_expected.to eq [] }
 
-    s = ActiveSetting::Setting.new(data_type: :csv, subtype: :symbol, raw_value: 'first, second')
-    s.value.should eq [:first, :second]
+        context 'when default a non empty array' do
+          let(:default) { [1, 2] }
+          it { is_expected.to eq [1, 2] }
+        end
+      end
+    end
+
+    context 'when array of symbols' do
+      let(:subtype) { :symbol }
+      let(:raw_value) { 'first, second' } # deliberate spacing
+      it { is_expected.to eq [:first, :second] }
+    end
+  end
 
-    s = ActiveSetting::Setting.new(data_type: :hash, raw_value: 'a:1 , b : 2')
-    s.value.should eq(a: '1', b: '2')
+  context 'when hash' do
+    let(:data_type) { :hash }
+    let(:raw_value) { 'a:1 , b : 2' } # deliberate spacing
+    it { is_expected.to eq(a: '1', b: '2') }
   end
 end
 
 describe ActiveSetting::Setting, 'when having options' do
-  it 'should format the options in the right type' do
-    s = ActiveSetting::Setting.new(options: 'easy normal hard')
-    s.options.should eq %w(easy normal hard)
+  context 'with regular options' do
+    subject { ActiveSetting::Setting.new(options: 'easy normal hard').options }
+    it { is_expected.to eq %w(easy normal hard) }
   end
 
-  it 'should format the options by key,value when object options' do
-    first  = double(id: '1', name: 'First')
-    second = double(id: '2', name: 'Second')
-    s = ActiveSetting::Setting.new
-    s.objects_from_collection([first, second], :name, :id).should eq [%w(First 1), %w(Second 2)]
+  context 'calculating objects from collection' do
+    let(:first) { double(id: '1', name: 'First') }
+    let(:second) { double(id: '2', name: 'Second') }
+    subject { ActiveSetting::Setting.new.objects_from_collection([first, second], :name, :id) }
+    it { is_expected.to eq [%w(First 1), %w(Second 2)] }
   end
 
-  it 'should not cache object options' do
-    class Model
-      attr_accessor :id, :name
-
-      def self.objects
-        @objects ||= []
-      end
+  context 'with object options' do
+    before do
+      stub_const 'Model', double(all: objects)
+    end
 
-      def self.all
-        objects
-      end
+    subject { ActiveSetting::Setting.new(object_options: 'Model.all id name').options }
+    let(:objects) { [] }
+    it { is_expected.to eq [] }
 
-      class << self
-        attr_writer :objects
-      end
+    context 'when objects exist' do
+      let(:objects) { [double(id: 1, name: 'First')] }
+      it { is_expected.to eq [[1, 'First']] }
     end
-
-    s = ActiveSetting::Setting.new(object_options: 'Model.all id name')
-    s.options.should eq []
-    first = double(id: 1, name: 'First')
-    Model.objects = [first]
-    s.options.should eq [[1, 'First']]
   end
 end

data/spec/settings.yml

@@ -1,6 +1,7 @@
 ---
 settings:
   general_category:
+    minimalist:
     maximum_percent:
       default: 50
       type: integer

data/spec/spec_helper.rb

@@ -12,7 +12,7 @@ require 'support/coverage_loader'
 require 'active_setting'
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.raise_errors_for_deprecations!
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 end

data/spec/support/coverage_loader.rb

@@ -1,4 +1,4 @@
-MINIMUM_COVERAGE = 90
+MINIMUM_COVERAGE = 97
 
 unless ENV['COVERAGE'] == 'off'
   require 'simplecov'
@@ -18,8 +18,9 @@ unless ENV['COVERAGE'] == 'off'
   SimpleCov.at_exit do
     SimpleCov.result.format!
     percent = SimpleCov.result.covered_percent
+    puts "Coverage is #{"%.2f" % percent}%"
     unless percent >= MINIMUM_COVERAGE
-      puts "Coverage must be above #{MINIMUM_COVERAGE}%. It is #{"%.2f" % percent}%"
+      puts "Coverage must be above #{MINIMUM_COVERAGE}%"
       Kernel.exit(1)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_setting
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Michael Noack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-17 00:00:00.000000000 Z
+date: 2016-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -135,6 +135,7 @@ files:
 - ".ruby-style.yml"
 - ".ruby-version"
 - ".travis.yml"
+- CHANGELOG.rb
 - Gemfile
 - README.md
 - Rakefile
@@ -168,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Store active_settings of various data types