undo-serializer-active_model 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d12c416b6ad607a212cc6d5b3d66f7aa5164f72
-  data.tar.gz: 5ec5d4c5db2e21f6944839c7e378ff2ba128f90e
+  metadata.gz: 6188d00d90207d48156387473c490acea184f15f
+  data.tar.gz: bdbd1c4a303f7bd9369b14b44e80f7efd4670d6d
 SHA512:
-  metadata.gz: 4562cb102abbe4dd871a6fa7578061b4cc5dea5cf0c38933da76086f7544305d8bd4be2ace75b3afcd6b371cb4dc17fd44f7ceb0bb302fd3a03c1287ed7b6098
-  data.tar.gz: f95498485f8b6659fe465c00bfaa74a9bdf759b8f6430abb649774f835ce3d49477faf21cfcd24186517ccb53d97a80755aa9d878ae2173feda2ce6ed354200a
+  metadata.gz: 784789d8a4f0312a731133d06fa067fb960c22344202f645c58a7a3722720928e709878d4b31b4f220dad34777cc437726001bd3c7f3140f1c2f7d7076d22ec6
+  data.tar.gz: 2559ff72d0eff7ecff7bb9bdcd9c298444afe5fb39287faac00cbbfb151dff88184f0921929693fa497ffb074579f39fed5e2487715c7adff4b5ed9b974100ce

data/.travis.yml

@@ -1,17 +1,19 @@
 language: ruby
+bundler_args: --without development
+cache: bundler
 rvm:
   - 2.1
   - 2.0
   - 1.9.3
   - ruby-head
-  - rbx
+  - rbx-2
   - jruby-19mode
   - jruby-head
 
 matrix:
   allow_failures:
     - rvm: ruby-head
-    - rvm: rbx
+    - rvm: rbx-2
     - rvm: jruby-19mode
     - rvm: jruby-head
 

data/Gemfile

@@ -1,22 +1,26 @@
 source 'https://rubygems.org'
-gemspec
+
+gem "rake"
+
+group :development do
+  gem 'pry'
+  platforms :ruby_19, :ruby_20 do
+    gem 'pry-plus'
+  end
+end
 
 group :test do
+  gem "coveralls", require: false
+end
+
+group :test, :development do
+  gem "rspec", ">= 3.0.0.beta1"
   gem 'rails', '4.0.2'
   gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
   gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
   gem 'factory_girl'
   gem 'faker'
-  if !!ENV['CI']
-    gem "coveralls"
-  else
-    gem "pry"
-    gem "pry-plus" if "ruby" == RUBY_ENGINE
-  end
+  gem "active_model_serializers", "~> 0.8"
 end
 
-platforms :rbx do
-  gem 'racc'
-  gem 'rubysl', '~> 2.0'
-  gem 'psych'
-end
+gemspec

data/README.md

@@ -7,6 +7,8 @@ Undo
 
 ActiveModel serializer for Undo gem.
 
+Designed to be used with `gem "active_model_serializers"`, but does not depends on it.
+
 Contents
 ---------
 1. Installation
@@ -34,44 +36,62 @@ Or install it yourself as:
 Requirements
 ------------
 1. Ruby >= 1.9
-1. `active_model_serializers` "~> 0.8"
-1. `activesupport` (`active_model_serializers` depends on it too)
+1. `activesupport` (`active_model_serializers` depends on it)
 
 Usage
 ------------
 
-It is required to set `somethig___association_class_name` as `key` in `active_model_serializer`:
+Gem is designed to be used with Undo gem.  
+Add it in global config:
+
 ``` ruby
-class UserSerializer < ActiveModel::Serializer
-  attributes *User.attribute_names.map(&:to_sym)
-  has_many :roles, key: :has_many___roles
+Undo.configure do |config|
+  config.serializer = Undo::Serializer::ActiveModel.new
 end
 ```
 
-Gem is designed to be used with Undo gem.  
-Add it in global config:
+Custom serializer could be provided to the adapter:
+``` ruby
+Undo.configure do |config|
+  config.serializer = 
+    Undo::Serializer::ActiveModel.new serializer: ->(object) { "#{object.class.name}UndoSerializer".constantize.new(object) }
+end
+```
 
+Or it may be initialized by serializer instance:
 ``` ruby
 Undo.configure do |config|
-  config.serializer = Undo::Serializer::ActiveModel.new
+  config.serializer = 
+    Undo::Serializer::ActiveModel.new CustomSerializer.new
 end
 ```
 
