configurability 3.1.2 → 3.2.0.pre20170417124946

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c45a9143a15707d91401576cb803aceedd10855
-  data.tar.gz: 73ccce66fcded9ec68e40913f17a9524cdb1c88b
+  metadata.gz: 0e8dd8f36e8946a47bb0995306511f0b294cb017
+  data.tar.gz: 328e482e54d855294152c4cdd6c3a681537970a0
 SHA512:
-  metadata.gz: 2429a91eacfdac2d85086a7c27df4eef69df8e9829305cb305beb406c47e130028a0e0e6de015c032524e3a793e504857de5c64033fe129935db1c596e4a15bf
-  data.tar.gz: a167625e37fd5e66f1416d3c68751dc1ab7bfa2c7fdc0690dc102f5a86d7f291851d27491a51f154f146c98b1d9fe2cc5aafba4e7faaedeaa09edceaf0802c8a
+  metadata.gz: 0d44d26d9266ebdf4356507f42714471015a99c3a889d9b373ed89a8958db681ce35a0e4af16962d74aceb5d803c6b511c4dd473d72ed1b49d203424081d7781
+  data.tar.gz: 6050a8d1125b623b4ffa2f4795c7df05ad846977e01cdee654ff944c4bc9deee16f7488781f1b66b0eef93ccdba997fe9bb72dde84262abe7ed782647a6817ef

data/README.md

@@ -75,7 +75,7 @@ some settings:
             setting :user
             setting :password
             setting :port do |value|
-                Integer( value )
+                Integer( value ) if value
             end
         end
     end
@@ -85,7 +85,12 @@ three subkey settings under it (with getters and setters) to the class. It also
 adds a `configure` class method that will set whichever of the settings are
 passed to it, defaulting the `url` to the provided value if it's not given.
 
-The `setting` can include a block which is given the config value before it's set; from this block you can do validity-checking, cast it to something other than a String, etc. The new value will be set to the return value of the block.
+The `setting` can include a block which is given the config value before it's
+set; from this block you can do validity-checking, cast it to something other
+than a String, etc. The new value will be set to the return value of the block.
+Note that this will be called with the default for the setting when it's
+declared, so the block should be able to handle the default (even if it's
+`nil`).
 
 If your config file (e.g., `config.yml`) looks like this:
 

data/lib/configurability/setting_installer.rb

@@ -39,17 +39,46 @@ class Configurability::SettingInstaller
 
 	### Add accessors with the specified +name+ to the target.
 	def add_setting_accessors( name, options, &writer_hook )
-		reader = lambda { self.instance_variable_get("@#{name}") }
-		writer = lambda do |value|
-			value = writer_hook[ value ] if writer_hook
-			self.instance_variable_set( "@#{name}", value )
-		end
+		reader = self.make_setting_reader( name, options )
+		writer = self.make_setting_writer( name, options, &writer_hook )
 
 		self.target.define_singleton_method( "#{name}", &reader )
 		self.target.define_singleton_method( "#{name}=", &writer )
 	end
 
 
+	### Create the body of the setting reader method with the specified +name+ and +options+.
+	def make_setting_reader( name, options )
+		if options[:use_class_vars]
+			return lambda do
+				Loggability[ Configurability ].debug "Using class variables for %s of %p" %
+					[ name, self ]
+				self.class_variable_get("@@#{name}")
+			end
+		else
+			return lambda { self.instance_variable_get("@#{name}") }
+		end
+	end
+
+
+	### Create the body of the setting writer method with the specified +name+ and +options+.
+	def make_setting_writer( name, options, &writer_hook )
+		if options[:use_class_vars]
+			return lambda do |value|
+				Loggability[ Configurability ].debug "Using class variables for %s of %p" %
+					[ name, self ]
+				value = writer_hook[ value ] if writer_hook
+				self.class_variable_set( "@@#{name}", value )
+			end
+		else
+			return lambda do |value|
+				value = writer_hook[ value ] if writer_hook
+				self.instance_variable_set( "@#{name}", value )
+			end
+		end
+	end
+
+
 	### Add a default for +name+ to the CONFIG_DEFAULTS constant of the target, creating
 	### it if necessary.
 	def add_default( name, options )

data/spec/configurability_spec.rb

@@ -684,6 +684,27 @@ describe Configurability do
 		end
 
 
+		it "allows the use of class variables instead of class-instance variables for settings on a Class" do
+			superclass = Class.new
+			superclass.extend( Configurability )
+			superclass.configurability( :plugin ) do
+				setting :api_key, default: 'service_api_key', use_class_vars: true
+				setting :environment, default: 'development'
+			end
+
+			subclass = Class.new( superclass )
+
+			expect {
+				superclass.api_key = 'QzCoukGwAWDMjyTkQzWnCXhhgEs'
+			}.to change { subclass.api_key }.
+				from( 'service_api_key' ).
+				to( 'QzCoukGwAWDMjyTkQzWnCXhhgEs' )
+			expect {
+				superclass.environment = 'production'
+			}.to_not change { subclass.environment }.
+				from( nil )
+		end
+
 	end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: configurability
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.2.0.pre20170417124946
 platform: ruby
 authors:
 - Michael Granger
@@ -9,34 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIEbDCCAtSgAwIBAgIBATANBgkqhkiG9w0BAQsFADA+MQwwCgYDVQQDDANnZWQx
-  GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
-  HhcNMTYwODIwMTgxNzQyWhcNMTcwODIwMTgxNzQyWjA+MQwwCgYDVQQDDANnZWQx
-  GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
-  ggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC/JWGRHO+USzR97vXjkFgt
-  83qeNf2KHkcvrRTSnR64i6um/ziin0I0oX23H7VYrDJC9A/uoUa5nGRJS5Zw/+wW
-  ENcvWVZS4iUzi4dsYJGY6yEOsXh2CcF46+QevV8iE+UmbkU75V7Dy1JCaUOyizEt
-  TH5UHsOtUU7k9TYARt/TgYZKuaoAMZZd5qyVqhF1vV+7/Qzmp89NGflXf2xYP26a
-  4MAX2qqKX/FKXqmFO+AGsbwYTEds1mksBF3fGsFgsQWxftG8GfZQ9+Cyu2+l1eOw
-  cZ+lPcg834G9DrqW2zhqUoLr1MTly4pqxYGb7XoDhoR7dd1kFE2a067+DzWC/ADt
-  +QkcqWUm5oh1fN0eqr7NsZlVJDulFgdiiYPQiIN7UNsii4Wc9aZqBoGcYfBeQNPZ
-  soo/6za/bWajOKUmDhpqvaiRv9EDpVLzuj53uDoukMMwxCMfgb04+ckQ0t2G7wqc
-  /D+K9JW9DDs3Yjgv9k4h7YMhW5gftosd+NkNC/+Y2CkCAwEAAaN1MHMwCQYDVR0T
-  BAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFHKN/nkRusdqCJEuq3lgB3fJvyTg
-  MBwGA1UdEQQVMBOBEWdlZEBGYWVyaWVNVUQub3JnMBwGA1UdEgQVMBOBEWdlZEBG
-  YWVyaWVNVUQub3JnMA0GCSqGSIb3DQEBCwUAA4IBgQAPJzKiT0zBU7kpqe0aS2qb
-  FI0PJ4y5I8buU4IZGUD5NEt/N7pZNfOyBxkrZkXhS44Fp+xwBH5ebLbq/WY78Bqd
-  db0z6ZgW4LMYMpWFfbXsRbd9TU2f52L8oMAhxOvF7Of5qJMVWuFQ8FPagk2iHrdH
-  inYLQagqAF6goWTXgAJCdPd6SNeeSNqA6vlY7CV1Jh5kfNJJ6xu/CVij1GzCLu/5
-  DMOr26DBv+qLJRRC/2h34uX71q5QgeOyxvMg+7V3u/Q06DXyQ2VgeeqiwDFFpEH0
-  PFkdPO6ZqbTRcLfNH7mFgCBJjsfSjJrn0sPBlYyOXgCoByfZnZyrIMH/UY+lgQqS
-  6Von1VDsfQm0eJh5zYZD64ZF86phSR7mUX3mXItwH04HrZwkWpvgd871DZVR3i1n
-  w8aNA5re5+Rt/Vvjxj5AcEnZnZiz5x959NaddQocX32Z1unHw44pzRNUur1GInfW
-  p4vpx2kUSFSAGjtCbDGTNV2AH8w9OU4xEmNz8c5lyoA=
-  -----END CERTIFICATE-----
-date: 2017-01-16 00:00:00.000000000 Z
+- certs/ged.pem
+date: 2017-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: loggability
@@ -72,14 +46,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: hoe-highline
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +116,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.16'
 description: |-
   Configurability is a unified, non-intrusive, assume-nothing configuration system
   for Ruby. It lets you keep the configuration for multiple objects in a single
@@ -169,7 +143,6 @@ extra_rdoc_files:
 files:
 - ChangeLog
 - History.md
-- LICENSE
 - Manifest.txt
 - README.md
 - Rakefile
@@ -203,12 +176,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Configurability is a unified, non-intrusive, assume-nothing configuration

checksums.yaml.gz.sig

@@ -1 +0,0 @@
-�g���ڱ?
�
�u�$hDn���4yPB�����~\��m&߷�.ߚ��$�H�H��?h����yd�
�J��^㪠���K������֘������G��V������

data.tar.gz.sig

@@ -1,3 +0,0 @@
-�0�?h
-sأ����NZ<l$�3]����ŝo*���V2�n�~j�_�$�Ӈ���d��p	S�Z���v���j��Q�s|�|�f�I�'st�.�e�}����sLM2=�r��רo�P�$�ܝ|�#�^�*��@��I��q5`�s�g����
-��Љ��XH5vaZA�m�

data/LICENSE

@@ -1,27 +0,0 @@
-Copyright (c) 2010-2016 Michael Granger and Mahlon E. Smith
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the author/s, nor the names of the project's
-  contributors may be used to endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.