everyday-menu 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66daeba8da989301477c3d0b2474c5d32ad19011
-  data.tar.gz: 9d47532f129aaea7c5057dba34872fd588b19401
+  metadata.gz: 070446116cd1b8619df4634a2615d0fe56bd54b7
+  data.tar.gz: 625c092f45698dab96d3fe6bc50218eeb3dbeba7
 SHA512:
-  metadata.gz: cf969107f17c26e64f3e19e64ddb1e9b251f8c432c7f563cc6633fac82cf8a98375d9b7fb065b08a6883e65a3a19e0019e604dff2925c7b217d145d59cb78e05
-  data.tar.gz: 3b34fa1275f028cda1ae152809f0f559b89a5663d3c13574636852eda8b2d1a29079943633dd0f58e599c0c74874d4a072804231ab0081a7e08c24f47d969ac7
+  metadata.gz: 1b692b467c2bcf26a9c4a31f83003135a8766cf36ab80968f7237f28d22196d0a1d788e5cdf53854948e5bdea9e6497a18da5fb8cd4e0f780de84478f11e90e1
+  data.tar.gz: 17a5b9ada1e707ada94b4406cd51591ba423db275e3ce31436cf1e2ff256ae1bd87ce422c35f141376975f433411dbaded4804ed1ed7464e56061c1db1e7ceac

data/.gitignore

@@ -23,3 +23,5 @@ vendor
 /projectFilesBackup/
 
 /.repl_history
+
+/.dat3715.000

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in drink-menu.gemspec
 gemspec
+
+gem 'rm-digest'

data/README.md

@@ -1,18 +1,34 @@
 # EverydayMenu
 
+[![Gem Version](https://badge.fury.io/rb/everyday-menu.png)](http://badge.fury.io/rb/everyday-menu)
+
 ## Updates
+* 0.2.0:
+    * Create `EverydayCommand` to allow control of enablement of menu items
+* 0.2.1:
+    * Fix a set method issue and resolve the error messages about missing methods
+* 0.3.0:
+    * Add handling for `NSApp.servicesMenu`, `NSApp.windowsMenu`, and `NSApp.helpMenu`
 * 0.4.0:
     * Please see the "Introducing Presets!" section below for an awesome new feature!
 * 1.0.0:
     * Please see the "Introducing Statusbar Menus!" section below for another awesome new feature!
+* 1.1.0:
+    * Added reference to parent `MenuItem` instance to `EverydayCommand`
+* 1.2.0:
+    * Added the ability to have individual ids for each command
+* 1.3.0:
+    * Commands now get a random id if you don't give them one
+    * You can now access a command by id
+    * I now have a runtime dependency, the gem `rm-digest`, but it has the necessary objective-c code built-in, so there shouldn't be any extra work for users of `everyday-menu`
 
 ## 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.
+Please note that this gem is 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.
 
-You can find his gem at <https://github.com/joefiorini/drink-menu>.  He doesn't get all of the credit, but he gets a lot of it.
+You can find his gem at <https://github.com/joefiorini/drink-menu>.  He doesn't get all of the credit, but he gets a fair amount of it.
 
 ## Installation
 
@@ -104,10 +120,15 @@ class AppDelegate
       puts 'close'
     }.canExecuteBlock { |_| @has_open }
 
-    MainMenu[:file].subscribe(:open) { |_, _|
+    MainMenu[:file].subscribe(:open) { |command, _|
       @has_open = true
       puts 'open'
+      puts "open subscribe 1 command id: #{command.command_id}"
+    }
+    MainMenu[:file].subscribe(:open) { |command, _|
+      puts "open subscribe 2 command id: #{command.command_id}"
     }
+    puts "start_stop subscribe 1 parent label: #{MainMenu[:file].items[:start_stop][:commands][:start_stop_command_id].label}"
   end
 end
 ```

data/everyday-menu.gemspec

@@ -19,4 +19,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake', '~> 10.0'
+
+  spec.add_dependency 'rm-digest'
 end

data/examples/basic_main_menu/app_delegate.rb

@@ -12,17 +12,21 @@ class AppDelegate
       @has_open = false
       puts 'close'
     }.canExecuteBlock { |_| @has_open }
-    MainMenu[:file].subscribe(:open) { |_, _|
+    MainMenu[:file].subscribe(:open) { |command, _|
       @has_open = true
       puts 'open'
+      puts "open subscribe 1 command id: #{command.command_id}"
+    }
+    MainMenu[:file].subscribe(:open) { |command, _|
+      puts "open subscribe 2 command id: #{command.command_id}"
     }
     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}"
+      puts "start_stop 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}"
+      puts "start_stop subscribe 2 command id: #{command.command_id}"
     }
     MainMenu[:statusbar].subscribe(:status_new) { |_, _|
       @has_open = true
@@ -36,5 +40,6 @@ class AppDelegate
       @has_open = true
       puts 'status-open'
     }
+    puts "start_stop subscribe 1 parent label: #{MainMenu[:file].items[:start_stop][:commands][:start_stop_command_id].label}"
   end
 end

data/lib/everyday-menu/menu_item.rb

@@ -127,6 +127,10 @@ module EverydayMenu
     def execute
       @menuItem.runBlock(self)
     end
+
+    def commands
+      @commands ||= EverydayMenu::CommandList.new(self, self.label)
+    end
   end
 end
 
@@ -134,10 +138,9 @@ class NSMenuItem
   attr_reader :commands
 
   def subscribe(parent, label, command_id = nil, &block)
-    @commands ||= EverydayMenu::CommandList.new(parent, label)
-    @commands.add command_id, &block
-    command      = @commands.last
-    self.enabled = @commands.canExecute
+    @commands    ||= parent.commands
+    command      = parent.commands.add command_id, &block
+    self.enabled = parent.commands.canExecute
     unless @boundEnabled
       @boundEnabled = true
       self.bind(NSEnabledBinding, toObject: self.commands, withKeyPath: 'canExecute', options: nil)

data/lib/everyday-menu/utils.rb

@@ -1,3 +1,7 @@
+class EverydayRmDigest
+  include RmDigest
+end
+
 module EverydayMenu
   class EverydayCommand
     attr_reader :label, :parent, :command_id
@@ -32,11 +36,25 @@ module EverydayMenu
     def initialize(parent, label)
       @parent = parent
       @label  = label
-      @items  = []
+      @items  = {}
+      @rand   = Random.new
+    end
+
+    def unique_id
+      EverydayRmDigest::MD5.hexdigest("#{@rand.rand}#{@rand.rand}")
+    end
+
+    def rand_id
+      :"command_id_#{unique_id}"
     end
 
     def add(command_id = nil, &block)
-      @items << EverydayCommand.new(@parent, @label, command_id, &block)
+      id         = command_id || rand_id
+      @items[id] = EverydayCommand.new(@parent, @label, id, &block)
+    end
+
+    def [](id)
+      @items[id]
     end
 
     def last
@@ -44,11 +62,11 @@ module EverydayMenu
     end
 
     def execute(sender)
-      @items.each { |item| item.execute(sender) }
+      @items.values.each { |item| item.execute(sender) }
     end
 
     def canExecute
-      @items.any? { |item| item.canExecute }
+      @items.values.any? { |item| item.canExecute }
     end
   end
 

data/lib/everyday-menu/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: everyday-menu
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Eric Henderson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-20 00:00:00.000000000 Z
+date: 2014-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rm-digest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: An easy way to define menu items and visually lay out menus for your
   OSX apps. Based strongly on the drink-menu gem that I couldn't get to work for me.
 email: