sandyw-active_configuration 1.2.0 → 1.2.1

data/lib/active_configuration/base.rb

@@ -6,12 +6,12 @@ module ActiveConfiguration
   # when the #configure block is used on an ActiveRecord model. For more details
   # see ActiveRecord::Configuration#configure.
   class Base
-    attr_accessor :options
+    attr_accessor :options_hash
 
     # Initializes an empty options hash to store ActiveConfiguration::Option
     # instances containing configuration details.
     def initialize
-      @options = HashWithIndifferentAccess.new
+      @options_hash = HashWithIndifferentAccess.new
     end
 
     # Creates and accepts the configuration details for an Option.
@@ -32,11 +32,12 @@ module ActiveConfiguration
     def option(key, &block)
       opt = Option.new(key)
       opt.instance_eval(&block)
-      @options[key.to_sym] = opt
+      @options_hash[key.to_sym] = opt
     end
 
     def options( namespace = nil )
-      @options.select{|key, option| option.option_namespace == namespace }.with_indifferent_access
+      return @options_hash if namespace == :all
+      @options_hash.select{|key, option| option.option_namespace == namespace }.with_indifferent_access
     end
   end
 end

data/lib/active_configuration/setting_manager.rb

@@ -24,7 +24,7 @@ module ActiveConfiguration
     # @return [Hash, Array, NilClass] the Hash or Array of Hashes for the
     #   setting with the given key or nil if there isn't a match.
     def [](key)
-      if @configurable.class.configuration.options.has_key?(key)
+      if @configurable.class.configuration.options_hash.has_key?(key)
         @settings[key] ||= SettingProxy.new(self, key)
 
         return @settings[key].value
@@ -41,7 +41,7 @@ module ActiveConfiguration
     # @return [Hash, Array, NilClass] the Hash or Array of Hashes for the
     #   setting with the given key or nil if there isn't a match.
     def []=(key, value)
-      if @configurable.class.configuration.options.has_key?(key)
+      if @configurable.class.configuration.options_hash.has_key?(key)
         @settings[key] ||= SettingProxy.new(self, key)
         @settings[key].replace(value)
 
@@ -91,4 +91,4 @@ module ActiveConfiguration
       @settings = Hash.new
     end
   end
-end
+end

data/lib/active_configuration/setting_proxy.rb

@@ -177,7 +177,7 @@ module ActiveConfiguration
     #
     # @return [ActiveConfiguration::Option] the option for this setting.
     def option
-      return @manager.configurable.class.configuration.options[key]
+      return @manager.configurable.class.configuration.options_hash[key]
     end
 
     # Coerces a stored String value into the expected type if an allowed format

data/lib/active_configuration/version.rb

@@ -2,7 +2,7 @@ module ActiveConfiguration
   class Version
     MAJOR = 1
     MINOR = 2
-    PATCH = 0
+    PATCH = 1
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sandyw-active_configuration
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -196,7 +196,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 50292813157852160
+      hash: -3189903809501531503
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: