settings_on_rails 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3d2546e49211ff3f4772301ea5d8ddad7760e57
-  data.tar.gz: 03eb8027cd870ae60d475a1972d15f328df244b2
+  metadata.gz: 0b83c9ecc5fb868616dcd1708d3f5b1c6efec936
+  data.tar.gz: 8a1e64c5f65a24383fab856200b48d4acc0bdb67
 SHA512:
-  metadata.gz: 5b3381b4f813100a6ed5e9adc50de7ec2b165308f6a8738551d679414663d98c84998e27b77d5878fcce28787691212a5616a51079b6e0548adf6f163088ca71
-  data.tar.gz: ebaba09d122cdb86617146c60e08b6ebd974bbf9057d0497e4d476bd27a4877c946861a699d67a30d11120ec437604b558edaf2be605b5980bb4bbb14d63089e
+  metadata.gz: 0331b4b06617abc42b1b30bb5ad595bfc3db21b121ff8b795a57e32750c6e29e6b2499a79b7dc41d3d9266befbdca74e0788e7f7eb8d0663578606f3f6e24b29
+  data.tar.gz: c91c95f9240c83ec946573063658cc3137f80b31af6444818dfa1ecdb5eb317f588363fa01589730ff369992193faf77c9e2ca3f94b33cefa45ff025f403f80d

data/Gemfile

@@ -4,4 +4,4 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'coveralls', require: false
-gem 'byebug'
+

data/README.md

@@ -35,7 +35,7 @@ end
 
 Set settings
 ```ruby
-@blog.settings.title = 'My Blog'
+@blog.settings.title = 'My Space'
 @blog.settings(:theme).background_color = 'blue'
 
 @blog.save

data/lib/settings_on_rails/base.rb

@@ -10,7 +10,14 @@ module SettingsOnRails
         define_method method_name do |*keys|
           column = Configuration.check!(self)
 
-          Settings.new(keys, self, column, method_name)
+          settings = Settings.new(keys, self, column, method_name)
+          node = settings._current_node
+
+          if node.nil? || node.is_a?(Hash)
+            settings
+          else
+            node
+          end
         end
 
         has_settings(&block)

data/lib/settings_on_rails/configuration.rb

@@ -7,12 +7,14 @@ module SettingsOnRails
     # @param [ActiveRecord] klass, the Model who has settings
     # @param [Symbol] column, the column to store settings
     def self.init(klass, column)
-      raise ArgumentError.new("has_settings_on: symbol expected, but got a #{column.class}") unless column.is_a?(Symbol)
+      unless column.is_a?(Symbol) || column.is_a?(String)
+        raise ArgumentError.new("has_settings_on: symbol or string expected, but got a #{column.class}")
+      end
 
       klass.class_eval do
         class_attribute Configuration::NAME_COLUMN, Configuration::DEFAULTS_COLUMN
 
-        serialize column, Hash
+        serialize column, HashWithIndifferentAccess
         Configuration::init_defaults_column(self)
         Configuration::init_name_column(self, column)
       end
@@ -37,7 +39,7 @@ module SettingsOnRails
     # init to Hash {} for data attribute in klass if nil
     def self.init_defaults_column(klass)
       defaults = klass.send(Configuration::DEFAULTS_COLUMN)
-      klass.send(Configuration::DEFAULTS_COLUMN.to_s + '=', {}) unless defaults
+      klass.send(Configuration::DEFAULTS_COLUMN.to_s + '=', ActiveSupport::HashWithIndifferentAccess.new) unless defaults
     end
 
     def self.init_name_column(klass, column_name)

data/lib/settings_on_rails/has_settings.rb

@@ -25,7 +25,9 @@ module SettingsOnRails
       options = keys.extract_options!
       raise ArgumentError.new("has_settings: Option :defaults expected, but got #{options.keys.join(', ')}") unless options.blank? || (options.keys == [:defaults])
       keys.each do |key_name|
-        raise ArgumentError.new("has_settings: symbol expected, but got a #{key_name.class}") unless key_name.is_a?(Symbol)
+        unless key_name.is_a?(Symbol) || key_name.is_a?(String)
+          raise ArgumentError.new("has_settings: symbol or string expected, but got a #{key_name.class}")
+        end
       end
 
       options[:defaults].each do |k, v|
@@ -38,7 +40,9 @@ module SettingsOnRails
     # @param [Symbol] value
     # @param [Hash] options, options with a default Hash
     def attr(value, options = {})
-      raise ArgumentError.new("has_settings: symbol expected, but got a #{value.class}") unless value.is_a?(Symbol)
+      unless value.is_a?(Symbol) || value.is_a?(String)
+        raise ArgumentError.new("has_settings: symbol expected, but got a #{value.class}")
+      end
       raise ArgumentError.new("has_settings: Option :default expected, but got #{options.keys.join(', ')}") unless options.blank? || (options.keys == [:default])
 
       default_value = options[:default]

data/lib/settings_on_rails/key_tree_builder.rb

@@ -6,7 +6,9 @@ module SettingsOnRails
     # Thus we can differentiate settings(:key).attr and settings(:key, :attr)
     def initialize(keys, target_obj, target_column_name, parent)
       keys.each do |key_name|
-        raise ArgumentError.new("has_settings: symbol expected, but got a #{key_name.class}") unless key_name.is_a?(Symbol)
+        unless (key_name.is_a?(Symbol) || key_name.is_a?(String))
+          raise ArgumentError.new("has_settings: symbol or string expected, but got a #{key_name.class}")
+        end
       end
       @keys = keys
       @target_obj = target_obj

data/lib/settings_on_rails/settings.rb

@@ -21,6 +21,11 @@ module SettingsOnRails
     end
 
     def method_missing(method_name, *args, &block)
+      if block_given?
+        node = current_node || {}
+        return node.send(method_name, *args, &block)
+      end
+
       if method_name.to_s =~ REGEX_SETTER && args.size == 1
         _set_value($1, args.first)
       elsif method_name.to_s =~ REGEX_GETTER && args.size == 0
@@ -31,12 +36,23 @@ module SettingsOnRails
       end
     end
 
+    # Just a wrapper of current_node
+    def _current_node
+      current_node
+    end
+
     private
 
     def _settings(*keys)
       raise ArgumentError, 'wrong number of arguments (0 for 1..n)' if keys.size == 0
+      settings = Settings.new(keys, @target_object, @column_name, @method_name, self)
+      node = settings._current_node
 
-      Settings.new(keys, @target_object, @column_name, @method_name, self)
+      if node.nil? || node.is_a?(Hash)
+        settings
+      else
+        node
+      end
     end
 
     def _get_value(name)

data/lib/settings_on_rails/version.rb

@@ -1,3 +1,3 @@
 module SettingsOnRails
-  VERSION = '0.2.2'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: settings_on_rails
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - ALLEN WANG QIANG
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-13 00:00:00.000000000 Z
+date: 2015-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Model specific Hash Preferences/Settings for Rails.