jet_set 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe8110ac9241efcdd8c84d85b8668cbeb48e022a
-  data.tar.gz: 479ef832c344f4dbc3fd45494d23b3fa19a33a1b
+  metadata.gz: 9d9c31fea3ab85535b7334a1bcfea9f5a15577f6
+  data.tar.gz: 9dff8880d96dc20c7674a64e66553ac104da18be
 SHA512:
-  metadata.gz: 98f1d9bf5214c2a271ba7e72d73878ebc21673bc8251355163a9d3647c5c135c11f08603eb6dae68835a3d5de780d499d5bcc47bead8d0a56e7586ec3bbdba86
-  data.tar.gz: 6df0496c18992fdd35f1ac8da910c936d3e3a6ea156ed49802cbc59a161294a82a28c55aed6757dba581c92901c9061a73132cd78514edf1ecdd596e6d0238a8
+  metadata.gz: 23b7ed643ec6ad827879e7d6f2e1e9d0f038a78cd7051483de3c85f6ea1f32d02361d098ecbeab6648375b5d206367028bdd16310ca8a11bd76962ece12b0258
+  data.tar.gz: c59832f80bbf2996665384963be940e81ae9bc26a68a28f6d5bb212e28c1899710c544cfb5eeff48564e5a9a7458453eddaa475708d5ad11809a765111bb8964

data/lib/jet_set/dependency_graph.rb

@@ -10,7 +10,7 @@ module JetSet
 
       mapping.entity_mappings.keys.each do |key|
         entity = mapping.entity_mappings[key]
-        @matrix[entity.type.name] = entity.dependencies.map{|d| d.name}
+        @matrix[entity.type.name] = entity.relations.map{|d| d.name}
       end
     end
 

data/lib/jet_set/entity_mapping.rb

@@ -5,7 +5,7 @@ module JetSet
   # Entity mapping is an element of JetSet mapping definition, see +JetSet::Mapping+.
   # Should be instantiated by method +entity+ of +JetSet::Mapping+ instance.
   class EntityMapping
-    attr_reader :references, :collections, :fields, :type, :dependencies
+    attr_reader :references, :collections, :fields, :type, :dependencies, :relations
 
     # Initializes the mapping using Ruby block.
     # Parameters:
@@ -15,7 +15,8 @@ module JetSet
       @type = type
       @references = {}
       @collections = {}
-      @dependencies = []
+      @dependencies = [] # stores only strong dependencies
+      @relations = [] # stores all dependencies
       @fields = ['id']
 
       if block_given?
@@ -42,8 +43,9 @@ module JetSet
         raise MapperError, "Reference \"#{name}\" should have a type. Example:\n reference '#{name}', type: User\n"
       end
 
-      @references[name] = Reference.new(name, params[:type])
+      @references[name] = Reference.new(name, params[:type], params[:weak])
       @dependencies << params[:type] unless params[:weak]
+      @relations << params[:type]
     end
 
     # Defines an attribute-collection of a complex type - another entity defined in the mapping.

data/lib/jet_set/mapper.rb

@@ -37,8 +37,11 @@ module JetSet
 
       row.reference_names.each do |reference_name|
         if entity_mapping.references.key? reference_name.to_sym
-          type = entity_mapping.references[reference_name.to_sym].type
-          entity.set_reference! reference_name, map(type, row_hash, session, reference_name)
+          reference_id_name = reference_name + '__id'
+          unless row_hash[reference_id_name.to_sym].nil?
+            type = entity_mapping.references[reference_name.to_sym].type
+            entity.set_reference! reference_name, map(type, row_hash, session, reference_name)
+          end
         end
       end
 

data/lib/jet_set/mixin/entity.rb

@@ -97,12 +97,16 @@ module JetSet
 
         entity.references.keys.each do |key|
           value = instance_variable_get("@#{key}")
+          reference = entity.references[key]
+
           if value
             reference_id = value.instance_variable_get('@id')
-            if reference_id.nil?
+
+            if reference_id.nil? && !reference.weak?
               @__factory.create(value)
               value.flush(sequel)
             end
+
             set_reference!(key, value)
             fields << "#{key}_id"
 

data/lib/jet_set/reference.rb

@@ -7,9 +7,15 @@ module JetSet
     # Parameters:
     #   +name+:: name of the attribute
     #   +type+:: class of an entity
-    def initialize(name, type)
+    #   +weak+:: is it weak reference?
+    def initialize(name, type, weak)
       @name = name
       @type = type
+      @weak = weak
+    end
+
+    def weak?
+      @weak
     end
   end
 end

data/lib/jet_set/version.rb

@@ -1,3 +1,3 @@
 module JetSet
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jet_set
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Vladimir Kalinkin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-02 00:00:00.000000000 Z
+date: 2018-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel