everyday-menu 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a54828a0a7db304a577074de86e42c80ce795a12
-  data.tar.gz: f82ed542d84b73465072a5e8c9c6b55d43924498
+  metadata.gz: 66daeba8da989301477c3d0b2474c5d32ad19011
+  data.tar.gz: 9d47532f129aaea7c5057dba34872fd588b19401
 SHA512:
-  metadata.gz: e45812b9c587be046d51056505a761dd8a2439f082fca92cdee33700c8990e3d09c41a59e7b22706fc6695df774c63425e2e7bea399e62927b21d2754135561d
-  data.tar.gz: 411691c2aa1fc7a8aacd7636da4ffb6023f04bb45d244dde1b0801201acbd3506252c878451ffbffdd91bb4c75652501e5bc9233402ca4843e5cd8069a80d634
+  metadata.gz: cf969107f17c26e64f3e19e64ddb1e9b251f8c432c7f563cc6633fac82cf8a98375d9b7fb065b08a6883e65a3a19e0019e604dff2925c7b217d145d59cb78e05
+  data.tar.gz: 3b34fa1275f028cda1ae152809f0f559b89a5663d3c13574636852eda8b2d1a29079943633dd0f58e599c0c74874d4a072804231ab0081a7e08c24f47d969ac7

data/README.md

@@ -86,9 +86,13 @@ class AppDelegate
     MainMenu[:app].subscribe(:hide_others) { |_, _| NSApp.hideOtherApplications(self) }
     MainMenu[:app].subscribe(:quit) { |_, _| NSApp.terminate(self) }    
 
-    MainMenu[:file].subscribe(:start_stop) { |command, _|
+    MainMenu[:file].subscribe(:start_stop, :start_stop_command_id) { |command, _|
       @started               = !@started
       command.parent[:title] = @started ? 'Stop' : 'Start'
+      puts "subscribe 1 command id: #{command.command_id}"
+    }
+    MainMenu[:file].subscribe(:start_stop, :start_stop_command_id2) { |command, _|
+      puts "subscribe 2 command id: #{command.command_id}"
     }
     MainMenu[:file].subscribe(:new) { |_, _|
       @has_open = true

data/examples/basic_main_menu/app_delegate.rb

@@ -16,9 +16,13 @@ class AppDelegate
       @has_open = true
       puts 'open'
     }
-    MainMenu[:file].subscribe(:start_stop) { |command, _|
+    MainMenu[:file].subscribe(:start_stop, :start_stop_command_id) { |command, _|
       @started               = !@started
       command.parent[:title] = @started ? 'Stop' : 'Start'
+      puts "subscribe 1 command id: #{command.command_id}"
+    }
+    MainMenu[:file].subscribe(:start_stop, :start_stop_command_id2) { |command, _|
+      puts "subscribe 2 command id: #{command.command_id}"
     }
     MainMenu[:statusbar].subscribe(:status_new) { |_, _|
       @has_open = true

data/lib/everyday-menu/menu.rb

@@ -48,8 +48,8 @@ module EverydayMenu
 
     alias :menu_item :menuItem
 
-    def subscribe(label, &block)
-      self.items[label].subscribe(&block)
+    def subscribe(label, command_id = nil, &block)
+      self.items[label].subscribe(command_id, &block)
     end
 
     def <<(item)

data/lib/everyday-menu/menu_item.rb

@@ -120,8 +120,8 @@ module EverydayMenu
       @onBuild << block
     end
 
-    def subscribe(&block)
-      @menuItem.subscribe(self, self.label, &block)
+    def subscribe(command_id = nil, &block)
+      @menuItem.subscribe(self, self.label, command_id, &block)
     end
 
     def execute
@@ -133,9 +133,9 @@ end
 class NSMenuItem
   attr_reader :commands
 
-  def subscribe(parent, label, &block)
+  def subscribe(parent, label, command_id = nil, &block)
     @commands ||= EverydayMenu::CommandList.new(parent, label)
-    @commands.add &block
+    @commands.add command_id, &block
     command      = @commands.last
     self.enabled = @commands.canExecute
     unless @boundEnabled

data/lib/everyday-menu/utils.rb

@@ -1,18 +1,20 @@
 module EverydayMenu
   class EverydayCommand
-    attr_reader :label, :parent
+    attr_reader :label, :parent, :command_id
     attr_writer :canExecute
 
-    def initialize(parent, label, canExecute = true, &block)
+    def initialize(parent, label, command_id = nil, canExecute = true, &block)
       @parent          = parent
       @label           = label
       @block           = block
+      @command_id      = command_id
       @canExecute      = canExecute
       @canExecuteBlock = nil
     end
 
     def canExecuteBlock(&block)
       @canExecuteBlock = block
+      self
     end
 
     def canExecute
@@ -33,8 +35,8 @@ module EverydayMenu
       @items  = []
     end
 
-    def add(&block)
-      @items << EverydayCommand.new(@parent, @label, &block)
+    def add(command_id = nil, &block)
+      @items << EverydayCommand.new(@parent, @label, command_id, &block)
     end
 
     def last

data/lib/everyday-menu/version.rb

@@ -1,3 +1,3 @@
 module EverydayMenu
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: everyday-menu
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Eric Henderson