dir_model 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 022ba69b362a22c860bcf8ef4ada5e8b9f91a10c
-  data.tar.gz: efbbff6ca84ccdaae46894847f106f95778c4bab
+  metadata.gz: 55a68864ee18333c18a59e6e8a8331aedf90ed0f
+  data.tar.gz: cf8dee9636172ce581287536d1bc903ec155690a
 SHA512:
-  metadata.gz: 2577ef987f2d30ae7b62c5ff8066bb84d29091614d423e81976248b9ae7366e8fd9d63adb3db15d9c0163f4251da97d7660d4e4200f08b0908891683876b795c
-  data.tar.gz: 1dfa90b331e66a31ca222eef9e19bd8035330a1d77f5e9dea82d2af6d8255b9fffce3ec0fd1a95c42ae1b984ff4c99906b0e2b8bb894e166dea007a2e3b68557
+  metadata.gz: edbca7458a28490260d7f50495e10540ed6cfad0422bbdede0aaeb8d01393a33f7c4ddded2c4d2207784823b2615e0de887863c8217e3400e33c0f323882ce60
+  data.tar.gz: 73bd59243eaffcd38e75522434cf5f40a3014efc6556df4bb90214992a0066fb600d53f8037c8b7e8634d79407f45ace2e80c63a8ae6db20754896153da6db1b

data/README.md

@@ -115,6 +115,47 @@ end
 exporter.dir_path # => path of generated dir .../Sectors
 ```
 
+an skip? method based on the name of file :image is create, this method is named `image_skip?`
+
+default implementation
+```
+def image_skip?
+  image.present?
+end
+```
+NOTE Safe to override on your Exporter
+
+In fact this is equivalent to
+
+```
+def image_skip?
+  source_model.zone.present?
+end
+```
+
+by default Exporter provide a link between `source_model` and your `file` like
+```
+def image
+  source_model.image
+end
+```
+NOTE Safe to override on your Exporter
+
+In fact this play well with carrierwave and provide for you automatically
+```
+def image
+  source_model.image.file
+end
+```
+
+as well Exporter provide extension method only for carrierwave uploader
+```
+def image_extension
+  source_model.image.file.extension
+end
+```
+Otherwise return nil, safe to override on your Exporter
+
 ## zip_dir
 Use [`zip_dir`](https://github.com/FinalCAD/zip_dir) to zip DirModel::Export instances:
 ```ruby

data/lib/dir_model/export/files.rb

@@ -0,0 +1,63 @@
+module DirModel
+  module Export
+    module Files
+      extend ActiveSupport::Concern
+
+      included do
+        self.file_names.each do |*args|
+          define_skip_method(*args)
+          define_file_method(*args)
+          define_extension_method(*args)
+        end
+      end
+
+      module ClassMethods
+
+        # Safe to override
+        #
+        # Define default skip method for a file
+        # @param file_name [Symbol] the file: name
+        def define_skip_method(file_name)
+          define_method("#{file_name}_skip?") do
+            !self.public_send(file_name).try(:present?)
+          end
+        end
+
+        # Safe to override
+        #
+        # Define default file method for defined file
+        # @param file_name [Symbol] the file: name
+        def define_file_method(file_name)
+          define_method(file_name) do
+            file = file_or_uploader = source_model.public_send(file_name)
+            if file_or_uploader.respond_to?(:file) # Carrierwave Uploader
+              file = file_or_uploader.file
+            end
+            file
+          end
+        end
+
+        # Safe to override
+        #
+        # Define default extension method for defined file
+        # @param file_name [Symbol] the file: name
+        def define_extension_method(file_name)
+          define_method("#{file_name}_extension") do
+            return unless self.public_send(file_name).respond_to?(:extension)
+            self.public_send(file_name).extension # Carrierwave Uploader
+          end
+        end
+
+        protected
+
+        def file(file_name, options={})
+          super
+          define_skip_method(file_name)
+          define_file_method(file_name)
+          define_extension_method(file_name)
+        end
+      end
+
+    end
+  end
+end

data/lib/dir_model/export.rb

@@ -2,6 +2,11 @@ require 'fastimage'
 
 module DirModel
   module Export
+    extend ActiveSupport::Concern
+
+    included do
+      include Files
+    end
 
     attr_reader :source_model, :context
 
@@ -30,12 +35,14 @@ module DirModel
       self.class.file_names.each do |file_name|
         options = self.class.options(file_name)
 
+        next if self.send("#{file_name}_skip?")
+
         dir_path  = get_value_of(options[:path])
         file_path = File.join(dir_path, get_value_of(options[:name]))
 
         mkdir { File.join(@root_path, dir_path) }
 
-       file_path = ensure_extension(file_path, file_name)
+        file_path = ensure_extension(file_path, file_name)
 
         File.open(File.join(@root_path, file_path), 'wb') {|f| f.write(self.public_send(file_name).read) }
       end
@@ -44,18 +51,19 @@ module DirModel
     end
 
     def ensure_extension(file_path, file_method_name)
+      return file_path if File.extname(file_path).present? # Return if extension was provided in name: attribute, i.e name: 'image.png'
+
       file_path_with_extension = file_path
 
-      if self.respond_to?("#{file_method_name}_extension")
-        file_path_with_extension = file_path + '.' + self.public_send("#{file_method_name}_extension")
-      elsif File.extname(file_path).blank?
-        if ext = FastImage.type(self.public_send(file_method_name))
-          file_path_with_extension = file_path + '.' + ext.to_s
-        else
-          raise StandardError.new("options :name should provid an extension")
-        end
+      # Looking into <file_name>_extension method
+      ext = self.public_send("#{file_method_name}_extension")
+      ext ||= FastImage.type(self.public_send(file_method_name))
+      unless ext
+        # You have to provide an extension i.e name: 'file.json
+        raise StandardError.new("options :name should provide an extension")
       end
-      file_path_with_extension
+
+      file_path_with_extension = file_path + '.' + ext.to_s
     end
 
     def get_value_of(string_or_proc)

data/lib/dir_model/import.rb

@@ -16,11 +16,6 @@ module DirModel
       file_infos[:options][:match]
     end
 
-    def document
-      File.open(source_path)
-    end
-    alias_method :image, :document
-
     def skip?
       load
       !@_match

data/lib/dir_model/version.rb

@@ -1,3 +1,3 @@
 module DirModel
-  VERSION = '0.3.4'
+  VERSION = '0.4.0'
 end

data/lib/dir_model.rb

@@ -9,6 +9,7 @@ require 'dir_model/utils'
 require 'dir_model/model'
 require 'dir_model/model/files'
 
+require 'dir_model/export/files'
 require 'dir_model/export'
 require 'dir_model/export/aggregate_dir'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dir_model
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Steve Chung
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-06 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -74,6 +74,7 @@ files:
 - lib/dir_model.rb
 - lib/dir_model/export.rb
 - lib/dir_model/export/aggregate_dir.rb
+- lib/dir_model/export/files.rb
 - lib/dir_model/import.rb
 - lib/dir_model/import/dir.rb
 - lib/dir_model/import/path.rb