serialization_scopes 0.3.0 → 0.8.0

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.8.0

data/lib/serialization_scopes.rb

@@ -2,41 +2,56 @@ module SerializationScopes
   extend ActiveSupport::Concern
 
   included do
-    class_inheritable_reader    :serialization_scopes
-    write_inheritable_attribute :serialization_scopes, {}
+    class_attribute :serialization_scopes, :instance_writer => false
+    alias_method_chain :to_xml, :scopes
+    alias_method_chain :as_json, :scopes
   end
 
   module ClassMethods
 
     def serialization_scope(name, options = {})
+      self.serialization_scopes ||= {}
       serialization_scopes[name.to_sym] = options
     end
 
     def scoped_serialization_options(options = {})
-      options ||= {}
-      name    = (options || {})[:scope]
-      scopes  = name.present? && serialization_scopes[name.to_sym] ? serialization_scopes[name.to_sym] : serialization_scopes[:default]
-      scopes.each do |key, scope_options|
-        custom_options = options[key]
-        options[key] = if key == :except
-          custom_options ? (Array.wrap(custom_options) + Array.wrap(scope_options)).uniq : Array.wrap(scope_options)
-        elsif [:only, :methods, :include].include?(key)
-          custom_options ? Array.wrap(custom_options) & Array.wrap(scope_options) : Array.wrap(scope_options)
-        else
-          custom_options ? custom_options : scope_options
-        end
+      options = options.try(:clone) || {}
+      name    = options[:scope].try(:to_sym)
+      scopes  = name.present? && serialization_scopes.key?(name) ? serialization_scopes[name] : serialization_scopes[:default]
+
+      scopes.each do |key, defaults|
+        options[key] = options[key] ? Resolver.scope(key, defaults, options[key]) : defaults
       end if scopes
+
       options
     end
 
   end
 
-  def to_xml(options = {})
-    super self.class.scoped_serialization_options(options)
+  module Resolver
+
+    def self.scope(key, defaults, settings)
+      defaults = Array.wrap(defaults)
+      settings = Array.wrap(settings)
+
+      case key
+      when :except
+        (settings + defaults).uniq
+      when :only, :methods, :include
+        settings & defaults
+      else
+        settings
+      end
+    end
+
+  end
+
+  def to_xml_with_scopes(options = {})
+    to_xml_without_scopes self.class.scoped_serialization_options(options)
   end
 
-  def as_json(options = {})
-    super self.class.scoped_serialization_options(options)
+  def as_json_with_scopes(options = {})
+    as_json_without_scopes self.class.scoped_serialization_options(options)
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: serialization_scopes
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 63
   prerelease: 
   segments: 
   - 0
-  - 3
+  - 8
   - 0
-  version: 0.3.0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Dimitrij Denissenko