preferable 0.2.0 → 0.4.0

data/lib/preferable.rb

@@ -3,6 +3,7 @@ require "active_record"
 
 module Preferable
   autoload :Model,  "preferable/model"
+  autoload :Coder,  "preferable/coder"
   autoload :Schema, "preferable/schema"
   autoload :Field,  "preferable/field"
   autoload :Set,    "preferable/set"

data/lib/preferable/coder.rb

@@ -0,0 +1,29 @@
+class Preferable::Coder
+
+  def dump(obj)
+    ActiveSupport::JSON.encode(obj) if obj.is_a?(Hash) && obj.present?
+  end
+
+  def load(string)
+    return {} if string.blank?
+    return string if string.is_a?(Hash)
+    return legacy_load(string) if string.is_a?(String) && string =~ /^---/
+
+    begin
+      obj = ActiveSupport::JSON.decode(string) || {}
+      raise ActiveRecord::SerializationTypeMismatch, "Attribute was supposed to be a Hash, but was a #{obj.class}" unless obj.is_a?(Hash)
+      obj
+    rescue MultiJson::DecodeError
+      {}
+    end
+  end
+
+  private
+
+    def legacy_load(yaml)
+      lines = yaml.lines.to_a
+      lines.shift
+      YAML.load ["---", *lines].join("\n")
+    end
+
+end

data/lib/preferable/field.rb

@@ -26,7 +26,7 @@ class Preferable::Field
   def initialize(name, type, options = {})
     raise ArgumentError, "Unknown type '#{type}', available types are: #{TYPES.map(&:to_s).join(', ')}" unless TYPES.include?(type.to_sym)
 
-    @name    = name.to_sym
+    @name    = name.to_s
     @type    = type.to_sym
     @options = options.dup
     @default = type_cast @options.delete(:default)

data/lib/preferable/model.rb

@@ -21,13 +21,12 @@ module Preferable::Model
     #   end
     #
     def preferable(&block)
-      unless _preferable
-        self._preferable = Preferable::Schema.new
-        serialize :preferences
-        include PreferableMethods
-      end
-      self._preferable.instance_eval(&block) if block
-      self._preferable
+      serialize :preferences, Preferable::Coder.new
+      include PreferableMethods
+
+      self._preferable   = self._preferable.dup if self._preferable
+      self._preferable ||= Preferable::Schema.new
+      self._preferable.instance_eval(&block)
     end
 
   end
@@ -41,8 +40,7 @@ module Preferable::Model
     #   user.preferences[:theme_id] = 3
     #
     def preferences
-      value = read_attribute(:preferences)
-      value.is_a?(Preferable::Set) ? value : write_attribute(:preferences, Preferable::Set.new(self.class.name))
+      @preferences ||= Preferable::Set.wrap(self, super)
     end
 
     # Preferences writer. Updates existing preferences (doesn't replace them!)

data/lib/preferable/set.rb

@@ -1,5 +1,4 @@
 class Preferable::Set < Hash
-  MODEL_KEY = "_".freeze
   PRIVATE   = [:rehash, :fetch, :store, :shift, :delete, :delete_if, :keep_if].to_set.freeze
 
   # Make destructive methods private
@@ -7,13 +6,15 @@ class Preferable::Set < Hash
     PRIVATE.include?(m.to_sym) || m.to_s.ends_with?('!')
   end
 
-  def initialize(model_name)
-    super()
-    store MODEL_KEY, "::#{model_name}"
+  def self.wrap(owner, value)
+    new(owner).set(value || {})
   end
 
-  def model
-    @model ||= fetch(MODEL_KEY).constantize
+  attr_reader :owner
+
+  def initialize(owner)
+    super()
+    @owner = owner
   end
 
   def [](name)
@@ -30,6 +31,7 @@ class Preferable::Set < Hash
     else
       super field.name, value
     end
+    owner.send :write_attribute, :preferences, to_hash
   end
 
   def set(pairs)
@@ -37,10 +39,14 @@ class Preferable::Set < Hash
     self
   end
 
+  def to_hash
+    {}.update(self)
+  end
+
   private
 
     def find_field(name)
-      model.preferable[name.to_sym]
+      owner.class._preferable[name.to_s] if owner
     end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: preferable
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 2
+  - 4
   - 0
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Dimitrij Denissenko
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-01 00:00:00 Z
+date: 2011-09-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: abstract
@@ -38,22 +38,14 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
-    - - <
-      - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 3
         segments: 
         - 3
-        - 2
+        - 1
         - 0
-        version: 3.2.0
+        version: 3.1.0
   type: :runtime
   version_requirements: *id002
 description: Great for storing user preferences
@@ -71,6 +63,7 @@ files:
 - lib/preferable/model.rb
 - lib/preferable/set.rb
 - lib/preferable/schema.rb
+- lib/preferable/coder.rb
 homepage: https://github.com/bsm/preferable
 licenses: []