mongoid-archivable 1.5.0 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d281f023d49fddd082a7afd6c8287c653fb9db96
-  data.tar.gz: 0a289215bf188f0596ede2dfa32d1693d04ebc02
+  metadata.gz: 6196888bed37db1654169604ef259efd32fcf17c
+  data.tar.gz: 510d60a14521bffa9a7fc0c1f128ddb2549702fa
 SHA512:
-  metadata.gz: 7accbb6a07ee5027898e8d1834cc2ca08360cbb5ac6f9a4ec8c73248a4b9551e8cbf83b5744d588db9190d6818e535702ef4138fc45a7a4e1fdfed232a7cf73c
-  data.tar.gz: d16615059c613e8dab9c63495e8bd84ebd95ccf3acf87950b95b7dce1c193271655026edb2523daad4b1f67482ea4b99528584a2ac308fc8a2e27769e0b5826e
+  metadata.gz: 1f0176ff51fca46ffbbe08af76c0f7d3feadcee54cd1d3445844bd02b21449fcd029cbab63327b196129eeb21e2078b860238e2908401657c148866ad281db43
+  data.tar.gz: 63262b2557d0f08feb5a138c6281f0dc416cac19fd9415b9b70413bea3044955178df39fcd227cf13dd4b86a6896d6336617e2e555f1aed4bded9900fb238d78

data/.ruby-version

@@ -1 +1 @@
-2.2.2
+2.2.5

data/.travis.yml

@@ -0,0 +1,15 @@
+language: ruby
+script: 'bundle exec rake'
+sudo: false
+rvm:
+  - 2.2.5
+services:
+  - mongodb
+
+notifications:
+  email:
+    recipients:
+      - joost@spacebabies.nl
+      - tomas.celizna@gmail.com
+    on_failure: change
+    on_success: never

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+# 1.5.2
+
+* correctly restore localized fields on self and embedded documents
+
+# 1.5.0
+
+* support Mongoid 6

data/README.md

@@ -1,8 +1,8 @@
 # Mongoid::Archivable
 
-Moves Mongoid documents to an archive instead of destroying them.
+[![Build Status](https://travis-ci.org/Sign2Pay/mongoid-archivable.svg)](https://travis-ci.org/Sign2Pay/mongoid-archivable) [![Gem Version](https://badge.fury.io/rb/mongoid-archivable.svg)](http://badge.fury.io/rb/mongoid-archivable)
 
-[ ![Codeship Status for Sign2Pay/mongoid-archivable](https://codeship.com/projects/a6d39180-c4c7-0132-bf85-1a3509ce6b71/status?branch=master)](https://codeship.com/projects/74192)
+Moves Mongoid documents to an archive instead of destroying them.
 
 ## Installation
 

data/Rakefile

@@ -1,5 +1,5 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new
 

data/lib/mongoid-archivable.rb

@@ -1,2 +1,3 @@
 require 'mongoid/archivable/version'
+require 'mongoid/archivable/process_localized_fields'
 require 'mongoid/archivable'

data/lib/mongoid/archivable.rb

@@ -1,4 +1,5 @@
 require 'active_support/concern'
+require 'mongoid/archivable/process_localized_fields'
 
 module Mongoid
   module Archivable
@@ -14,7 +15,10 @@ module Mongoid
       def original_document
         @original_document ||= begin
           excluded_attributes = %w(_id original_id original_type archived_at)
-          original_class_name.constantize.new(attributes.except(*excluded_attributes)) do |doc|
+          attrs = attributes.except(*excluded_attributes)
+          attrs = Mongoid::Archivable::ProcessLocalizedFields.call(original_class, attrs)
+
+          original_class.new(attrs) do |doc|
             doc.id = original_id
           end
         end
@@ -30,6 +34,10 @@ module Mongoid
           self.class.to_s.gsub(/::Archive\z/, '') # gem version < 1.3.0, turns "User::Archive" into "User".
         end
       end
+
+      def original_class
+        original_class_name.constantize
+      end
     end
 
     included do

data/lib/mongoid/archivable/process_localized_fields.rb

@@ -0,0 +1,60 @@
+module Mongoid
+  module Archivable
+    # loops through all fields on document, as well as on its embedded relations
+    # and makes sure all attributes that belong to localized fields are assigned
+    # via their *_translations writer
+    class ProcessLocalizedFields < Struct.new(:cls, :attrs)
+      def self.call(*args)
+        new(*args).call
+      end
+
+      def initialize(cls, attrs = {})
+        super(cls, attrs)
+      end
+
+      def call
+        attrs = convert_fields
+
+        embedded_relations.each do |relation|
+          relation_name = relation.name.to_s
+          relation_class = relation.class_name.constantize
+
+          # convert embeds_many
+          if attrs[relation_name].is_a?(Array)
+            attrs[relation_name] = attrs[relation_name].map do |att|
+              ProcessLocalizedFields.call(relation_class, att)
+            end
+          # convert embeds_one
+          elsif att = attrs[relation_name]
+            attrs[relation_name] = ProcessLocalizedFields.call(relation_class, att)
+          end
+        end
+
+        attrs
+      end
+
+      private
+
+      def localized_fields
+        cls.fields.values.select(&:localized?)
+      end
+
+      def localized_field_names
+        localized_fields.map(&:name)
+      end
+
+      def convert_fields
+        attrs.map do |name, value|
+          if localized_field_names.include?(name.to_s)
+            name = "#{name}_translations"
+          end
+          [name, value]
+        end.to_h
+      end
+
+      def embedded_relations
+        cls.relations.values.select(&:embedded?)
+      end
+    end
+  end
+end

data/lib/mongoid/archivable/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Archivable
-    VERSION = '1.5.0'.freeze
+    VERSION = '1.5.2'.freeze
   end
 end

data/mongoid-archivable.gemspec

@@ -24,5 +24,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec', '~> 3.2.0'
+  spec.add_development_dependency 'rspec'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-archivable
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.2
 platform: ruby
 authors:
 - Joost Baaij
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-13 00:00:00.000000000 Z
+date: 2017-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -70,16 +70,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '0'
 description: Move Mongoid documents to an archive instead of destroying them.
 email:
 - joost@spacebabies.nl
@@ -90,6 +90,8 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
+- ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -99,6 +101,7 @@ files:
 - bin/setup
 - lib/mongoid-archivable.rb
 - lib/mongoid/archivable.rb
+- lib/mongoid/archivable/process_localized_fields.rb
 - lib/mongoid/archivable/version.rb
 - mongoid-archivable.gemspec
 homepage: https://github.com/Sign2Pay/mongoid-archivable
@@ -121,9 +124,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Move Mongoid documents to an archive instead of destroying them.
 test_files: []
-has_rdoc: