lib/dir_model.rb in dir_model-0.2.0 vs lib/dir_model.rb in dir_model-0.3.0

@@ -1,37 +1,20 @@
+require 'inherited_class_var'
+
 require 'dir_model/version'
 
 require 'active_support/concern'
 
 require 'dir_model/utils'
 
-require 'dir_model/core_ext/dir'
-require 'dir_model/core_ext/zip_dir/zipper'
+require 'dir_model/model'
+require 'dir_model/model/files'
 
 require 'dir_model/export'
 require 'dir_model/export/aggregate_dir'
 
-require 'inherited_class_var'
+require 'dir_model/import'
+require 'dir_model/import/dir'
+require 'dir_model/import/path'
 
 module DirModel
-  extend ActiveSupport::Concern
-
-  included do
-    include Utils
-    include InheritedClassVar
-    inherited_class_hash :files
-  end
-
-  module ClassMethods
-
-    # @return [Array<Symbol>] file names
-    def file_names
-      files.keys
-    end
-
-    protected
-
-    def file(file_name, options={})
-      merge_files(file_name.to_sym => options)
-    end
-  end
 end