dir_model 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97702ad9ff5a3415d30ca57f0ddfb416ca123aa7
-  data.tar.gz: 35f8b36a9e1a8c8567523188aa85fe452084be9b
+  metadata.gz: 4bd12bf7d01c2bad2a2523951ab4ab1c568e0e02
+  data.tar.gz: fc427c58ec981822cb6cbb2094133d565ca11d89
 SHA512:
-  metadata.gz: 4c7f45eaf2273af554f5698443a6c4c32e3a29fa1c4a0815bce3a7bc2bb5728dea044fc7087f8a304111f79cccdbcdb35326e38cebc9bdd7d056c170b71f27cb
-  data.tar.gz: 1da95475764bc987b22499a9236757480113f7f9eb2c96882b0a303d419c79b8864a93e69a96614c506bf0217c157bb298aa38a6af95bdd48c45a235f8af1b6c
+  metadata.gz: 16742b98db89c722a6781663280852b7c37a5fb957c9d8ce586b88b0ee910463919c6c487ce3fa32fd2a8913b248b3fb57487df2696352a6edc8781b840b2894
+  data.tar.gz: 4404f164ed161c2629abc6ebf18e51ca3790c02f85732a379161bb23b09ec0e7e211935a4a0364f6131a6d723f3282b3736a38e281600aab5cb977bb017c42cd

data/.travis.yml

@@ -1,4 +1,4 @@
 language: ruby
 rvm:
-  - 2.2.3
+  - 2.3.0
 before_install: gem install bundler -v 1.10.6

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### VERSION 0.6.0
+
+* Fix relations
+
 ### VERSION 0.5.1
 
 * Add relation has_many to a dir_model

data/README.md

@@ -60,13 +60,17 @@ A dir_model can have a relation like `has_one` basically is
 class ChildImportDirModel
   include DirModel::Model
   include DirModel::Import
-  file :metadata, regex: -> { /Zones\/Sector_(?<sector_id>.*)\/Zone_(?<zone_id>.*)\.(?<extension>json)/i }
+  file :metadata, regex: ->(foreign_value) { "Zones\/(?<sector_name>#{foreign_value})\/Zone_(?<zone_id>.*)\.(?<extension>json)" }
 end
 ```
 
 ```ruby
 class ParentImportDirModel < BasicImportDirModel
-  has_one :dependency, ChildImportDirModel
+  has_one :dependency, ChildImportDirModel, foreign_key: :sector_name
+
+  def sector_name
+    "sector_#{sector_id}"
+  end
 end
 ```
 
@@ -85,7 +89,7 @@ NOTE regex on child pass explicitly the value
 class ZoneDirModel
   include DirModel::Model
   include DirModel::Import
-  file :image, regex: ->(foreign_value) { "Zones\/#{foreign_value}\/Zone_(?<zone_id>.*)\.(?<extension>png|jpg)" }
+  file :image, regex: ->(foreign_value) { "Zones\/(?<sector_name>#{foreign_value})\/Zone_(?<zone_id>.*)\.(?<extension>png|jpg)" }
 end
 ```
 

data/UPGRADE.md

@@ -1,5 +1,9 @@
 # Upgrading
 
+# Upgrading from 0.5.1 to 0.6.0
+
+* relation need to have a foreign_key and dir_model related need to have a regex with the foreign_key in params
+
 # Upgrading from 0.4.0 to 0.5.0
 
 * Ensure you have only one definition of `file:` by dir_model

data/lib/dir_model/import.rb

@@ -30,7 +30,7 @@ module DirModel
 
         path.read_path
         dir_model = new(path.current_path, index: path.index, context: context, previous: previous)
-        find_relations(dir_model, path, context)
+        find_relations(dir_model, path, context) unless dir_model.skip?
 
         dir_model
       end
@@ -38,20 +38,18 @@ module DirModel
       private
 
       def find_relations(dir_model, path, context)
-        unless dir_model.skip?
-          if dir_model.has_relations?
-            if dir_model.has_one?
-              child = search(path, context) do |_path, _context|
-                dir_model.append_dir_model(_path.current_path, index: _path.index, context: _context)
-              end.first
-              find_relations(child, path, context) if child
-            end
-            if dir_model.has_many?
-              children = search(path, context) do |_path, _context|
-                dir_model.append_dir_models(_path.current_path, index: _path.index, context: _context)
-              end
-              children.each { |_child| find_relations(_child, path, context) }
+        if dir_model.has_relations?
+          if dir_model.has_one?
+            child = search(path, context) do |_path, _context|
+              dir_model.append_dir_model(_path.current_path, index: _path.index, context: _context)
+            end.first
+            find_relations(child, path, context) if child
+          end
+          if dir_model.has_many?
+            children = search(path, context) do |_path, _context|
+              dir_model.append_dir_models(_path.current_path, index: _path.index, context: _context)
             end
+            children.each { |_child| find_relations(_child, path, context) }
           end
         end
       end

data/lib/dir_model/model/relations.rb

@@ -21,9 +21,13 @@ module DirModel
       # @return [Model] return the child if it is valid, otherwise returns nil
       def append_dir_model(source_path, options={})
         relation_name = self.class.has_one_relationship.keys.first
-        related_class = self.class.has_one_relationship.values.first
+        _options      = self.class.has_one_relationship.values.first
+        related_class = _options[:dir_model_class]
+        foreign_key   = _options[:foreign_key]
+        foreign_value = self.send(foreign_key)
 
-        related_dir_model = related_class.new(source_path, options.reverse_merge(parent: self))
+        related_dir_model = related_class.new(source_path,
+          options.reverse_merge(parent: self, foreign_value: foreign_value))
 
         return unless related_dir_model
 
@@ -74,12 +78,12 @@ module DirModel
         #
         # @param [Symbol] relation_name the name of the relation
         # @param [DirModel::Import] dir_model_class class of the relation
-        def has_one(relation_name, dir_model_class)
+        def has_one(relation_name, dir_model_class, options)
           raise "for now, DirModel's has_one may only be called once" if @_has_one_relationship.present?
 
           relation_name = relation_name.to_sym
 
-          merge_has_one_relationship(relation_name => dir_model_class)
+          merge_has_one_relationship(relation_name => { dir_model_class: dir_model_class }.merge(options))
 
           define_method(:has_one?) do
             true
@@ -94,6 +98,10 @@ module DirModel
           end
         end
 
+        def has_one?
+          !!@_has_one_relationship
+        end
+
         # Defines a relationship between a dir model
         #
         # @param [Symbol] relation_name the name of the relation
@@ -118,6 +126,14 @@ module DirModel
             instance_variable_get(variable_name) || instance_variable_set(variable_name, [])
           end
         end
+
+        def has_many?
+          !!@_has_many_relationship
+        end
+
+        def has_relations?
+          has_one? || has_many?
+        end
       end
     end
   end

data/lib/dir_model/version.rb

@@ -1,3 +1,3 @@
 module DirModel
-  VERSION = '0.5.2'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dir_model
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Steve Chung
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-04 00:00:00.000000000 Z
+date: 2016-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport