configure_me 0.2.1 → 0.3.1

data/lib/configure_me/base.rb

@@ -1,18 +1,18 @@
 require 'active_model'
 require 'active_support/core_ext/hash/indifferent_access'
 require 'singleton'
-require 'configure_me/persistence'
-require 'configure_me/caching'
 require 'configure_me/settings'
 require 'configure_me/nesting'
+require 'configure_me/persisting'
+require 'configure_me/caching'
 
 module ConfigureMe
   class Base
     include ActiveModel::AttributeMethods
     include Settings
-    include Persistence
-    include Caching
     include Nesting
+    include Persisting
+    include Caching
     include Singleton
     extend ActiveModel::Naming
 
@@ -20,6 +20,51 @@ module ConfigureMe
       def config_name
         self.name.split('::').last.gsub(/^(.*)Config$/, '\1').downcase
       end
+
+      def from_hash(root, config)
+        if root.nil?
+          root = const_set("RootConfig", Class.new(ConfigureMe::Base))
+        end
+
+        # Determine how many root keys there are.
+        #
+        # If more than one, create a new nested ConfigureMe::Base
+        # subclass for each key.
+        #
+        # If only one, just assign the values to the root config
+        if config.keys.length > 1
+          config.each_pair do |key, value|
+            if value.is_a?(Hash)
+              klass_name = "#{key}_config".camelize
+              c = root.const_set(klass_name, Class.new(ConfigureMe::Base))
+              from_hash(c, value)
+              c.send :nest_me, root
+            else
+              root.send :setting, key, :string, :default => value
+            end
+          end
+          root
+        else
+          from_hash(root, config.values.first)
+        end
+      end
+
+      def load(config)
+        case config
+        when Hash
+          from_hash(nil, config)
+        else
+          raise ::ArgumentError, "ConfigureMe: Not sure how to load type [#{config.class}]"
+        end
+      end
+
+      def method_missing(method, *args)
+        if instance.respond_to?(method)
+          instance.send(method, *args)
+        else
+          super
+        end
+      end
     end
 
     def parent

data/lib/configure_me/{persistence.rb → persisting.rb}

@@ -1,23 +1,23 @@
 require 'active_support/concern'
 
 module ConfigureMe
-  module Persistence
+  module Persisting
     extend ActiveSupport::Concern
 
-    included do
-      @persisting = false
-    end
+    #included do
+    #  @persisting = false
+    #end
 
     module ClassMethods
       def persist_me(persistence_key = nil)
         if ConfigureMe.persistence_klass.nil?
-          raise ::RuntimeError, "configure_me - persistence_klass is not set.  Make sure you have an initializer to assign it."
+          raise ::RuntimeError, "ConfigureMe: persistence_klass is not set.  Make sure you have an initializer to assign it."
         end
         @persisting = true
       end
 
       def persisting?
-        @persisting
+        @persisting ||= false
       end
 
       def persistence_key

data/lib/configure_me/setting.rb

@@ -1,16 +1,27 @@
 module ConfigureMe
   class Setting
-    attr_reader :name, :default
+    attr_reader :name, :type, :default
 
-    def initialize(owner, name, *args)
+    def initialize(owner, name, type, *args)
       options = args.extract_options!
 
-      @owner, @name = owner, name.to_s
+      @owner, @name, @type = owner, name.to_s
       @default = options.key?(:default) ? options[:default] : nil
     end
 
     def define_methods!
       @owner.define_attribute_methods(true)
     end
+
+    def convert(value)
+      case type
+      when :string    then value
+      when :text      then value
+      when :integer   then value.to_i rescue value ? 1 : 0
+      when :float     then value.to_f
+      when :date      then ActiveRecord::ConnectionAdapters::Column.string_to_date(value)
+      else value
+      end
+    end
   end
 end

data/lib/configure_me/settings.rb

@@ -9,8 +9,8 @@ module ConfigureMe
     end
 
     module ClassMethods
-      def setting(name, options = {})
-        new_setting = Setting.new(self, name, options)
+      def setting(name, type, options = {})
+        new_setting = Setting.new(self, name, type, options)
         class_settings[name] = new_setting
         new_setting.define_methods!
       end
@@ -34,29 +34,31 @@ module ConfigureMe
     end
 
     def read_setting(name)
+      value = nil
       if self.class.caching?
-        setting = Rails.cache.read(cache_key(name))
-        return setting unless setting.nil?
+        value = Rails.cache.read(cache_key(name))
       end
 
-      if self.class.persisting?
+      if self.class.persisting? && value.nil?
         setting = ConfigureMe.persistence_klass.find_by_key(persistence_key(name))
         unless setting.nil?
           value = YAML::load(setting.value)
-          Rails.cache.write(cache_key(name), value)
+          if self.class.caching?
+            Rails.cache.write(cache_key(name), value)
+          end
           @settings[name.to_sym] = value
-          return value
         end
       end
 
-      @settings[name.to_sym]
+      value = @settings[name.to_sym] if value.nil?
+      self.class.class_settings[name.to_sym].convert(value)
     end
 
     def write_setting(name, value)
       if self.class.class_settings[name]
         @settings[name.to_sym]  = value
       else
-        raise NoMethodError, "Unknown setting: #{name.inspect}"
+        raise NoMethodError, "ConfigureMe: Unknown setting: #{name.inspect}"
       end
 
       if self.class.caching?

data/lib/configure_me/version.rb

@@ -1,3 +1,3 @@
 module ConfigureMe
-  VERSION = "0.2.1"
+  VERSION = "0.3.1"
 end

data/lib/configure_me.rb

@@ -5,9 +5,10 @@ module ConfigureMe
     end
 
     def persistence_klass
-      @persistence_klass ||= nil
+      @persistence_klass ||= ::Setting
     end
   end
 end
+
 require 'configure_me/setting'
 require 'configure_me/base'

data/spec/configure_me/base_spec.rb

@@ -12,7 +12,7 @@ describe ConfigureMe::Base do
   describe 'with a "color" setting with a default of "red"' do
     before(:each) do
       @klass = Class.new(ConfigureMe::Base)
-      @klass.send :setting, :color, :default => 'red'
+      @klass.send :setting, :color, :string, :default => 'red'
     end
 
     describe 'an instance ' do
@@ -55,7 +55,7 @@ describe ConfigureMe::Base do
       @klass = TestConfig
       @persistence = mock('PersistenceClass')
       ConfigureMe.persist_with @persistence
-      @klass.send :setting, :color, :default => 'red'
+      @klass.send :setting, :color, :string, :default => 'red'
       @klass.send :persist_me
     end
 
@@ -83,11 +83,6 @@ describe ConfigureMe::Base do
         @persistence.stubs(:find_or_create_by_key).returns(@unpersisted)
         @obj.color = "blue"
       end
-
-      it 'should return the default value' do
-        @persistence.stubs(:find_by_key).returns(nil)
-        @obj.color.should eql('red')
-      end
     end
 
     describe 'with a persisted setting' do

data/spec/configure_me/setting_spec.rb

@@ -5,7 +5,7 @@ describe ConfigureMe::Setting do
     @owner = mock('owner') do
       stubs(:define_attribute_methods)
     end
-    @setting = ConfigureMe::Setting.new(@owner, :foo, :default => 'bar')
+    @setting = ConfigureMe::Setting.new(@owner, :foo, :string, :default => 'bar')
   end
 
   it { @setting.should respond_to(:name) }
@@ -17,7 +17,7 @@ describe ConfigureMe::Setting do
     owner = mock('owner') do
       expects(:define_attribute_methods).with(true)
     end
-    setting = ConfigureMe::Setting.new(owner, :foo, :default => 'bar')
+    setting = ConfigureMe::Setting.new(owner, :foo, :string, :default => 'bar')
     setting.define_methods!
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: configure_me
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 17
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 1
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Josh Williams
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-27 00:00:00 -06:00
+date: 2011-01-06 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -152,7 +152,7 @@ files:
 - lib/configure_me/base.rb
 - lib/configure_me/caching.rb
 - lib/configure_me/nesting.rb
-- lib/configure_me/persistence.rb
+- lib/configure_me/persisting.rb
 - lib/configure_me/setting.rb
 - lib/configure_me/settings.rb
 - lib/configure_me/version.rb