-or use in place:
+As usual any Undo configuration may be set in place on wrap and restore:
 ``` ruby
 Undo.wrap user, serializer: Undo::Serializer::ActiveModel.new
 Undo.restore uuid, serializer: Undo::Serializer::ActiveModel.new
 ```
 
-In place using the specific serializer from `gem active_model_serializers`:
+In place using the specific serializer from `gem "active_model_serializers"`:
 ``` ruby
 Undo.wrap user, serializer: Undo::Serializer::ActiveModel.new(UserSerializer.new(user))
 ```
 
+### Associations
+
+It is required to set `somethig___association_class_name` as `key` in `active_model_serializer`:
+``` ruby
+class UserSerializer < ActiveModel::Serializer
+  attributes *User.attribute_names.map(&:to_sym)
+  has_many :roles, key: :has_many___roles
+end
+```
+
 
 Contacts
 -------------
 Have questions or recommendations? Contact me via `alexander.n.paramonov@gmail.com`
+
 Found a bug or have enhancement request? You are welcome at [Github bugtracker](https://github.com/AlexParamonov/undo-serializer-active_model/issues)
 
 
@@ -83,7 +103,7 @@ tested with Ruby
 * 2.0
 * 1.9.3
 * ruby-head
-* rbx
+* rbx-2
 * jruby-19mode
 * jruby-head
 
@@ -100,5 +120,5 @@ See [build history](http://travis-ci.org/#!/AlexParamonov/undo-serializer-active
 
 Copyright
 ---------
-Copyright © 2014 Alexander Paramonov.
+Copyright © 2014 Alexander Paramonov.  
 Released under the MIT License. See the LICENSE file for further details.

data/Rakefile

@@ -4,7 +4,8 @@ require 'rspec/core/rake_task'
 namespace :ci do
   desc "Run tests on CI"
   RSpec::Core::RakeTask.new('all') do |t|
-    t.rspec_opts = '-fprogress'
     t.verbose = true
   end
 end
+
+task :default => "ci:all"

data/VERSION

@@ -0,0 +1 @@
+0.0.3

data/lib/undo/serializer/active_model.rb

@@ -1,14 +1,17 @@
+require "active_support"
+
 module Undo
   module Serializer
     class ActiveModel
-      VERSION = "0.0.2"
-
-      def initialize(model_serializer = nil)
-        @model_serializer = model_serializer
+      def initialize(*args)
+        options = args.extract_options!
+        @serializer = args.first
+        @serializer_source = options.fetch :serializer,
+          ->(object) { object.active_model_serializer.new object }
       end
 
       def serialize(object)
-        model_serializer(object).as_json
+        serializer(object).as_json
       end
 
       def deserialize(hash)
@@ -35,9 +38,10 @@ module Undo
       end
 
       private
-      def model_serializer(object)
-        @model_serializer ||= object.active_model_serializer
-        @model_serializer.new object
+      attr_reader :serializer_source
+
+      def serializer(object)
+        @serializer ||= serializer_source.call object
       end
 
       def deserialize_association(association, values)

data/spec/coverage_helper.rb

@@ -0,0 +1,14 @@
+if !!ENV["CI"] || "test" == ENV["RAILS_ENV"]
+  require 'simplecov'
+  require 'coveralls'
+  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+    SimpleCov::Formatter::HTMLFormatter,
+    Coveralls::SimpleCov::Formatter
+  ]
+
+  SimpleCov.start do
+    add_filter '/spec/'
+    add_filter '/vendor/'
+    minimum_coverage(90)
+  end
+end

data/spec/rails_app/config/database.yml

@@ -1,4 +1,7 @@
-test:
+test: &test
   adapter: <%= "jruby" == RUBY_ENGINE ? "jdbcsqlite3" : "sqlite3" %>
   database: ":memory:"
   timeout: 5000
+
+development: 
+  <<: *test

data/spec/rails_app/config/environments/development.rb

@@ -0,0 +1,34 @@
+RailsApp::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
+
+  # The test environment is used exclusively to run your application's
+  # test suite.  You never need to work with it otherwise.  Remember that
+  # your test database is "scratch space" for the test suite and is wiped
+  # and recreated between test runs.  Don't rely on the data there!
+  config.cache_classes = true
+  config.eager_load = false
+
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Raise exceptions instead of rendering exception templates
+  config.action_dispatch.show_exceptions = false
+
+  # Disable request forgery protection in test environment
+  config.action_controller.allow_forgery_protection    = false
+
+  # Tell Action Mailer not to deliver emails to the real world.
+  # The :test delivery method accumulates sent emails in the
+  # ActionMailer::Base.deliveries array.
+  config.action_mailer.delivery_method = :test
+  config.action_mailer.default_url_options = { :host => 'www.example.com' }
+
+  # Use SQL instead of Active Record's schema dumper when creating the test database.
+  # This is necessary if your schema can't be completely dumped by the schema dumper,
+  # like if you have constraints or database-specific column types
+  # config.active_record.schema_format = :sql
+
+  # Print deprecation notices to the stderr
+  config.active_support.deprecation = :stderr
+end

data/spec/spec_helper_lite.rb

@@ -0,0 +1,10 @@
+require_relative "coverage_helper"
+require "undo/serializer/active_model"
+
+RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+end
+
+$: << File.expand_path('../lib', File.dirname(__FILE__))

data/spec/spec_helper_rails.rb

@@ -1,22 +1,10 @@
-if !!ENV['CI']
-  require 'coveralls'
-  Coveralls.wear!
-else
-  require 'pry'
-end
-
-ENV['RAILS_ENV'] ||= 'test'
-
-require File.expand_path('../rails_app/config/environment', __FILE__)
-require 'rspec'
+require_relative 'spec_helper_lite'
+require_relative 'rails_app/config/environment'
 require_relative 'factories'
 
 ActiveRecord::Migration.verbose = false
 ActiveRecord::Migrator.migrate(Rails.root.join('db', 'migrate').to_s)
 
 RSpec.configure do |config|
-  config.mock_with :rspec do |config|
-    config.syntax = :expect
-  end
   config.include FactoryGirl::Syntax::Methods
 end

data/spec/undo/serializer/active_model_integration_spec.rb

@@ -0,0 +1,44 @@
+require "spec_helper_rails"
+
+describe Undo::Serializer::ActiveModel do
+  subject { described_class }
+  let(:serializer) { subject.new }
+  let(:user) { create :user }
+
+  it "restores object" do
+    hash = serializer.serialize user
+    user.destroy
+    restored_user = serializer.deserialize hash
+
+    expect(restored_user).to eq user
+    expect(user).not_to be_persisted
+    expect(restored_user).to be_persisted
+  end
+
+  it "restores object and associations" do
+    roles = create_list :role, 3, user: user
+    hash = serializer.serialize user
+    user.destroy
+    restored_user = serializer.deserialize hash
+
+    expect(restored_user).to eq user
+    expect(restored_user.roles).to eq roles
+  end
+
+  it "reverts changes to object" do
+    hash = serializer.serialize user
+    user.name = "Changed"
+    user.save!
+
+    restored_user = serializer.deserialize hash
+
+    expect(restored_user.name).not_to eq "Changed"
+    expect(restored_user).to eq user.reload
+  end
+
+  it "detects default serializer for a model" do
+    serializer = subject.new
+    expect(UserSerializer).to receive(:new)
+    serializer.serialize(user)
+  end
+end

data/spec/undo/serializer/active_model_spec.rb

@@ -1,54 +1,41 @@
-require "spec_helper_rails"
-require "undo/serializer/active_model"
+require "spec_helper_lite"
 
 describe Undo::Serializer::ActiveModel do
   subject { described_class }
-  let(:serializer) { described_class.new UserSerializer }
-  let(:user) { create :user }
+  let(:serializer) { subject.new }
+  let(:object) { double :object }
+  let(:am_serializer_method) { :as_json }
 
-  it "restores object" do
-    hash = serializer.serialize user
-    user.destroy
-    restored_user = serializer.deserialize hash
-
-    expect(restored_user).to eq user
-    expect(user).not_to be_persisted
-    expect(restored_user).to be_persisted
-  end
+  describe "custom serializer" do
+    it "uses provided serializer" do
+      custom_serializer = double :custom_serializer
+      serializer = subject.new custom_serializer
 
-  it "restores object and associations" do
-    roles = create_list :role, 3, user: user
-    hash = serializer.serialize user
-    user.destroy
-    restored_user = serializer.deserialize hash
+      expect(custom_serializer).to receive am_serializer_method
+      serializer.serialize object
+    end
 
-    expect(restored_user).to eq user
-    expect(restored_user.roles).to eq roles
-  end
+    it "uses custom serializer source" do
+      custom_serializer_source = double :custom_serializer_source
+      custom_serializer = double :custom_serializer
+      serializer = subject.new serializer: custom_serializer_source
 
-  it "reverts changes to object" do
-    hash = serializer.serialize user
-    user.name = "Changed"
-    user.save!
+      expect(custom_serializer_source).to receive(:call).with(object) { custom_serializer }
+      expect(custom_serializer).to receive am_serializer_method
+      serializer.serialize object
+    end
 
-    restored_user = serializer.deserialize hash
+    it "has lower priority than providing the serializer directly" do
+      custom_serializer_source = double :custom_serializer_source
+      custom_serializer = double :custom_serializer
 
-    expect(restored_user.name).not_to eq "Changed"
-    expect(restored_user).to eq user.reload
-  end
+      serializer = subject.new custom_serializer, serializer: custom_serializer_source
 
-  describe "find model serializer" do
-    it "detects serializer for a model" do
-      serializer = subject.new
-      expect(UserSerializer).to receive(:new)
-      serializer.serialize(user)
-    end
+      expect(custom_serializer_source).not_to receive(:call)
+      expect(custom_serializer).to receive am_serializer_method
 
-    it "uses provided serializer" do
-      model_serializer = double :model_serializer
-      serializer = subject.new model_serializer
-      expect(model_serializer).to receive(:new)
-      serializer.serialize(user)
+      serializer.serialize object
     end
   end
+
 end

data/undo-serializer-active_model.gemspec

@@ -1,11 +1,10 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'undo/serializer/active_model'
 
 Gem::Specification.new do |spec|
   spec.name          = "undo-serializer-active_model"
-  spec.version       = Undo::Serializer::ActiveModel::VERSION
+  spec.version       = IO.read("VERSION")
   spec.authors       = ["Alexander Paramonov"]
   spec.email         = ["alexander.n.paramonov@gmail.com"]
   spec.summary       = %q{ActiveModel serializer for Undo gem.}
@@ -19,8 +18,5 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "activesupport"
-  spec.add_dependency "active_model_serializers", "~> 0.8"
-  spec.add_development_dependency "bundler", "~> 1.5"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", ">= 3.0.0.beta1"
+  spec.add_development_dependency 'bundler', '~> 1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: undo-serializer-active_model
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Alexander Paramonov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-18 00:00:00.000000000 Z
+date: 2014-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,62 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: active_model_serializers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0.beta1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0.beta1
+        version: '1.0'
 description: ActiveModel serializer for Undo gem.
 email:
 - alexander.n.paramonov@gmail.com
@@ -97,7 +55,9 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- VERSION
 - lib/undo/serializer/active_model.rb
+- spec/coverage_helper.rb
 - spec/factories.rb
 - spec/rails_app/.gitignore
 - spec/rails_app/Rakefile
@@ -110,6 +70,7 @@ files:
 - spec/rails_app/config/boot.rb
 - spec/rails_app/config/database.yml
 - spec/rails_app/config/environment.rb
+- spec/rails_app/config/environments/development.rb
 - spec/rails_app/config/environments/test.rb
 - spec/rails_app/config/routes.rb
 - spec/rails_app/db/migrate/20140214213610_create_users.rb
@@ -117,7 +78,9 @@ files:
 - spec/rails_app/db/schema.rb
 - spec/rails_app/db/seeds.rb
 - spec/rails_app/script/rails
+- spec/spec_helper_lite.rb
 - spec/spec_helper_rails.rb
+- spec/undo/serializer/active_model_integration_spec.rb
 - spec/undo/serializer/active_model_spec.rb
 - undo-serializer-active_model.gemspec
 homepage: http://github.com/AlexParamonov/undo-serializer-active_model
@@ -145,6 +108,7 @@ signing_key:
 specification_version: 4
 summary: ActiveModel serializer for Undo gem.
 test_files:
+- spec/coverage_helper.rb
 - spec/factories.rb
 - spec/rails_app/.gitignore
 - spec/rails_app/Rakefile
@@ -157,6 +121,7 @@ test_files:
 - spec/rails_app/config/boot.rb
 - spec/rails_app/config/database.yml
 - spec/rails_app/config/environment.rb
+- spec/rails_app/config/environments/development.rb
 - spec/rails_app/config/environments/test.rb
 - spec/rails_app/config/routes.rb
 - spec/rails_app/db/migrate/20140214213610_create_users.rb
@@ -164,6 +129,8 @@ test_files:
 - spec/rails_app/db/schema.rb
 - spec/rails_app/db/seeds.rb
 - spec/rails_app/script/rails
+- spec/spec_helper_lite.rb
 - spec/spec_helper_rails.rb
+- spec/undo/serializer/active_model_integration_spec.rb
 - spec/undo/serializer/active_model_spec.rb
 has_rdoc: