dir_model 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7378de9f6c47b4b77eb94586bf020f0fd63936f4
-  data.tar.gz: f0658de2bead2696f7b2c0f42acc3a47657bfd76
+  metadata.gz: 488a7e3ac0284d3de0d578ff43fe0293132b4a03
+  data.tar.gz: 61b2bf17b362a211bddda139effe0cbcf628d594
 SHA512:
-  metadata.gz: 76622ae1c4b1d7c548147f0f51ed28efc80dc97be1d4008b23c93c689e687674caac34828ecc68e424da6e96f2bbab199f57d435308c423260917534b0c55ab4
-  data.tar.gz: de928cf63446966eb56948c029f742f97d5ede9058d94698e2cbe4336e963ccba6baca339851811e8b0a281575ab7b5f94879228e0f65818e8bf1b1c207b9f76
+  metadata.gz: a91b3e607bdc5e8baa616cd1c4541edb45a733307d69128366bac0f0f9cf423a192e5af3dc8630194538fcc9371c023b778df7d4cef163060c97b0b415486457
+  data.tar.gz: e2477c238e7c641cff600fa2fb0db60b7c613438d73aa3ef3a2c4b0936aa36970ad25eaa7e51f60e7c45f965c7e240278d01fb3b7131707422b93f9006d85742

data/.gitignore

@@ -8,4 +8,5 @@
 /spec/reports/
 /tmp/
 
-.idea/*
+.idea/*
+.byebug_history

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### VERSION 0.7.0
+
+* Change the design of `AggregateDir` to make it composable 
+
 ### VERSION 0.6.2
 
 * Removing escaping from the code, so now `foreign_key` should be escaped on the caller, basically user `Regexp.quote` :

data/README.md

@@ -160,10 +160,12 @@ fixture_models = [
   })
 ]
 
-exporter = DirModel::Export::AggregateDir.new(BasicExportDirModel)
+exporter = DirModel::Export::AggregateDir.new
 
 exporter.generate do |dir|
-  models.each { |model| dir << model }
+  models.each do |model|
+    dir.append_model(BasicExportDirModel, model)
+  end
 end
 
 exporter.dir_path # => path of generated dir .../Sectors

data/UPGRADE.md

@@ -1,5 +1,50 @@
 # Upgrading
 
+# Upgrading from 0.6.2 to 0.7.0
+
+* Change the manner of call AggregateDir like
+
+From
+
+```
+exporter = DirModel::Export::AggregateDir.new(BasicExportDirModel)
+
+exporter.generate do |dir|
+  models.each do |model|
+    dir << model
+  end
+end
+```
+
+
+To
+
+```
+exporter = DirModel::Export::AggregateDir.new
+
+exporter.generate do |dir|
+  models.each do |model|
+    dir.append_model(BasicExportDirModel, model)
+  end
+end
+```
+
+Now you can compose like
+
+```
+exporter = DirModel::Export::AggregateDir.new
+
+exporter.generate do |dir|
+  models.each do |model|
+    dir.append_model(SectorExportDirModel, model)
+  end
+end.generate do |dir|
+  models.each do |model|
+    dir.append_model(ZoneExportDirModel, model)
+  end
+end
+```
+
 # 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

data/dir_model.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'activesupport',       '~> 4.2'
-  spec.add_dependency 'inherited_class_var', '~> 0.1'
+  spec.add_dependency 'inherited_class_var', '1.0.0.beta1'
   spec.add_dependency 'fastimage',           '~> 1.8'
 end

data/lib/dir_model/export/aggregate_dir.rb

@@ -5,23 +5,21 @@ module DirModel
     class AggregateDir
       include Utils
 
-      attr_reader :export_dir_model_class, :context, :dir_path
+      attr_reader :context, :dir_path
 
       # @param [Export] export_model export model class
-      def initialize(export_dir_model_class, context={})
-        @export_dir_model_class = export_dir_model_class
-        @context                = context.to_h.symbolize_keys
-        @dir_path               = Dir.mktmpdir
+      def initialize(context={})
+        @context  = context.to_h.symbolize_keys
+        @dir_path = Dir.mktmpdir
       end
 
       # Add a row_model to the
       # @param [] source_model the source model of the export file model
       # @param [Hash] context the extra context given to the instance of the file model
-      def append_model(source_model, context={})
+      def append_model(export_dir_model_class, source_model, context={})
         source_path = export_dir_model_class.new(source_model, context.reverse_merge(self.context)).path
         FileUtils.cp_r Dir.glob("#{source_path}/*"), dir_path
       end
-      alias_method :<<, :append_model
 
       def generate
         yield self
@@ -31,7 +29,6 @@ module DirModel
       def files
         Dir["#{@dir_path}/**/*"].select { |f| File.file?(f) }
       end
-
     end
   end
 end

data/lib/dir_model/import.rb

@@ -90,11 +90,9 @@ module DirModel
     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
+      args = []
+      args << foreign_value if foreign_value
+      instance_exec(*args, &self.class.options[:regex])
     end
   end
 end

data/lib/dir_model/model/files.rb

@@ -29,10 +29,9 @@ module DirModel
         protected
 
         def file(file_name, options={})
-          merge_files(file_name.to_sym => options)
+          files_object.merge(file_name.to_sym => options)
           raise ArgumentError.new("You cannot define more of one file: but you can add relations, see README") if files.keys.size > 1
         end
-
       end
     end
   end

data/lib/dir_model/model/relations.rb

@@ -81,7 +81,7 @@ module DirModel
         def has_one(relation_name, dir_model_class, options)
           relation_name = relation_name.to_sym
 
-          merge_has_one_relationship(relation_name => { dir_model_class: dir_model_class }.merge(options))
+          has_one_relationship_object.merge(relation_name => { dir_model_class: dir_model_class }.merge(options))
 
           define_method(:has_one?) do
             true
@@ -113,7 +113,7 @@ module DirModel
           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))
+          has_many_relationship_object.merge(relation_name => { dir_model_class: dir_model_class }.merge(options))
 
           define_method(:has_many?) do
             true

data/lib/dir_model/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dir_model
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Steve Chung
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-03 00:00:00.000000000 Z
+date: 2017-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -28,16 +28,16 @@ dependencies:
   name: inherited_class_var
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 1.0.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 1.0.0.beta1
 - !ruby/object:Gem::Dependency
   name: fastimage
   requirement: !ruby/object:Gem::Requirement