has_setting 0.4.6 → 0.5

data/help/001_create_settings.rb

@@ -5,6 +5,7 @@ class CreateSettings < ActiveRecord::Migration
        t.integer(:owner_id,         :null => false)
        t.string(:name,              :null => false,   :length => 64)
        t.string(:value,             :null => true,    :length => 255)
+       t.string(:locale,            :null => true)
        t.timestamps
       end
   end

data/lib/has_setting/ar_extensions.rb

@@ -1,26 +1,13 @@
 module HasSetting
-  
-  module InstanceMethods
-    def write_setting(name, value)
-      # find an existing setting or build a new one
-      setting = self.settings.detect() {|item| item.name == name }
-      setting = self.settings.build(:name => name) if setting.blank?
-      setting.value = value
-    end
-    
-    def read_setting(name)
-      # use detect instead of SQL find. like this the 'cached' has_many-collection is inited 
-      # only once
-      self.settings.detect() {|item| item.name == name }
-    end
-  end
-  
+
+  extend ActiveSupport::Concern
+
   module ClassMethods
     # Setup of the getter/setter
     def has_setting(name, options = {})
       name = name.to_s
       raise ArgumentError.new('Setting name must not be blank') if name.blank?
-      
+
       self.class_eval do
         unless @has_setting_options # define only once
           # AR association to settings
@@ -31,7 +18,7 @@ module HasSetting
           def self.has_setting_options
             @has_setting_options
           end
-          
+
           private
           # Callback to save settings
           def save_has_setting_association
@@ -41,30 +28,44 @@ module HasSetting
           end
         end
       end
-      
-      
+
       raise ArgumentError.new("Setting #{name }is already defined on #{self.name}") if self.has_setting_options.has_key?(name)
-      
+
       # default options
-      options[:type] ||= :string    # treat as string
+      type = options[:type] || :string    # treat as string
         # default could be false, thats why we use has_key?
-      options[:default] = options.has_key?(:default) ? options[:default] : nil # no default
+      default = options[:default] || (options.has_key?(:default) ? options[:default] : nil) # no default
       self.has_setting_options[name] = options
-      
+
       # setter
       define_method("#{name}=".intern) do |value|
-        formatter = HasSetting::Formatters.for_type(options[:type])
+        formatter = HasSetting::Formatters.for_type(type)
         write_setting(name, formatter.to_s(value))
       end
-      
+
       # getter
       define_method(name) do |*args|
         setting = read_setting(name)
         options = args.first || self.class.has_setting_options[name]
         return options[:default] if setting.nil? 
-        formatter = Formatters.for_type(options[:type])
+        formatter = Formatters.for_type(options[:type] || type)
         formatter.to_type(setting.value)
       end
     end
   end
+
+  def write_setting(name, value)
+    # find an existing setting or build a new one
+    setting = self.settings.detect() {|item| item.name == name and item.locale.to_s == I18n.locale.to_s }
+    setting = self.settings.build(:name => name, locale: I18n.locale.to_s) if setting.blank?
+    setting.value = value
+  end
+
+  def read_setting(name)
+    # use detect instead of SQL find. like this the 'cached' has_many-collection is inited 
+    # only once
+    s = self.settings.detect() {|item| item.name == name and item.locale.to_s == I18n.locale.to_s} # first see if there is a setting with current locale
+    s ||= self.settings.detect() {|item| item.name == name} # then if not found, take the first setting with matching name (TODO: add locale fallbacks)
+    s
+  end
 end

data/lib/has_setting/version.rb

@@ -1,3 +1,3 @@
 module HasSetting
-  VERSION = "0.4.6"
+  VERSION = "0.5"
 end

data/lib/has_setting.rb

@@ -2,9 +2,10 @@
 require File.dirname(__FILE__) + '/has_setting/ar_extensions'
 require File.dirname(__FILE__) + '/has_setting/formatters'
 require File.dirname(__FILE__) + '/has_setting/setting'
-ActiveRecord::Base.class_eval do
-  include(HasSetting::InstanceMethods)
-  extend(HasSetting::ClassMethods)
+
+
+ActiveSupport.on_load(:active_record) do
+  include HasSetting
 end
 
 

data/test/test_helper.rb

@@ -23,13 +23,12 @@ ActiveRecord::Base.connection.create_table(:settings) do |table|
   table.string(:name,       :limit => 64,     :null => false)
   table.string(:owner_type, :limit => 255,    :null => false)
   table.integer(:owner_id,                    :null => false)
+  table.string(:locale)
 end
 [:foos, :bars, :bazs].each do |table|
   ActiveRecord::Base.connection.create_table(table) do |t|
   end
 end
-ActiveRecord::Base.logger = Logger.new(STDOUT)
-ActiveRecord::Base.logger.level = Logger::DEBUG # change to DEBUG if you want to see something :-)
 
 require File.join(File.dirname(__FILE__), 'foo')
 require File.join(File.dirname(__FILE__), 'bar')

data/test/unit/has_setting_test.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class HasSettingTest < Test::Unit::TestCase
-  def setup()
+  def setup
     @foo = Foo.create!
     @bar = Bar.create!
     @baz = Baz.create!
@@ -143,6 +143,16 @@ class HasSettingTest < Test::Unit::TestCase
     @foo.setting_4 = false
     assert_equal false, @foo.setting_4
   end
+
+  def test_locale_awareness
+    I18n.locale = :de
+    @bar.setting_1 = 'setting de'
+    I18n.locale = 'de-CH'
+    @bar.setting_1 = 'setting ch'
+    assert_equal 'setting ch', @bar.setting_1
+    I18n.locale = :de
+    assert_equal 'setting de', @bar.setting_1
+  end
   
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_setting
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: '0.5'
   prerelease: 
 platform: ruby
 authors: