rowdb 0.3.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25dccfb912a9743e255f553123f0a8ce576a5a3a308436b84ed17b4f3587eebd
-  data.tar.gz: 5f44e3b3dcafda35fe3d1b2abd6514f72ae584f04200f2efab070c52c93feeda
+  metadata.gz: 01b60ad701cb2c8829f6eb8266886e09206c7b5ae7701f6f65b457226b9801c1
+  data.tar.gz: fa0f8c8e78696053f1db4371958f2dad7a7676ffde40378e67677232290c9e08
 SHA512:
-  metadata.gz: 4051e0fdb7d774021c6c1d71c577c690bcf26ba1abfecd5d869ed0460c416862f4f50164a51f9941d445c84277ac0b0195318a1f7c9e50613f966809f033c3d2
-  data.tar.gz: de22fab9cafb0a8d9dcf00b031ad11204e5b4ef64d67ccf0e9b6102c327cc20970c72d5bbc6794cc4ec5db5b5cb8efb14598d3c2d13360b9e0cecb045a2a9397
+  metadata.gz: b4b886394e59f1f0bd01462ba938c18afeb017d94088a41a4b9c7147fae7f57069acde07c26fd30e302e1a2f367a024668abcfe50d82c84a7848a90caaba13c8
+  data.tar.gz: 7243829e5c96dcb28c7be102f4e913ad7bfae2662747df03ba83480b30d761d4b7b98b9bbc5cff64584cbf9473808c72d33a4075a3f8e5bd86f56dcb87b651db

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,76 +3,69 @@ require_relative 'adapters/Sync.rb'
 
 class Rowdb
 
-  def initialize(adapter = :sync, file_path)
-    @adapter = self.send(adapter, normalize_path(file_path))
-    @data = R_.chain(@adapter.read())
+  def initialize(file_path, adapter = :sync, js_var = "data")
+
+    # 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.3.0
+  version: 0.6.1
 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,8 +38,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A local JSON database for Ruby inspired by lowdb.
-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: []
@@ -47,7 +48,7 @@ files:
 - lib/adapters/Adapter.rb
 - lib/adapters/Sync.rb
 - lib/rowdb.rb
-homepage: https://github.com/maedi/rowdb
+homepage: https://github.com/rowdb/rowdb
 licenses:
 - MPL-2.0
 metadata: {}