password_protected_file 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c8e29e2bfe872a6fc6c04ce9b97c2586280676c
-  data.tar.gz: b907e163dc55ec86cd3c363a2c02a32ca3519225
+  metadata.gz: 22f79bd8144d4177e3864230ff65e59f256b6bd3
+  data.tar.gz: 91f718ca2909d063607e7a2ad90685df20cc146d
 SHA512:
-  metadata.gz: 9562a35d9f717ff823ad65fa65b768eff99154ca2fd99209a0872e4d7c12e38b9ecd3580703ff1a14f35f2334755934f9dcdeae1b123ba32ae615a7b3a3d4b8c
-  data.tar.gz: 454ad97ea0115614d4641b060af66b497add655ae51142927b4f95894470954877f819b7c6d2edfdc467cd003b5ccc08c18696eedbe4e8af8b28405d613d5346
+  metadata.gz: 666356eac3094b83f5bcb9f20b95458de9f61fa70688d8e641ba731672c09d8e2acf51c2c9e9c7bc76e03925c7512be2b92fc4229f3f5cbd006f1f06098ef22d
+  data.tar.gz: 58c46cf815894cccec60a1df5598e2b28e18dc431b606de73de5396179c7d5c83e7043ffb72c39cd66da9b56c49c1ee3fba2d3d2a7cd8f945822e53133cf7152

data/lib/password_protected_file.rb

@@ -9,16 +9,16 @@ class PasswordProtectedFile
   private_class_method :new
 
   def self.open(file_name, password)
+    assert_valid_filename(file_name)
     assert_file_exists(file_name)
     assert_valid_password(password)
-    assert_valid_filename(file_name)
     new(file_name, password).tap { |o| o.__send__(:open_existing) }
   end
 
   def self.create(file_name, password, data = '')
+    assert_valid_filename(file_name)
     assert_file_does_not_exist(file_name)
     assert_valid_password(password)
-    assert_valid_filename(file_name)
     new(file_name, password).tap { |o| o.__send__(:create_new, data) }
   end
 
@@ -27,8 +27,7 @@ class PasswordProtectedFile
   end
 
   def data=(new_data)
-    fail InvalidDataError unless new_data.instance_of?(String)
-    fail InvalidStringEncodingError unless new_data.encoding == Encoding::UTF_8
+    assert_valid_data(new_data)
     @data = new_data.clone
     write_file
   end
@@ -104,26 +103,27 @@ class PasswordProtectedFile
     SecureRandom.random_bytes(SALT_BYTES)
   end
 
+  def self.assert_valid_filename(file_name)
+    unless file_name.is_a?(String) && !file_name.empty? && Dir.exist?(File.dirname(file_name))
+      fail InvalidFilenameError.new("Invalid filename given: #{file_name.inspect}")
+    end
+  end
+
   def self.assert_file_exists(file_name)
-    return file_name if file_name.is_a?(String) && File.exist?(file_name)
-    fail FileNotFoundError.new("File #{file_name} not found")
+    fail FileNotFoundError.new("File #{file_name} not found") unless File.exist?(file_name)
   end
 
   def self.assert_file_does_not_exist(file_name)
-    return file_name unless file_name.is_a?(String) && File.exist?(file_name)
-    fail FilenameNotAvailableError.new("File #{file_name} already exists")
+    fail FilenameNotAvailableError.new("File #{file_name} already exists") if File.exist?(file_name)
   end
 
   def self.assert_valid_password(password)
-    return password if password.is_a?(String) && !password.empty?
-    fail InvalidPasswordError.new("Invalid password given: #{password.inspect}")
+    fail InvalidPasswordError.new("Invalid password given: #{password.inspect}") unless password.is_a?(String) && password.length > 0
   end
 
-  def self.assert_valid_filename(file_name)
-    return file_name if file_name.is_a?(String) &&
-      !file_name.empty? &&
-      Dir.exist?(File.dirname(file_name))
-    fail InvalidFilenameError.new("Invalid filename given: #{file_name.inspect}")
+  def assert_valid_data(d)
+    fail InvalidDataError.new("Expected String, got #{d.class}") unless d.instance_of?(String)
+    fail InvalidStringEncodingError.new("Expected utf-8, got #{d.encoding}") unless d.encoding == Encoding::UTF_8
   end
 
   class PasswordProtectedFileError < StandardError; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: password_protected_file
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Isaac Post
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-06 00:00:00.000000000 Z
+date: 2016-07-21 00:00:00.000000000 Z
 dependencies: []
 description: An easy way to create files protected by a password
 email: post.isaac@gmail.com