file_db 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 166f1e78e647f42d534f681e12d8e5d01d8be911
-  data.tar.gz: 2c02687eacf9df2cc5313453d378c2c1a606be53
+  metadata.gz: eefd4de3e4e2853dde383386c3ae19aa0aa03c51
+  data.tar.gz: de1c220f5918925adedc7780a7a33fdd6078be41
 SHA512:
-  metadata.gz: 00072324fcef2e55f356769d17cdba0e990295bd456afd467ed2813a94fa1b33be5adfc4963f4fa92d26d0b77db081fde97248941c0a8453d86cf97d37e783c0
-  data.tar.gz: 3272b5dca20856d67d123ea0c4788a4fd4ebf9ee5d08f5016032b44889f03fb1561720f61dc7f1e32fe6372c937dd6bc4909be57ab9f0096518f80b87bada376
+  metadata.gz: ee185e482a0709dbe926238c38231a2fd715544ffcb35ad674b2ebdc4d595d382ad7a7eb470eba4729b81398dd00a696ec6e2df2ede406b8e2e3d6c6bacef36f
+  data.tar.gz: 7f10cec2afe1e8f6c066f92fc89bd558a8332c7339f7d3af9e1f2335e808100c068160bd367f4503a824e17197a281b82616d1c6cecda9979635bc5641f0ae75

data/lib/file_db/data.rb

@@ -4,16 +4,16 @@ module FileDb
       load_params_into_model params
     end
 
-    def delete 
-      self.class.delete_entry self
+    def delete
+      Database.instance.delete_record self
     end
 
     def save
       if persisted?
-        self.class.update_database self
+        Database.instance.update_record self
       else
         self.id = Time.now.to_i
-        self.class.append_to_database self
+        Database.instance.add_record self
       end
     end
 

data/lib/file_db/database.rb

@@ -9,11 +9,39 @@ module FileDb
 
     def search model
       return unless File.exist?(table_file(model))
-      ::CSV.foreach(table_file(model)) do |row|
+      read_from_table model do |row|
         yield row
       end
     end
 
+    def delete_record record
+      records = []
+      read_from_table record.class do |row|
+        next if row[0]==record.id.to_s
+        records << build_object(record.class, row)
+      end
+
+      rebuild_table! record.class, records
+    end
+
+    def update_record record
+      records = []
+      read_from_table record.class do |row|
+        if row[0]==record.id.to_s
+          records << record
+        else
+          records << build_object(record.class, row)
+        end
+      end
+      rebuild_table! record.class, records
+    end
+
+    def add_record record
+      write_to_table record.class, :a do
+        record
+      end
+    end
+
     def exist_data_directory?
       File.exist? data_directory
     end
@@ -24,6 +52,34 @@ module FileDb
 
     private
 
+    def build_object clazz, data
+      hash = {}
+      clazz.columns.each do |column|
+        hash[column] = data[clazz.column_index(column)]
+      end
+      clazz.new hash
+    end
+
+    def read_from_table clazz
+      ::CSV.foreach(table_file(clazz)) do |row|
+        yield(row)
+      end
+    end
+
+    def write_to_table clazz, mode = 'w'
+      ::CSV.open(table_file(clazz), mode.to_s) do |csv|
+        [yield].flatten.each do |record|
+          csv << record.to_csv
+        end
+      end
+    end
+
+    def rebuild_table! clazz, records
+      write_to_table clazz do
+        records
+      end
+    end
+
     def table_file model
       File.join(data_directory, "#{model.table_name}.csv")
     end

data/lib/file_db/table.rb

@@ -13,44 +13,5 @@ module FileDb
       object.save
       object
     end
-
-    def rebuild_file! entries
-      ::CSV.open(table_file_location, "w") do |csv|
-        entries.each do |entry|
-          csv << entry
-        end
-      end
-    end
-
-    def append_to_database entry_object
-      ::CSV.open(table_file_location, "a") do |csv|
-        csv << entry_object.to_csv
-      end
-    end
-
-    def delete_entry entry
-      records = []
-      ::CSV.foreach(table_file_location) do |row|
-        next if row[0]==entry.id.to_s
-        records << row
-      end
-      rebuild_file! records
-    end
-
-    def update_database entry_object
-      records = []
-      ::CSV.foreach(table_file_location) do |row|
-        if row[0]==entry_object.id.to_s
-          records << entry_object.to_csv
-        else
-          records << row
-        end
-      end
-      rebuild_file! records
-    end
-
-    def table_file_location
-      File.join(Configuration.configured(:data_directory), "#{table_name}.csv")
-    end
   end
 end

data/lib/file_db/version.rb

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

metadata

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