rowdb 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 002f4d85a85041fb086b84afc4afca0d2f69a23db592296a9e43c0bc87e42429
-  data.tar.gz: 7e9dffa6eacb363d53735498b791b2ddf63ecf40ad5433a910ff057703695d24
+  metadata.gz: 01b60ad701cb2c8829f6eb8266886e09206c7b5ae7701f6f65b457226b9801c1
+  data.tar.gz: fa0f8c8e78696053f1db4371958f2dad7a7676ffde40378e67677232290c9e08
 SHA512:
-  metadata.gz: 9c8fc6df80d12dad2a8cce4cb7e9be9cda0346fb1d346e80f1d1515e6013d9fd59e09186847ba76aa6a978d9b0a398370382b7919e2e3ea0f98d4f5bfd77422b
-  data.tar.gz: f35a9d0e10fba829d3c3ec3e77eae8ab9aab547f94f0cb4a770c51e70741176a649eabc83290d37b9d0c49111975074f2757f4b307fbc822487b893a31415333
+  metadata.gz: b4b886394e59f1f0bd01462ba938c18afeb017d94088a41a4b9c7147fae7f57069acde07c26fd30e302e1a2f367a024668abcfe50d82c84a7848a90caaba13c8
+  data.tar.gz: 7243829e5c96dcb28c7be102f4e913ad7bfae2662747df03ba83480b30d761d4b7b98b9bbc5cff64584cbf9473808c72d33a4075a3f8e5bd86f56dcb87b651db

data/lib/adapters/Adapter.rb

@@ -53,10 +53,21 @@ class Adapter
   #
   # @param String json
   ##
-  def wrap(json)
+  def wrap()
 
-    json.prepend(@prefix)
-    json << @suffix
+    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
 
@@ -67,8 +78,11 @@ class Adapter
   ##
   def unwrap(json)
 
-    json.delete_prefix!(@prefix)
-    json.delete_suffix!(@suffix)
+    # Deletes: var data = \"
+    json.delete_prefix!(@prefix + '"')
+
+    # Deletes: \";
+    json.delete_suffix!('"' + @suffix)
 
   end
 

data/lib/adapters/Sync.rb

@@ -13,13 +13,22 @@ class Sync < Adapter
   ##
   def read()
 
-    json = Oj.load_file(@source)
-
-    unless json.nil?
-
-      if @format == :js
+    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?
 
       # Parse JSON.
       data = Oj.load(json)
@@ -40,12 +49,12 @@ class Sync < Adapter
 
     json = Oj.dump(data, mode: :compat)
 
+    Oj.to_file(@source, json)
+
     if @format == :js
-      wrap(json)
+      wrap()
     end
 
-    Oj.to_file(@source, json)
-
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rowdb
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Maedi Prichard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-14 00:00:00.000000000 Z
+date: 2020-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj