serialization_scopes 0.8.2 → 0.9.0

data/VERSION

@@ -1 +1 @@
-0.8.2
+0.9.0

data/lib/serialization_scopes.rb

@@ -1,14 +1,17 @@
+require 'serialization_scopes/resolver'
+
 module SerializationScopes
   extend ActiveSupport::Concern
 
   included do
-    class_inheritable_accessor :serialization_scopes, :instance_reader => false, :instance_writer => false
+    class_inheritable_reader    :serialization_scopes, :instance_reader => false
+    write_inheritable_attribute :serialization_scopes, {}
   end
 
   module ClassMethods
 
     def serialization_scope(name, options = {})
-      self.serialization_scopes ||= {}
+      include InstanceExtensions unless included_modules.include?(InstanceExtensions)
       serialization_scopes[name.to_sym] = options
     end
 
@@ -25,35 +28,18 @@ module SerializationScopes
 
   end
 
-  module Resolver
-
-    def self.scope(key, defaults, settings)
-      defaults = Array.wrap(defaults).map(&:to_s)
-      settings = Array.wrap(settings).map(&:to_s)
+  module InstanceExtensions
+    extend ActiveSupport::Concern
 
-      case key
-      when :except
-        (settings + defaults).uniq
-      when :only
-        result = settings & defaults
-        result.empty? ? defaults : result
-      when :methods, :include
-        settings & defaults
-      else
-        settings
-      end
+    def to_xml(options = {})
+      super self.class.scoped_serialization_options(options)
     end
 
-  end
-
-  def to_xml(options = {})
-    super self.class.scoped_serialization_options(options)
-  end
+    def serializable_hash(options = {})
+      super self.class.scoped_serialization_options(options)
+    end
 
-  def serializable_hash(options = {})
-    super self.class.scoped_serialization_options(options)
   end
-
 end
 
 ActiveRecord::Base.class_eval do

data/lib/serialization_scopes/resolver.rb

@@ -0,0 +1,23 @@
+module SerializationScopes
+  module Resolver
+    extend self
+
+    def scope(key, defaults, settings)
+      defaults = Array.wrap(defaults).map(&:to_s)
+      settings = Array.wrap(settings).map(&:to_s)
+
+      case key
+      when :except
+        (settings + defaults).uniq
+      when :only
+        result = settings & defaults
+        result.empty? ? defaults : result
+      when :methods, :include
+        settings & defaults
+      else
+        settings
+      end
+    end
+
+  end
+end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 0
-  - 8
-  - 2
-  version: 0.8.2
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Dimitrij Denissenko
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-20 00:00:00 +01:00
+date: 2011-04-21 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -32,6 +32,7 @@ files:
 - VERSION
 - README
 - lib/serialization_scopes.rb
+- lib/serialization_scopes/resolver.rb
 - lib/serialization_scopes/matchers/serialize_matcher.rb
 - lib/serialization_scopes/matchers.rb
 - rails/init.rb