dir_model 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 488a7e3ac0284d3de0d578ff43fe0293132b4a03
-  data.tar.gz: 61b2bf17b362a211bddda139effe0cbcf628d594
+  metadata.gz: 942349c8ad33f73a980864f457aebca25fdd62a0
+  data.tar.gz: 07c2e63f7d8ddfd63bb5622bc6be8e8696bb8f24
 SHA512:
-  metadata.gz: a91b3e607bdc5e8baa616cd1c4541edb45a733307d69128366bac0f0f9cf423a192e5af3dc8630194538fcc9371c023b778df7d4cef163060c97b0b415486457
-  data.tar.gz: e2477c238e7c641cff600fa2fb0db60b7c613438d73aa3ef3a2c4b0936aa36970ad25eaa7e51f60e7c45f965c7e240278d01fb3b7131707422b93f9006d85742
+  metadata.gz: 17c0a84bec8dd64f799faee0b81aa6f4b8954ae3e684fe96d721020df6f4d1ffdba706f9eb5062144d47df076052ee1e126a9eca45264a66b517f49e6fe4ff35
+  data.tar.gz: 086fc4fa9c8f33675701ae8a3b59b8f6f33e5a9fe24f7a9337caa62e2fd3e756825d8d2bd9ac062eb4e4608be48709fa6527cac28fd55ace21ff97486bad9f28

data/.gitignore

@@ -9,4 +9,5 @@
 /tmp/
 
 .idea/*
-.byebug_history
+.byebug_history
+*.gem

data/CHANGELOG.md

@@ -1,6 +1,10 @@
+### VERSION 0.7.1
+
+ Add `ActiveModel::Callbacks` to play around next, basically tracking progress
+
 ### VERSION 0.7.0
 
-* Change the design of `AggregateDir` to make it composable 
+* Change the design of `AggregateDir` to make it composable
 
 ### VERSION 0.6.2
 

data/README.md

@@ -112,6 +112,23 @@ class SectorImportDirModel < SectorDirModel
 end
 ```
 
+### Import Callbacks
+`DirModel::Import::Dir` can be subclassed to access
+[`ActiveModel::Callbacks`](http://api.rubyonrails.org/classes/ActiveModel/Callbacks.html).
+
+* next - `before`, `around`, or `after` each change in `current_dir_model`
+
+and implement the callbacks:
+```ruby
+class ImportDir < DirModel::Import::Dir
+  before_next :track_progress
+
+  def track_progress
+    ...
+  end
+end
+```
+
 ### Export
 
 ```ruby

data/UPGRADE.md

@@ -1,5 +1,9 @@
 # Upgrading
 
+# Upgrading from 0.7.0 to 0.7.1
+
+Nothing
+
 # Upgrading from 0.6.2 to 0.7.0
 
 * Change the manner of call AggregateDir like

data/dir_model.gemspec

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

data/lib/dir_model/import/dir.rb

@@ -1,9 +1,13 @@
-require 'forwardable'
+require 'active_model'
 
 module DirModel
   module Import
     class Dir # File
-      extend Forwardable
+      extend ActiveModel::Callbacks
+
+      define_model_callbacks :next
+
+      delegate :size, :index, :end?, to: :path
 
       attr_reader :index
       attr_reader :path
@@ -12,8 +16,6 @@ module DirModel
       attr_reader :current_dir_model
       attr_reader :previous_dir_model
 
-      def_delegators :@path, :end?
-
       def initialize(source_path, import_dir_model_class, context={})
         @path, @import_dir_model_class, @context = Path.new(source_path), import_dir_model_class, context.to_h.symbolize_keys
         reset
@@ -37,11 +39,13 @@ module DirModel
       def next(context={})
         return if end?
 
-        context = context.to_h.reverse_merge(self.context)
-        @previous_dir_model = current_dir_model
-        @current_dir_model = import_dir_model_class.next(path, context, previous_dir_model)
-        @index += 1
-        @current_dir_model = @index = nil if end?
+        run_callbacks :next do
+          context = context.to_h.reverse_merge(self.context)
+          @previous_dir_model = current_dir_model
+          @current_dir_model  = import_dir_model_class.next(path, context, previous_dir_model)
+          @index += 1
+          @current_dir_model = @index = nil if end?
+        end
 
         current_dir_model
       end

data/lib/dir_model/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dir_model
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Steve Chung
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: inherited_class_var
   requirement: !ruby/object:Gem::Requirement