glib-eventable 0.1.2 → 0.1.3

data/README.md

@@ -24,6 +24,14 @@ class Window < Gtk::Window
 end
 ```
 
+Or simply:
+
+```ruby
+class Window < Gtk::Window
+  event destroy: -> { Gtk.main_quit }
+end
+```
+
 This allows you to create subclasses of `Gtk` objects in a more OOP style.
 
 ## Install
@@ -39,13 +47,13 @@ require 'glib/eventable'
 
 class MyToggleRenderer < Gtk::CellRendererToggle
   event toggled: :on_toggle
-        
+  
   def initialize(column)
     @column = column
-          
+    
     super()
   end
-        
+  
   def on_toggle(path)
     iter = @column.tree_view.model.get_iter(path)
           

data/Rakefile

@@ -27,6 +27,7 @@ spec = Gem::Specification.new do |s|
   s.add_development_dependency 'at', '~> 0.1.3'
   s.add_development_dependency 'rake', '~> 0.9'
   s.add_development_dependency 'gtk2', '~> 1.1.5'
+  s.add_development_dependency 'rspec', '~> 2.12'
   s.add_development_dependency 'guard-rspec', '~> 2.1'
   s.add_development_dependency 'guard-yard', '~> 2.0'
   s.add_development_dependency 'guard-shell', '~> 0.5'

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/glib-eventable.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "glib-eventable"
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Scott Lewis"]
-  s.date = "2012-11-27"
+  s.date = "2012-12-04"
   s.description = "This is a helper gem for ruby-gnome2 applications that allows developers to easily connect signals to methods."
   s.email = "ryan@rynet.us"
   s.files = [".gitignore", ".rvmrc", "Gemfile", "Guardfile", "LICENSE", "README.md", "Rakefile", "VERSION", "glib-eventable.gemspec", "lib/glib-eventable.rb", "lib/glib/eventable.rb", "spec/glib/eventable_spec.rb", "spec/spec_helper.rb", "spec/support/windows.rb"]
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<at>, ["~> 0.1.3"])
       s.add_development_dependency(%q<rake>, ["~> 0.9"])
       s.add_development_dependency(%q<gtk2>, ["~> 1.1.5"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.12"])
       s.add_development_dependency(%q<guard-rspec>, ["~> 2.1"])
       s.add_development_dependency(%q<guard-yard>, ["~> 2.0"])
       s.add_development_dependency(%q<guard-shell>, ["~> 0.5"])
@@ -37,6 +38,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<at>, ["~> 0.1.3"])
       s.add_dependency(%q<rake>, ["~> 0.9"])
       s.add_dependency(%q<gtk2>, ["~> 1.1.5"])
+      s.add_dependency(%q<rspec>, ["~> 2.12"])
       s.add_dependency(%q<guard-rspec>, ["~> 2.1"])
       s.add_dependency(%q<guard-yard>, ["~> 2.0"])
       s.add_dependency(%q<guard-shell>, ["~> 0.5"])
@@ -51,6 +53,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<at>, ["~> 0.1.3"])
     s.add_dependency(%q<rake>, ["~> 0.9"])
     s.add_dependency(%q<gtk2>, ["~> 1.1.5"])
+    s.add_dependency(%q<rspec>, ["~> 2.12"])
     s.add_dependency(%q<guard-rspec>, ["~> 2.1"])
     s.add_dependency(%q<guard-yard>, ["~> 2.0"])
     s.add_dependency(%q<guard-shell>, ["~> 0.5"])

data/lib/glib/eventable.rb

@@ -16,22 +16,31 @@ module GLib
       @events ||= ancestors[1].respond_to?(:events) ? ancestors[1].events.dup : {}
       return @events if event_hash.nil?
       
-      raise TypeError, 'event_hash must respond to :to_hash or :to_h' unless [:to_hash, :to_h].any? { |method_name| event_hash.respond_to?(method_name) }
+      raise TypeError, 'event_hash must respond to :to_hash or :to_h' unless event_hash.respond_to?(:to_hash) || event_hash.respond_to?(:to_h)
       event_hash = event_hash.to_hash rescue event_hash.to_h
+      
+      @events = @events.merge(event_hash).each_with_object({}) do |(event_name, method_name_or_proc), memo|
+        raise TypeError, 'event_hash keys must respond to :to_s' unless event_hash.respond_to?(:to_s)
+        raise TypeError, 'event_hash values must respond to :call or :to_s' unless method_name_or_proc.respond_to?(:call) || method_name_or_proc.respond_to?(:to_s)
+        
+        event_name = event_name.to_s.downcase.strip
+        method_name_or_proc = method_name_or_proc.to_s.downcase.strip.to_sym unless method_name_or_proc.respond_to?(:call)
         
-      @events = event_hash.merge(@events)
+        memo[event_name] = method_name_or_proc
+      end
     end
     alias_method :events, :event
     
     # Connect signals to events before initialization.
     def new(*args)
       super.instance_eval do
-        self.class.events.each do |event_name, method_name|
-          # TODO: These should be /defined/ as this, not read as this
-          event_name = event_name.to_s.downcase.strip
-          method_name = method_name.to_s.downcase.strip.to_sym
-          
-          signal_connect(event_name) { |object, *args| send(method_name, *args)}
+        self.class.events.each do |event_name, method_name_or_proc|
+          signal_connect(event_name) do |*arguments|
+            proc = method_name_or_proc.respond_to?(:call) ? method_name_or_proc : method(method_name_or_proc).to_proc
+            arguments = arguments[0...proc.arity] if proc.arity >= 0
+            
+            instance_exec(*arguments, &proc)
+          end
         end
         
         self
@@ -39,7 +48,7 @@ module GLib
     end
   end
   
-  # Modify all Instantiatable with Eventable
+  # Modify all Instantiatable objects with Eventable
   class Instantiatable
     extend Eventable
   end

data/spec/glib/eventable_spec.rb

@@ -23,3 +23,13 @@ end
 describe MainWindow do
   it_behaves_like 'an eventable GLib object'
 end
+
+describe ProcWindow do
+  describe '#on_destroy' do
+    it 'should be run when a `destroy` signal is emitted' do
+      subject.at.is_destroyed.should be_false
+      subject.signal_emit('destroy')
+      subject.at.is_destroyed.should == :true_from_proc
+    end
+  end
+end

data/spec/support/windows.rb

@@ -1,14 +1,18 @@
 class BaseWindow < Gtk::Window
-  event 'destroy' => :on_destroy
+  event destroy: :on_destroy
   
   def initialize
     super
     @is_destroyed = false
   end
   
-  def on_destroy
+  def on_destroy(*args)
     @is_destroyed = true
   end
 end
 
 class MainWindow < BaseWindow; end
+
+class ProcWindow < BaseWindow
+  event destroy: -> { |*args| @is_destroyed = :true_from_proc }
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-eventable
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-27 00:00:00.000000000 Z
+date: 2012-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: version
@@ -91,6 +91,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.5
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.12'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement