tunable 0.0.2 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 429e9db65fc91c748fc526ef2b8b3a8241490e39
-  data.tar.gz: 21c3c99469bebdd04cfcf5e9d383a15878eb2520
+SHA256:
+  metadata.gz: 18948658c5465d7de3637533a887367622d7c1067d60cc67cb4a340936144fa7
+  data.tar.gz: 9caad8b2f1e03f15c862e4ae44b5f07f423ab21f2fbde7be9c0bf3ce2ceafa8c
 SHA512:
-  metadata.gz: b12ebe2c3d3670c3d9eb3de9511d0e5e068d90806c315c1011ca91c74fe9579bdca681102dde7f1aa47ed298dde33064fc56fb2f14393f14b1921bb849cc7bbb
-  data.tar.gz: 44e64b53736a25c6c754dccb8f6a842ee3182c0aeaf2400ecc9fd5b860ae834fe920d22ea209840206c7ddb2515d1bd9e476cb2457fcd12edf053ab4c46991cf
+  metadata.gz: 1843588f136e89158718d78765dfede4be12a7748ecb6e2572c8e349b0b847209ab7f8b2e7239529eab4fc1885e0c3ee37b96f437f866d8230930efc1216dc38
+  data.tar.gz: 204320680e9719bcb102c25c166bb20c1df168b98fc788b2476e9106e0f81c352c01a4ad656747d811ac5b4a5d6b8207ab2cb8cd86f4e606f00ef711381dd82e

data/Gemfile

@@ -1,4 +1,4 @@
 source :rubygems
 
-# specified in tuktuk.gemspec
+# specified in gemspec
 gemspec

data/README.md

@@ -1,7 +1,16 @@
 Tunable
 =======
 
-A simple gem that provides scoped, pluggable settings for your AR 4+ models. Let's you keep things simple in your models by moving all customizable settings into a separate table, using a polymorphic Settings model. 
+A simple gem that provides scoped, pluggable settings for your AR 4+ models. Lets you keep things simple in your models by moving all customizable settings into a separate table, using a polymorphic Settings model. 
+
+Install
+-------
+
+In your Gemfile:
+
+```
+gem 'tunable'
+```
 
 The code
 --------
@@ -19,7 +28,7 @@ Now we can do:
   user.get_setting(:theme, :layout) # => nil
   user.get_setting(:theme, :color) # => nil
 
-  user.settings = { theme: { format: 'wide', color: 'red' } }
+  user.settings = { theme: { layout: 'wide', color: 'red' } }
   user.save
 
   user.get_setting(:theme, :layout) # => 'wide'
@@ -94,7 +103,6 @@ class User < ActiveRecord::Base
   main_settings :layout_type => {
     :default => lambda { |user| user.is_admin? ? 'advanced' : 'simple' }
   }
-
 end
 ```
 

data/Rakefile

@@ -1,8 +1,8 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
-require 'spec/rake/spectask'
-
-Spec::Rake::SpecTask.new do |t|
-  t.spec_files = FileList["spec/**/*_spec.rb"]
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:spec)
+rescue LoadError
 end

data/lib/tunable/model.rb

@@ -86,14 +86,7 @@ module Tunable
           set_default_setting(:main, field, default) unless default.nil?
 
           define_method field do
-            if instance_variable_defined?("@setting_main_#{field}")
-              # the instance var is already normalized to 1/0 when called by the setter
-              Tunable.getter_value(instance_variable_get("@setting_main_#{field}"))
-            else
-              current = main_settings[field.to_sym]
-              default_value = default.is_a?(Proc) ? default.call(self) : default
-              current.nil? ? default_value : current
-            end
+            get_value_for(field)
           end
 
           define_method "#{field}?" do
@@ -111,11 +104,12 @@ module Tunable
             end
 
             value   = Tunable.normalize_value(raw_value)
-            current = Tunable.normalize_value(send("#{field}"))
+            current = Tunable.normalize_value(get_value_for(field, false)) # don't fallback to default
             # debug "Setting #{field} to #{value} (#{value.class}), current: #{current} (#{current.class})"
 
             if value === current
-              send('changed_attributes').delete(field) # in case we had set if before
+              # puts 'Value is same as current'
+              @changed_attributes.delete(field) # in case we had set if before
               return
             end
 
@@ -159,6 +153,15 @@ module Tunable
       self.class.default_settings(context)[key.to_sym]
     end
 
+    def set_setting(context, key, val)
+      obj = { context => { key => val } }
+      self.settings = obj
+    end
+
+    def remove_setting(context, key)
+      set_setting(context, key, nil)
+    end
+
     def get_main_setting(key)
       get_setting(:main, key)
     end
@@ -186,20 +189,36 @@ module Tunable
 
     def queue_setting_for_update(context, key, val)
       if self.class.main_settings_list.include?(key.to_sym)
-        send('changed_attributes')[key.to_sym] = val
+        @changed_attributes[key.to_sym] = val if changed_attributes.include?(key.to_sym)
       end
       (modified_settings[context.to_sym] ||= {})[key.to_sym] = val
     end
 
     def queue_setting_for_deletion(context, key)
       if self.class.main_settings_list.include?(key)
-        send('changed_attributes')[key.to_sym] = nil
+        @changed_attributes[key.to_sym] = nil if changed_attributes.include?(key.to_sym)
       end
       (deleted_settings[context.to_sym] ||= []) << key.to_sym
     end
 
     private
 
+    def get_value_for(field, use_default = true)
+      if instance_variable_defined?("@setting_main_#{field}")
+        # the instance var is already normalized to 1/0 when called by the setter
+        Tunable.getter_value(instance_variable_get("@setting_main_#{field}"))
+      else
+        current = main_settings[field.to_sym]
+        return current if current.present? or !use_default
+
+        if default = self.class.default_settings(:main)[field.to_sym]
+          return default.is_a?(Proc) ? default.call(self) : default
+        end
+
+        nil
+      end
+    end
+
     def modified_settings
       @modified_settings ||= {}
     end

data/lib/tunable/normalizer.rb

@@ -8,6 +8,7 @@ module Tunable
     def normalize_value(val)
       return 1 if TRUTHIES.include?(val.to_s)
       return 0 if FALSIES.include?(val.to_s)
+      return Integer(val) if is_integer?(val)
       return if val.blank? # false.blank? returns true so this needs to go after the 0 line
       val
     end
@@ -29,6 +30,15 @@ module Tunable
       end
     end
 
+    private
+
+    def is_integer?(val)
+      Integer(val)
+      true
+    rescue
+      false
+    end
+
   end
 
 end

data/lib/tunable/setting.rb

@@ -26,7 +26,7 @@ module Tunable
 
       hash.each do |context, fields|
         fields.each do |key, val|
-          if val.blank? && object.settings_context(context.to_sym)[key.to_sym].present?
+          if val.blank? && !object.settings_context(context.to_sym)[key.to_sym].nil?
 
             # setting was present and now deleted
             object.queue_setting_for_deletion(context, key)

data/lib/tunable/version.rb

@@ -1,5 +1,5 @@
 module Tunable
 
-  VERSION = '0.0.2'
+  VERSION = '0.0.5'
 
 end

data/spec/spec_helper.rb

@@ -1,16 +1,18 @@
-require 'rubygems'
-require 'active_support'
+$LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
+
+require 'bundler/setup'
 require 'active_record'
+require 'tunable'
 
 ActiveRecord::Base.establish_connection(
-  "adapter" => "sqlite3", "database" => ':memory:'
+  "adapter"  => "sqlite3",
+  "database" => ':memory:'
 )
 
 ActiveRecord::Base.logger = Logger.new(File.join(File.dirname(__FILE__), "debug.log"))
 
 this_path = File.dirname(__FILE__)
 load File.join(this_path, '/schema.rb')
-require File.join(this_path, '..', 'lib', 'tunable.rb')
 
 class TunableModel < ActiveRecord::Base
   include Tunable::Model

data/spec/tunable/defaults_spec.rb

@@ -100,7 +100,7 @@ describe 'defaults' do
 
           TEST_SETTINGS.each do |key, val|
             it "#{key} equals new val" do
-              @foo.main_settings[key].should == @new_settings[key]
+              @foo.main_settings[key].should === @new_settings[key]
             end
           end
 
@@ -110,7 +110,7 @@ describe 'defaults' do
 
           TEST_SETTINGS.each do |key, val|
             it "#{key} equals new val" do
-              @foo.get_main_setting(key).should == @new_settings[key]
+              @foo.get_main_setting(key).should === @new_settings[key]
             end
           end
         end

data/spec/tunable/normalization_spec.rb

@@ -18,7 +18,7 @@ describe 'normalization' do
     :numbers => {
       :number_0 => '0',
       :number_1 => '1',
-      :number_of_the_beast => '666'
+      :number_of_the_beast => 666
     },
     :onoffs => {
       :on  => 'on',
@@ -57,7 +57,7 @@ describe 'normalization' do
       sql = "select `value` from `settings` where `settable_id` = #{id} and `context` = '#{context}' and `key` = '#{key}';"
       res = ActiveRecord::Base.connection.execute(sql)
       # puts res.inspect
-      res[0]['value']
+      res[0] ? res[0]['value'] : nil
     end
 
     describe 'creating a new setting directly' do
@@ -188,10 +188,7 @@ describe 'normalization' do
     describe 'using settings relationship' do
 
       before :all do
-
-        @model.update_attributes({
-          :settings => VALUE_TYPES
-        })
+        @model.update_attributes(:settings => VALUE_TYPES)
       end
 
       after :all do
@@ -292,7 +289,7 @@ describe 'normalization' do
     end
 
     it 'keeps 666 as 666' do
-      get_value_from_model(:numbers, :number_of_the_beast).should == '666'
+      get_value_from_model(:numbers, :number_of_the_beast).should == 666
     end
 
     it 'keeps foo as foo' do

data/spec/tunable/setters_spec.rb

@@ -1,5 +1,48 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
+describe 'basic setters' do
+
+  before :all do
+    load_main_settings!
+    @model = TunableModel.create(name: "Yay, I'm settable!")
+  end
+
+  describe '#set_setting' do
+
+    it 'stores new setting, without saving' do
+      @model.set_setting(:foo, :bar, 123)
+      expect(@model.get_setting(:foo, :bar)).to eq(nil)
+      expect(@model.settings_hash[:foo]).to eq(nil)
+      @model.save
+      @model.reload
+      expect(@model.get_setting(:foo, :bar)).to eq(123)
+      expect(@model.settings_hash[:foo]).to eq({ bar: 123 })
+    end
+
+  end
+
+  describe '#remove_setting' do
+
+    it 'stores new setting' do
+      @model.set_setting(:foo, :bar, 123)
+      @model.set_setting(:foo, :test, false)
+      @model.save
+      @model.reload
+      @model.remove_setting(:foo, :bar)
+      expect(@model.get_setting(:foo, :bar)).to eq(123)
+      @model.save
+      @model.reload
+      expect(@model.settings_hash[:foo]).to eq({ test: false })
+      @model.remove_setting(:foo, :test)
+      @model.save
+      @model.reload
+      expect(@model.settings_hash[:foo]).to eq(nil)
+    end
+
+  end
+
+end
+
 describe 'main_setting setters' do
 
   before :all do

data/tunable.gemspec

@@ -14,12 +14,12 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   # s.rubyforge_project         = "tunable"
 
-  s.add_runtime_dependency "activerecord", "~> 4.0"
-  s.add_runtime_dependency "activesupport", "~> 4.0"
+  s.add_runtime_dependency "activerecord", "~> 4.2.x"
+  s.add_runtime_dependency "activesupport", "~> 4.2.x"
 
-  s.add_development_dependency "bundler", '~> 1.0', '>= 1.0.0'
-  s.add_development_dependency "rspec", '~> 3.0', '>= 3.0.0'
-  s.add_development_dependency "sqlite3", '~> 1.0', '>= 1.0.0'
+  s.add_development_dependency "bundler" #, '~> 1.0', '>= 1.0.0'
+  s.add_development_dependency "rspec" #, '~> 3.0', '>= 3.0.0'
+  s.add_development_dependency "sqlite3", '< 1.4.x'
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tunable
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.5
 platform: ruby
 authors:
 - Tomás Pollak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-01 00:00:00.000000000 Z
+date: 2022-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,88 +16,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.2.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.2.x
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.2.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.2.x
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.4.x
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.4.x
 description: Pluggable settings for your AR models.
 email:
 - tomas@forkhq.com
@@ -145,9 +127,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Pluggable settings for your AR models.
 test_files: []
-has_rdoc: