dir_model 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b3a8d350b4d8004603f0dc60aafcea63d16d093
-  data.tar.gz: 829174e25f6ca9217891cb4e50316f7aaf95ba40
+  metadata.gz: 7378de9f6c47b4b77eb94586bf020f0fd63936f4
+  data.tar.gz: f0658de2bead2696f7b2c0f42acc3a47657bfd76
 SHA512:
-  metadata.gz: 44cef5e36645bf8a328e24cff4bb64e89fe99150f998264d34b877b8e7bfa7706c66fec48d820bf2eaa7f2194561c0e9eb21c5a0ffd11ead8d66821ca94c3528
-  data.tar.gz: 32dfd96f5ea816d1f3eea320e74fa9903383bd580db28b6a55c85a099a525cbad5743d5c4a228ded24a518c093dffd88534c8355cc9c428ae38ad0bf2b185389
+  metadata.gz: 76622ae1c4b1d7c548147f0f51ed28efc80dc97be1d4008b23c93c689e687674caac34828ecc68e424da6e96f2bbab199f57d435308c423260917534b0c55ab4
+  data.tar.gz: de928cf63446966eb56948c029f742f97d5ede9058d94698e2cbe4336e963ccba6baca339851811e8b0a281575ab7b5f94879228e0f65818e8bf1b1c207b9f76

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+### VERSION 0.6.2
+
+* Removing escaping from the code, so now `foreign_key` should be escaped on the caller, basically user `Regexp.quote` :
+
+```
+class ParentImportDirModel < BasicImportDirModel
+  has_one :dependency, ChildImportDirModel, foreign_key: :sector_name
+
+  def sector_name
+    "sector_#{Regexp.quote(sector_id)}"
+  end
+end
+```
+
 ### VERSION 0.6.1
 
 * escape special characters on foreign key values. Due of this relations weren't be found.

data/lib/dir_model/import.rb

@@ -41,14 +41,20 @@ module DirModel
         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)
+              related_dir_model = nil
+              dir_model.has_one.each do |name, options|
+                related_dir_model = dir_model.append_dir_model(_path.current_path, index: _path.index, context: _context, relation_name: name, relation_options: options)
+              end
+              related_dir_model
             end.first
+            # Recursive call on children
             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
+            # Recursive call on children
             children.each { |_child| find_relations(_child, path, context) }
           end
         end
@@ -85,7 +91,7 @@ module DirModel
 
     def get_regexp
       if foreign_value
-        Regexp.new(self.class.options[:regex].call(Regexp.quote(foreign_value)), Regexp::IGNORECASE)
+        Regexp.new(self.class.options[:regex].call(foreign_value), Regexp::IGNORECASE)
       else
         self.class.options[:regex].call
       end

data/lib/dir_model/model/relations.rb

@@ -20,8 +20,8 @@ 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
-        _options      = self.class.has_one_relationship.values.first
+        relation_name = options[:relation_name]
+        _options      = options[:relation_options]
         related_class = _options[:dir_model_class]
         foreign_key   = _options[:foreign_key]
         foreign_value = self.send(foreign_key)
@@ -79,8 +79,6 @@ 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, 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: dir_model_class }.merge(options))
@@ -89,6 +87,10 @@ module DirModel
             true
           end
 
+          define_method(:has_one) do
+            self.class.has_one_relationship
+          end
+
           define_method("#{relation_name}=") do |value|
             instance_variable_set("@#{relation_name}", value)
           end
@@ -109,7 +111,6 @@ module DirModel
         # @param [Hash] basically for set :foreign_key
         def has_many(relation_name, dir_model_class, options)
           raise "for now, DirModel's has_many may only be called once" if @_has_many_relationship.present?
-
           relation_name = relation_name.to_sym
 
           merge_has_many_relationship(relation_name => { dir_model_class: dir_model_class }.merge(options))

data/lib/dir_model/version.rb

@@ -1,3 +1,3 @@
 module DirModel
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end

metadata

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