ducktape 0.3.2 → 0.3.3

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NTdhMjYxMTNjNWZmOTYwOWEwZjI0ZGU2OTQxOTYyYTgxYTUzOTQwNw==
+  data.tar.gz: !binary |-
+    ZTViZThkYWZiNGRiNjI3NGRmZTg1NTUzMzc3ZjIwMGEwNzVjYjc5MA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MWIxOWMxOWVkNWZlMWFlNzA4OWUzMDU5MDljNzBhNWI4ZDBlZTJkZWUyN2Ji
+    M2Y5NmJiN2UxZmZjMmIxNWM0ZmI0OTM2MWQyZTE4MDg5ODdlZTQxYTU3N2Ez
+    YmVkM2EzMjU4MDViMmY0M2RhNDgxYTgyNmM4ZDg1MDU0NmVlZWM=
+  data.tar.gz: !binary |-
+    YTk1NTYxN2NjNDgwMmI2NTJkMmU4MGQyNTYzZjFlNDU1NzdkOGQ5MDJlNjc3
+    ZDQwM2M2MDUzOTkyN2QyNmU0YTk4ZjhjOTJkNDhiZGZmOThkOWIyYjU3ZmYz
+    MzhjOWM5NDhhODdkZWIwZjBlNTI3N2NmOTFlNzAzNDgzYTY1MmU=

data/README.md

@@ -1,13 +1,42 @@
 # ducktape
 
-A [truly outrageous](http://youtu.be/dSPb56-_I98) gem for bindable attributes and event notification.
+* https://github.com/SilverPhoenix99/ducktape
+
+<a href='http://www.pledgie.com/campaigns/18955'><img alt='Click here to lend your support to: ducktape and make a donation at www.pledgie.com !' src='http://www.pledgie.com/campaigns/18955.png?skin_name=chrome' border='0' /></a>
+
+## INSTALL:
 
-To install:
+    gem install ducktape
+
+## DESCRIPTION:
+
+A [truly outrageous](http://youtu.be/dSPb56-_I98) gem for bindable attributes and event notification.
 
-```
-gem install ducktape
-```
+## SYNOPSIS:
 
 Additional documentation can be found in the [Wiki](https://github.com/SilverPhoenix99/ducktape/wiki).
 
-<a href='http://www.pledgie.com/campaigns/18955'><img alt='Click here to lend your support to: ducktape and make a donation at www.pledgie.com !' src='http://www.pledgie.com/campaigns/18955.png?skin_name=chrome' border='0' /></a>
+## LICENSE:
+
+(The MIT License)
+
+Copyright &copy; 2012 Pedro Pinto
+
+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.

data/lib/ducktape/bindable.rb

@@ -36,7 +36,8 @@ module Ducktape
         name = name.to_s
         m = bindings_metadata[name]
         return m if m
-        return nil unless superclass.respond_to?(:metadata) && (m = superclass.metadata(name))
+        a = ancestors.find { |a| a != self && a.respond_to?(:metadata) }
+        return nil unless a && (m = a.metadata(name))
         m = m.dup
         bindings_metadata[name] = m
       end
@@ -49,6 +50,12 @@ module Ducktape
 
     def self.included(base)
       base.extend(ClassMethods)
+      return unless base.is_a?(Module)
+      included = base.respond_to?(:included) && base.method(:included)
+      base.define_singleton_method(:included, ->(c) do
+        included.(c) if included
+        c.extend(ClassMethods)
+      end)
     end
 
     def self.extended(_)

data/lib/ducktape/hookable.rb

@@ -3,17 +3,14 @@ module Ducktape
 
     module ClassMethods
       def def_hook(*events)
-        events.each { |e| define_method e, ->(method_name = nil, &block){ add_hook(e, method_name, &block) } }
+        events.each { |e| define_method e, ->(method_name = nil, &block) { add_hook(e, method_name, &block) } }
       end
 
       %w'hook handler'.each do |type|
         define_method "make_#{type}s" do |*args|
           return if args.length == 0
 
-          #def_hook 'on_changed' unless method_defined?('on_changed')
-
-          names_hash = args.pop if args.last.is_a?(Hash)
-          names_hash ||= {}
+          names_hash = (args.last.is_a?(Hash) && args.pop) || {}
 
           #Reversed merge because names_hash has priority.
           names_hash = Hash[args.flatten.map { |v| [v, v] }].merge!(names_hash)
@@ -27,8 +24,8 @@ module Ducktape
             define_method(name) do |*a, &block|
               bm = um.bind(self)
               r = bm.(*a, &block)
-              if !send(cm,          aka, self, event: name, args: a, result: r) || type != 'handler'
-                send(  cm, 'on_changed', self, event: name, args: a, result: r)
+              if !send(cm, aka,         name, OpenStruct.new(args: a, result: r)) || type != 'handler'
+                send(  cm, :on_changed, name, OpenStruct.new(args: a, result: r))
               end
               r
             end
@@ -39,7 +36,13 @@ module Ducktape
 
     def self.included(base)
       base.extend(ClassMethods)
-      base.def_hook :on_changed unless base.method_defined? :on_changed
+      base.def_hook :on_changed unless base.method_defined?(:on_changed)
+      return unless base.is_a?(Module)
+      included = base.respond_to?(:included) && base.method(:included)
+      base.define_singleton_method(:included, ->(c) do
+        included.(c) if included
+        c.extend(ClassMethods)
+      end)
     end
 
     def self.extended(_)
@@ -48,14 +51,14 @@ module Ducktape
 
     def add_hook(event, hook = nil, &block)
       hook = block if block #block has precedence
-      return unless hook
-      hook = hook.to_s unless hook.respond_to?('call')
+      raise ArgumentError, 'no hook was passed' unless hook
+      hook = hook.to_s unless hook.respond_to?(:call)
       self.hooks[event.to_s].unshift(hook)
       hook
     end
 
     def remove_hook(event, hook)
-      hook = hook.to_s unless hook.respond_to?('call')
+      hook = hook.to_s unless hook.respond_to?(:call)
       self.hooks[event.to_s].delete(hook)
     end
 
@@ -75,14 +78,36 @@ module Ducktape
 
     # `#call_handlers` is similar to `#call_hooks`,
     # but stops calling other hooks when a hook returns a value other than nil or false.
-    %w'hook handler'.each do |type|
-      define_method("call_#{type}s", ->(event, caller = self, parms = {}) do
-        return unless self.hooks.has_key? event.to_s
-        self.hooks[event.to_s].each do |hook|
-          hook = caller.method(hook) unless hook.respond_to?('call')
-          handled = hook.(event, caller, parms)
-          break handled if type == 'handler' && handled
+    # If caller is a Hash, then use: call_*s(event, hash, {})
+    %w'hook handler'.each do |name|
+      define_method("call_#{name}s", ->(event, *args) do
+        raise ArgumentError, "wrong number of arguments (#{args.length} for 3)" if args.length > 2
+        caller, parms = case
+          when args.length == 0 then [self, {}]                                    # call_*s(event, caller = self, parms = {})
+          when args.length == 2 then args                                          # call_*s(event, caller, parms)
+          when [Hash, OpenStruct].any? { |c| c === args[0] } then [self, args[0]]  # call_*s(event, caller = self, parms)
+          else [args[0], {}]                                                       # call_*s(event, caller, parms = {})
+        end
+
+        return unless hooks.has_key?(event.to_s)
+
+        handled, parms2 = nil, nil
+        hooks[event.to_s].each do |hook|
+          hook = case hook
+            when Proc, Method then hook
+            when Symbol, String then caller.method(hook)
+            else hook.method(:call)
+          end
+          handled = if hook.arity == 1
+                      parms2 ||= OpenStruct.new(
+                        (parms.is_a?(OpenStruct) ? parms.to_h : parms).merge(event: event, caller: caller))
+                      hook.(parms2)
+                    else
+                      hook.(event, caller, parms)
+                    end
+          break if name.index('handler') && handled
         end
+        name.index('handler') && handled
       end)
     end
   end

data/lib/ducktape/version.rb

@@ -0,0 +1,7 @@
+# Although against rubygems recommendation, while version is < 1.0.0, an increase in the minor version number
+# may represent an incompatible implementation with the previous minor version, which should have been
+# represented by a major version number increase.
+
+module Ducktape
+  VERSION = '0.3.3'.freeze
+end

data/lib/ducktape.rb

@@ -1,18 +1,15 @@
-module Ducktape
-  # Although against rubygems recommendation, while version is < 1.0.0, an increase in the minor version number
-  # may represent an incompatible implementation with the previous minor version, which should have been
-  # represented by a major version number increase.
-
-  VERSION = '0.3.2'
-
-  camelize = ->(f){ f.gsub(/(^|_)([^_]+)/) { |_| $2.capitalize } }
-
-  %w'ducktape'.each do |dir|
-    Dir["#{File.expand_path("../#{dir}", __FILE__)}/*.rb"].
-      map  { |f| File.basename(f, File.extname(f)) }.
-      each { |f| autoload camelize.(f), "#{dir}/#{f}" }
-  end
-
-  %w'def_hookable'.each { |f| require "ext/#{f}" }
-
-end
+%w'
+  set
+  facets/ostruct
+'.each { |f| require f }
+
+%w'
+  version
+  hookable
+  binding_source
+  bindable_attribute_metadata
+  bindable_attribute
+  bindable
+'.each { |f| require "ducktape/#{f}" }
+
+%w'def_hookable'.each { |f| require "ext/#{f}" }

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ducktape
 version: !ruby/object:Gem::Version
-  version: 0.3.2
-  prerelease: 
+  version: 0.3.3
 platform: ruby
 authors:
 - SilverPhoenix99
@@ -10,8 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-27 00:00:00.000000000 Z
-dependencies: []
+date: 2013-03-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: facets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.9'
 description: Truly outrageous bindable attributes
 email:
 - silver.phoenix99@gmail.com
@@ -28,32 +41,32 @@ files:
 - lib/ducktape/ext/hash.rb
 - lib/ducktape/ext/string.rb
 - lib/ducktape/hookable.rb
+- lib/ducktape/version.rb
 - lib/ducktape.rb
 - lib/ext/def_hookable.rb
 - README.md
 homepage: https://github.com/SilverPhoenix99/ducktape
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Truly outrageous bindable attributes
 test_files: []
 has_rdoc: