dir_model 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31f2c4f7e3899b8393fcd1246acdaf6e34e57128
-  data.tar.gz: 11a8f61f3fa2cf01ccc673df484794caa293cfdc
+  metadata.gz: 97702ad9ff5a3415d30ca57f0ddfb416ca123aa7
+  data.tar.gz: 35f8b36a9e1a8c8567523188aa85fe452084be9b
 SHA512:
-  metadata.gz: 565270b028ebd60317079ab4ed93ab1111e91467ca832108216ff7920c9bad0048a6bf7d0cfe0faf96ad6ced0e8b1fdc22975436245b6a3730bf0bf147be6c8f
-  data.tar.gz: 9c64417df2fdfcc362f7089a5559e49af51a439485f777b733ae096304802e56845c2aa67c6ce41f41cc36559bd058d1814c98ec2ebfbb7d04388fd08f0fce25
+  metadata.gz: 4c7f45eaf2273af554f5698443a6c4c32e3a29fa1c4a0815bce3a7bc2bb5728dea044fc7087f8a304111f79cccdbcdb35326e38cebc9bdd7d056c170b71f27cb
+  data.tar.gz: 1da95475764bc987b22499a9236757480113f7f9eb2c96882b0a303d419c79b8864a93e69a96614c506bf0217c157bb298aa38a6af95bdd48c45a235f8af1b6c

data/UPGRADE.md

@@ -2,7 +2,7 @@
 
 # Upgrading from 0.4.0 to 0.5.0
 
-* Ensure you have only on definition of `file:` by dir_model
+* Ensure you have only one definition of `file:` by dir_model
 
 # Upgrading from 0.2.0 to 0.3.0
 

data/lib/dir_model/export/files.rb

@@ -4,8 +4,8 @@ module DirModel
       extend ActiveSupport::Concern
 
       included do
-        define_skip_method(self.file_name)
         define_file_method(self.file_name)
+        define_skip_method(self.file_name)
         define_extension_method(self.file_name)
       end
 
@@ -17,7 +17,19 @@ module DirModel
         # @param file_name [Symbol] the file: name
         def define_skip_method(file_name)
           define_method(:skip?) do
-            !self.public_send(file_name).try(:present?)
+            _file = self.public_send(file_name)
+
+            return true if _file.nil?
+            if _file.respond_to?(:exists?) # Carrierwave with remote file
+              return true unless _file.exists?
+            else
+              if _file.respond_to?(:path) # Locale file
+                return true unless File.exists?(_file.path)
+              end
+            end
+            return true unless _file.respond_to?(:read)
+
+            false
           end
         end
 
@@ -50,8 +62,9 @@ module DirModel
 
         def file(file_name, options={})
           super
-          define_skip_method(file_name)
+
           define_file_method(file_name)
+          define_skip_method(file_name)
           define_extension_method(file_name)
         end
       end

data/lib/dir_model/export.rb

@@ -40,11 +40,17 @@ module DirModel
       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.open(File.join(@root_path, file_path), 'wb') {|f| f.write(self.public_send(file_name).read) }
+      full_path = File.join(@root_path, file_path)
+
+      mkdir { File.dirname(full_path) }
+
+      begin
+        File.open(full_path, 'wb') {|f| f.write(self.public_send(file_name).read) }
+      rescue Errno::ENOENT => e
+        warn e.message
+      end
     ensure
       @generated = true
     end

data/lib/dir_model/version.rb

@@ -1,3 +1,3 @@
 module DirModel
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dir_model
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Steve Chung
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-31 00:00:00.000000000 Z
+date: 2016-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Import and export directories with an ORM-like interface.