wxruby3-shapes 0.9.0.pre.beta.3 → 0.9.6

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: wxruby3-shapes
 version: !ruby/object:Gem::Version
-  version: 0.9.0.pre.beta.3
+  version: 0.9.6
 platform: ruby
 authors:
 - Martin Corino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-24 00:00:00.000000000 Z
+date: 2024-11-12 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +52,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
+- !ruby/object:Gem::Dependency
+  name: firm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: wxruby3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0.pre.beta.14
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: wxruby3-mdap
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0.pre.beta.14
+        version: '1.0'
 description: wxRuby3/Shapes is a pure Ruby library providing 2D shapes and diagramming
   framework based on wxRuby3
 email: mcorino@m2c-software.nl
@@ -93,14 +121,28 @@ files:
 - INSTALL.md
 - LICENSE
 - README.md
+- assets/logo.svg
+- assets/logo.xpm
 - assets/screenshot.png
+- assets/social.png
 - bin/wx-shapes
 - lib/wx/shapes.rb
 - lib/wx/shapes/arrow_base.rb
 - lib/wx/shapes/arrows/circle_arrow.rb
+- lib/wx/shapes/arrows/circle_prong_arrow.rb
+- lib/wx/shapes/arrows/cross_bar_arrow.rb
+- lib/wx/shapes/arrows/cross_bar_circle_arrow.rb
+- lib/wx/shapes/arrows/cross_bar_prong_arrow.rb
+- lib/wx/shapes/arrows/crossed_circle.rb
+- lib/wx/shapes/arrows/cup_arrow.rb
 - lib/wx/shapes/arrows/diamond_arrow.rb
+- lib/wx/shapes/arrows/double_cross_bar_arrow.rb
+- lib/wx/shapes/arrows/filled_arrow.rb
+- lib/wx/shapes/arrows/line_arrow.rb
 - lib/wx/shapes/arrows/open_arrow.rb
+- lib/wx/shapes/arrows/prong_arrow.rb
 - lib/wx/shapes/arrows/solid_arrow.rb
+- lib/wx/shapes/arrows/square_arrow.rb
 - lib/wx/shapes/art/shape_canvas/page.xpm
 - lib/wx/shapes/auto_layout.rb
 - lib/wx/shapes/base.rb
@@ -111,17 +153,14 @@ files:
 - lib/wx/shapes/events.rb
 - lib/wx/shapes/printout.rb
 - lib/wx/shapes/serializable.rb
-- lib/wx/shapes/serialize/core.rb
-- lib/wx/shapes/serialize/id.rb
 - lib/wx/shapes/serialize/wx.rb
-- lib/wx/shapes/serializer/json.rb
-- lib/wx/shapes/serializer/yaml.rb
 - lib/wx/shapes/shape.rb
 - lib/wx/shapes/shape_canvas.rb
 - lib/wx/shapes/shape_data_object.rb
 - lib/wx/shapes/shape_handle.rb
 - lib/wx/shapes/shape_list.rb
 - lib/wx/shapes/shapes/bitmap_shape.rb
+- lib/wx/shapes/shapes/box_shape.rb
 - lib/wx/shapes/shapes/circle_shape.rb
 - lib/wx/shapes/shapes/control_shape.rb
 - lib/wx/shapes/shapes/curve_shape.rb
@@ -131,6 +170,7 @@ files:
 - lib/wx/shapes/shapes/flex_grid_shape.rb
 - lib/wx/shapes/shapes/grid_shape.rb
 - lib/wx/shapes/shapes/line_shape.rb
+- lib/wx/shapes/shapes/manager_shape.rb
 - lib/wx/shapes/shapes/multi_sel_rect.rb
 - lib/wx/shapes/shapes/ortho_shape.rb
 - lib/wx/shapes/shapes/polygon_shape.rb
@@ -151,6 +191,8 @@ files:
 - rakelib/yard/yard-relative_markdown_links.rb
 - rakelib/yard/yard/relative_markdown_links.rb
 - rakelib/yard/yard/relative_markdown_links/version.rb
+- samples/demo/arrows.json
+- samples/demo/arrows.yaml
 - samples/demo/art/AlignBottom.xpm
 - samples/demo/art/AlignCenter.xpm
 - samples/demo/art/AlignLeft.xpm
@@ -167,6 +209,7 @@ files:
 - samples/demo/art/FlexGrid.xpm
 - samples/demo/art/GC.xpm
 - samples/demo/art/Grid.xpm
+- samples/demo/art/HBox.xpm
 - samples/demo/art/Line.xpm
 - samples/demo/art/NoSource.xpm
 - samples/demo/art/OrthoLine.xpm
@@ -177,26 +220,33 @@ files:
 - samples/demo/art/StandAloneLine.xpm
 - samples/demo/art/Text.xpm
 - samples/demo/art/Tool.xpm
-- samples/demo/art/sample.xpm
+- samples/demo/art/VBox.xpm
+- samples/demo/art/logo.xpm
+- samples/demo/class.json
+- samples/demo/class.yaml
 - samples/demo/demo.rb
+- samples/demo/dialogs.rb
+- samples/demo/erd.json
+- samples/demo/erd.yaml
 - samples/demo/frame_canvas.rb
 - samples/demo/images/motyl.bmp
 - samples/demo/images/motyl2.bmp
-- samples/sample1/art/sample.xpm
+- samples/sample1/art/logo.xpm
 - samples/sample1/sample.rb
-- samples/sample2/art/sample.xpm
+- samples/sample2/art/logo.xpm
 - samples/sample2/sample.rb
 - samples/sample2/sample_canvas.rb
 - samples/sample2/sample_shape.rb
-- samples/sample3/art/sample.xpm
+- samples/sample3/art/logo.xpm
 - samples/sample3/sample.rb
-- samples/sample4/art/sample.xpm
+- samples/sample4/art/logo.xpm
 - samples/sample4/sample.rb
 - tests/art/motyl.bmp
 - tests/lib/wxapp_runner.rb
 - tests/serializer_tests.rb
 - tests/test_grid_shapes.rb
 - tests/test_serialize.rb
+- tests/test_serialize_xml.rb
 - tests/test_serialize_yaml.rb
 homepage: https://github.com/mcorino/wxRuby3-shapes
 licenses:
@@ -235,7 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.3.5
 signing_key: 
 specification_version: 4
 summary: wxRuby3 2D shapes and diagramming framework

data/lib/wx/shapes/serialize/core.rb

@@ -1,40 +0,0 @@
-# Wx::SF::Serializer - Ruby core serializer extensions
-# Copyright (c) M.J.N. Corino, The Netherlands
-
-# we do not include Wx::SF::Serializer::SerializeMethod here as that would
-# also extend these classes with the engine specific extension that we do not
-# need or want here
-
-class Array
-  def serialize(io = nil, pretty: false, format: Wx::SF::Serializable.default_format)
-    Wx::SF::Serializable[format].dump(self, io, pretty: pretty)
-  end
-end
-
-class Hash
-  def serialize(io = nil, pretty: false, format: Wx::SF::Serializable.default_format)
-    Wx::SF::Serializable[format].dump(self, io, pretty: pretty)
-  end
-end
-
-class Struct
-  def serialize(io = nil, pretty: false, format: Wx::SF::Serializable.default_format)
-    Wx::SF::Serializable[format].dump(self, io, pretty: pretty)
-  end
-end
-
-require 'set'
-
-class Set
-  def serialize(io = nil, pretty: false, format: Wx::SF::Serializable.default_format)
-    Wx::SF::Serializable[format].dump(self, io, pretty: pretty)
-  end
-end
-
-require 'ostruct'
-
-class OpenStruct
-  def serialize(io = nil, pretty: false, format: Wx::SF::Serializable.default_format)
-    Wx::SF::Serializable[format].dump(self, io, pretty: pretty)
-  end
-end

data/lib/wx/shapes/serialize/id.rb

@@ -1,82 +0,0 @@
-# Wx::SF::Serializer - Wx::SF serializable ID class
-# Copyright (c) M.J.N. Corino, The Netherlands
-
-module Wx::SF::Serializable
-
-  class ID
-
-    include Wx::SF::Serializable
-
-    class << self
-
-      TLS_RESTORATION_MAP_KEY = :wx_sf_serializable_id_restoration_map.freeze
-      private_constant :TLS_RESTORATION_MAP_KEY
-
-      def init_restoration_map
-        (::Thread.current[TLS_RESTORATION_MAP_KEY] ||= []) << {}
-      end
-
-      def clear_restoration_map
-        ::Thread.current[TLS_RESTORATION_MAP_KEY].pop
-      end
-
-      def restoration_map
-        ::Thread.current[TLS_RESTORATION_MAP_KEY].last
-      end
-
-    end
-
-    # Returns a Serialized::Id instance matching the deserialized id number
-    # either by retrieving an earlier restored Id from the (thread/fiber-)current
-    # restoration map or creating (and mapping) a new Id instance.
-    # @param [Hash] data deserialized properties hash
-    # @return [ID] restored ID instance
-    # @see SerializeClassMethods#create_for_deserialize
-    def self.create_for_deserialize(data)
-      serialized_id = data[:id] || 0
-      restoration_map[serialized_id] ||= self.new
-    end
-
-    # Collects the ID's object_id for serialization.
-    # Note that this is fixed and cannot be excluded.
-    # @param [Hash] hash property serialization hash
-    # @param [Set] _excludes ignored
-    # @return [Hash] property serialization hash
-    def for_serialize(hash, _excludes=nil)
-      hash[:id] = self.object_id
-      hash
-    end
-    protected :for_serialize
-
-    # Noop for ID instances.
-    # @param [Hash] _hash ignored
-    # @return [self]
-    def from_serialized(_hash)
-      # no deserializing necessary
-      self
-    end
-    protected :from_serialized
-
-    # Always returns false for IDs.
-    # @return [Boolean]
-    def serialize_disabled?
-      false
-    end
-
-    def to_s
-      "Wx::SF::Serializable::ID<#{object_id}>"
-    end
-
-    def inspect
-      to_s
-    end
-
-    def to_i
-      object_id
-    end
-
-  end
-
-  serializables << ID
-
-end

data/lib/wx/shapes/serializer/json.rb

@@ -1,258 +0,0 @@
-# Wx::SF::Serializer - shape serializer module
-# Copyright (c) M.J.N. Corino, The Netherlands
-
-require 'json'
-require 'json/add/core'
-require 'json/add/set'
-require 'json/add/ostruct'
-
-module Wx::SF
-
-  module Serializable
-
-    module JSON
-
-      # Derived Hash class to use for deserialized JSON object data which
-      # supports using Symbol keys.
-      class ObjectHash < ::Hash
-        # Returns the object associated with given key.
-        # @param [String,Symbol] key key value
-        # @return [Object] associated object
-        # @see ::Hash#[]
-        def [](key)
-          super(key.to_s)
-        end
-        # Returns true if the given key exists in self otherwise false.
-        # @param [String,Symbol] key key value
-        # @return [Boolean]
-        # @see ::Hash#include?
-        def include?(key)
-          super(key.to_s)
-        end
-        alias member? include?
-        alias has_key? include?
-        alias key? include?
-      end
-
-      # Mixin module to patch hash objects during JSON serialization.
-      # By default JSON will not consider hash keys for custom serialization
-      # but assumes any key should be serialized as it's string representation.
-      # This is restrictive but compatible with "pure" JSON object notation.
-      # JSON however also does not (correctly?) honour overriding Hash#to_json to
-      # customize serialization of Hash-es which seems too restrictive (stupid?)
-      # as using more complex custom keys for Hash-es instead of String/Symbol-s
-      # is not that uncommon.
-      # This mixin is used to "patch" Hash **instances** through #extend.
-      module HashInstancePatch
-        def patch_nested_hashes(obj)
-          case obj
-          when ::Hash
-            obj.extend(HashInstancePatch) unless obj.singleton_class.include?(HashInstancePatch)
-            obj.each_pair { |k, v| patch_nested_hashes(k); patch_nested_hashes(v) }
-          when ::Array
-            obj.each { |e| patch_nested_hashes(e) }
-          end
-          obj
-        end
-        private :patch_nested_hashes
-
-        # Returns JSON representation (String) of self.
-        # Hash data which is part of object properties/members being serialized
-        # (including any nested Hash-es) will be patched with HashInstancePatch.
-        # Patched Hash instances will be serialized as JSON-creatable objects
-        # (so provided with a JSON#create_id) with the hash contents represented
-        # as an array of key/value pairs (arrays).
-        # @param [Array<Object>] args any args passed by the JSON generator
-        # @return [String] JSON representation
-        def to_json(*args)
-          if self.has_key?(::JSON.create_id)
-            if self.has_key?('data')
-              if (data = self['data']).is_a?(::Hash)
-                data.each_value { |v| patch_nested_hashes(v) }
-              end
-            else # core class extensions use different data members for property serialization
-              self.each_value { |v| patch_nested_hashes(v) }
-            end
-            super
-          else
-            {
-              ::JSON.create_id => self.class.name,
-              'data' => patch_nested_hashes(to_a)
-            }.to_json(*args)
-          end
-        end
-      end
-
-      # Mixin module to patch singleton_clas of the Hash class to make Hash-es
-      # JSON creatable (#json_creatable? returns true).
-      module HashClassPatch
-        # Create a new Hash instance from deserialized JSON data.
-        # @param [Hash] object deserialized JSON object
-        # @return [Hash] restored Hash instance
-        def json_create(object)
-          object['data'].to_h
-        end
-      end
-
-      class ::Hash
-        include Wx::SF::Serializable::JSON::HashInstancePatch
-        class << self
-          include Wx::SF::Serializable::JSON::HashClassPatch
-        end
-      end
-
-      class << self
-        def serializables
-          ::Set.new [::NilClass, ::TrueClass, ::FalseClass, ::Integer, ::Float, ::String, ::Array, ::Hash,
-                     ::Date, ::DateTime, ::Exception, ::Range, ::Regexp, ::Struct, ::Symbol, ::Time, ::Set, ::OpenStruct]
-        end
-
-        TLS_SAFE_DESERIALIZE_KEY = :wx_sf_json_safe_deserialize.freeze
-        private_constant :TLS_SAFE_DESERIALIZE_KEY
-
-        TLS_PARSE_STACK_KEY = :wx_sf_json_parse_stack.freeze
-        private_constant :TLS_PARSE_STACK_KEY
-
-        def safe_deserialize
-          ::Thread.current[TLS_SAFE_DESERIALIZE_KEY] ||= []
-        end
-        private :safe_deserialize
-
-        def start_safe_deserialize
-          safe_deserialize.push(true)
-        end
-
-        def end_safe_deserialize
-          safe_deserialize.pop
-        end
-
-        def parse_stack
-          ::Thread.current[TLS_PARSE_STACK_KEY] ||= []
-        end
-        private :parse_stack
-
-        def start_parse
-          parse_stack.push(safe_deserialize.pop)
-        end
-
-        def end_parse
-          unless (val = parse_stack.pop).nil?
-            safe_deserialize.push(val)
-          end
-        end
-
-        def safe_parsing?
-          !!parse_stack.last
-        end
-      end
-
-      def self.dump(obj, io=nil, pretty: false)
-        obj.extend(HashInstancePatch) if obj.is_a?(::Hash)
-        if pretty
-          if io || io.respond_to?(:write)
-            io.write(::JSON.pretty_generate(obj))
-            io
-          else
-            ::JSON.pretty_generate(obj)
-          end
-        else
-          ::JSON.dump(obj, io)
-        end
-      end
-
-      def self.load(source)
-        begin
-          # initialize ID restoration map
-          Serializable::ID.init_restoration_map
-          # enable safe deserializing
-          self.start_safe_deserialize
-          ::JSON.parse!(source,
-                        **{create_additions: true,
-                           object_class: Serializable::JSON::ObjectHash})
-        ensure
-          # reset safe deserializing
-          self.end_safe_deserialize
-          # reset ID restoration map
-          Serializable::ID.clear_restoration_map
-        end
-      end
-
-    end
-
-    # extend serialization class methods
-    module SerializeClassMethods
-
-      def json_create(object)
-        create_for_deserialize(data = object['data'])
-          .__send__(:from_serialized, data)
-      end
-
-    end
-
-    # extend instance serialization methods
-    module SerializeInstanceMethods
-
-      def to_json(*args)
-        {
-          ::JSON.create_id => self.class.name,
-          'data' => for_serialize(Hash.new)
-        }.to_json(*args)
-      end
-
-    end
-
-    class ID
-
-      def self.json_create(object)
-        create_for_deserialize(data = object['data'])
-      end
-
-      def to_json(*args)
-        {
-          ::JSON.create_id => self.class.name,
-          'data' => for_serialize(Hash.new)
-        }.to_json(*args)
-      end
-
-    end
-
-    register(Serializable.default_format, JSON)
-
-  end
-
-end
-
-module ::JSON
-  class << self
-
-    alias :pre_wxsf_parse! :parse!
-    def parse!(*args, **kwargs)
-      begin
-        # setup parsing stack for safe or normal deserializing
-        # the double bracketing provided from Wx::SF::Serializable::JSON#load and here
-        # makes sure to support both nested Wx::SF deserializing as well as nested
-        # hybrid deserializing (Wx::SF -> common JSON -> ...)
-        Wx::SF::Serializable::JSON.start_parse
-        pre_wxsf_parse!(*args, **kwargs)
-      ensure
-        # reset parsing stack
-        Wx::SF::Serializable::JSON.end_parse
-      end
-    end
-
-  end
-end
-
-class ::Class
-
-  # override this to be able to do safe deserializing
-  def json_creatable?
-    if Wx::SF::Serializable::JSON.safe_parsing?
-      return false unless Wx::SF::Serializable::JSON.serializables.include?(self) ||
-                          Wx::SF::Serializable.serializables.include?(self) ||
-                          ::Struct > self
-    end
-    respond_to?(:json_create)
-  end
-
-end