flor 0.9.5 → 0.10.0

data/lib/flor/dollar.rb

@@ -1,27 +1,3 @@
-#--
-# Copyright (c) 2015-2017, John Mettraux, jmettraux+flor@gmail.com
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Made in Japan.
-#++
-
 
 module Flor
 

data/lib/flor/errors.rb

@@ -1,27 +1,3 @@
-#--
-# Copyright (c) 2015-2017, John Mettraux, jmettraux+flor@gmail.com
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Made in Japan.
-#++
-
 
 class Flor::FlorError < StandardError
 

data/lib/flor/flor.rb

@@ -1,302 +1,11 @@
-#--
-# Copyright (c) 2015-2017, John Mettraux, jmettraux+flor@gmail.com
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Made in Japan.
-#++
-
 
 module Flor
 
-  #
-  # deep
-  #
-  # functions for deep getting/setting in structures
-
-  def self.to_index(s)
-
-    return 0 if s == 'first'
-    return -1 if s == 'last'
-
-    i = s.to_i
-    return nil if i.to_s != s
-
-    i
-  end
-
   def self.to_a(o)
 
     o.nil? ? nil : Array(o)
   end
 
-  def self.deep_get(o, k) # --> success(boolean), value
-
-    return [ true, o ] unless k
-
-    val = o
-    ks = k.split('.')
-
-    loop do
-
-      break unless kk = ks.shift
-
-      case val
-        when Array
-          i = to_index(kk)
-          return [ false, nil ] unless i
-          val = val[i]
-        when Hash
-          val = val[kk]
-        else
-          return [ false, nil ]
-      end
-    end
-
-    [ true, val ]
-  end
-
-  def self.deep_set(o, k, v) # --> [ success(boolean), value ]
-
-    lastdot = k.rindex('.')
-    path = lastdot && k[0..lastdot - 1]
-    key = lastdot ? k[lastdot + 1..-1] : k
-
-    b, col = deep_get(o, path)
-
-    return [ false, v ] unless b
-
-    case col
-      when Array
-        i = to_index(key)
-        return [ false, v ] unless i
-        col[i] = v
-      when Hash
-        col[key] = v
-      else
-        return [ false, v ]
-    end
-
-    [ true, v ]
-  end
-
-  def self.deep_has_key?(o, k)
-
-    val = o
-    ks = k.split('.')
-
-    loop do
-
-      kk = ks.shift
-
-      case val
-        when Array
-          i = to_index(kk)
-          return false unless i
-          return (i < 0 ? -i < val.length : i < val.length) if ks.empty?
-          val = val[i]
-        when Hash
-          return val.has_key?(kk) if ks.empty?
-          val = val[kk]
-        else
-          return false
-      end
-    end
-  end
-
-  #
-  # djan
-  #
-  # functions about the "djan" silly version of JSON
-
-  def self.to_djan(x, opts={})
-
-    opts[:cl] = opts[:color] || opts[:colour]
-
-    r =
-      case x
-        when nil then 'null'
-        when String then string_to_d(x, opts)
-        when Hash then object_to_d(x, opts)
-        when Array then array_to_d(x, opts)
-        when TrueClass then c_tru(x.to_s, opts)
-        when FalseClass then c_tru(x.to_s, opts)
-        else c_num(x.to_s, opts)
-      end
-    if opts[:inner]
-      opts.delete(:inner)
-      r = r[1..-2] if r[0, 1] == '[' || r[0, 1] == '{'
-    end
-    r
-  end
-
-  def self.s_to_d(x, opts={})
-
-    x.is_a?(String) ? x : to_djan(x, opts)
-  end
-
-  class << self
-
-    alias to_d to_djan
-
-    protected # somehow
-
-    # Black       0;30     Dark Gray     1;30
-    # Blue        0;34     Light Blue    1;34
-    # Green       0;32     Light Green   1;32
-    # Cyan        0;36     Light Cyan    1;36
-    # Red         0;31     Light Red     1;31
-    # Purple      0;35     Light Purple  1;35
-    # Brown       0;33     Yellow        1;33
-    # Light Gray  0;37     White         1;37
-
-    def c_inf(s, opts); opts[:cl] ? "#{s}" : s; end
-    def c_str(s, opts); opts[:cl] ? "#{s}" : s; end
-    def c_tru(s, opts); opts[:cl] ? "#{s}" : s; end
-    def c_fal(s, opts); opts[:cl] ? "#{s}" : s; end
-    def c_num(s, opts); opts[:cl] ? "#{s}" : s; end
-
-    def c_key(s, opts)
-
-      return s unless opts[:cl]
-
-      s.match(/\A".*"\z/) ?
-        "#{c_inf('"', opts)}#{s[1..-2]}#{c_inf('"', opts)}" :
-        "#{s}"
-    end
-
-    def string_to_d(x, opts)
-
-      if (
-        x.match(/\A[^: \b\f\n\r\t"',()\[\]{}#\\]+\z/) == nil ||
-        x.to_i.to_s == x ||
-        x.to_f.to_s == x
-      )
-        "#{c_inf('"', opts)}#{c_str(x.inspect[1..-2], opts)}#{c_inf('"', opts)}"
-      else
-        c_str(x, opts)
-      end
-    end
-
-    def object_to_d(x, opts)
-
-      a = [ '{ ', ': ', ', ', ' }' ]
-      a = a.collect(&:strip) if x.empty? || opts[:compact]
-      a = a.collect { |s| c_inf(s, opts) }
-      a, b, c, d = a
-
-      a +
-      x.collect { |k, v|
-        "#{c_key(to_djan(k, {}), opts)}#{b}#{to_djan(v, opts)}"
-      }.join(c) +
-      d
-    end
-
-    def array_to_d(x, opts)
-
-      a = [ '[ ', ', ', ' ]' ]
-      a = a.collect(&:strip) if x.empty? || opts[:compact]
-      a = a.collect { |s| c_inf(s, opts) }
-      a, b, c = a
-
-      a + x.collect { |e| to_djan(e, opts) }.join(b) + c
-    end
-  end
-
-
-  #
-  # ids
-  #
-  # functions about exids, nids, sub_nids, ...
-
-  def self.split_fei(fei)
-
-    if m = fei.match(/\A([^-]+-[^-]+-\d+\.\d+\.[^-]+)-(.*)\z/)
-      [ m[1], m[2] ]
-    else
-      [ nil ]
-    end
-  end
-
-  def self.exid(fei)
-
-    split_fei(fei).first
-  end
-
-  def self.split_nid(nid)
-
-    nid.split('-')
-  end
-
-  def self.child_id(nid)
-
-    nid ? nid.split('_').last.split('-').first.to_i : nil
-  end
-
-  def self.next_child_id(nid)
-
-    child_id(nid) + 1
-  end
-
-  def self.sub_nid(nid, subid)
-
-    "#{nid.split('-').first}-#{subid}"
-  end
-
-  # Remove the sub_nid if any.
-  #
-  def self.master_nid(nid)
-
-    nid.split('-').first
-  end
-
-  def self.child_nid(nid, i, sub=nil)
-
-    nid, subnid = nid.split('-')
-    subnid = sub if sub && sub > 0
-
-    "#{nid}_#{i}#{subnid ? "-#{subnid}" : ''}"
-  end
-
-  def self.parent_id(nid)
-
-    if i = nid.rindex('_')
-      nid[0, i]
-    else
-      nil
-    end
-  end
-
-  def self.parent_nid(nid, remove_subnid=false)
-
-    _, sub = nid.split('-')
-    i = nid.rindex('_')
-
-    return nil unless i
-    "#{nid[0, i]}#{remove_subnid || sub.nil? ? nil : "-#{sub}"}"
-  end
-
-  def self.is_nid?(s)
-
-    !! (s.is_a?(String) && s.match(/\A[0-9]+(?:_[0-9]+)*(?:-[0-9]+)?\z/))
-  end
-
   #
   # misc
   #
@@ -374,11 +83,6 @@ module Flor
     Array(o)
   end
 
-  def self.truncate(s, l)
-
-    s.length < l ? s : s[0, l] + '...'
-  end
-
   def self.relativize_path(path, from=Dir.getwd)
 
     path = File.absolute_path(path)
@@ -388,6 +92,15 @@ module Flor
     path
   end
 
+  def self.is_array_of_messages?(o)
+
+    o.is_a?(Array) &&
+    o.all? { |e|
+      e.is_a?(Hash) &&
+      e['point'].is_a?(String) &&
+      e.keys.all? { |k| k.is_a?(String) } }
+  end
+
   #
   # functions about time
 
@@ -528,6 +241,15 @@ module Flor
     o.is_a?(Array) && o.all? { |e| Flor.is_tree?(e) }
   end
 
+#  # Array, object or atom tree
+#  #
+#  def self.is_value_tree?(o)
+#
+#    o.is_a?(Array) &&
+#    %w[ _num _boo _sqs _dqs _rxs _nul _arr _obj ].include?(o[0]) &&
+#    o[2].is_a?(Integer)
+#  end
+
   def self.is_proc_tree?(o)
 
     o.is_a?(Array) &&
@@ -561,5 +283,30 @@ module Flor
     Flor.is_array_of_trees?(o[1]) &&
     o[2].is_a?(Integer)
   end
+
+  # Returns [ st, i ], the parent subtree for the final i index of the nid
+  # Used when inserting updated subtrees.
+  #
+  def self.parent_tree_locate(t, nid)
+
+    return nil if t == nil
+
+    n, i, d = nid.split('_', 3)
+
+    return [ t, nil ] if i == nil
+    return [ t, i.to_i ] if ! d
+    parent_tree_locate(t[1][i.to_i], [ i, d ].join('_'))
+  end
+
+  # Returns the subtree down at the given nid
+  #
+  def self.tree_locate(t, nid)
+
+    st, i = parent_tree_locate(t, nid)
+
+    return nil if st == nil
+    return st if i == nil
+    st[1][i]
+  end
 end
 

data/lib/flor/id.rb

@@ -0,0 +1,90 @@
+
+module Flor
+
+  #
+  # ids
+  #
+  # functions about exids, nids, sub_nids, ...
+
+  def self.split_fei(fei)
+
+    if m = fei.match(/\A([^-]+-[^-]+-\d+\.\d+\.[^-]+)-(.*)\z/)
+      [ m[1], m[2] ]
+    else
+      [ nil ]
+    end
+  end
+
+  def self.exid(fei)
+
+    split_fei(fei).first
+  end
+
+  def self.split_nid(nid)
+
+    nid.split('-')
+  end
+
+  def self.child_id(nid)
+
+    nid ? nid.split('_').last.split('-').first.to_i : nil
+  end
+
+  def self.next_child_id(nid)
+
+    child_id(nid) + 1
+  end
+
+  def self.sub_nid(nid, subid)
+
+    "#{nid.split('-').first}-#{subid}"
+  end
+
+  # Remove the sub_nid if any.
+  #
+  def self.master_nid(nid)
+
+    nid.split('-').first
+  end
+
+  def self.child_nid(nid, i, sub=nil)
+
+    nid, subnid = nid.split('-')
+    subnid = sub if sub && sub > 0
+
+    "#{nid}_#{i}#{subnid ? "-#{subnid}" : ''}"
+  end
+
+  def self.parent_id(nid)
+
+    if i = nid.rindex('_')
+      nid[0, i]
+    else
+      nil
+    end
+  end
+
+  def self.parent_nid(nid, remove_subnid=false)
+
+    _, sub = nid.split('-')
+    i = nid.rindex('_')
+
+    return nil unless i
+    "#{nid[0, i]}#{remove_subnid || sub.nil? ? nil : "-#{sub}"}"
+  end
+
+  def self.is_nid?(s)
+
+    !! (s.is_a?(String) && s.match(/\A[0-9]+(?:_[0-9]+)*(?:-[0-9]+)?\z/))
+  end
+
+  # Returns [ exid, nid ]
+  #
+  def self.extract_exid_and_nid(s)
+
+    m = s.match(/(\d{8}\.\d{4}\.[a-z]+)-(\d+(?:_\d+)*)(-\d+)?/)
+
+    m ? [ m[1], [ m[2], m[3] ].compact.join ] : nil
+  end
+end
+