undo-serializer-active_model 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6188d00d90207d48156387473c490acea184f15f
-  data.tar.gz: bdbd1c4a303f7bd9369b14b44e80f7efd4670d6d
+  metadata.gz: a8f6129e916df1177c739956b56adcfb3b1f337b
+  data.tar.gz: 09f23cd4001f82babd417949d40dced4323e359e
 SHA512:
-  metadata.gz: 784789d8a4f0312a731133d06fa067fb960c22344202f645c58a7a3722720928e709878d4b31b4f220dad34777cc437726001bd3c7f3140f1c2f7d7076d22ec6
-  data.tar.gz: 2559ff72d0eff7ecff7bb9bdcd9c298444afe5fb39287faac00cbbfb151dff88184f0921929693fa497ffb074579f39fed5e2487715c7adff4b5ed9b974100ce
+  metadata.gz: 4d219d7d0189d6eeb4bd05bc144e663c543aaeb902d1832545e7b0b4003a353a7514a24cf5d9fdc7417f39dfc57675bc68ea320d6cadf073c89373ccc4c7c034
+  data.tar.gz: afda0a79e726b1656deaed0c48d73f6f6052d5414560c91d21a2f9804e20d7d574afa44c3b737bbfa6f7ea7fbba944bd6df5d3c4f8bea346db63bc1b24224e03

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 /tags
+*.gemfile.lock

data/.travis.yml

@@ -10,6 +10,13 @@ rvm:
   - jruby-19mode
   - jruby-head
 
+gemfile:
+  - gemfiles/3.0.gemfile
+  - gemfiles/3.1.gemfile
+  - gemfiles/3.2.gemfile
+  - gemfiles/4.0.gemfile
+  - gemfiles/4.1.gemfile
+
 matrix:
   allow_failures:
     - rvm: ruby-head

data/Appraisals

@@ -0,0 +1,24 @@
+appraise "3.0" do
+  gem "activerecord", "~> 3.0.20"
+  gem "undo-serializer-active_model", :path => "../"
+end
+
+appraise "3.1" do
+  gem "activerecord", "~> 3.1.12"
+  gem "undo-serializer-active_model", :path => "../"
+end
+
+appraise "3.2" do
+  gem "activerecord", "~> 3.2.15"
+  gem "undo-serializer-active_model", :path => "../"
+end
+
+appraise "4.0" do
+  gem "activerecord", "~> 4.0.0"
+  gem "undo-serializer-active_model", :path => "../"
+end
+
+appraise "4.1" do
+  gem "activerecord", "~> 4.1.0.beta"
+  gem "undo-serializer-active_model", :path => "../"
+end

data/Gemfile

@@ -7,6 +7,7 @@ group :development do
   platforms :ruby_19, :ruby_20 do
     gem 'pry-plus'
   end
+  gem "appraisal", github: "thoughtbot/appraisal"
 end
 
 group :test do
@@ -15,7 +16,7 @@ end
 
 group :test, :development do
   gem "rspec", ">= 3.0.0.beta1"
-  gem 'rails', '4.0.2'
+  gem 'activerecord', '>= 3.0.0'
   gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
   gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
   gem 'factory_girl'

data/README.md

@@ -97,7 +97,7 @@ Found a bug or have enhancement request? You are welcome at [Github bugtracker](
 
 Compatibility
 -------------
-tested with Ruby
+tested with Ruby:
 
 * 2.1
 * 2.0
@@ -107,6 +107,14 @@ tested with Ruby
 * jruby-19mode
 * jruby-head
 
+and ActiveRecord:
+
+* 3.0
+* 3.1
+* 3.2
+* 4.0
+* 4.1
+
 See [build history](http://travis-ci.org/#!/AlexParamonov/undo-serializer-active_model/builds)
 
 

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/gemfiles/3.0.gemfile

@@ -0,0 +1,31 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "activerecord", "~> 3.0.20"
+gem "undo-serializer-active_model", :path=>"../"
+
+group :development do
+  gem "pry"
+  gem "appraisal", :github=>"thoughtbot/appraisal"
+  
+  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 "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
+  gem "sqlite3", :platform=>[:ruby, :mswin, :mingw]
+  gem "factory_girl"
+  gem "faker"
+  gem "active_model_serializers", "~> 0.8"
+end
+
+gemspec :path=>".././"

data/gemfiles/3.1.gemfile

@@ -0,0 +1,31 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "activerecord", "~> 3.1.12"
+gem "undo-serializer-active_model", :path=>"../"
+
+group :development do
+  gem "pry"
+  gem "appraisal", :github=>"thoughtbot/appraisal"
+  
+  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 "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
+  gem "sqlite3", :platform=>[:ruby, :mswin, :mingw]
+  gem "factory_girl"
+  gem "faker"
+  gem "active_model_serializers", "~> 0.8"
+end
+
+gemspec :path=>".././"

data/gemfiles/3.2.gemfile

@@ -0,0 +1,31 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "activerecord", "~> 3.2.15"
+gem "undo-serializer-active_model", :path=>"../"
+
+group :development do
+  gem "pry"
+  gem "appraisal", :github=>"thoughtbot/appraisal"
+  
+  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 "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
+  gem "sqlite3", :platform=>[:ruby, :mswin, :mingw]
+  gem "factory_girl"
+  gem "faker"
+  gem "active_model_serializers", "~> 0.8"
+end
+
+gemspec :path=>".././"

data/gemfiles/4.0.gemfile

@@ -0,0 +1,31 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "activerecord", "~> 4.0.0"
+gem "undo-serializer-active_model", :path=>"../"
+
+group :development do
+  gem "pry"
+  gem "appraisal", :github=>"thoughtbot/appraisal"
+  
+  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 "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
+  gem "sqlite3", :platform=>[:ruby, :mswin, :mingw]
+  gem "factory_girl"
+  gem "faker"
+  gem "active_model_serializers", "~> 0.8"
+end
+
+gemspec :path=>".././"

data/gemfiles/4.1.gemfile

@@ -0,0 +1,31 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "activerecord", "~> 4.1.0.beta"
+gem "undo-serializer-active_model", :path=>"../"
+
+group :development do
+  gem "pry"
+  gem "appraisal", :github=>"thoughtbot/appraisal"
+  
+  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 "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
+  gem "sqlite3", :platform=>[:ruby, :mswin, :mingw]
+  gem "factory_girl"
+  gem "faker"
+  gem "active_model_serializers", "~> 0.8"
+end
+
+gemspec :path=>".././"

data/lib/undo/serializer/active_model.rb

@@ -15,26 +15,25 @@ module Undo
       end
 
       def deserialize(hash)
-        hash.each do |object_class, data|
-          next unless data.is_a? Hash
-          data.stringify_keys!
-
-          object_class = object_class.to_s.camelize.constantize
-          object = object_class.where(id: data.fetch("id")).first_or_initialize
-
-          data.each do |field, value|
-            next if "id" == field && object.persisted?
-            _, association = field.to_s.split("___")
-            if association
-              deserialize_association(association, value)
-            else
-              object.send "#{field}=", value # not public_send!
+        object_handler, data = hash.first
+        return unless data.is_a? Hash
+        data.stringify_keys!
+
+        ActiveRecord::Base.transaction do
+          initialize_object(object_handler, data).tap do |object|
+            data.each do |field, value|
+              next if "id" == field && object.persisted?
+
+              case field
+              when /___(.*)/ then deserialize_association object, $1,    value
+              else                deserialize_field       object, field, value
+              end
             end
-          end
 
-          object.save!
-          return object
+            object.save!
+          end
         end
+
       end
 
       private
@@ -44,11 +43,24 @@ module Undo
         @serializer ||= serializer_source.call object
       end
 
-      def deserialize_association(association, values)
+      def deserialize_association(object, association, values)
         Array.wrap(values).each do |value|
-          deserialize(association.singularize => value)
+          deserialize object.public_send(association) => value
         end
       end
+
+      def deserialize_field(object, field, value)
+        object.send "#{field}=", value # not public_send!
+      end
+
+      def initialize_object(object_handler, data)
+        id = data.fetch "id"
+        relation = case object_handler
+                   when String, Symbol then object_handler.to_s.camelize.constantize
+                   else object_handler end
+
+        relation.where(id: id).first || relation.new(id: id)
+      end
     end
   end
 end

data/spec/{spec_helper_lite.rb → spec_helper.rb}

@@ -1,4 +1,4 @@
-require_relative "coverage_helper"
+require_relative "support/ci_helper"
 require "undo/serializer/active_model"
 
 RSpec.configure do |config|

data/spec/support/active_record.rb

@@ -0,0 +1,16 @@
+require 'active_record'
+$: << File.expand_path('active_record', File.dirname(__FILE__))
+
+require_relative 'factories'
+
+ActiveRecord::Base.establish_connection(
+  adapter: "jruby" == RUBY_ENGINE ? "jdbcsqlite3" : "sqlite3",
+  database: ":memory:",
+  timeout: 5000
+)
+
+require_relative "active_record/schema.rb"
+
+RSpec.configure do |config|
+  config.include FactoryGirl::Syntax::Methods
+end

data/spec/{rails_app/db → support/active_record}/schema.rb

@@ -20,4 +20,11 @@ ActiveRecord::Schema.define(version: 20140214213610) do
     t.datetime "updated_at"
   end
 
+  create_table "roles", force: true do |t|
+    t.string   "name"
+    t.integer  "user_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
 end

data/spec/{rails_app/app/models → support/active_record}/user_serializer.rb

@@ -1,6 +1,6 @@
 require "active_model_serializers"
 
 class UserSerializer < ActiveModel::Serializer
-  attributes *User.attribute_names.map(&:to_sym)
+  attributes :id, :name, :email
   has_many :roles, key: :has_many___roles
 end

data/spec/{coverage_helper.rb → support/ci_helper.rb}

@@ -11,4 +11,6 @@ if !!ENV["CI"] || "test" == ENV["RAILS_ENV"]
     add_filter '/vendor/'
     minimum_coverage(90)
   end
+else
+  require "pry"
 end

data/spec/{factories.rb → support/factories.rb}

@@ -1,3 +1,5 @@
+require 'factory_girl'
+require "faker"
 FactoryGirl.define do
   factory :user do
     name { Faker::Name.name }

data/spec/undo/serializer/active_model_integration_spec.rb

@@ -1,4 +1,8 @@
-require "spec_helper_rails"
+require "spec_helper"
+require "support/active_record"
+require "user"
+require "role"
+require "user_serializer"
 
 describe Undo::Serializer::ActiveModel do
   subject { described_class }
@@ -7,7 +11,7 @@ describe Undo::Serializer::ActiveModel do
 
   it "restores object" do
     hash = serializer.serialize user
-    user.destroy
+    user.delete
     restored_user = serializer.deserialize hash
 
     expect(restored_user).to eq user
@@ -18,9 +22,12 @@ describe Undo::Serializer::ActiveModel do
   it "restores object and associations" do
     roles = create_list :role, 3, user: user
     hash = serializer.serialize user
-    user.destroy
+    user.delete
+    Role.delete_all # HACK for ActiveRecord 3.0
+
     restored_user = serializer.deserialize hash
 
+    restored_user.reload # HACK for ActiveRecord 3.0
     expect(restored_user).to eq user
     expect(restored_user.roles).to eq roles
   end

data/spec/undo/serializer/active_model_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper_lite"
+require "spec_helper"
 
 describe Undo::Serializer::ActiveModel do
   subject { described_class }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: undo-serializer-active_model
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Alexander Paramonov
@@ -51,35 +51,26 @@ files:
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
+- Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - VERSION
+- gemfiles/3.0.gemfile
+- gemfiles/3.1.gemfile
+- gemfiles/3.2.gemfile
+- gemfiles/4.0.gemfile
+- gemfiles/4.1.gemfile
 - lib/undo/serializer/active_model.rb
-- spec/coverage_helper.rb
-- spec/factories.rb
-- spec/rails_app/.gitignore
-- spec/rails_app/Rakefile
-- spec/rails_app/app/models/.gitkeep
-- spec/rails_app/app/models/role.rb
-- spec/rails_app/app/models/user.rb
-- spec/rails_app/app/models/user_serializer.rb
-- spec/rails_app/config.ru
-- spec/rails_app/config/application.rb
-- 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
-- spec/rails_app/db/migrate/20140214213614_create_roles.rb
-- 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/spec_helper.rb
+- spec/support/active_record.rb
+- spec/support/active_record/role.rb
+- spec/support/active_record/schema.rb
+- spec/support/active_record/user.rb
+- spec/support/active_record/user_serializer.rb
+- spec/support/ci_helper.rb
+- spec/support/factories.rb
 - spec/undo/serializer/active_model_integration_spec.rb
 - spec/undo/serializer/active_model_spec.rb
 - undo-serializer-active_model.gemspec
@@ -108,29 +99,14 @@ 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
-- spec/rails_app/app/models/.gitkeep
-- spec/rails_app/app/models/role.rb
-- spec/rails_app/app/models/user.rb
-- spec/rails_app/app/models/user_serializer.rb
-- spec/rails_app/config.ru
-- spec/rails_app/config/application.rb
-- 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
-- spec/rails_app/db/migrate/20140214213614_create_roles.rb
-- 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/spec_helper.rb
+- spec/support/active_record.rb
+- spec/support/active_record/role.rb
+- spec/support/active_record/schema.rb
+- spec/support/active_record/user.rb
+- spec/support/active_record/user_serializer.rb
+- spec/support/ci_helper.rb
+- spec/support/factories.rb
 - spec/undo/serializer/active_model_integration_spec.rb
 - spec/undo/serializer/active_model_spec.rb
 has_rdoc: 

data/spec/rails_app/.gitignore

@@ -1,4 +0,0 @@
-.bundle
-db/*.sqlite3
-log/*.log
-tmp/

data/spec/rails_app/Rakefile

@@ -1,7 +0,0 @@
-# Add your own tasks in files placed in lib/tasks ending in .rake,
-# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
-
-require File.expand_path('../config/application', __FILE__)
-require 'rake'
-
-RailsApp::Application.load_tasks

data/spec/rails_app/config.ru

@@ -1,4 +0,0 @@
-# This file is used by Rack-based servers to start the application.
-
-require ::File.expand_path('../config/environment',  __FILE__)
-run RailsApp::Application

data/spec/rails_app/config/application.rb

@@ -1,13 +0,0 @@
-require File.expand_path('../boot', __FILE__)
-
-require "rails/all"
-
-# If you have a Gemfile, require the gems listed there, including any gems
-# you've limited to :test, :development, or :production.
-Bundler.require(:default, Rails.env) if defined?(Bundler)
-
-module RailsApp
-  class Application < Rails::Application
-    I18n.enforce_available_locales = false
-  end
-end

data/spec/rails_app/config/boot.rb

@@ -1,6 +0,0 @@
-require 'rubygems'
-
-# Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])

data/spec/rails_app/config/database.yml

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

data/spec/rails_app/config/environment.rb

@@ -1,5 +0,0 @@
-# Load the rails application
-require File.expand_path('../application', __FILE__)
-
-# Initialize the rails application
-RailsApp::Application.initialize!

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

@@ -1,34 +0,0 @@
-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/rails_app/config/environments/test.rb

@@ -1,34 +0,0 @@
-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/rails_app/config/routes.rb

@@ -1,2 +0,0 @@
-RailsApp::Application.routes.draw do
-end

data/spec/rails_app/db/migrate/20140214213610_create_users.rb

@@ -1,10 +0,0 @@
-class CreateUsers < ActiveRecord::Migration
-  def change
-    create_table :users do |t|
-      t.string :name
-      t.string :email
-
-      t.timestamps
-    end
-  end
-end

data/spec/rails_app/db/migrate/20140214213614_create_roles.rb

@@ -1,10 +0,0 @@
-class CreateRoles < ActiveRecord::Migration
-  def change
-    create_table :roles do |t|
-      t.string :name
-      t.integer :user_id
-
-      t.timestamps
-    end
-  end
-end

data/spec/rails_app/db/seeds.rb

@@ -1,7 +0,0 @@
-# This file should contain all the record creation needed to seed the database with its default values.
-# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
-#
-# Examples:
-#
-#   cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }])
-#   Mayor.create(:name => 'Daley', :city => cities.first)

data/spec/rails_app/script/rails

@@ -1,6 +0,0 @@
-#!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
-
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
-require File.expand_path('../../config/boot',  __FILE__)
-require 'rails/commands'

data/spec/spec_helper_rails.rb

@@ -1,10 +0,0 @@
-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.include FactoryGirl::Syntax::Methods
-end