tunable 0.0.8 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a58a7749222087c0b2fbb540247bb6a66dcaca507b4c13ba8dfc569ab68d9df
-  data.tar.gz: 0e6460f96413b4180fe1e1bbf196718ffff757ccf0f62b8ee14607538645b032
+  metadata.gz: 844872db005ce594870ba86746820e4299bcecbecaba9606a6e4e7cc2a39177b
+  data.tar.gz: 5187361fbcfd3af0a04f5d02ed03e62b3496edd5f962e9d57a7579af4f914529
 SHA512:
-  metadata.gz: eebb2f72d572f22e3adad48a71df09cf93c869d886cb186cc0928c4ad2ddecca82b5e38cd6aa718bcc888bde993325ae84f74735c36dc8046668843d39a0dc2a
-  data.tar.gz: 7065b6d54fe664411222a7df5dba4b2391d9515a1a3c07c7ca8ac2aec88e26ce472942b6c5800e1aa06b1787c89cb5bd5109aeb73616ceccf4fd584b644d970d
+  metadata.gz: 615660905363b14900b5d0773f5a90e836fbd3d5a83888dd52359515563d2715c41e74e8db749c6dc9af7acada93de6df0da4345d868c86df9e580a554994574
+  data.tar.gz: dcc95b1b796ef5c1ab334c1c3be6e02cddfd90266a61e508d970b73322bca2db0d529ea087fede88602d87d3cd48e64fd595ac4b8d3e3d2dc94af8d5e1d2b645

data/lib/tunable/core_ext.rb

@@ -12,14 +12,12 @@ module Tunable
       columns_array = columns.map { |column| connection.quote_column_name(column) }
 
       values_array = values.map do |arr|
-        row_values = []
-        arr.each_with_index do |val, i|
-          row_values << connection.quote(val)
-        end
-        row_values.join(',')
+        arr.map do |val, i|
+          val == true ? '"true"' : val == false ? '"false"' : connection.quote(val)
+        end.join(',')
       end
 
-      values_array = values_array.map{ |str| str.gsub(EmojiFix::REGEX, " ") }
+      values_array = values_array.map { |str| str.gsub(EmojiFix::REGEX, " ") }
       insert_method = options[:method] || 'INSERT'
       sql = "#{insert_method} INTO `#{self.table_name}` (#{columns_array.join(',')}) VALUES "
 

data/lib/tunable/model.rb

@@ -114,7 +114,7 @@ module Tunable
               raise "Invalid value: #{raw_value}. Expected #{default.class}, got #{raw_value.class}"
             end
 
-            value   = Tunable.normalize_value(raw_value)
+            value   = Tunable.normalize_value(raw_value, default.class)
             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})"
 
@@ -148,7 +148,6 @@ module Tunable
     end
 
     def settings_hash
-
       @object_hashed_settings ||= Hasher.flatten(settings.reload, :context, :key)
 
       if modified_settings.any?
@@ -167,7 +166,9 @@ module Tunable
       val = settings_context(context)[key]
 
       # if value is nil or no default is set, stop here
-      return val if !val.nil? or self.class.default_settings(context)[key.to_sym].nil?
+      if !val.nil? or self.class.default_settings(context)[key.to_sym].nil?
+        return val
+      end
 
       self.class.default_settings(context)[key.to_sym]
     end
@@ -224,8 +225,8 @@ module Tunable
 
     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}"))
+        # the instance var is already normalized when called by the setter
+        instance_variable_get("@setting_main_#{field}")
       else
         current = main_settings[field.to_sym]
         return current if current.present? or !use_default

data/lib/tunable/normalizer.rb

@@ -2,24 +2,25 @@ module Tunable
 
   module Normalizer
 
-    TRUTHIES = ['true', 't', 'on', 'yes', 'y', '1'].freeze
-    FALSIES  = ['false', 'f', 'off', 'no', 'n', '0'].freeze
+    TRUTHIES = ['true', 't', 'on', 'yes', 'y'].freeze
+    FALSIES  = ['false', 'f', 'off', 'no', 'n'].freeze
 
-    def normalize_value(val)
-      return 1 if TRUTHIES.include?(val.to_s)
-      return 0 if FALSIES.include?(val.to_s)
+    def normalize_value(val, type = nil)
+      # if [TrueClass, FalseClass].include?(type)
+      #   return false if val.to_s == '0'
+      #   return true if val.to_s == '1'
+      # end
+
+      return true if TRUTHIES.include?(val.to_s)
+      return false 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
 
-    def getter_value(normalized)
-      return normalized === 1 ? true : normalized === 0 ? false : normalized
-    end
-
     # Called from Setting#normalized_value and DeviceActions#toggle_action
     def normalize_and_get(val)
-      getter_value(normalize_value(val))
+      normalize_value(val)
     end
 
     def matching_type(a, b)

data/lib/tunable/version.rb

@@ -1,3 +1,3 @@
 module Tunable
-  VERSION = '0.0.8'
+  VERSION = '0.1.0'
 end

data/spec/tunable/normalization_spec.rb

@@ -32,6 +32,14 @@ describe 'normalization' do
     }
   }
 
+  let(:sql_true) {
+    ActiveRecord::Base.connection.adapter_name == 'SQLite' ? 't' : 'true'
+  }
+
+  let(:sql_false) {
+    ActiveRecord::Base.connection.adapter_name == 'SQLite' ? 'f' : 'false'
+  }
+
   describe 'before saving to DB' do
 
     after do
@@ -40,19 +48,19 @@ describe 'normalization' do
 
     it 'the getter returns true for 1' do
       @model.boolean_setting = 1
-      @model.boolean_setting.should === true
+      @model.boolean_setting.should === 1
     end
 
     it 'the getter returns false for 0' do
       @model.boolean_setting = '0' # as string
-      @model.boolean_setting.should === false
+      @model.boolean_setting.should === 0
     end
 
   end
 
   describe 'when inserting to DB' do
 
-    def get_value(context, key)
+    def get_value_from_db(context, key)
       id = @model.id
       sql = "select `value` from `settings` where `settable_id` = #{id} and `context` = '#{context}' and `key` = '#{key}';"
       res = ActiveRecord::Base.connection.execute(sql)
@@ -79,59 +87,59 @@ describe 'normalization' do
       end
 
       it 'keeps 1 as 1' do
-        get_value(:numbers, :number_1).should == '1'
+        get_value_from_db(:numbers, :number_1).should == '1'
       end
 
       it 'keeps 0 as 0' do
-        get_value(:numbers, :number_0).should == '0'
+        get_value_from_db(:numbers, :number_0).should == '0'
       end
 
       it 'keeps 666 as 666' do
-        get_value(:numbers, :number_of_the_beast).should == '666'
+        get_value_from_db(:numbers, :number_of_the_beast).should == '666'
       end
 
       it 'keeps foo as foo' do
-        get_value(:main, :foo).should == 'foo'
+        get_value_from_db(:main, :foo).should == 'foo'
       end
 
       it 'normalizes booleany true values to 1' do
-        get_value(:main, :truthy).should == '1'
+        get_value_from_db(:main, :truthy).should == sql_true
       end
 
       it 'normalizes booleany false values to 0' do
-        get_value(:main, :falsy).should == '0'
+        get_value_from_db(:main, :falsy).should == sql_false
       end
 
-      it 'normalizes t (from true) to 1' do
-        get_value(:main, :t).should == '1'
+      it 'normalizes t (from true) to true' do
+        get_value_from_db(:main, :t).should == sql_true
       end
 
       it 'normalizes f (from false) to 0' do
-        get_value(:main, :f).should == '0'
+        get_value_from_db(:main, :f).should == sql_false
       end
 
       it 'normalizes on to 1' do
-        get_value(:onoffs, :on).should == '1'
+        get_value_from_db(:onoffs, :on).should == sql_true
       end
 
       it 'normalizes off to 0' do
-        get_value(:onoffs, :off).should == '0'
+        get_value_from_db(:onoffs, :off).should == sql_false
       end
 
       it 'normalizes y to 1' do
-        get_value(:yesnoes, :y).should == '1'
+        get_value_from_db(:yesnoes, :y).should == sql_true
       end
 
       it 'normalizes n to 0' do
-        get_value(:yesnoes, :n).should == '0'
+        get_value_from_db(:yesnoes, :n).should == sql_false
       end
 
       it 'normalizes yes to 1' do
-        get_value(:yesnoes, :yes).should == '1'
+        get_value_from_db(:yesnoes, :yes).should == sql_true
       end
 
       it 'normalizes no to 0' do
-        get_value(:yesnoes, :no).should == '0'
+        get_value_from_db(:yesnoes, :no).should == sql_false
       end
 
     end
@@ -140,47 +148,49 @@ describe 'normalization' do
 
       it 'keeps 1 as 1' do
         @model.update_attribute(:number_setting, 1)
-        get_value(:main, :number_setting).should == '1'
+        get_value_from_db(:main, :number_setting).should == '1'
       end
 
       it 'keeps 0 as 0' do
         @model.update_attribute(:number_setting, '0')
-        get_value(:main, :number_setting).should == '0'
+        get_value_from_db(:main, :number_setting).should == '0'
       end
 
       it 'keeps foo as foo' do
         @model.update_attribute(:other_setting, 'foo')
-        get_value(:main, :other_setting).should == 'foo'
+        get_value_from_db(:main, :other_setting).should == 'foo'
       end
 
       it 'normalizes booleany true values to 1' do
-        @model.update_attribute(:boolean_setting, true)
-        get_value(:main, :boolean_setting).should == '1'
+        # @model.update_attribute(:boolean_setting, true)
+        @model.boolean_setting = true
+        @model.save
+        get_value_from_db(:main, :boolean_setting).should == 'true'
       end
 
       it 'normalizes booleany false values to 0' do
-        @model.update_attribute(:boolean_setting, false)
-        get_value(:main, :boolean_setting).should == '0'
+        @model.update(boolean_setting: false)
+        get_value_from_db(:main, :boolean_setting).should == 'false'
       end
 
       it 'normalizes on to 1' do
         @model.update_attribute(:on_off_setting, 'on')
-        get_value(:main, :on_off_setting).should == '1'
+        get_value_from_db(:main, :on_off_setting).should == 'true'
       end
 
       it 'normalizes off to 0' do
         @model.update_attribute(:on_off_setting, 'off')
-        get_value(:main, :on_off_setting).should == '0'
+        get_value_from_db(:main, :on_off_setting).should == 'false'
       end
 
       it 'normalizes on to 1' do
         @model.update_attribute(:y_n_setting, 'y')
-        get_value(:main, :y_n_setting).should == '1'
+        get_value_from_db(:main, :y_n_setting).should == 'true'
       end
 
       it 'normalizes off to 0' do
         @model.update_attribute(:y_n_setting, 'n')
-        get_value(:main, :y_n_setting).should == '0'
+        get_value_from_db(:main, :y_n_setting).should == 'false'
       end
 
     end
@@ -196,59 +206,59 @@ describe 'normalization' do
       end
 
       it 'keeps 1 as 1' do
-        get_value(:numbers, :number_1).should == '1'
+        get_value_from_db(:numbers, :number_1).should == '1'
       end
 
       it 'keeps 0 as 0' do
-        get_value(:numbers, :number_0).should == '0'
+        get_value_from_db(:numbers, :number_0).should == '0'
       end
 
       it 'keeps 666 as 666' do
-        get_value(:numbers, :number_of_the_beast).should == '666'
+        get_value_from_db(:numbers, :number_of_the_beast).should == '666'
       end
 
       it 'keeps foo as foo' do
-        get_value(:main, :foo).should == 'foo'
+        get_value_from_db(:main, :foo).should == 'foo'
       end
 
       it 'normalizes booleany true values to 1' do
-        get_value(:main, :truthy).should == '1'
+        get_value_from_db(:main, :truthy).should == 'true'
       end
 
       it 'normalizes booleany false values to 0' do
-        get_value(:main, :falsy).should == '0'
+        get_value_from_db(:main, :falsy).should == 'false'
       end
 
       it 'normalizes t (from true) to 1' do
-        get_value(:main, :t).should == '1'
+        get_value_from_db(:main, :t).should == 'true'
       end
 
       it 'normalizes f (from false) to 0' do
-        get_value(:main, :f).should == '0'
+        get_value_from_db(:main, :f).should == 'false'
       end
 
       it 'normalizes on to 1' do
-        get_value(:onoffs, :on).should == '1'
+        get_value_from_db(:onoffs, :on).should == 'true'
       end
 
       it 'normalizes off to 0' do
-        get_value(:onoffs, :off).should == '0'
+        get_value_from_db(:onoffs, :off).should == 'false'
       end
 
       it 'normalizes y to 1' do
