yerba 0.7.1-x86_64-linux-gnu → 0.7.2-x86_64-linux-gnu

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a744833d3cd55b0f004dc6c6bdb567b647f11de6627dd9c189a255266e14d24
-  data.tar.gz: 88c9a6faff158bde6ca9c6a5194fd502b5b80ff5aa4eb17bbfe29158c56e5a0f
+  metadata.gz: 3a901689f1ac4a8c221bcdef132cf38e26a923c0dda6098b5f66df72e61e9db6
+  data.tar.gz: ce4068b78e473c95f0329c338231beb3da503534a8d6311bc7e9bdc3a22c4265
 SHA512:
-  metadata.gz: 8a06d6daba21425caab8e39aa5f2557503d703327b1bb30fc57adb23c1c99f5524a6f9a84c6ae56d06487d4e31340fbba6ad69a7cfaff88ef40d87fffddc8544
-  data.tar.gz: df0b0f531f6bd6c6815389d42d0030e3b60a9f9be34c33ddf00d4da3adc724c56fa1a53af98ed83800a15d9c991bcbaf81510b9e9e3ac101ed2b06eb71191dc9
+  metadata.gz: f3923446f3aff456976150b2cfae3b75dfb854f2b6e0352647c9afbca77d3bf75e831151f716fbb1461c7334e5069f0c863effe17ba11d56a5789d7797e331f0
+  data.tar.gz: 2ceb3df0cd42c4cf4cc0302d928d6895f8ed98fda4cc74fe5cdfe9f4567b617725e9a1d688f0f9aa8eb475cdcced58ff9f1914d774b49769343d422413c534a9

data/ext/yerba/include/yerba.h

@@ -72,6 +72,11 @@ void yerba_document_free(struct Document *document);
 
 struct YerbaGetResult yerba_document_get(const struct Document *document, const char *path);
 
+/**
+ * Caller must free with yerba_string_free.
+ */
+char *yerba_document_source(const struct Document *document, const char *path);
+
 /**
  * Caller must free with yerba_string_free.
  */

data/ext/yerba/yerba.c

@@ -119,10 +119,12 @@ static VALUE document_initialize(int argc, VALUE *argv, VALUE self) {
   if (NIL_P(path)) {
     result = yerba_document_parse("---\n");
     rb_iv_set(self, "@path", Qnil);
+    rb_iv_set(self, "@loaded_mtime", Qnil);
   } else {
     const char *file_path = StringValueCStr(path);
     result = yerba_document_parse_file(file_path);
     rb_iv_set(self, "@path", path);
+    rb_iv_set(self, "@loaded_mtime", rb_funcall(rb_cFile, rb_intern("mtime"), 1, path));
   }
 
   if (!result.document) {
@@ -297,6 +299,19 @@ static VALUE document_valid_selector_p(VALUE self, VALUE path) {
   return yerba_document_valid_selector(document, StringValueCStr(path)) ? Qtrue : Qfalse;
 }
 
+/* document.source(path) → raw YAML text of the node at path */
+static VALUE document_source(VALUE self, VALUE path) {
+  struct Document *document = get_document(self);
+  char *text = yerba_document_source(document, StringValueCStr(path));
+
+  if (!text) return Qnil;
+
+  VALUE result = make_utf8_string(text);
+  yerba_string_free(text);
+
+  return result;
+}
+
 /* document.get_value(path) → parsed Ruby object (Hash/Array/String/Integer/etc) */
 static VALUE document_get_value(VALUE self, VALUE path) {
   struct Document *document = get_document(self);
@@ -1091,6 +1106,7 @@ void Init_yerba(void) {
   rb_define_method(rb_cDocument, "blank_lines", document_blank_lines, 2);
   rb_define_method(rb_cDocument, "apply_yerbafile", document_apply_yerbafile, -1);
   rb_define_method(rb_cDocument, "validate_schema", document_validate_schema, -1);
+  rb_define_method(rb_cDocument, "source", document_source, 1);
   rb_define_method(rb_cDocument, "to_s", document_to_s, 0);
   rb_define_method(rb_cDocument, "write!", document_save, 0);
   rb_define_method(rb_cDocument, "changed?", document_changed_p, 0);

data/lib/yerba/document.rb

@@ -64,9 +64,16 @@ module Yerba
 
     def save_to!(path)
       @path = path
+      @loaded_mtime = nil
       save!
     end
 
+    def stale?
+      return false unless @path && @loaded_mtime
+
+      File.mtime(@path) != @loaded_mtime
+    end
+
     def dig(*keys)
       keys.reduce(self) { |node, key| node.nil? ? nil : node[key] }
     end
@@ -106,15 +113,18 @@ module Yerba
     end
 
     def save!(apply: false)
+      check_stale!
       Yerbafile.apply!(self, apply) if apply
       write!
-
+      @loaded_mtime = File.mtime(@path) if @path
       self
     end
 
     def apply!(yerbafile = nil)
+      check_stale!
       apply(yerbafile)
       write! if changed?
+      @loaded_mtime = File.mtime(@path) if @path
 
       self
     end
@@ -157,6 +167,16 @@ module Yerba
       raise Yerba::SelectorNotFoundError, message
     end
 
+    private
+
+    def check_stale!
+      return unless stale?
+
+      raise Yerba::StaleFileError, "#{@path} was modified externally since it was loaded"
+    end
+
+    public
+
     def inspect
       if path
         "#<Yerba::Document path=#{path.inspect}>"

data/lib/yerba/map.rb

@@ -161,6 +161,10 @@ module Yerba
     end
     alias to_hash to_h
 
+    def to_s
+      source || to_yaml
+    end
+
     def to_yaml
       to_hash.map do |key, val|
         formatted = format_value(val)

data/lib/yerba/node.rb

@@ -20,6 +20,12 @@ module Yerba
       !@document.nil? || !@file_path.nil?
     end
 
+    def source
+      return nil unless connected? && @selector
+
+      document.source(@selector)
+    end
+
     module ClassMethods
       def from_document(document, selector, location = nil, key = nil, **attributes)
         instance = allocate

data/lib/yerba/sequence.rb

@@ -281,6 +281,10 @@ module Yerba
       end.join("\n")
     end
 
+    def to_s
+      source || super
+    end
+
     def inspect
       list = items
       preview = list.first(5).map(&:inspect).join(", ")

data/lib/yerba/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Yerba
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

data/lib/yerba.rb

@@ -30,6 +30,7 @@ module Yerba
   class ExecutableNotFoundError < StandardError; end
   class CompilationError < StandardError; end
   class SelectorNotFoundError < StandardError; end
+  class StaleFileError < StandardError; end
 
   GEM_NAME = "yerba"
   EXECUTABLE_NAME = "yerba"

data/rust/Cargo.lock

@@ -1772,7 +1772,7 @@ dependencies = [
 
 [[package]]
 name = "yerba"
-version = "0.7.1"
+version = "0.7.2"
 dependencies = [
  "cbindgen",
  "clap",

data/rust/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "yerba"
-version = "0.7.1"
+version = "0.7.2"
 edition = "2021"
 authors = ["Marco Roth <marco.roth@intergga.ch>"]
 description = "YAML Editing and Refactoring with Better Accuracy"

data/rust/src/document/mod.rs

@@ -159,6 +159,11 @@ impl Document {
     Ok(())
   }
 
+  pub fn source(&self, dot_path: &str) -> Result<String, YerbaError> {
+    let node = self.navigate(dot_path)?;
+    Ok(node.text().to_string())
+  }
+
   pub fn navigate(&self, dot_path: &str) -> Result<SyntaxNode, YerbaError> {
     Self::validate_path(dot_path)?;
 

data/rust/src/ffi.rs

@@ -278,6 +278,18 @@ fn location_to_ffi(location: crate::Location) -> YerbaLocation {
   }
 }
 
+/// Caller must free with yerba_string_free.
+#[no_mangle]
+pub unsafe extern "C" fn yerba_document_source(document: *const Document, path: *const c_char) -> *mut c_char {
+  let document = &*document;
+  let selector_string = CStr::from_ptr(path).to_str().unwrap_or("");
+
+  match document.source(selector_string) {
+    Ok(text) => CString::new(text).unwrap_or_default().into_raw(),
+    Err(_) => ptr::null_mut(),
+  }
+}
+
 /// Caller must free with yerba_string_free.
 #[no_mangle]
 pub unsafe extern "C" fn yerba_document_get_value(document: *const Document, path: *const c_char) -> *mut c_char {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yerba
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: x86_64-linux-gnu
 authors:
 - Marco Roth