reflexion 0.1.30 → 0.1.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c45eff1a76fb5a4e74a9f97f5f6f2223b02fb6b0181d44d9ba5a1e7cf5c78cad
-  data.tar.gz: 22ca55caa3cdc2decbe65f56d5bc45b62795137adbabd1c809a1d97d2a8108c9
+  metadata.gz: 6978ef77180312c159f086e6f6264077b652dc2fb4831df39d9d0d65e8db7f7a
+  data.tar.gz: a91ecc01f7e467e6939f3e9d88d9b741b08cfff6952da46bd4b292d156250eeb
 SHA512:
-  metadata.gz: 15b85c7d42faee0bbaa16fc7f95d4c4b9e99f7e771d811cae7d8ab29cf3feed7317273adc5011726053b4d3d44d4a525530c8fd87528d3bf02b3e2fc221d027d
-  data.tar.gz: 131509d6bf21b835f37d1ba41dfbd7c3fbccf013fdaf4f9a0b026ffc0b2d3214a211361466f339ceecd7c66f1d156d8ee1bc90e6ff19ec5ae022b7ecea49630c
+  metadata.gz: a7ef46c647f619c3b610992978307994878c295323101631df12cbbd568f01e57ea2cc0fe9c7f74a8c4cf3f9bb60a13f89399baf2ca83ab54aeccae63ede4578
+  data.tar.gz: 78c616ca288d7a1e2c6df7cde725b505b3b7122f71e222060c3de8eac8b11458e77b1242fba45abd95f1f3828fdc09a401dd2e760aa4aa71780fe057fa3448f4

data/.github/workflows/release-gem.yml

@@ -0,0 +1,59 @@
+name: Release Gem
+
+on:
+  push:
+    tags: ['v[0-9]*']
+
+jobs:
+  release:
+    runs-on: macos-latest
+
+    steps:
+      - name: ruby 3.2
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.2
+
+      - name: checkout
+        uses: actions/checkout@v2
+
+      - name: setup dependencies
+        run: "ruby -I.github/workflows -rutils -e 'setup_dependencies'"
+
+      - name: test
+        run: rake test
+
+      - name: create gem
+        id: gem
+        run: |
+          rake gem
+          echo path=$(ruby -e 'print Dir.glob("*.gem").first') >> $GITHUB_OUTPUT
+
+      - name: create github release
+        id: release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: ${{ github.ref }}
+
+      - name: upload to github release
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.release.outputs.upload_url }}
+          asset_path: ./${{ steps.gem.outputs.path }}
+          asset_name:   ${{ steps.gem.outputs.path }}
+          asset_content_type: application/zip
+
+      - name: upload to rubygems
+        env:
+          GEM_HOST_API_KEY: ${{ secrets.RUBYGEMS_AUTH_TOKEN }}
+        run: |
+          mkdir -p $HOME/.gem
+          touch $HOME/.gem/credentials
+          chmod 0600 $HOME/.gem/credentials
+          printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+          rake upload

data/.github/workflows/tag.yml

@@ -0,0 +1,35 @@
+name: Tag
+
+on:
+  push:
+    branches: [master]
+
+jobs:
+  tag:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: ruby 3.2
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.2
+
+      - name: checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.PAT }}
+
+      - name: setup dependencies
+        run: "ruby -I.github/workflows -rutils -e 'setup_dependencies only: :xot'"
+
+      - name: setup user name and email
+        run: |
+          git config --global user.email "xordog@gmail.com"
+          git config --global user.name "xord"
+
+      - name: tag versions
+        run: "ruby -I.github/workflows -rutils -e 'tag_versions'"
+
+      - name: push tags
+        run: git push origin --tags

data/.github/workflows/test.yml

@@ -0,0 +1,26 @@
+name: Test
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  test:
+    runs-on: macos-latest
+
+    steps:
+      - name: ruby 3.2
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.2
+
+      - name: checkout
+        uses: actions/checkout@v2
+
+      - name: setup dependencies
+        run: "ruby -I.github/workflows -rutils -e 'setup_dependencies'"
+
+      - name: test
+        run: rake test

data/.github/workflows/utils.rb

@@ -0,0 +1,55 @@
+RENAMES = {reflex: 'reflexion'}
+
+def sh(cmd)
+  puts cmd
+  system cmd
+end
+
+def setup_dependencies(build: true, only: nil)
+  gemspec_path = `git ls-files`.lines(chomp: true).find {|l| l =~ /\.gemspec$/}
+  return unless gemspec_path
+
+  gemspec = File.read gemspec_path
+  name    = File.basename gemspec_path, '.gemspec'
+
+  exts = File.readlines('Rakefile')
+    .map {|l| l[%r|^\s*require\W+(\w+)/extension\W+$|, 1]}
+    .compact
+    .reject {|ext| ext == name}
+  exts = exts & [only].flatten.map(&:to_s) if only
+
+  exts.each do |ext|
+    gem   = RENAMES[ext.to_sym].then {|s| s || ext}
+    clone = "git clone --depth 1 https://github.com/xord/#{ext}.git ../#{ext}"
+    ver   = gemspec[/add_runtime_dependency.*['"]#{gem}['"].*['"]\s*~>\s*([\d\.]+)\s*['"]/, 1]
+
+    # 'rake subtree:push' pushes all subrepos, so cloning by new tag
+    # often fails before tagging each new tag
+    sh %( #{clone} --branch v#{ver} || #{clone} )
+    sh %( cd ../#{ext} && rake ext )
+  end
+end
+
+def tag_versions()
+  tags = `git tag`.lines chomp: true
+  vers = `git log --oneline ./VERSION`
+    .lines(chomp: true)
+    .map {|line| line.split.first[/^\w+$/]}
+    .map {|hash| [`git cat-file -p #{hash}:./VERSION 2>/dev/null`[/[\d\.]+/], hash]}
+    .select {|ver, hash| ver && hash}
+    .reverse
+    .to_h
+
+  changes = File.read('ChangeLog.md')
+    .split(/^\s*##\s*\[\s*v([\d\.]+)\s*\].*$/)
+    .slice(1..-1)
+    .each_slice(2)
+    .to_h
+    .transform_values(&:strip!)
+
+  vers.to_a.reverse.each do |ver, hash|
+    tag = "v#{ver}"
+    break if tags.include?(tag)
+    sh %( git tag -a -m \"#{changes[ver]&.gsub '"', '\\"'}\" #{tag} #{hash} )
+  end
+end

data/ChangeLog.md

@@ -0,0 +1,19 @@
+# reflex ChangeLog
+
+
+## [v0.1.32] - 2023-03-01
+
+- fix bugs
+
+
+## [v0.1.31] - 2023-02-27
+
+- add ChangeLog.md file
+- add test.yml, tag.yaml, and release.yml
+- requires ruby 2.7.0 or later
+
+
+## [v0.1.30] - 2023-02-09
+
+- fix conflicting reflex's Init_exception() and others Init_exception()
+- refactoring

data/Rakefile

@@ -7,13 +7,13 @@
 
 require 'rucy/rake'
 
-require 'xot/module'
-require 'rucy/module'
-require 'rays/module'
-require 'reflex/module'
+require 'xot/extension'
+require 'rucy/extension'
+require 'rays/extension'
+require 'reflex/extension'
 
 
-MODULES     = [Xot, Rucy, Rays, Reflex]
+EXTENSIONS  = [Xot, Rucy, Rays, Reflex]
 GEMNAME     = 'reflexion'
 TESTS_ALONE = ['test/test_reflex.rb']
 
@@ -22,10 +22,9 @@ use_external_library 'https://github.com/erincatto/Box2D',
   incdir: 'Box2D',
   srcdir: 'Box2D/Box2D'
 
+default_tasks :ext
 build_native_library
 build_ruby_extension
 test_ruby_extension
 generate_documents
 build_ruby_gem
-
-task :default => :ext

data/VERSION

@@ -1 +1 @@
-0.1.30
+0.1.32

data/ext/reflex/extconf.rb

@@ -7,10 +7,10 @@
 
 require 'mkmf'
 require 'xot/extconf'
-require 'xot/module'
-require 'rucy/module'
-require 'rays/module'
-require 'reflex/module'
+require 'xot/extension'
+require 'rucy/extension'
+require 'rays/extension'
+require 'reflex/extension'
 
 
 Xot::ExtConf.new Xot, Rucy, Rays, Reflex do
@@ -22,7 +22,7 @@ Xot::ExtConf.new Xot, Rucy, Rays, Reflex do
     $LDFLAGS   << ' -Wl,--out-implib=native.dll.a' if cygwin?
 
     unless osx?
-      lib_dirs << Rays::Module.lib_dir
+      lib_dirs << Rays::Extension.lib_dir
       libs     << 'rays/native'
     end
   end

data/lib/reflex/{module.rb → extension.rb}

@@ -4,7 +4,7 @@
 module Reflex
 
 
-  module Module
+  module Extension
 
     module_function
 
@@ -13,7 +13,7 @@ module Reflex
     end
 
     def version()
-      open(root_dir 'VERSION') {|f| f.readline.chomp}
+      File.read(root_dir 'VERSION')[/[\d\.]+/]
     end
 
     def root_dir(path = '')
@@ -28,7 +28,7 @@ module Reflex
       root_dir 'lib'
     end
 
-  end# Module
+  end# Extension
 
 
 end# Reflex

data/lib/reflex/view.rb

@@ -155,7 +155,7 @@ module Reflex
     alias velocity=     linear_velocity=
     alias velocity      linear_velocity
 
-    alias meter  meter2pixel
+    alias meter meter2pixel
 
     def self.has_model()
       include ModelView

data/lib/reflex.rb

@@ -2,7 +2,7 @@
 
 
 require 'reflex/autoinit'
-require 'reflex/module'
+require 'reflex/extension'
 
 require 'reflex/point'
 require 'reflex/bounds'

data/reflex.gemspec

@@ -4,7 +4,7 @@
 File.expand_path('lib', __dir__)
   .tap {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
 
-require 'reflex/module'
+require 'reflex/extension'
 
 
 Gem::Specification.new do |s|
@@ -12,26 +12,29 @@ Gem::Specification.new do |s|
     patterns.map {|pat| Dir.glob(pat).to_a}.flatten
   end
 
-  mod   = Reflex::Module
-  name  = mod.name.downcase
+  ext   = Reflex::Extension
+  name  = ext.name.downcase
   rdocs = glob.call *%w[README .doc/ext/**/*.cpp]
 
   s.name        = "#{name}ion"
   s.summary     = 'A Graphical User Interface Tool Kit.'
   s.description = 'This library helps you to develop interactive graphical user interface.'
-  s.version     = mod.version
+  s.version     = ext.version
 
   s.authors  = %w[xordog]
   s.email    = 'xordog@gmail.com'
   s.homepage = "https://github.com/xord/reflex"
 
   s.platform              = Gem::Platform::RUBY
-  s.required_ruby_version = '>= 2.6.0'
+  s.required_ruby_version = '>= 2.7.0'
 
-  s.add_runtime_dependency 'xot',   '~> 0.1.30'
-  s.add_runtime_dependency 'rucy',  '~> 0.1.30'
-  s.add_runtime_dependency 'beeps', '~> 0.1.30'
-  s.add_runtime_dependency 'rays',  '~> 0.1.30'
+  s.add_runtime_dependency 'xot',   '~> 0.1.32'
+  s.add_runtime_dependency 'rucy',  '~> 0.1.32'
+  s.add_runtime_dependency 'beeps', '~> 0.1.32'
+  s.add_runtime_dependency 'rays',  '~> 0.1.32'
+
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'test-unit'
 
   s.files            = `git ls-files`.split $/
   s.executables      = s.files.grep(%r{^bin/}) {|f| File.basename f}

data/src/view.cpp

@@ -1086,6 +1086,8 @@ namespace Reflex
 
 		p->pop_state();
 
+		if (event->is_blocked()) return;
+
 		View::ChildList* pchildren = view->self->pchildren.get();
 		if (pchildren)
 		{

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reflexion
 version: !ruby/object:Gem::Version
-  version: 0.1.30
+  version: 0.1.32
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-08 00:00:00.000000000 Z
+date: 2023-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -16,56 +16,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.30
+        version: 0.1.32
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.30
+        version: 0.1.32
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.30
+        version: 0.1.32
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.30
+        version: 0.1.32
 - !ruby/object:Gem::Dependency
   name: beeps
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.30
+        version: 0.1.32
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.30
+        version: 0.1.32
 - !ruby/object:Gem::Dependency
   name: rays
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.30
+        version: 0.1.32
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.30
+        version: 0.1.32
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This library helps you to develop interactive graphical user interface.
 email: xordog@gmail.com
 executables: []
@@ -135,6 +163,11 @@ files:
 - ".doc/ext/reflex/view.cpp"
 - ".doc/ext/reflex/wheel_event.cpp"
 - ".doc/ext/reflex/window.cpp"
+- ".github/workflows/release-gem.yml"
+- ".github/workflows/tag.yml"
+- ".github/workflows/test.yml"
+- ".github/workflows/utils.rb"
+- ChangeLog.md
 - LICENSE
 - README.md
 - Rakefile
@@ -218,6 +251,7 @@ files:
 - lib/reflex/draw_event.rb
 - lib/reflex/ellipse_shape.rb
 - lib/reflex/ext.rb
+- lib/reflex/extension.rb
 - lib/reflex/filter.rb
 - lib/reflex/fixture.rb
 - lib/reflex/focus_event.rb
@@ -233,7 +267,6 @@ files:
 - lib/reflex/model.rb
 - lib/reflex/model_owner.rb
 - lib/reflex/model_view.rb
-- lib/reflex/module.rb
 - lib/reflex/painter.rb
 - lib/reflex/point.rb
 - lib/reflex/pointer.rb
@@ -393,14 +426,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: A Graphical User Interface Tool Kit.