-        get_value(:yesnoes, :y).should == '1'
+        get_value_from_db(:yesnoes, :y).should == 'true'
       end
 
       it 'normalizes n to 0' do
-        get_value(:yesnoes, :n).should == '0'
+        get_value_from_db(:yesnoes, :n).should == 'false'
       end
 
       it 'normalizes yes to 1' do
-        get_value(:yesnoes, :yes).should == '1'
+        get_value_from_db(:yesnoes, :yes).should == 'true'
       end
 
       it 'normalizes no to 0' do
-        get_value(:yesnoes, :no).should == '0'
+        get_value_from_db(:yesnoes, :no).should == 'false'
       end
 
     end
@@ -274,66 +284,66 @@ describe 'normalization' do
       end
     end
 
-    def get_value_from_model(context, key)
+    def get_value_from_db_from_model(context, key)
       settings = @model.reload.settings_hash
       ctx = "raw_#{context}".to_sym
       settings[ctx][key]
     end
 
     it 'normalizes 1 to true' do
-      get_value_from_model(:numbers, :number_1).should === true
+      get_value_from_db_from_model(:numbers, :number_1).should === 1
     end
 
     it 'normalizes 0 to false' do
-      get_value_from_model(:numbers, :number_0).should === false
+      get_value_from_db_from_model(:numbers, :number_0).should === 0
     end
 
     it 'keeps 666 as 666' do
-      get_value_from_model(:numbers, :number_of_the_beast).should == 666
+      get_value_from_db_from_model(:numbers, :number_of_the_beast).should == 666
     end
 
     it 'keeps foo as foo' do
-      get_value_from_model(:main, :foo).should == 'foo'
+      get_value_from_db_from_model(:main, :foo).should == 'foo'
     end
 
     it 'normalizes booleany true values to true' do
-      get_value_from_model(:main, :truthy).should === true
+      get_value_from_db_from_model(:main, :truthy).should === true
     end
 
     it 'normalizes booleany false values to false' do
-      get_value_from_model(:main, :falsy).should === false
+      get_value_from_db_from_model(:main, :falsy).should === false
     end
 
     it 'normalizes t (from true) to true' do
-      get_value_from_model(:main, :t).should === true
+      get_value_from_db_from_model(:main, :t).should === true
     end
 
     it 'normalizes f (from false) to false' do
-      get_value_from_model(:main, :f).should === false
+      get_value_from_db_from_model(:main, :f).should === false
     end
 
     it 'normalizes on to true' do
-      get_value_from_model(:onoffs, :on).should === true
+      get_value_from_db_from_model(:onoffs, :on).should === true
     end
 
     it 'normalizes off to false' do
-      get_value_from_model(:onoffs, :off).should === false
+      get_value_from_db_from_model(:onoffs, :off).should === false
     end
 
     it 'normalizes y to true' do
-      get_value_from_model(:yesnoes, :y).should === true
+      get_value_from_db_from_model(:yesnoes, :y).should === true
     end
 
     it 'normalizes n to false' do
-      get_value_from_model(:yesnoes, :n).should === false
+      get_value_from_db_from_model(:yesnoes, :n).should === false
     end
 
     it 'normalizes yes to true' do
-      get_value_from_model(:yesnoes, :yes).should === true
+      get_value_from_db_from_model(:yesnoes, :yes).should === true
     end
 
     it 'normalizes no to false' do
-      get_value_from_model(:yesnoes, :no).should === false
+      get_value_from_db_from_model(:yesnoes, :no).should === false
     end
 
   end

data/spec/tunable/querying_spec.rb

@@ -125,8 +125,8 @@ describe 'setting on/off?' do
       end
 
       describe '1' do
-        it 'returns true' do
-          @model.setting_on?(:numbers, :number_1).should === true
+        it 'returns false' do
+          @model.setting_on?(:numbers, :number_1).should === false
         end
       end
 
@@ -195,8 +195,8 @@ describe 'setting on/off?' do
       end
 
       describe '0' do
-        it 'returns true' do
-          @model.setting_off?(:numbers, :number_0).should === true
+        it 'returns false' do
+          @model.setting_off?(:numbers, :number_0).should === false
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tunable
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors:
 - Tomás Pollak
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-05 00:00:00.000000000 Z
+date: 2025-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord