kvj 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db683924cd739a41874d4a32113455412d463c18
-  data.tar.gz: ed0981e3425f16b407be7a168641919e91f5860e
+  metadata.gz: 05ff9c7e30c82506812d379073f6d00de58d37c6
+  data.tar.gz: a19ad513e5513dfb4d7af19a05ad5f99a4a7f5ca
 SHA512:
-  metadata.gz: 131abac341b8dd544c57a55b1ae15941e60ab034395a1246e2f9927cf9cb93f29554e97c820120e9b13d08d05854defbce6adda786538441eefda458ee8e7b72
-  data.tar.gz: 62d59ad5a545224eabf3db3e6ac48ed1e3fe91da175d44850897f6d498c54ef756f3145152ad61ba8d3128365c4f91b7379dafdc16e7dbed178868a5479a799d
+  metadata.gz: caf5f3baf60c37d94d19721250307337e08b6f47004943c8580cbe74f3941f5423739890e52fbcec414d652c148cf39f39b7ac46087e5d93317764eed81f8b3d
+  data.tar.gz: df224a20c4c42ee7fa453ac5c53bc49892573f3e18242eceba38c1eb39a34f681890f9c57b4b75308c240f3c1b1b15127f27d791279fcb58d0b1ff65ae413ae7

data/lib/file_connector.rb

@@ -8,7 +8,7 @@ class FileConnector
 
   def initialize(name, directory)
     @file_path = directory + name.to_s + '.json'
-    create_file unless if_exist
+    create_file unless FileConnector.exist(name, directory)
     @file = File.open(@file_path, File::RDWR)
   end
 
@@ -24,12 +24,13 @@ class FileConnector
     read
   end
 
-  private
-
-  def if_exist
-    File.file?(@file_path)
+  def self.exist(name, directory)
+    file_path = directory + name.to_s + '.json'
+    File.file?(file_path)
   end
 
+  private
+
   def create_file
     # creat directory
     dirname = File.dirname(@file_path)

data/lib/kvj.rb

@@ -8,9 +8,18 @@ CONFIG = YAML.load_file('config/kvj_config.yml')
 class KVJ
   extend BaseManager
 
-  def initialize(name)
+  def self.create(database)
     directory = CONFIG['base_directory']
-    @file_connector = FileConnector.new(name, directory)
+    return new(database, directory) unless FileConnector.exist(database, directory)
+    STDERR.puts "Request to initialize a new database : #{database} but alread exists. "
+    false
+  end
+
+  def self.connect(database)
+    directory = CONFIG['base_directory']
+    return new(database, directory) if FileConnector.exist(database, directory)
+    STDERR.puts "Request to connect to database : #{database} but does not exists. "
+    false
   end
 
   def write(key, value)
@@ -18,13 +27,16 @@ class KVJ
     hash = @file_connector.read
     hash[key] = value
     @file_connector.write(hash)
+    return true
   ensure
     @file_connector.release_lock
   end
 
   def read(key)
     @file_connector.grab_sh_lock
-    @file_connector.read[key]
+    data = @file_connector.read
+    return false unless key_exist(data, key, 'read')
+    return data[key]
   ensure
     @file_connector.release_lock
   end
@@ -38,16 +50,28 @@ class KVJ
 
   def delete(key)
     @file_connector.grab_ex_lock
-    hash = @file_connector.read
-    hash.delete(key)
+    data = @file_connector.read
+    return false unless key_exist(data, key, 'delete')
+    data.delete(key)
     @file_connector.write(hash)
   ensure
     @file_connector.release_lock
   end
 
-  class << self
-    alias connect new
-  end
   alias []= write
   alias [] read
+
+  def key_exist(data, key, action)
+    return true if data.key?(key)
+    STDERR.puts "Request to #{action} key : '#{key}' does not exist in database : '#{@database}' "
+    false
+  end
+
+  def initialize(database, directory)
+    @database = database
+    @file_connector = FileConnector.new(database, directory)
+  end
+
+  private :key_exist
+  private_class_method :new
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kvj
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - RundongGao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-11 00:00:00.000000000 Z
+date: 2016-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json