rowdb 0.4.1 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ad64b04f574bb4bf24939928f1c85534ac368f4304b70e4d91dd85fe9c23b84
-  data.tar.gz: 3845d4ce910bb3e853d7723348dc3471034aa90febfe21cc07128e2c09bcc340
+  metadata.gz: f4af7bf755b47e63af755ac16150648b479b011762eb14b967c48fd8e4347107
+  data.tar.gz: 33b9e69ca1b509960b476a65d12eef78ba81426330558e52a7f8b68afe9bdb90
 SHA512:
-  metadata.gz: 8d013e350e375819a84b73e6103c4e4313098b2218f397d8ab16465695f74d7212c711690fd23c9d8d0df1c2e786041b5581a0472ba7a4babb63c17d89610674
-  data.tar.gz: 18643fcf1fbe0c294bf88757dcc375c00239470856a92e8380726c99f88f8131e5482a9d5731555b364c83e711210c95e523d545b14a936bfff71473acfe0f7f
+  metadata.gz: 007f875740d29b424e4133786fbcb6c12273bbcc8f0165c535fc10b88ba48a77ccc295a240cc37b909766e645f58ebc10b201d0cbfb6e7f4519a154105d6c4cd
+  data.tar.gz: 879f35928d80afccb5e60b0e9549cd5e90aa1df3a509b933b2896ec25f48911f0152f4c308e6eda50dd8d4113e1c64d7b9b608503fec49b796528e2590855439

data/lib/adapters/Adapter.rb

@@ -1,7 +1,91 @@
 class Adapter
 
-  def initialize(source)
-    @source = source
+  def initialize(file_path, js_var)
+
+    @source = normalize_path(file_path)
+    @format = find_format(file_path)
+    @prefix = "var #{js_var} = "
+    @suffix = ";"
+
+  end
+
+  ##
+  # Normalize path.
+  #
+  # @param file_path - An absolute or relative path.
+  # @return An absolute path.
+  ##
+  def normalize_path(file_path)
+
+    # Absolute path.
+    if file_path.start_with? '/'
+      return file_path
+    # Relative path.
+    else
+      # Get directory the script executed from.
+      return File.join(Dir.pwd, '/' + file_path)
+    end
+
+  end
+
+  ##
+  # Find format.
+  #
+  # Find the format of a file based on its extension.
+  ##
+  def find_format(file_path)
+
+    extension = File.extname(file_path)
+
+    case extension
+    when ".json"
+      return :json
+    when ".js"
+      return :js
+    end
+
+    :json
+
+  end
+
+  ##
+  # Wrap JSON in a Javascript variable.
+  #
+  # @param String json
+  ##
+  def wrap()
+
+    new_file = ""
+
+    # Open file.
+    File.open(@source, 'r') do |file|
+      new_file = file.read
+      new_file.prepend(@prefix)
+      new_file << @suffix
+    end
+
+    # Overwrite file.
+    File.open(@source, 'w') do |file|
+      file.write(new_file)
+    end
+
+  end
+
+  ##
+  # Unwrap JSON from a Javascript variable.
+  #
+  # @param String json
+  ##
+  def unwrap(json)
+
+    # Deletes: var data = \"
+    json.delete_prefix!(@prefix + '"')
+
+    # Deletes: \";
+    # Deletes: \";\n
+    json.delete_suffix!('"' + @suffix)
+    json.delete_suffix!('"' + @suffix + "\n")
+
   end
 
 end

data/lib/adapters/Sync.rb

@@ -13,10 +13,27 @@ class Sync < Adapter
   ##
   def read()
 
-    json = Oj.load_file(@source)
+    json = nil
+
+    # Load JSON inside a Javascript variable.
+    if @format == :js && File.exist?(@source)
+      File.open(@source, 'r') do |file|
+        json = file.read
+        # Fix double encoding issue due to JSON string becoming Ruby string.
+        json.gsub!('\\"', '"')
+        unwrap(json)
+      end
+    # Load JSON string.
+    else
+      json = Oj.load_file(@source)
+    end
 
     unless json.nil?
-      return Oj.load(json)
+
+      # Parse JSON.
+      data = Oj.load(json)
+      return data.transform_keys(&:to_sym)
+
     end
 
     return nil
@@ -24,15 +41,20 @@ class Sync < Adapter
   end
 
   ##
-  # Save a Hash to a file as JSON.
+  # Save a Hash to a file as a JSON string or JS.
   #
   # @param Hash data
   ##
   def write(data)
 
-    json = Oj.dump(data)
+    json = Oj.dump(data, mode: :compat)
+
     Oj.to_file(@source, json)
 
+    if @format == :js
+      wrap()
+    end
+
   end
 
 end

data/lib/rowdb.rb

@@ -3,76 +3,69 @@ require_relative 'adapters/Sync.rb'
 
 class Rowdb
 
-  def initialize(file_path, adapter = :sync)
-    @adapter = self.send(adapter, normalize_path(file_path))
-    @data = R_.chain(@adapter.read())
+  def initialize(file_path, adapter = :sync, js_var = "db")
+
+    # Initialize the chosen adapter.
+    @adapter = self.send(adapter, file_path, js_var)
+
+    @chain = R_.chain(@adapter.read())
     @get_path = nil
+
   end
 
+  # Set default data.
   def defaults(data)
-    if @data.value().nil?
-      # Load default data.
-      @data = R_.chain(data)
-      # Save data to disk.
-      @adapter.write(data)
+    if @chain.value().nil?
+      @chain = R_.chain(data.transform_keys(&:to_sym))
     end
     self
   end
 
   def get(path)
     @get_path = path
-    @data.get(path)
+    @chain.get(path)
     self
   end
 
   def set(path, value)
-    @data.set(path, value)
+    @chain.set(path, value)
     self
   end
 
   def value()
-    @data.value()
+    @chain.value()
   end
 
   def push(value)
+
     if @get_path.nil?
       raise StandardError.new "You must get() before push()."
     end
 
-    index = @data.get(@get_path).value().count
-    @data.set("#{@get_path}[#{index}]", value)
+    # Add value to end of array.
+    adder = -> (items) {
+      [*items, value]
+    }
+    R_.update(@chain.value(), @get_path, adder)
 
     self
   end
 
   def write()
-    @adapter.write(@data.value())
+    @adapter.write(@chain.value())
     self
   end
 
   private
 
-  def sync(file_path)
-    Sync.new(file_path)
-  end
-
   ##
-  # Normalize path.
+  # Adapters.
   #
-  # @param file_path - An absolute or relative path.
-  # @return An absolute path.
+  # The chosen adapter is initialized by the constructor.
   ##
-  def normalize_path(file_path)
-
-    # Absolute path.
-    if file_path.start_with? '/'
-      return file_path
-    # Relative path.
-    else
-      # Get directory the script executed from.
-      return File.join(Dir.pwd, '/' + file_path)
-    end
 
+  def sync(file_path, js_var)
+    Sync.new(file_path, js_var)
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rowdb
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.6.3
 platform: ruby
 authors:
 - Maedi Prichard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-19 00:00:00.000000000 Z
+date: 2020-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -38,9 +38,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A local JSON database for Ruby inspired by lowdb, using Rudash for easy
-  Hash traversal.
-email: maediprichard@gmailcom
+description: A local JSON database built in Ruby inspired by lowdb, using Rudash for
+  easy Hash traversal.
+email: maediprichard@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []