file_db 0.7.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24e147af83c09e392af68b2d35ba364359222dc0
-  data.tar.gz: a14ad70583def016b74a250cfb147734cf5b5afb
+  metadata.gz: 08faf66085096d47a2174f7b9a830ffefab7a0c9
+  data.tar.gz: e04c84ba4d2b326abb841fde573d4aec1a71f420
 SHA512:
-  metadata.gz: 00ef2f85b0fe7017354b1be6afb198dd71c204e8dd928692ee0123cbacf0e9d377bd42cb38965a39dd28002e0051a1ba7c9d5b935c96852ace50e7dde90ad709
-  data.tar.gz: ab4e957e912e51413f85e3d08bd7445e6db12faa6af3b085e9e595e90454e3db78f04f2d0c557ada78b4661d1d8d7a122494f03bd198dde302828f354da35c58
+  metadata.gz: a320df01f983701a6d0d714705a87979484bbd0a8ccffb1e5ff77cfb72f78c9e8f7e5509d1434673251feaa119f4fa547a7af958811f4f49209fd23bac1ae6a5
+  data.tar.gz: 4a4cf440242030a75fb4f1aebd504b66d2d8e425ece1589706b0327556ce6af3c73c4a8fa71f57a6ae95bf487fd9ef96904bdd464569a932ca8f469bb8cc3fa1

data/README.md

@@ -1,13 +1,13 @@
 # FileDb
 
-You need to store data into a small type of database, like CSV and want a better way to handle it? So you can use `FileDb` for this. It stores all data for a model into CSV files and create accessor for you.
+FileDb is a small type of database. It stores all data for a model into CSV files and create accessor for you.
 
 ## Installation
 
 hm, yeah. just add this to your Gemfile:
 
 ```ruby
-gem 'file_db', '~> 0.7.0'
+gem 'file_db', '~> 1.0.0'
 ```
 
 And then execute:
@@ -21,6 +21,60 @@ Or install it yourself as:
 
 Huh, ready to use!
 
+## Differences to Version 0.7.0
+
+Fieldnames are now in the first line of the table file.
+
+And:
+
+### Performance
+
+#### 0.7.0 with 1000 Entries
+
+| Action | Time in Milliseconds |
+|---|---|
+|getting the first|29.194|
+|update record|39.226|
+|create record|74.994|
+|using where with 1 parameter|8.700|
+|using where with 2 parameter|9.775|
+|find |9.507|
+
+#### 1.0.0 with 1000 Entries
+
+| Action | Time in Milliseconds |
+|---|---|
+|getting the first|8.184|
+|update record|4.629|
+|create record|3.673|
+|using where with 1 parameter|0.535|
+|using where with 2 parameter|0.337|
+|find |0.030|
+
+#### 0.7.0 with 5000 Entries
+
+| Action | Time in Milliseconds |
+|---|---|
+|getting the first|88.852|
+|update record|122.662|
+|create record|284.086|
+|using where with 1 parameter|35.795|
+|using where with 2 parameter|35.125|
+|find |35.881|
+
+#### 1.0.0 with 5000 Entries
+
+| Action | Time in Milliseconds |
+|---|---|
+|getting the first|27.343|
+|update record|14.405|
+|create record|9.705|
+|using where with 1 parameter|1.846|
+|using where with 2 parameter|2.027|
+|find |0.019|
+
+
+
 ## Usage
 
 ### Configuration
@@ -30,12 +84,8 @@ First configure the storage directory:
 ```ruby
 FileDb::Configuration.configure data_directory: 'data'
 ```
-Subdirectory is the default for storing the tables. If you change the configuration, the `FileDb` will be automaticly create a new database.
+Subdirectory is the default for storing the tables. If you change the configuration, the `FileDb` will be automaticly create a new database directory and table files if needed.
 
-If you running a clean instance with no configuration changes so make sure, the storage directory exists or use the build in check for checking and creating the data directory:
-```ruby
-FileDb::System::Check.run!
-```
 
 Let's start with creating a model called `User`.
 

data/lib/file_db/configuration.rb

@@ -2,7 +2,6 @@ module FileDb
   module Configuration
     def self.configure options = {}
       @configuration = default_options.merge(options)
-      System::Check.run!
     end
 
     def self.configured option

data/lib/file_db/data.rb

@@ -5,37 +5,22 @@ module FileDb
     end
 
     def delete
-      Database.instance.delete_record self
+      table.delete(id)
     end
 
     def save
-      if persisted?
-        Database.instance.update_record self
-      else
-        self.id = next_id #Time.now.to_i
-        Database.instance.add_record self
-      end
+      table.update_record self
     end
 
     def persisted?
-      id
+      table.hashed_by_id[id.to_s]
     end
 
-private
-
-    def next_id
-      return 1 unless current_id
-      current_id + 1
+    def table
+      self.class.table
     end
 
-    def current_id
-      return unless last_record
-      last_record.id.to_i
-    end
-
-    def last_record
-      self.class.last
-    end
+private
 
     def load_params_into_model params
       params.each do |key, value|

data/lib/file_db/database_manager.rb

@@ -0,0 +1,20 @@
+require 'singleton'
+module FileDb
+  class DatabaseManager
+    include Singleton
+
+    attr_accessor :database
+
+    def initialize
+      @database = System::Database.new Configuration.configured(:data_directory)
+    end
+
+    def drop_database!
+      database.drop_data_directory!
+    end
+
+    def create_database_if_not_exist!
+      database.create_database_if_not_exist!
+    end
+  end
+end

data/lib/file_db/model.rb

@@ -1,7 +1,8 @@
 module FileDb
   class Model
+    extend FileDb::Columns
+    extend FileDb::Table
     extend FileDb::Query
     include FileDb::Data
-    include FileDb::Convert
   end
 end

data/lib/file_db/query.rb

@@ -1,7 +1,12 @@
 module FileDb
   module Query
-    include FileDb::Columns
-    include FileDb::Table
+
+    def find id
+      found_element = table.find(id)
+      return unless found_element
+      new found_element
+    end
+
     def first
       all.first
     end
@@ -11,43 +16,16 @@ module FileDb
     end
 
     def all
-      where({})
+      table.all.map{ |entry| new entry }
     end
 
-    def find id
-      find_by(:id, id)
+    def where conditions
+      table.where(conditions).map{ |entry| new entry }
     end
 
     def find_by attribute, search_value
       where("#{attribute}".to_sym => search_value).first
     end
 
-    def where conditions
-      results = []
-      Database.instance.search(self) do |data_row|
-        if conditions_match?(conditions,data_row)
-          results << create_object(data_row)
-        end
-      end
-      results
-    end
-
-private
-
-    def create_object values
-      hash = {}
-      columns.each do |column|
-        hash[column] = values[column_index(column)]
-      end
-      new hash
-    end
-
-    def conditions_match? conditions, data
-      conditions.each do |key, value|
-        return false unless data[column_index(key)].eql?(value.to_s)
-      end
-     true
-    end
-
   end
 end

data/lib/file_db/system/database.rb

@@ -0,0 +1,67 @@
+module FileDb
+  module System
+    class Database
+
+      attr_accessor :tables
+
+      def initialize data_directory
+        @data_directory = data_directory
+        create_database_if_not_exist!
+        load_tables!
+      end
+
+      def load_tables!
+        @tables = {}
+        Dir[File.join(@data_directory, "*.csv")].each do |filename|
+          next unless File.file?(filename)
+          load_table! filename
+        end
+      end
+
+      def load_table! filename
+        @tables[cleared_tablename(filename)] = Table.new(filename, self)
+      end
+
+      def create_database_if_not_exist!
+        return if exist_data_directory?
+        create_data_directory!
+      end
+
+      def drop_data_directory!
+        ::FileUtils.rm_rf @data_directory
+      end
+
+      def save_to_disk table, content
+        File.write(table.filename, content)
+      end
+
+      def check_table! table_name
+        return if @tables[table_name]
+        create_table_file! table_name
+      end
+
+      private
+
+      def cleared_tablename filename
+        filename = filename.gsub '.csv', ''
+        filename = filename.gsub @data_directory, ''
+        filename = filename.gsub '/', ''
+        filename.to_sym
+      end
+
+      def exist_data_directory?
+        File.exist? @data_directory
+      end
+
+      def create_data_directory!
+        Dir.mkdir @data_directory
+      end
+
+      def create_table_file! table_name
+        File.write(File.join(@data_directory, "#{table_name}.csv"), '')
+        load_table! File.join(@data_directory, "#{table_name}.csv")
+      end
+
+    end
+  end
+end

data/lib/file_db/system/table.rb

@@ -0,0 +1,113 @@
+module FileDb
+  module System
+    class Table
+      attr_accessor :entries_index_by, :filename
+      def initialize filename, database
+        @filename = filename
+        @database = database
+        @entries_index_by = {}
+        @entries_index_by[:id] = {}
+        @fields = {}
+        @fieldnames = {}
+        read_rows!
+      end
+
+      def read_rows!
+        File.foreach(@filename).with_index do |row, row_index|
+          if row_index == 0
+            set_fieldnames remove_line_break(row).split(',')
+          else
+            set_entry row.split(',')
+          end
+        end
+      end
+
+      def find id
+        hashed_by_id[id.to_s]
+      end
+
+      def all
+        hashed_by_id.values
+      end
+
+      def where conditions
+        found_elements = all
+        conditions.each do |key, value|
+          found_elements = found_elements.select do |entry|
+            entry[key.to_sym].eql?(value.to_s)
+          end
+        end
+        found_elements
+      end
+
+      def hashed_by_id
+        entries_index_by[:id]
+      end
+
+      def next_id
+        hashed_by_id.keys.last.to_i + 1
+      end
+
+      def delete id
+        hashed_by_id.delete(id.to_s)
+        save_records!
+      end
+
+      def update_record object
+        set_fieldnames(object.class.columns) if @fields.empty?
+        data_to_save = {}
+        @fieldnames.each_with_index do |column, column_index|
+          field = @fields[column_index]
+          data_to_save[field] = object.send(field)
+        end
+        unless object.persisted?
+          data_to_save[:id] = next_id.to_s
+          object.id = data_to_save[:id]
+        end
+        @entries_index_by[:id][object.id.to_s] = data_to_save
+        save_records!
+      end
+
+      def save_records!
+        headline = @fields.keys.map { |field_key| @fields[field_key] }.join(',')
+
+        content = hashed_by_id.map do |index, entry|
+          @fields.keys.map do |identifier|
+            field = @fields[identifier]
+            entry[field.to_sym]
+          end.join(',')
+        end.join("\n")
+
+        @database.save_to_disk self, [headline, content].join("\n")
+      end
+
+      private
+
+
+
+      def set_fieldnames fieldnames
+        fieldnames.each_with_index do |column, column_index|
+          symbol_column = remove_line_break(column).to_sym
+          @fields[column_index] = symbol_column
+          @fieldnames[symbol_column] = column_index
+        end
+      end
+
+      def set_entry entry
+        t_entry = {}
+        entry.each_with_index do |column, column_index|
+          t_entry[@fields[column_index].to_sym] = remove_line_break(column)
+        end
+
+        key_name = remove_line_break(entry[@fieldnames[:id]])
+
+        @entries_index_by[:id][key_name.to_s] = t_entry
+      end
+
+      def remove_line_break value
+        value.to_s.gsub "\n", ""
+      end
+
+    end
+  end
+end

data/lib/file_db/table.rb

@@ -1,5 +1,15 @@
 module FileDb
   module Table
+
+    def database
+      DatabaseManager.instance.database
+    end
+
+    def table
+      database.check_table! table_name.to_sym
+      database.tables[table_name.to_sym]
+    end
+
     def table_name
       @table_name ||= self.new.class.to_s.gsub(/(.)([A-Z])/,'\1_\2').downcase
     end

data/lib/file_db/version.rb

@@ -1,3 +1,3 @@
 module FileDb
-  VERSION = "0.7.0"
+  VERSION = "1.0.0"
 end

data/lib/file_db.rb

@@ -1,13 +1,13 @@
-require "csv"
+require 'fileutils'
 require "file_db/version"
-require "file_db/system/check"
+require "file_db/system/database"
+require "file_db/system/table"
 require "file_db/configuration"
-require "file_db/database"
+require "file_db/database_manager"
 require "file_db/columns"
 require "file_db/table"
 require "file_db/data"
 require "file_db/query"
-require "file_db/convert"
 require "file_db/model"
 
 module FileDb

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: file_db
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Robert Starke
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-27 00:00:00.000000000 Z
+date: 2016-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,12 +75,12 @@ files:
 - lib/file_db.rb
 - lib/file_db/columns.rb
 - lib/file_db/configuration.rb
-- lib/file_db/convert.rb
 - lib/file_db/data.rb
-- lib/file_db/database.rb
+- lib/file_db/database_manager.rb
 - lib/file_db/model.rb
 - lib/file_db/query.rb
-- lib/file_db/system/check.rb
+- lib/file_db/system/database.rb
+- lib/file_db/system/table.rb
 - lib/file_db/table.rb
 - lib/file_db/version.rb
 homepage: https://github.com/robst/file_db

data/lib/file_db/convert.rb

@@ -1,11 +0,0 @@
-module FileDb
-  module Convert
-
-    def to_csv
-      self.class.columns.inject([]) do |csv, column|
-        csv << send(column)
-      end
-    end
-  end
-
-end

data/lib/file_db/database.rb

@@ -1,84 +0,0 @@
-require 'singleton'
-module FileDb
-  class Database
-    include Singleton
-
-    def self.database_check!
-      System::Check.run!
-    end
-
-    def search model
-      return unless File.exist?(table_file(model))
-      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
-
-    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
-
-    def data_directory
-      Configuration.configured(:data_directory)
-    end
-  end
-
-end

data/lib/file_db/system/check.rb

@@ -1,26 +0,0 @@
-module FileDb
-  module System
-    class Check
-      def self.run!
-        new.create_database_if_not_exist!
-      end
-
-      def create_database_if_not_exist!
-        return if exist_data_directory?
-        create_data_directory!
-      end
-
-      def exist_data_directory?
-        File.exist? data_directory
-      end
-
-      def create_data_directory!
-        Dir.mkdir data_directory
-      end
-
-      def data_directory
-        Configuration.configured(:data_directory)
-      end
-    end
-  end
-end