dir_model 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a463aecfe9ed4b92a734acdca662de128f7e342
-  data.tar.gz: 512616906b07badd6ee5ebb1b4a3c797d6a8cade
+  metadata.gz: 31f2c4f7e3899b8393fcd1246acdaf6e34e57128
+  data.tar.gz: 11a8f61f3fa2cf01ccc673df484794caa293cfdc
 SHA512:
-  metadata.gz: e46872a46024038ba6997fe2b4967f9e85f349f5f58ede009bc17eaf8ccc47d47c47243e714cd91a936525c3eea646d1afaf59f5987ee4007cf08408052b9cac
-  data.tar.gz: 9fdf00b25d1318468b1907f4ad574b8e5a98e1f776fb7c3524ad29549bd17cb8f7ffcdbf097808d8be409e6d01810463b3c94e4e5bc3b66bb8b44be6d3e9be64
+  metadata.gz: 565270b028ebd60317079ab4ed93ab1111e91467ca832108216ff7920c9bad0048a6bf7d0cfe0faf96ad6ced0e8b1fdc22975436245b6a3730bf0bf147be6c8f
+  data.tar.gz: 9c64417df2fdfcc362f7089a5559e49af51a439485f777b733ae096304802e56845c2aa67c6ce41f41cc36559bd058d1814c98ec2ebfbb7d04388fd08f0fce25

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### VERSION 0.5.1
+
+* Add relation has_many to a dir_model
+
 ### VERSION 0.5.0
 
 * Add relation has_one to a dir_model

data/README.md

@@ -52,6 +52,8 @@ You can have access at the file through
 
 #### Relation
 
+### Has One
+
 A dir_model can have a relation like `has_one` basically is
 
 ```ruby
@@ -73,6 +75,39 @@ parent_instance.dependency # => ChildImportDirModel
 child.parent # => parent_instance
 ```
 
+### Has Many
+
+You can define an `has_many` relation with another `DirModel`, is this case syntax is a bit different you have to pass a `foreign_key`, basically the name of the method should return a value will be replace in the regex in children relationships, like examples below
+
+NOTE regex on child pass explicitly the value
+
+```ruby
+class ZoneDirModel
+  include DirModel::Model
+  include DirModel::Import
+  file :image, regex: ->(foreign_value) { "Zones\/#{foreign_value}\/Zone_(?<zone_id>.*)\.(?<extension>png|jpg)" }
+end
+```
+
+```ruby
+class SectorDirModel
+  include DirModel::Model
+  file :image, regex: -> { /Sectors\/Sector_(?<sector_id>.*)\.(?<extension>png|jpg)/i }
+end
+```
+
+```ruby
+class SectorImportDirModel < SectorDirModel
+  include DirModel::Import
+
+  has_many :dependencies, ZoneDirModel, foreign_key: :sector_name
+
+  def sector_name
+    'sector_1'
+  end
+end
+```
+
 ### Export
 
 ```ruby

data/lib/dir_model/import.rb

@@ -2,14 +2,14 @@ module DirModel
   module Import
     extend ActiveSupport::Concern
 
-    attr_reader :context, :source_path, :index, :previous
+    attr_reader :context, :source_path, :index, :previous, :foreign_value
 
     def initialize(path, options={})
       super # set parent
       @source_path, @context = path, OpenStruct.new(options[:context])
       @index, @previous      = options[:index], options[:previous].try(:dup)
       @load_state            = :ghost
-      @file_infos            = {}
+      @foreign_value         = options[:foreign_value]
     end
 
     def skip?
@@ -26,26 +26,54 @@ module DirModel
 
     module ClassMethods
       def next(path, context={}, previous=nil)
+        return if path.end?
+
         path.read_path
         dir_model = new(path.current_path, index: path.index, context: context, previous: previous)
+        find_relations(dir_model, path, context)
+
+        dir_model
+      end
 
-        if dir_model.has_relations?
-          current_position = path.index
-          path.rewind
-          loop do # loop until find related file (has_one relation)
-            path.read_path
-            break if dir_model.append_dir_model(path.current_path, index: path.index, context: context)
+      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) }
+            end
           end
-          path.set_position(current_position)
         end
-        
-        dir_model
+      end
+
+      def search(path, context)
+        return unless block_given?
+
+        dir_models = []
+        current_position = path.index
+        path.rewind
+        while !path.end? do
+          path.read_path
+          dir_models << yield(path, context)
+        end
+        path.set_position(current_position)
+        dir_models.uniq.compact
       end
     end
 
     private
 
-    attr_reader :load_state, :file_infos
+    attr_reader :load_state
 
     def match?
       return if load_state == :loaded
@@ -54,7 +82,15 @@ module DirModel
     alias_method :load, :match?
 
     def find_match
-      @_match = (source_path||'').match(self.class.options[:regex].call)
+      @_match = (source_path||'').match(get_regexp)
+    end
+
+    def get_regexp
+      if foreign_value
+        Regexp.new(self.class.options[:regex].call(foreign_value), Regexp::IGNORECASE)
+      else
+        self.class.options[:regex].call
+      end
     end
   end
 end

data/lib/dir_model/model/relations.rb

@@ -4,15 +4,16 @@ module DirModel
       extend ActiveSupport::Concern
       included do
         inherited_class_hash :has_one_relationship
+        inherited_class_hash :has_many_relationship
       end
-      
+
       # @return [Boolean] returns true, if the instance is a child
       def child?
         !!parent
       end
-      
+
       def has_relations?
-        has_one?
+        has_one? || has_many?
       end
 
       # Appends model to the parent and returns it
@@ -23,8 +24,13 @@ module DirModel
         related_class = self.class.has_one_relationship.values.first
 
         related_dir_model = related_class.new(source_path, options.reverse_merge(parent: self))
-        
+
+        return unless related_dir_model
+
         unless related_dir_model.skip?
+          if public_send(relation_name).present?
+            raise StandardError.new("There are more of one #{relation_name} => #{related_class} for #{self.class.name}")
+          end
           public_send("#{relation_name}=", related_dir_model)
           related_dir_model
         else
@@ -32,10 +38,37 @@ module DirModel
         end
       end
 
+      # Appends modeld to the parent and returns it
+      #
+      # @return [Model] return the child if it is valid, otherwise returns nil
+      def append_dir_models(source_path, options={})
+        relation_name = self.class.has_many_relationship.keys.first
+        _options      = self.class.has_many_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, foreign_value: foreign_value))
+
+        return unless related_dir_model
+
+        unless related_dir_model.skip?
+          public_send(relation_name) << related_dir_model
+          related_dir_model
+        else
+          nil
+        end
+      end
+
       def has_one?
         false
       end
-      
+
+      def has_many?
+        false
+      end
+
       class_methods do
         # Defines a relationship between a dir model
         #
@@ -47,11 +80,11 @@ module DirModel
           relation_name = relation_name.to_sym
 
           merge_has_one_relationship(relation_name => dir_model_class)
-          
+
           define_method(:has_one?) do
             true
           end
-          
+
           define_method("#{relation_name}=") do |value|
             instance_variable_set("@#{relation_name}", value)
           end
@@ -60,8 +93,32 @@ module DirModel
             instance_variable_get("@#{relation_name}")
           end
         end
-      end
 
+        # Defines a relationship between a dir model
+        #
+        # @param [Symbol] relation_name the name of the relation
+        # @param [DirModel::Import] dir_model_class class of the relation
+        # @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))
+
+          define_method(:has_many?) do
+            true
+          end
+
+          define_method(relation_name) do
+            #
+            # equal to: @relation_name ||= []
+            #
+            variable_name = "@#{relation_name}"
+            instance_variable_get(variable_name) || instance_variable_set(variable_name, [])
+          end
+        end
+      end
     end
   end
 end

data/lib/dir_model/version.rb

@@ -1,3 +1,3 @@
 module DirModel
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dir_model
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Steve Chung
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-30 00:00:00.000000000 Z
+date: 2015-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport