tunable 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 429e9db65fc91c748fc526ef2b8b3a8241490e39
-  data.tar.gz: 21c3c99469bebdd04cfcf5e9d383a15878eb2520
+  metadata.gz: 2a8d2bbef77fbf42971cd338f96724a7a7f12fed
+  data.tar.gz: 183a44bcb7404f87d161c62ccf0e2ea8447a8f63
 SHA512:
-  metadata.gz: b12ebe2c3d3670c3d9eb3de9511d0e5e068d90806c315c1011ca91c74fe9579bdca681102dde7f1aa47ed298dde33064fc56fb2f14393f14b1921bb849cc7bbb
-  data.tar.gz: 44e64b53736a25c6c754dccb8f6a842ee3182c0aeaf2400ecc9fd5b860ae834fe920d22ea209840206c7ddb2515d1bd9e476cb2457fcd12edf053ab4c46991cf
+  metadata.gz: cb42447896039571c0bdb446bcf494d1805d79e6b9d28abaf52775a1b72f4185ea95087805ef2ec2a8157498b8fdefb3ce77cdc303f32c5db067c8df0d9f727f
+  data.tar.gz: a54821f4d0bb61710eeba8487c318eda54a661d11f9c148455918dbea0f7e3580eb30f900b0ffcb3e461c17ed96eb2526ebbb1ea511708a124234b6eb1f27d4a

data/README.md

@@ -19,7 +19,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'

data/Rakefile

@@ -1,8 +1,2 @@
 require 'bundler'
-Bundler::GemHelper.install_tasks
-
-require 'spec/rake/spectask'
-
-Spec::Rake::SpecTask.new do |t|
-  t.spec_files = FileList["spec/**/*_spec.rb"]
-end
+Bundler::GemHelper.install_tasks

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,10 +104,11 @@ 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
+              # puts 'Value is same as current'
               send('changed_attributes').delete(field) # in case we had set if before
               return
             end
@@ -200,6 +194,22 @@ module Tunable
 
     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/version.rb

@@ -1,5 +1,5 @@
 module Tunable
 
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 
 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/tunable.gemspec

@@ -14,8 +14,8 @@ 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.0.0"
+  s.add_runtime_dependency "activesupport", "~> 4.0.0"
 
   s.add_development_dependency "bundler", '~> 1.0', '>= 1.0.0'
   s.add_development_dependency "rspec", '~> 3.0', '>= 3.0.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tunable
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Tomás Pollak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-01 00:00:00.000000000 Z
+date: 2015-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -145,9 +145,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Pluggable settings for your AR models.
 test_files: []
-has_rdoc: