callbacks_attachable 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5704f2e0b5be12b67d21705fd058832d8b43c768
-  data.tar.gz: af96252e63b77c3d83b99f9c0b1df8d75144e916
+  metadata.gz: 7091bf08cc2a80db2eeb18a8f79e183a0d994dad
+  data.tar.gz: 6d2ae70d5b6dcbe5c884eeecec9aa9144d90f616
 SHA512:
-  metadata.gz: 908846d84dcba7ffa75ee38efd635e6c600015cfd029d39cc83b08ece263a80ec2b66c87c916d5d534aeff5e75d5684e34126109d8374a18e8b5763a9a7067c4
-  data.tar.gz: 619ad1b6ea59e844fb2e54bd2835ca7b1637b662a1dec721cfa84efb06ecca1b973e2e1a984c7afee60f05be34c55326dd3989969be5586837c3c6a079f2fe75
+  metadata.gz: 94f3810baf82fc729a726b66cc301a9b5161d98801efe4331414844d98d922c0a619fcd759110af154ad19928350dbddc8675b4e3f4d6d12a45edfcac86635f0
+  data.tar.gz: 98278e8fb7e882e48829a1328b4f83a0bb05ac739203fed142b4bc972d8d81e36efaefe8913d874c801cc2cb81640c577991cba512274da347aaa946483641b3

data/.rspec

@@ -1,2 +1,4 @@
 --format documentation
 --color
+--default-path spec/CRuby
+--require spec_helper.rb

data/callbacks_attachable.gemspec

@@ -1,4 +1,4 @@
-require_relative 'mrblib/version'
+require_relative 'lib/all/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "callbacks_attachable"
@@ -16,5 +16,5 @@ to an individual instance to be triggered only for this instance.
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ["lib/CRuby"]
 end

data/ext/mruby/class.c

@@ -0,0 +1,20 @@
+#include "mruby.h"
+#include "mruby/class.h"
+
+static mrb_value
+mrb_mod_singleton_class_p(mrb_state *mrb, mrb_value self)
+{
+  return mrb_bool_value(mrb_type(self) == MRB_TT_SCLASS);
+}
+
+void
+mrb_mruby_callbacks_attachable_gem_init(mrb_state *mrb)
+{
+  struct RClass *mod = mrb->module_class;
+  mrb_define_method(mrb, mod, "singleton_class?", mrb_mod_singleton_class_p, MRB_ARGS_NONE());
+}
+
+void
+mrb_mruby_callbacks_attachable_gem_final(mrb_state *mrb)
+{
+}

data/lib/CRuby/callbacks_attachable.rb

@@ -0,0 +1,3 @@
+dir = File.dirname File.dirname __FILE__
+Dir[File.join(dir, 'all', '**', '*.rb')].sort.each{ |f| require f }
+Dir[File.join(dir, 'CRuby', '**', '*.rb')].sort.each{ |f| require f }

data/{mrblib → lib/all}/callback_registry.rb

@@ -13,7 +13,7 @@ module CallbacksAttachable
       callback = Callback.new(self, events, opts, !@singleton_owner, callback)
       events.each do |event|
         @callbacks[event] ||= {}
-        @callbacks[event][callback] = true
+        @callbacks[event][callback.__id__] = callback
       end
       callback
     end
@@ -23,11 +23,11 @@ module CallbacksAttachable
     end
 
     def trigger(instance, event, args)
-      @callbacks[event] and @callbacks[event].keys.each{ |callback| callback.call(instance, args) }
+      @callbacks[event] and @callbacks[event].each_value{ |callback| callback.call(instance, args) }
     end
 
     def deregister(event, callback)
-      @callbacks[event].delete(callback)
+      @callbacks[event].delete callback.__id__
       @callbacks.delete(event) if @callbacks[event].empty?
     end
   end

data/{mrblib → lib/all}/version.rb

@@ -1,3 +1,3 @@
 module CallbacksAttachable
-  VERSION = "2.3.0"
+  VERSION = "2.3.1"
 end

data/mrbgem.rake

@@ -1,4 +1,4 @@
-require_relative 'mrblib/version'
+require_relative 'lib/all/version'
 
 MRuby::Gem::Specification.new('mruby-callbacks_attachable') do |spec|
   spec.version      = CallbacksAttachable::VERSION
@@ -14,4 +14,11 @@ DESC
 
   spec.add_dependency 'mruby-objectspace', :core => 'mruby-objectspace'
   spec.add_dependency 'mruby-object-ext', :core => 'mruby-object-ext'
+
+  spec.objs = Dir["#{spec.dir}/ext/mruby/**/*.c"].sort.map do |f|
+    objfile(f.relative_path_from(spec.dir).to_s.pathmap("#{build_dir}/%X"))
+  end
+  spec.rbfiles =
+    Dir["#{spec.dir}/lib/all/**/*.rb"].sort +
+    Dir["#{spec.dir}/lib/mruby/**/*.rb"].sort
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: callbacks_attachable
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Christopher Aue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-07 00:00:00.000000000 Z
+date: 2017-10-03 00:00:00.000000000 Z
 dependencies: []
 description: |
   Attach callbacks to classes to be triggered for all instances or attach them
@@ -25,14 +25,14 @@ files:
 - LICENSE.txt
 - README.md
 - callbacks_attachable.gemspec
-- lib/callbacks_attachable.rb
+- ext/mruby/class.c
+- lib/CRuby/callbacks_attachable.rb
+- lib/all/callback.rb
+- lib/all/callback_registry.rb
+- lib/all/callbacks_attachable.rb
+- lib/all/error.rb
+- lib/all/version.rb
 - mrbgem.rake
-- mrblib/_ext_module_m.rb
-- mrblib/callback.rb
-- mrblib/callback_registry.rb
-- mrblib/callbacks_attachable.rb
-- mrblib/error.rb
-- mrblib/version.rb
 homepage: https://github.com/christopheraue/m-ruby-callbacks_attachable
 licenses:
 - MIT
@@ -40,7 +40,7 @@ metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
-- lib
+- lib/CRuby
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -53,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Attach callbacks to classes or individual instances.

data/lib/callbacks_attachable.rb

@@ -1,2 +0,0 @@
-dir = File.dirname File.dirname __FILE__
-Dir[File.join(dir, 'mrblib', '*.rb')].reject{ |f| f.end_with? '_m.rb' }.sort.each{ |f| require f }

data/mrblib/_ext_module_m.rb

@@ -1,12 +0,0 @@
-Module.class_eval do
-  def singleton_class?
-    # The object id of a module is its pointer address shifted 5 to the left
-    # and adding its type id:
-    # https://github.com/mruby/mruby/blob/2e8ed9514feb74f4137e5835e74f256d52d6f191/src/etc.c#L108
-    #
-    # The type id of a singleton class is 0xc
-    # https://github.com/mruby/mruby/blob/a0fbc46ccd3e129532b05a9fe4f13f42a3c349b2/include/mruby/value.h#L107
-
-    __id__ & 0x1f == 0xc
-  end
-end