dao-gateway-active_record 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87d40ef5baf959eec23c5f6031c9be1bcaf44959
-  data.tar.gz: 55e79ba0e99e6784c9b4283e3e86745885c96eb4
+  metadata.gz: c5d808e37d2bf87950af6ab7a3906e81526fcb30
+  data.tar.gz: 15b82b594ac5293a67647cc13cf1f7f8bfc070df
 SHA512:
-  metadata.gz: c85da288f12e278fe12719738a11aeda9a0bf62c590666b267fb8fd9371814663527d4a42b3923e765575bfd66fdee190f7e48c5bc2d93b2b49eb627eaacc750
-  data.tar.gz: 728a5ea93c0a7d900f07fb49c67dda01156be70b668f565dbf0db2f3d8b40c7b5d065f49aff64b0c6838e7812af31262e91f8417df6ec34e21e86278e402a740
+  metadata.gz: d5f75ef9ea720e015eaf1afeee28e9dfdd00a1ad7e27430d96cfba7c139eb9e4a4df5f4a9d8274b24b6c7223554cad858e86b429f8fd8fb3509e483fc99f2f41
+  data.tar.gz: 1d181913fb335c920a2185d512f063d45511d36ecdd9b47a1fec6347b2c5dbb25656448b112e27465ac6ea84f8a7f629c6ca7081198d91f8f14d049b1e643e1a

data/dao-gateway-active_record.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.2.2'
 
-  spec.add_dependency 'dao-gateway', '~> 1.1'
+  spec.add_dependency 'dao-gateway', '~> 1.2'
   spec.add_dependency 'activerecord', '>= 4.2'
   spec.add_dependency 'activesupport', '>= 4.2'
 

data/lib/dao/gateway/active_record/base.rb

@@ -52,19 +52,6 @@ module Dao
           record
         end
 
-        def import(relation, associations)
-          @transformer.associations = associations
-          unless relation.nil?
-            if collection_scope?(relation)
-              @transformer.many(relation)
-            elsif source_scope?(relation)
-              @transformer.one(relation)
-            else
-              @transformer.other(relation)
-            end
-          end
-        end
-
         def record(domain_id)
           source.find_by_id(domain_id) if domain_id.present?
         end
@@ -73,8 +60,6 @@ module Dao
           @_relations ||= @source.reflections.keys.map(&:to_sym)
         end
 
-        private
-
         def collection_scope?(relation)
           if relation.is_a?(::ActiveRecord::Relation)
             true
@@ -84,10 +69,6 @@ module Dao
             false
           end
         end
-
-        def source_scope?(relation)
-          relation.is_a?(source)
-        end
       end
     end
   end

data/lib/dao/gateway/active_record/base_transformer.rb

@@ -2,14 +2,8 @@ module Dao
   module Gateway
     module ActiveRecord
       class BaseTransformer < Dao::Gateway::ScopeTransformer
-        def one(relation)
-          super(Array(relation))
-        end
-
-        private
-
         def add_processors
-          @processors.unshift RecordProcessor.new
+          pipe.preprocess(RecordProcessor.new)
         end
       end
     end

data/lib/dao/gateway/active_record/record_processor.rb

@@ -2,10 +2,12 @@ module Dao
   module Gateway
     module ActiveRecord
       class RecordProcessor < Gateway::Processor
-        def process(record, associations, *)
-          associations = associations.first if associations.count == 1
+        def prepared
+          @associations = @associations.first if @associations.count == 1
+        end
 
-          ::HashWithIndifferentAccess.new(record.try(:serializable_hash, force_except: [], include: associations))
+        def process(record)
+          ::HashWithIndifferentAccess.new(record.try(:serializable_hash, force_except: [], include: @associations))
         end
       end
     end

data/lib/dao/gateway/active_record/version.rb

@@ -1,7 +1,7 @@
 module Dao
   module Gateway
     module ActiveRecord
-      VERSION = '1.1.0'
+      VERSION = '1.2.0'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dao-gateway-active_record
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - llxff
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-28 00:00:00.000000000 Z
+date: 2016-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dao-gateway
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement