laserlemon-dry_serial 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/dry_serial.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dry_serial}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["laserlemon"]
-  s.date = %q{2009-08-24}
+  s.date = %q{2009-08-30}
   s.description = %q{Define serialization styles for your ActiveRecord models}
   s.email = %q{steve@laserlemon.com}
   s.extra_rdoc_files = [
@@ -17,8 +17,7 @@ Gem::Specification.new do |s|
      "README.rdoc"
   ]
   s.files = [
-    ".document",
-     ".gitignore",
+    ".gitignore",
      "LICENSE",
      "README.rdoc",
      "Rakefile",

data/lib/dry_serial.rb

@@ -4,19 +4,24 @@ module LaserLemon
   module DrySerial
     def self.included(base)
       base.class_eval do
+        extend ClassMethods
+
         class_inheritable_hash :serialization_options
         self.serialization_options = {}
 
         class_inheritable_accessor :default_serialization_style
         self.default_serialization_style = nil
+
+        alias_method_chain :to_xml, :breakfast
+        alias_method_chain :to_json, :breakfast
       end
-      base.extend ClassMethods
     end
 
     module ClassMethods
       def dry_serial(*args)
         options = args.extract_options!
         style = args.first || :default
+
         self.serialization_options[style] = options
         self.default_serialization_style ||= style
       end
@@ -24,6 +29,24 @@ module LaserLemon
       def default_serialization_options
         self.serialization_options.fetch(self.default_serialization_style, {})
       end
+
+      def styled_serialization_options(*args)
+        options = args.extract_options!
+        style = args.first || options[:style] || default_serialization_style
+
+        style_options = serialization_options.fetch(style, default_serialization_options)
+        style_options.merge(options).merge(:style => style)
+      end
+    end
+
+    def to_xml_with_breakfast(*args, &block)
+      options = self.class.styled_serialization_options(*args)
+      to_xml_without_breakfast(options, &block)
+    end
+
+    def to_json_with_breakfast(*args)
+      options = self.class.styled_serialization_options(*args)
+      to_json_without_breakfast(options)
     end
   end
 end

data/lib/serialization.rb

@@ -2,26 +2,10 @@ module LaserLemon
   module DrySerial
     module Serializer
       def self.included(base)
-        base.alias_method_chain :initialize, :breakfast
         base.alias_method_chain :add_includes, :breakfast
         base.alias_method_chain :serializable_names, :breakfast
       end
 
-      def initialize_with_breakfast(record, options = nil)
-        default_options = record.class.default_serialization_options
-
-        new_options = case options
-        when Hash
-          options.reverse_merge!(:style => record.class.default_serialization_style)
-          style_options = record.class.serialization_options.fetch(options[:style], default_options)
-          options.reverse_merge(style_options)
-        else
-          record.class.serialization_options.fetch(options, default_options).merge(:style => options)
-        end
-
-        initialize_without_breakfast(record, new_options)
-      end
-
       def add_includes_with_breakfast(&block)
         if include_associations = options.delete(:include)
           include_has_options = include_associations.is_a?(Hash)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: laserlemon-dry_serial
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - laserlemon
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-24 00:00:00 -07:00
+date: 2009-08-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,7 +42,6 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
-- .document
 - .gitignore
 - LICENSE
 - README.rdoc

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE