druthers 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTc3MmFjMzEzOTdhODIzODUxZTA4ZWY5OTY5NTNmYWU1YmQwOTk5Nw==
+    Y2Q2ODBjN2ViMjc4NmQ0MzI3NzBjYTBhYjgzMDFmNDlkNjRmYmJmOQ==
   data.tar.gz: !binary |-
-    YzBlNDhiMDJiMzk3ZTBjZjMwNWYwOGI1NmRmODkxZmVjZDM0YjFlYg==
-!binary "U0hBNTEy":
+    MjkzYTgzOWJhYmUyMTgzMTQ4NDYwYjczMzUxNzkxNDUxNDZkZDJhNQ==
+SHA512:
   metadata.gz: !binary |-
-    ZDQ1YjZhYzhiY2QwMDJkNjA2NmRkOGMxNjZmODMyNWVkYTg4YzkzNmZmZjRi
-    MTIwYjM1MjMxOTE1M2E4ZmVjNjBjODg4ZmEyYjk0MzgyZjRkN2M4NmYyNmI2
-    NDljZjhhNzYyMDM5YTJlMTViYjdlOWIyNzk0OTNiYjJjM2MzZDI=
+    NTM4MmRmNzM0MTI1YjgzMGVmYjZhZWQ4NDdkN2JjN2Y2MWRmYmMxNWExYTgy
+    ZGJhYmRiNmI5NzFjOTUyOGYyNThmZGY0OTNlODU4ZjIyMjg2YWZlZGM4MGMx
+    MmI1N2E5NjllMzBlNTNjZTcwMjY0YjQzZWRiNWY0MzM3YTg0Yjg=
   data.tar.gz: !binary |-
-    ZGQ3MDdhZDg2ZTBkYjMyMTg0MzI2NTJhNjU5YWI5OWM3YmJhN2ZiM2I3Y2Iz
-    YzZkMDZjYjVhMzk5NzczNDUyOGIwYWRjMjIzMGY5Y2VlMzllOTA3MTYwYWRm
-    MDU0ZDk1MGU0M2U4NmVlOGNlMTg5ODNjNmIxZjMyZTQxN2Q0M2M=
+    MzAxNWMyZDMxMDdiOTE2YzIzYmFkODA0MmNhM2ZlMmM2NjEzODJhYjcxMGJm
+    NDBhZGE2MmVmOGMwM2ZjMTUxYmM0ZDcyNzg2YzVmYWMzMmU5NTZjZGI2MGQx
+    MWQ0NjdjNjBjY2JkNTcxOTNmNWEyMzIyYTUyZTZjOTRlYjVhZmI=

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.idea

data/.travis.yml

@@ -5,6 +5,7 @@ rvm:
   - 1.9.3
 
 gemfile:
+  - ci/Gemfile.rails-4.1.x
   - ci/Gemfile.rails-4.0.x
   - ci/Gemfile.rails-3.2.x
 

data/CHANGELOG.md

@@ -1,9 +1,17 @@
 # Changelog
 
+## v0.0.3
+
+* Rails 4.1 is supported
+
+* Fixes a bug where serialized values weren't cached properly. Thanks for the
+  [description, fix and tests](https://github.com/mceachen/druthers/pull/2),
+  [JKillian](https://github.com/JKillian)!
+
 ## v0.0.2
 
-```def_druthers``` only add methods if they aren't already defined now.
+* ```def_druthers``` will only add getter and setters if they aren't already defined
 
 ## v0.0.1
 
-First Post!
+Druthers is born. YOU WILL LOVE IT

data/README.md

@@ -23,7 +23,7 @@ As opposed to ```rails-settings``` and forks, ```method_missing``` isn't used an
 ## Supported versions
 
 The latest versions of
-* Rails 3.2 & 4.0
+* Rails 3.2, 4.0, & 4.1
 * Ruby 1.9.3 & 2.0.0
 * SQLite, MySQL, and PostgreSQL
 
@@ -43,11 +43,13 @@ class Setting < ActiveRecord::Base
   serialize :value
 
   # This will be used as the value of `Setting.quest` if it is not set.
-  def default_quest
+  def self.default_quest
     "to find the holy grail"
   end
 
-  # This validation will be only run for instances whose key == "favourite_color":
+  # This validation will be only run for instances whose key == "favourite_color"
+  # Note that this isn't a class method, as the validation needs access to the
+  # instance value.
   def validate_favourite_colour
     add_error("we're right out of teal, sorry") if value == "teal"
   end

data/ci/Gemfile.rails-4.0.x

@@ -1,5 +1,4 @@
 source 'https://rubygems.org'
 gemspec :path => '..'
 
-# rspec-rails reverts to 2.3.1 (old and broken) unless you fetch the whole rails enchilada:
-gem 'rails', '~> 4.0.0'
+gem 'activerecord', '~> 4.0.0'

data/ci/Gemfile.rails-4.1.x

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gemspec :path => '..'
+
+gem 'activerecord', '~> 4.1.0.beta1'

data/lib/druthers/support.rb

@@ -38,7 +38,10 @@ module Druthers
           obj.update_attributes!(value: value)
         end
         # Only update the cache if the update! succeeded:
-        druthers_cache.write(key, value)
+        # Note that we cached the obj.value, rather than the value, to make sure
+        # returned values are consistent with the serializer's result.
+        # See https://github.com/mceachen/druthers/pull/2
+        druthers_cache.write(key, obj.value)
         obj
       end
 

data/lib/druthers/version.rb

@@ -1,3 +1,3 @@
 module Druthers
-  VERSION = Gem::Version.new("0.0.2")
+  VERSION = Gem::Version.new("0.0.3")
 end

data/test/setting_test.rb

@@ -1,7 +1,8 @@
 require 'minitest_helper'
 
 describe Setting do
-  before :each do
+  before do
+    Setting.druthers_cache.clear
     Setting.delete_all
   end
 
@@ -52,5 +53,10 @@ describe Setting do
       Setting.hashish = h
       Setting.where(key: 'hashish').first.value.must_equal h
     end
+    
+    it 'returns serialized value correctly' do
+      Setting.change = 'foo'
+      Setting.change.must_equal 'bar'
+    end
   end
 end

data/test/test_models.rb

@@ -8,8 +8,7 @@ ActiveRecord::Schema.define(:version => 0) do
 end
 
 class Setting < ActiveRecord::Base
-  def_druthers :quest, :favourite_colour, :things, :hashish
-  serialize :value
+  def_druthers :quest, :favourite_colour, :things, :hashish, :change
 
   def self.default_quest
     "to find the holy grail"
@@ -22,4 +21,18 @@ class Setting < ActiveRecord::Base
   def validate_favourite_colour
     errors.add(:value, "invalid is invalid WERD") if value == "invalid"
   end
+
+  class CustomSerialize
+    def self.load(val)
+      ActiveRecord::Coders::YAMLColumn.new.load(val)
+    end
+
+    def self.dump(val)
+      val = 'bar' if val == 'foo'
+      ActiveRecord::Coders::YAMLColumn.new.dump(val)
+    end
+  end
+
+  serialize :value, CustomSerialize
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: druthers
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Matthew McEachen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-14 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -152,6 +152,7 @@ files:
 - Rakefile
 - ci/Gemfile.rails-3.2.x
 - ci/Gemfile.rails-4.0.x
+- ci/Gemfile.rails-4.1.x
 - druthers.gemspec
 - lib/druthers.rb
 - lib/druthers/def.rb
@@ -181,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: ''