dir_model 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b37d3d709550ebba94791438eb647ff38631caaa
-  data.tar.gz: 6897081d0e48e834a5e641b33097ec5b6bfd8e23
+  metadata.gz: 32c8c722a8b0c90ae93ee5cebb654227ee188652
+  data.tar.gz: dec22a3e621cee606b3876ade2bbf1080b9ff52f
 SHA512:
-  metadata.gz: 6e4ea16033776a1d2d3b6a6e331b8ee4660b56365a2c4b5014e700aad49b5157b7ff7579f056de55eaf7b077bffb332d402e5ead8f5870a15a8bd2d9390d7020
-  data.tar.gz: fa6270d818cca60016271b3a3bd31ba40982227cc817dcd320f530c892c6876c267a4d3d59c5196ecd2361aac9e81acc74c1323ff6265e2c6e8b2f260c8172ba
+  metadata.gz: 6ac58fc2cb229093204a0adf789362eba762c752bc09a71f4beac51fd3e69f6b47ee90c272cef7816e5ec54e599933267f50aacfb400305eb82ad038d5d8480d
+  data.tar.gz: a52e040adc41f966f7d09ca8f75339c2587099aa6617bc41ade4f369fb9d7f8e14909ff6ca9838c02ca79c206ab37ccdb088b401b07fdf47d7d5289bc59eb11e

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### VERSION 0.3.1
+
+* Technical changes, Simplication of Path, use Array skill to give previous, current and next Path instead of using Enumerator
+
 ### VERSION 0.3.0
 
 * Add Import feature

data/UPGRADE.md

@@ -1,9 +1,12 @@
 # Upgrading
 
-* Model is now a module you have to change include from `include DirModel` to `include DirModel::Model`
+# Upgrading from 0.3.0 to 0.3.1
+
+* Nothing todo
 
 # Upgrading from 0.2.0 to 0.3.0
 
+* Model is now a module you have to change include from `include DirModel` to `include DirModel::Model`
 
 # Upgrading from 0.1.0 to 0.2.0
 

data/lib/dir_model/import/path.rb

@@ -5,10 +5,9 @@ module DirModel
       attr_reader :path
       attr_reader :index
       attr_reader :current_path
-      attr_reader :previous_path
 
       def initialize(path)
-        @path = path
+        @path, @index = path, -1
         reset!
       end
 
@@ -18,7 +17,7 @@ module DirModel
 
       def reset!
         @index = -1
-        @current_path = @ruby_path = @previous_path = nil
+        @current_path = @ruby_path = nil
       end
 
       def start?
@@ -30,45 +29,26 @@ module DirModel
       end
 
       def next_path
-        @next_path ||= _read_path
+        ruby_path[index+1]
+      end
+
+      def previous_path
+        return nil if index < 1
+        ruby_path[index-1]
       end
 
       def read_path
-        @previous_path = @current_path
-        unless caching_value?
-          @current_path = _read_path { forward! }
-        end
+        return if end?
+        @index += 1
+        @current_path = ruby_path[index]
+        set_end unless current_path
         current_path
       end
 
       protected
 
-      def caching_value?
-        if @next_path
-          @current_path = @next_path
-          @next_path = nil
-          forward!
-          true
-        else
-          false
-        end
-      end
-
       def ruby_path
-        @ruby_path ||= Pathname.glob("#{path}/**/*").each
-      end
-
-      def _read_path
-        path = ruby_path.next.to_path
-        yield if block_given?
-        path
-      rescue StopIteration
-        set_end
-       nil
-      end
-
-      def forward!
-        @index += 1
+        @ruby_path ||= ::Dir.glob("#{path}/**/*")
       end
 
       def set_end

data/lib/dir_model/import.rb

@@ -45,22 +45,21 @@ module DirModel
 
     def match?
       return if load_state == :loaded
+      @_match = loader { find_match }
+    end
+    alias_method :load, :match?
 
-      @_match ||= begin
-        loader do
-          self.class.file_names.each do |file_name|
-            options = self.class.options(file_name)
+    def find_match
+      self.class.file_names.each do |file_name|
+        options = self.class.options(file_name)
 
-            if match = (source_path||'').match(options[:regex].call)
-              @file_infos = { file: file_name, options: options.merge(match: match) }
-              return true
-            end
-          end
-          false
+        if match = (source_path||'').match(options[:regex].call)
+          @file_infos = { file: file_name, options: options.merge(match: match) }
+          return true
         end
       end
+      false
     end
-    alias_method :load, :match?
 
     def loader
       @load_state = :loading

data/lib/dir_model/version.rb

@@ -1,3 +1,3 @@
 module DirModel
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

metadata

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