agile_serializer 0.0.6 → 0.0.7

data/Rakefile

@@ -1,6 +1,5 @@
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
 
 desc 'Default: run unit tests.'
 task :default => :test
@@ -12,12 +11,3 @@ Rake::TestTask.new(:test) do |t|
   t.pattern = 'test/**/*_test.rb'
   t.verbose = true
 end
-
-desc 'Generate documentation for the serialize_with_options plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'SerializeWithOptions'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/lib/agile_serializer/version.rb

@@ -1,3 +1,3 @@
 module AgileSerializer
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/agile_serializer.rb

@@ -4,20 +4,25 @@ module AgileSerializer
     require 'agile_serializer/railtie'
   end
 
+  def self.extended(base)
+    base.class_attribute(:serializer_configuration)
+    base.class_attribute(:serializer_options)
+  end
+
   def serialize_with_options(set = :default, &block)
-    configuration = read_inheritable_attribute(:configuration) || {}
-    options       = read_inheritable_attribute(:options) || {}
+    configuration = self.serializer_configuration.try(:dup) || {}
+    options       = self.serializer_options.try(:dup) || {}
 
     configuration[set] = Config.new(configuration).instance_eval(&block)
 
-    write_inheritable_attribute :configuration, configuration
-    write_inheritable_attribute :options, options
+    self.serializer_configuration = configuration
+    self.serializer_options = options
 
     include InstanceMethods
   end
 
   def serialization_configuration(set)
-    configuration = read_inheritable_attribute(:configuration)
+    configuration = self.serializer_configuration
     conf = if configuration
       configuration[set] || configuration[:default]
     end
@@ -26,7 +31,8 @@ module AgileSerializer
   end
 
   def serialization_options(set)
-    options = read_inheritable_attribute(:options)
+    options = self.serializer_options
+
     options[set] ||= serialization_configuration(set).tap do |opts|
       includes = opts.delete(:includes)
 
@@ -47,7 +53,8 @@ module AgileSerializer
         end
       end
     end
-    write_inheritable_attribute :options, options
+
+    self.serializer_options = options
     options[set]
   end
 
@@ -69,7 +76,7 @@ module AgileSerializer
       raise "Not known configuration!" unless @conf[set]
       @data = @conf[set].dup
     end
-    
+
   end
 
   module InstanceMethods

data/test/serialize_with_options_test.rb

@@ -4,7 +4,7 @@ class User < ActiveRecord::Base
   has_many :posts
   has_many :blog_posts
   has_many :check_ins
-  
+
   serialize_with_options do
     methods   :post_count
     includes  :posts
@@ -13,6 +13,7 @@ class User < ActiveRecord::Base
 
   serialize_with_options(:deep) do
     includes :check_ins
+    methods :post_count2
   end
 
   serialize_with_options(:with_email) do
@@ -23,7 +24,7 @@ class User < ActiveRecord::Base
   serialize_with_options(:with_comments) do
     includes  :posts => { :include => :comments }
   end
-  
+
   serialize_with_options(:with_check_ins) do
     includes :check_ins
     dasherize false
@@ -33,6 +34,10 @@ class User < ActiveRecord::Base
   def post_count
     self.posts.count
   end
+
+  def post_count2
+    self.posts.count
+  end
 end
 
 class Post < ActiveRecord::Base
@@ -41,7 +46,7 @@ class Post < ActiveRecord::Base
 
   serialize_with_options do
     only :title
-    includes :user, :comments
+    includes :comments
   end
 
   serialize_with_options(:deep) do
@@ -57,6 +62,8 @@ class BlogPost < Post
   serialize_with_options(:with_email) do
     includes :user
   end
+
+
 end
 
 class Comment < ActiveRecord::Base
@@ -77,65 +84,66 @@ class CheckIn < ActiveRecord::Base
 end
 
 class SerializeWithOptionsTest < Test::Unit::TestCase
-  def self.should_serialize_with_options
-    should "include active_record attributes" do
-      assert_equal @user.name, @user_hash["name"]
-    end
+  def json(obj, opts={})
+    obj.as_json(opts).with_indifferent_access
+  end
 
-    should "include specified methods" do
-      assert_equal @user.post_count, @user_hash["post_count"]
-    end
+  context "Serialize with options simple test" do
+    setup do
+      @user = User.create(:name => "John User", :email => "john@example.com")
+      @post = @user.posts.create(:title => "Hello World!", :content => "Welcome to my blog.")
+      @blog_post = @user.blog_posts.create(:title => "Hello World!", :content => "Welcome to my blog.")
+      @checkin = @user.check_ins.create(:code_name => "Natasa")
 
-    should "exclude specified attributes" do
-      assert_equal nil, @user_hash["email"]
+      [@user, @post, @blog_post, @checkin].map(&:reload)
     end
 
-    should "exclude attributes not in :only list" do
-      assert_equal nil, @post_hash["content"]
-    end
+    context "#default" do
 
-    should "include specified associations" do
-      assert_equal @post.title, @user_hash["posts"].first["title"]
-    end
-    
-    should "be identical in inherited model" do
-      assert_equal @post_hash["title"], @blog_post_hash["title"]
-    end
-    
-    should "include specified methods on associations" do
-      assert_equal @user.post_count, @post_hash["user"]["post_count"]
-    end
+      setup do
+        @user_hash = json( @user )
+        @post_hash = json( @post )
+        @blog_post_hash = json( @blog_post )
+      end
 
-    should "exclude specified methods on associations" do
-      assert_equal nil,  @post_hash["user"]["email"]
-    end
+      should "include active_record attributes" do
+        assert_equal @user.name, @user_hash["name"]
+      end
 
-    should "not include associations of associations" do
-      assert_equal nil, @user_hash["posts"].first["comments"]
-    end
+      should "include specified methods" do
+        assert_equal @user.post_count, @user_hash["post_count"]
+      end
 
-    should "include association without serialization options properly" do
-      assert_equal @comment.content, @post_hash["comments"].first["content"]
-    end
-    
-    should "override sets on inherited models" do
-      assert_equal nil, @blog_post_hash["comments"].first
-    end
-  end
+      should "exclude specified attributes" do
+        assert_equal nil, @user_hash["email"]
+      end
 
-  context "propagate includes" do
-    setup do
-      @user = User.create(:name => "John User", :email => "john@example.com")
-      @post = @user.posts.create(:title => "Hello World!", :content => "Welcome to my blog.")
-      @checkin = @user.check_ins.create(:code_name => "Natasa")
+      should "exclude attributes not in :only list" do
+        assert_equal nil, @post_hash["content"]
+      end
+
+      should "include specified associations" do
+        assert_equal @post.title, @user_hash["posts"].first["title"]
+      end
+
+      should "be identical in inherited model" do
+        assert_equal @post_hash["title"], @blog_post_hash["title"]
+      end
     end
 
-    should "Include deep relations" do
-      post_hash = JSON.parse @post.to_json(:flavor => :deep)
-      assert_equal @user.email, post_hash["user"]["email"]
-      assert_equal @checkin.code_name, post_hash["user"]["check_ins"].first['code_name']
+    context "#deep" do
+      setup do
+        @post_hash = json( @post, :flavor => :deep )
+      end
+
+      should "include specified methods on associations" do
+        assert_equal @user.post_count2, @post_hash["user"]["post_count2"]
+      end
+
+      should "include specified associations of associations" do
+        assert_equal @checkin.code_name, @post_hash["user"]["check_ins"].first["code_name"]
+      end
     end
-      
   end
 
 end

data/test/test_helper.rb

@@ -1,17 +1,23 @@
-require 'rubygems'
+require 'bundler/setup'
+
+require 'logger'
 require 'active_record'
-require 'test/unit'
+require 'turn'
 require 'shoulda'
 require 'json'
+require 'ap'
 
-$:.unshift(File.dirname(__FILE__) + '/../lib')
-require 'serialize_with_options'
-require File.dirname(__FILE__) + "/../init"
+lib = File.expand_path('../../lib/', __FILE__)
+$:.unshift lib unless $:.include?(lib)
+require 'agile_serializer'
+require 'agile_serializer/active_record'
 
 ActiveRecord::Base.establish_connection(
   :adapter => 'sqlite3',
   :database => 'test.db'
 )
+ActiveRecord::Base.include_root_in_json = false
+ActiveRecord::Base.logger = Logger.new('test.log')
 
 [:users, :posts, :comments, :check_ins, :reviews].each do |table|
   ActiveRecord::Base.connection.drop_table table rescue nil

metadata

@@ -1,70 +1,77 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: agile_serializer
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 6
-  version: 0.0.6
+version: !ruby/object:Gem::Version
+  version: 0.0.7
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Christos Trochalakis
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-10 00:00:00 +03:00
-default_executable: 
-dependencies: []
-
-description: A fork of serializer_with_options enabling deep serializer and other features
+date: 2012-09-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &34381420 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *34381420
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: &34380920 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *34380920
+description: A fork of serializer_with_options enabling deep serializer and other
+  features
 email: yatiohi@ideopolis.gr
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README.markdown
 - Rakefile
 - MIT-LICENSE
 - lib/agile_serializer.rb
-- lib/agile_serializer/version.rb
 - lib/agile_serializer/railtie.rb
+- lib/agile_serializer/version.rb
+- lib/agile_serializer/active_record.rb
 - test/test_helper.rb
 - test/serialize_with_options_test.rb
-- rails/init.rb
-has_rdoc: true
 homepage: http://github.com/ctrochalakis/agile_serializer
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Enhanced serialize options for rails, forked from serialize_with_options
 test_files: []
-
+has_rdoc: false