rowdb 0.4.0 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e568763a556dbe43873ac35b8475ad9cf22f4970f58d835de63e5013bd585dc4
-  data.tar.gz: 7cccfab82d55dd47d9707f1ed750be9e36ca9c52234f51b9fb0b95bf752ee3fa
+  metadata.gz: a2a31c07f4396d143f045c618fd8ad2aa0e5ef720106527672cd884fbe6e01f8
+  data.tar.gz: e51f5584cf508ff4bc1a821d01dd2c43d17103d6946a20219210fd6ec1f2597b
 SHA512:
-  metadata.gz: 7d302bc472aead69cde7eda497a61654d2bb53b17e15fd3f3dde8c3b6dc0d1e43276bc6f0916701039d2b84f360e1bd0a0c2217e598dc6e37fdd5e0678130bd7
-  data.tar.gz: d514edcb1de1cd39445f5fb25ae7fce7b892802afa7bd7ad6cb710b044c7210f88d08e5103454901143f0f8a7f27f4437892bbd8eb0c559f215cb68dacd687f9
+  metadata.gz: 5a344384ec5b4e6ccbb991b69da281c3a7660b877c7b84bdf38a85191d5520bb428e6abb2a0b343f2458284de038882d6772045c9be56cb5c5dc6d472898ebf5
+  data.tar.gz: 8ab7dd2603f247ec584f25ae5985c4ab27ea68a1ba1b9d3a79c266324defc67c407204e78afe45972f7b9e1ace5df2237ad1024e7c1dfcf0aa05da3aa4e064f6

data/lib/adapters/Adapter.rb

@@ -1,7 +1,89 @@
 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: \";
+    json.delete_suffix!('"' + @suffix)
+
   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,82 +3,69 @@ require_relative 'adapters/Sync.rb'
 
 class Rowdb
 
-  # Use Reflekt when available.
-  if Gem::Specification::find_by_name('reflekt')
-    require 'reflekt'
-    prepend Reflekt
-  end
+  def initialize(file_path, adapter = :sync, js_var = "db")
+
+    # Initialize the chosen adapter.
+    @adapter = self.send(adapter, file_path, js_var)
 
-  def initialize(file_path, adapter = :sync)
-    @adapter = self.send(adapter, normalize_path(file_path))
-    @data = R_.chain(@adapter.read())
+    @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.0
+  version: 0.6.2
 platform: ruby
 authors:
 - Maedi Prichard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-03 00:00:00.000000000 Z
+date: 2020-10-15 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: []