everyday-menu 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8629e47d2c83c578b36c97f19929b19510a2f109
-  data.tar.gz: 33d50f3c20d86ade4efb059ca5c540ec8fc3fd5e
+  metadata.gz: da6d30cd6c8e784123bf3c01669eb99c27c29b82
+  data.tar.gz: 351d736ce3c8d45269d1432ad0573641e9346786
 SHA512:
-  metadata.gz: d52d5545f858e73378246066a05eb524fab4363eacc03cba1876d80e9c5b6f58a86342c2736884b9313a85d0a3ce49645da321bb7df7f1a45c3ae52199e8e2e3
-  data.tar.gz: 4cfac1436396e77297c61d1745eab23bbb455baa64b184146fa73310b1c599de978887be0ed59f62ab10a7a04e05a8d5f9103ddc213440474019bba0aed4cdcc
+  metadata.gz: 4deb36dd997d2e87e0bdad716a60ea03b79f5a359ecc765e29353a04dcb011d4a2ccfb948a5ac4283c303fc57de7728dff3c7cb4453682169f8afabecd8d4046
+  data.tar.gz: 1b3401db78117dfedf598c2f48f6feae52c598da6c7a2b88e05ab8b6b61cdfa2edfb9114e7f1ca17aec716ddc9e8a17abe601e5b1a1d889735d2f9813324f9e2

data/README.md

@@ -1,5 +1,8 @@
 # EverydayMenu
 
+## Issue Tracking
+Please use <https://everydayprogramminggenius.atlassian.net/browse/EM> for issue tracking.
+
 ## Credit
 Please note that this gem is strongly based off of Joe Fiorini's `drink-menu` gem (with a little code copy-paste and lots of test and readme copy-paste), which I couldn't get to work for me.
 
@@ -28,35 +31,62 @@ Everyday Menu separates menu layout from menu definition. Menu definition looks
 class MainMenu
   extend EverydayMenu::MenuBuilder
 
-  menuItem :create_site, 'Create Site'
-  menuItem :export, 'Export to Folder...'
-  menuItem :import, 'Import Folder as Site...'
-  menuItem :force_rebuild, 'Force Rebuild'
-  menuItem :about, 'About Staticly'
   menuItem :quit, 'Quit', key_equivalent: 'q'
+
+  menuItem :open, 'Open', key_equivalent: 'o'
+  menuItem :new, 'New'
+  menuItem :close, 'Close', key_equivalent: 'w'
 end
+
 ```
 
-and then layout is as simple as:
+Layout is as simple as:
 
 ```ruby
-
 class MainMenu
   extend EverydayMenu::MenuBuilder
 
-  mainMenu :main_menu, 'Main Menu' do
-    create_site
-    ___
-    export
-    import
-    force_rebuild
-    ___
-    about
+  mainMenu(:app, 'Blah') {
     quit
+  }
+
+  mainMenu(:file, 'File') {
+    new
+    open
+    ___
+    close
+  }
+end
+```
+
+And actions are as simple as:
+```ruby
+class AppDelegate
+  def applicationDidFinishLaunching(notification)
+    @has_open = false
+    MainMenu.build!
+
+    MainMenu[:app].subscribe(:quit) { |_, _| NSApp.terminate(self) }
+
+    MainMenu[:file].subscribe(:new) { |_, _|
+      @has_open = true
+      puts 'new'
+    }
+
+    MainMenu[:file].subscribe(:close) { |_, _|
+      @has_open = false
+      puts 'close'
+    }.canExecuteBlock { |_| @has_open }
+
+    MainMenu[:file].subscribe(:open) { |_, _|
+      @has_open = true
+      puts 'open'
+    }
   end
 end
 ```
 
+
 ## Running the Examples
 
 To run our example apps:

data/examples/basic_main_menu/app_delegate.rb

@@ -1,24 +1,23 @@
 class AppDelegate
-
   def applicationDidFinishLaunching(notification)
+    @has_open = false
     MainMenu.build!
 
-    MainMenu[:app].subscribe :quit do |_|
-      NSApp.terminate(self)
-    end
+    MainMenu[:app].subscribe(:quit) { |_, _| NSApp.terminate(self) }
 
-    MainMenu[:file].subscribe :new do |_|
+    MainMenu[:file].subscribe(:new) { |_, _|
+      @has_open = true
       puts 'new'
-    end
+    }
 
-    MainMenu[:file].subscribe :close do |_|
+    MainMenu[:file].subscribe(:close) { |_, _|
+      @has_open = false
       puts 'close'
-    end
+    }.canExecuteBlock { |_| @has_open }
 
-    MainMenu[:file].subscribe :open do |_|
+    MainMenu[:file].subscribe(:open) { |_, _|
+      @has_open = true
       puts 'open'
-    end
-
+    }
   end
-
 end

data/examples/basic_main_menu/main_menu.rb

@@ -2,19 +2,19 @@ class MainMenu
   extend EverydayMenu::MenuBuilder
 
   menuItem :quit, 'Quit', key_equivalent: 'q'
+
   menuItem :open, 'Open', key_equivalent: 'o'
   menuItem :new, 'New'
-
   menuItem :close, 'Close', key_equivalent: 'w'
 
-  mainMenu :app, 'Blah' do
+  mainMenu(:app, 'Blah') {
     quit
-  end
+  }
 
-  mainMenu :file, 'File' do
+  mainMenu(:file, 'File') {
     new
     open
     ___
     close
-  end
+  }
 end

data/lib/everyday-menu/everyday_command.rb

@@ -0,0 +1,50 @@
+module EverydayMenu
+  class EverydayCommand
+    attr_reader :label
+    attr_writer :canExecute
+
+    def initialize(label, canExecute = true, &block)
+      @label           = label
+      @block           = block
+      @canExecute      = canExecute
+      @canExecuteBlock = nil
+    end
+
+    def canExecuteBlock(&block)
+      @canExecuteBlock = block
+    end
+
+    def canExecute
+      @canExecuteBlock.nil? ? @canExecute : @canExecuteBlock.call(self)
+    end
+
+    def execute(sender)
+      @block.call(self, sender)
+    end
+  end
+
+  class CommandList
+    attr_accessor :label
+
+    def initialize(label)
+      @label = label
+      @items = []
+    end
+
+    def add(&block)
+      @items << EverydayCommand.new(@label, &block)
+    end
+
+    def last
+      @items.last
+    end
+
+    def execute(sender)
+      @items.each { |item| item.execute(sender) }
+    end
+
+    def canExecute
+      @items.any? { |item| item.canExecute }
+    end
+  end
+end

data/lib/everyday-menu/menu_item.rb

@@ -98,7 +98,7 @@ module EverydayMenu
     alias :tag= :setTag
 
     def subscribe(&block)
-      @menuItem.subscribe(&block)
+      @menuItem.subscribe(self.label, &block)
     end
 
     def execute
@@ -108,16 +108,25 @@ module EverydayMenu
 end
 
 class NSMenuItem
-  def subscribe(&block)
-    @blocks ||= []
-    @blocks << block
-    return if (self.target = self && self.action == :'runBlocks:')
+  attr_reader :commands
+
+  def subscribe(label, &block)
+    @commands ||= EverydayMenu::CommandList.new(label)
+    @commands.add &block
+    command      = @commands.last
+    self.enabled = @commands.canExecute
+    unless @boundEnabled
+      @boundEnabled = true
+      self.bind(NSEnabledBinding, toObject: self.commands, withKeyPath: 'canExecute', options: nil)
+    end
+    return command if (self.target = self && self.action == :'runBlocks:')
     @original_target = self.target
     self.target      = self
     self.action      = :'runBlock:'
+    command
   end
 
   def runBlock(sender)
-    @blocks.each { |block| block.call(sender) } unless @blocks.nil?
+    @commands.execute(sender) unless @commands.nil?
   end
 end

data/lib/everyday-menu/version.rb

@@ -1,3 +1,3 @@
 module EverydayMenu
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: everyday-menu
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Eric Henderson
@@ -55,6 +55,7 @@ files:
 - examples/basic_main_menu/app_delegate.rb
 - examples/basic_main_menu/main_menu.rb
 - lib/everyday-menu.rb
+- lib/everyday-menu/everyday_command.rb
 - lib/everyday-menu/menu.rb
 - lib/everyday-menu/menu_builder.rb
 - lib/everyday-menu/menu_item.rb