active_data 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7a72a84858d1c5737ed98029682614052de1281e89d617d934a5ab7e16cd93c
-  data.tar.gz: ca64b3895dd8bbdd4503e8a8425aef4c210e0fb33f15f456bfe69d25fe741776
+  metadata.gz: aec99c84b95cc5a79feaf4230cdbf4eb89780afc910bf03278d5f2377a48b0c5
+  data.tar.gz: 71941c2fd303ccca637d7f58646dc5a3e3417f506e8cee405a57649a3c770d6c
 SHA512:
-  metadata.gz: 18452047bf27f1a2ea4b2428ebc0e887bce1fb03bbed3dc44a0e2867ad761dca984a828796cd4691b9c6a5240f432cfe4f6c79ff20197be044cd30971db84a41
-  data.tar.gz: 9f11d63a14102cee31677b9a97bdda8ff90f734ca3d18d3473ee0fee9da2ae8a61c08e240e4697d4eb86d55f5b56b79412438eeb92fd7f8197098510f2969882
+  metadata.gz: 3603d8b5de895f35f5c19db31a1de8fa71853595a0d93cf772c2894ff0a89fec0afb1d3b3c6f56b8d410ea22339f5e9abe96ca1023a1b414b720f1526afcc09e
+  data.tar.gz: 35a90113764e1a5125d8cd205036e804e9dbfe7e2cb1ffdd812d6b99a5b0233c7efebafaab8452ef12d89c1a78f3d8ee212b55dd5ad59bbc8b399e80c256cbc8

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # master
 
+# Version 1.1.2
+
+## Changes
+
+* `ActiveData.base_concern` config option in addition to `ActiveData.base_class` (#64)
+
 # Version 1.1.1
 
 ## Changes

data/lib/active_data/config.rb

@@ -2,7 +2,7 @@ module ActiveData
   class Config
     include Singleton
 
-    attr_accessor :include_root_in_json, :i18n_scope, :logger, :primary_attribute, :base_class,
+    attr_accessor :include_root_in_json, :i18n_scope, :logger, :primary_attribute, :base_class, :base_concern,
       :_normalizers, :_typecasters
 
     def self.delegated

data/lib/active_data/model/associations/reflections/embeds_any.rb

@@ -3,22 +3,29 @@ module ActiveData
     module Associations
       module Reflections
         class EmbedsAny < Base
-          def self.build(target, generated_methods, name, options = {}, &block)
-            if block
-              options[:class] = proc do |reflection|
-                superclass = reflection.options[:class_name].to_s.presence.try(:constantize)
-                klass = Class.new(superclass || ActiveData.base_class) do
-                  include ActiveData::Model
-                  include ActiveData::Model::Associations
-                  include ActiveData::Model::Lifecycle
-                  include ActiveData::Model::Primary
+          class << self
+            def build(target, generated_methods, name, options = {}, &block)
+              if block
+                options[:class] = proc do |reflection|
+                  superclass = reflection.options[:class_name].to_s.presence.try(:constantize)
+                  klass = build_class(superclass)
+                  target.const_set(name.to_s.classify, klass)
+                  klass.class_eval(&block)
+                  klass
                 end
-                target.const_set(name.to_s.classify, klass)
-                klass.class_eval(&block)
-                klass
+              end
+              super
+            end
+
+            private def build_class(superclass)
+              Class.new(superclass || ActiveData.base_class) do
+                include ActiveData::Model
+                include ActiveData::Model::Associations
+                include ActiveData::Model::Lifecycle
+                include ActiveData::Model::Primary
+                include ActiveData.base_concern if ActiveData.base_concern
               end
             end
-            super
           end
 
           def klass

data/lib/active_data/version.rb

@@ -1,3 +1,3 @@
 module ActiveData
-  VERSION = '1.1.1'.freeze
+  VERSION = '1.1.2'.freeze
 end

data/spec/lib/active_data/model/associations/reflections/embeds_any_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+require 'active_data/base'
+
+describe ActiveData::Model::Associations::Reflections::EmbedsAny do
+  describe '#build' do
+    subject { described_class.build(User, User, :projects) {}.klass.new }
+
+    before do
+      stub_model(:project) do
+        include ActiveData::Model::Lifecycle
+        attribute :title, String
+      end
+      stub_model(:user) do
+        include ActiveData::Model::Associations
+
+        attribute :name, String
+        embeds_many :projects
+      end
+    end
+
+    it { is_expected.to be_a(ActiveData::Model) }
+    it { is_expected.to be_a(ActiveData::Model::Primary) }
+    it { is_expected.to be_a(ActiveData::Model::Lifecycle) }
+    it { is_expected.to be_a(ActiveData::Model::Associations) }
+
+    context 'when ActiveData.base_concern is defined' do
+      before do
+        stub_const('MyModule', Module.new)
+
+        allow(ActiveData).to receive(:base_concern).and_return(MyModule)
+
+        stub_model(:user) do
+          include ActiveData::Model::Associations
+
+          embeds_many :projects
+        end
+      end
+
+      it { is_expected.to be_a(MyModule) }
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_data
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - pyromaniac
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-08 00:00:00.000000000 Z
+date: 2018-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -277,6 +277,7 @@ files:
 - spec/lib/active_data/model/associations/persistence_adapters/active_record_spec.rb
 - spec/lib/active_data/model/associations/references_many_spec.rb
 - spec/lib/active_data/model/associations/references_one_spec.rb
+- spec/lib/active_data/model/associations/reflections/embeds_any_spec.rb
 - spec/lib/active_data/model/associations/reflections/embeds_many_spec.rb
 - spec/lib/active_data/model/associations/reflections/embeds_one_spec.rb
 - spec/lib/active_data/model/associations/reflections/references_many_spec.rb
@@ -347,6 +348,7 @@ test_files:
 - spec/lib/active_data/model/associations/persistence_adapters/active_record_spec.rb
 - spec/lib/active_data/model/associations/references_many_spec.rb
 - spec/lib/active_data/model/associations/references_one_spec.rb
+- spec/lib/active_data/model/associations/reflections/embeds_any_spec.rb
 - spec/lib/active_data/model/associations/reflections/embeds_many_spec.rb
 - spec/lib/active_data/model/associations/reflections/embeds_one_spec.rb
 - spec/lib/active_data/model/associations/reflections/references_many_spec.rb