file_db 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20ddf6734071764b2de65872502a9cd890823e3c
-  data.tar.gz: ecdc39d94e782fcb3e7ac65050fc7a493768ef0d
+  metadata.gz: 166f1e78e647f42d534f681e12d8e5d01d8be911
+  data.tar.gz: 2c02687eacf9df2cc5313453d378c2c1a606be53
 SHA512:
-  metadata.gz: fd7224410c97b8e9c5d12389b5badf92b027893190b15cf87191af761e3e2ed33801a0b07c44bbb76bfcc3293850bc726ca6f70090d36e9098b8968565c80162
-  data.tar.gz: 1abbe4489dd1f06123baa7749aec617164275b91807e6f907eb4db9ca2ee2b046431f6f147798d4c743d35dcdc5a31a914ad8e977813250593748f7f2a31e82b
+  metadata.gz: 00072324fcef2e55f356769d17cdba0e990295bd456afd467ed2813a94fa1b33be5adfc4963f4fa92d26d0b77db081fde97248941c0a8453d86cf97d37e783c0
+  data.tar.gz: 3272b5dca20856d67d123ea0c4788a4fd4ebf9ee5d08f5016032b44889f03fb1561720f61dc7f1e32fe6372c937dd6bc4909be57ab9f0096518f80b87bada376

data/lib/file_db/database.rb

@@ -1,20 +1,36 @@
+require 'singleton'
 module FileDb
-  module Database
+  class Database
+    include Singleton
+
     def self.database_check!
-      create_data_directory! unless exist_data_directory?
+      instance.create_data_directory! unless instance.exist_data_directory?
     end
-    
-    private
-    def self.data_directory
-      Configuration.configured(:data_directory)
+
+    def search model
+      return unless File.exist?(table_file(model))
+      ::CSV.foreach(table_file(model)) do |row|
+        yield row
+      end
     end
 
-    def self.exist_data_directory?
+    def exist_data_directory?
       File.exist? data_directory
     end
 
-    def self.create_data_directory!
+    def create_data_directory!
       Dir.mkdir data_directory
     end
+
+    private
+
+    def table_file model
+      File.join(data_directory, "#{model.table_name}.csv")
+    end
+
+    def data_directory
+      Configuration.configured(:data_directory)
+    end
   end
+
 end

data/lib/file_db/query.rb

@@ -20,7 +20,7 @@ module FileDb
 
     def where conditions
       results = []
-      searching_database do |data_row|
+      Database.instance.search(self) do |data_row|
         if conditions_match?(conditions,data_row)
           results << create_object(data_row)
         end

data/lib/file_db/table.rb

@@ -14,13 +14,6 @@ module FileDb
       object
     end
 
-    def searching_database
-      return unless File.exist?(table_file_location)
-      ::CSV.foreach(table_file_location) do |row| 
-        yield row 
-      end
-    end
-
     def rebuild_file! entries
       ::CSV.open(table_file_location, "w") do |csv|
         entries.each do |entry|

data/lib/file_db/version.rb

@@ -1,3 +1,3 @@
 module FileDb
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: file_db
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Robert Starke
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-30 00:00:00.000000000 Z
+date: 2016-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler