drink-menu 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa0caded737aae5b8e19f02d234a62bec5532129
-  data.tar.gz: 3670d72c16d59197c56304cfe94992ab2218e71f
+  metadata.gz: 6a271cb84ff5bcafdc557d9413b0d4a12a7f5860
+  data.tar.gz: 341c7658bf3bf5699a169b83217da897f7ede78c
 SHA512:
-  metadata.gz: 30a6f653df7169b157e7424c5be84b35c34c3f339a88a3361f057f3e3822092005c2df993a1e91fe6dca366b2b70bf2a83a975f83fc719f849750ed8b301b892
-  data.tar.gz: f1d041f9171d4c9cd4ffe7671d60a82383c9d3b7d9fcf9868dd3fdf90eab3d7cc183adc37993931be0793b57bc91cdc2f496ec49c4483f455a33ae977d8710e3
+  metadata.gz: 579a9cfc385fddb960177447ffe87a968f01c0991c905163d0bc6edba0a4357c917759f223ae00fdb89e5f295c60eea99b80336a21731d5ac114bafce84e22b7
+  data.tar.gz: c6c7198e649ae76722ea91ec76825be29a44a0a853545516002718379896527eaafc7232136ff07bbeb8555dec9f726f233239d83ddbfeb40e9ff84490ec24f5

data/Rakefile

@@ -17,6 +17,10 @@ Motion::Project::App.setup do |app|
   app.identifier = 'com.densitypop.drink-menu'
   app.specs_dir = "spec/"
 
+  if ENV['example']
+    app.files << Dir["examples/#{ENV['example']}/**/*.rb"]
+  end
+
   app.pods do
     pod 'ReactiveCocoa'
   end

data/examples/basic_main_menu/app_delegate.rb

@@ -0,0 +1,24 @@
+class AppDelegate
+
+  def applicationDidFinishLaunching(notification)
+    MainMenu.build!
+
+    MainMenu[:app].subscribe :quit do |_|
+      NSApp.terminate(self)
+    end
+
+    MainMenu[:file].subscribe :new do |_|
+      puts "new"
+    end
+
+    MainMenu[:file].subscribe :close do |_|
+      puts "close"
+    end
+
+    MainMenu[:file].subscribe :open do |_|
+      puts "open"
+    end
+
+  end
+
+end

data/examples/basic_main_menu/main_menu.rb

@@ -0,0 +1,32 @@
+class MainMenu
+  extend DrinkMenu::MenuBuilder
+
+  menuItem :quit do |item|
+    item.title = 'Quit'
+    item.keyEquivalent = 'q'
+  end
+
+  menuItem :open do |item|
+    item.title = 'Open'
+    item.keyEquivalent = 'o'
+  end
+
+  menuItem :new, title: 'New'
+
+  menuItem :close do |item|
+    item.title = 'Close'
+    item.keyEquivalent = 'w'
+  end
+
+  mainMenu :app, title: 'Blah' do
+    quit
+  end
+
+  mainMenu :file, title: 'File'  do
+    new
+    open
+    ___
+    close
+  end
+
+end

data/lib/drink-menu/menu.rb

@@ -36,6 +36,14 @@ module DrinkMenu
       end
     end
 
+    def self.menuWithLabel(label, title: title, menuItem: needsMenuItem, &block)
+      new(label, &block).tap do |menu|
+        menu.title = title
+        menu.createMenuItemWithTitle title if needsMenuItem
+      end
+    end
+
+
     def self.menuWithLabel(label, title: title, &block)
       new(label, &block).tap do |menu|
         menu.title = title
@@ -72,6 +80,8 @@ module DrinkMenu
       @label = label
       @builder = block
       @menu = NSMenu.alloc.init
+      @needsStatusItem = false
+      @needsMenuItem = false
     end
 
     def <<(item)
@@ -81,6 +91,10 @@ module DrinkMenu
       @menu.addItem item.menuItem
     end
 
+    def menuItemFromMenu!
+      @mainMenuItem ||= MenuItem.itemWithLabel(label, title: title, submenu: self)
+    end
+
     def addMenuItemForMember(member)
       item = MenuItem.itemWithLabel(member.hash.to_s, title: member.send(memberTitleProperty))
       item.representedObject = member
@@ -101,6 +115,7 @@ module DrinkMenu
       end
     end
 
+    # Only works when built with menuWithLabel:itemsFromCollection:titleProperty
     def subscribeToMembers(&block)
       memberCommand.signal.subscribeNext(block)
     end
@@ -109,6 +124,11 @@ module DrinkMenu
       self[itemLabel].subscribe(&block)
     end
 
+    def createMenuItemWithTitle(title)
+      @needsMenuItem = true
+      @statusItemTitle = title
+    end
+
     def createStatusItemWithTitle(title)
       @needsStatusItem = true
       @statusItemTitle = title
@@ -151,6 +171,10 @@ module DrinkMenu
       @needsStatusItem
     end
 
+    def needsMenuItem?
+      @needsMenuItem
+    end
+
     def createStatusItem!
       statusBar = NSStatusBar.systemStatusBar
       @statusItem = statusBar.statusItemWithLength(NSSquareStatusItemLength)

data/lib/drink-menu/menu_builder.rb

@@ -1,7 +1,7 @@
 module DrinkMenu
   module MenuBuilder
 
-    class Context
+    class Context < BasicObject
         def initialize(menu, menuItems={})
           @menu = menu
           @menuItems = menuItems
@@ -55,6 +55,11 @@ module DrinkMenu
       @menus[label] = Menu.statusMenuWithLabel label, icon: image, &block
     end
 
+    def mainMenu(label, title: title, &block)
+      @menus ||= {}
+      @menus[label] = Menu.menuWithLabel label, title: title, menuItem: true, &block
+    end
+
     def menu(label, title: title, &block)
       @menus ||= {}
       @menus[label] = Menu.menuWithLabel label, title: title, &block
@@ -75,8 +80,18 @@ module DrinkMenu
         context.instance_eval(&menu.builder) if menu.builder
         if menu.needsStatusItem?
           menu.createStatusItem!
+        elsif menu.needsMenuItem?
+          @mainMenu ||= NSMenu.new
+          @mainMenu.addItem menu.menuItemFromMenu!.menuItem
         end
       end
+      setupMainMenu if @mainMenu
+    end
+
+    private
+
+    def setupMainMenu
+      NSApp.mainMenu = @mainMenu
     end
 
   end

data/lib/drink-menu/version.rb

@@ -1,3 +1,3 @@
 module DrinkMenu
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/menu_builder_spec.rb

@@ -1,4 +1,5 @@
 class TestMenu; extend DrinkMenu::MenuBuilder; end
+class TestMenu2; include DrinkMenu::MenuBuilder; end
 
 describe "sugar for creating menus" do
 
@@ -39,21 +40,52 @@ describe "sugar for creating menus" do
   end
 
   it "evaluates menu's block to add items to menu" do
-    item1 = TestMenu.menuItem :test_item1, title: "Blah"
-    item2 = TestMenu.menuItem :test_item2, title: "Blah"
+    builder = TestMenu2.new
+    item1 = builder.menuItem :test_item1, title: "Blah"
+    item2 = builder.menuItem :test_item2, title: "Blah"
 
-    TestMenu.menu :main_menu, title: "Main" do
+    builder.menu :main_menu, title: "Main" do
       test_item1
       ___
       test_item2
     end
 
-    TestMenu.build!
+    builder.build!
 
-    TestMenu[:main_menu][:test_item1].should.equal item1
-    TestMenu[:main_menu][:test_item2].should.equal item2
+    builder[:main_menu][:test_item1].should.equal item1
+    builder[:main_menu][:test_item2].should.equal item2
 
-    TestMenu[:main_menu][2].isSeparatorItem.should.be.true
+    builder[:main_menu][2].isSeparatorItem.should.be.true
+  end
+
+  it "supports generating an NSApp's mainMenu items" do
+    builder = TestMenu2.new
+    testItem1 = builder.menuItem :test_item1, title: "Blah 1"
+    testItem2 = builder.menuItem :test_item2, title: "Blah 2"
+
+    menu1 = builder.mainMenu :menu1, title: "Menu 1" do
+      test_item1
+    end
+
+    menu2 = builder.mainMenu :menu2, title: "Menu 2" do
+      test_item2
+    end
+
+    builder.build!
+
+    mainMenu = NSApp.mainMenu
+
+    menuItem = mainMenu.itemArray[0]
+    puts "menu1 title: #{menu1.title.inspect}"
+    puts "menuItem title: #{menuItem.title.inspect}"
+    menuItem.title.should.equal menu1.title
+    menuItem.submenu.title.should.equal menu1.title
+    menuItem.submenu.itemArray[0].title.should.equal("Blah 1")
+
+    menuItem = mainMenu.itemArray[1]
+    menuItem.title.should.equal(menu2.title)
+    menuItem.submenu.title.should.equal menu2.title
+    menuItem.submenu.itemArray[0].title.should.equal("Blah 2")
   end
 
   describe "builder's context class" do
@@ -77,9 +109,8 @@ describe "sugar for creating menus" do
 
       menu[1].should.be.nil
 
-      Context.new(menu).send :"___"
+      Context.new(menu).__send__ :"___"
 
-      puts menu.menuItems.inspect
       menu[1].isSeparatorItem.should.be.true
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drink-menu
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Joe Fiorini
@@ -82,6 +82,8 @@ files:
 - README.md
 - Rakefile
 - drink-menu.gemspec
+- examples/basic_main_menu/app_delegate.rb
+- examples/basic_main_menu/main_menu.rb
 - lib/drink-menu.rb
 - lib/drink-menu/ext/forwardable.rb
 - lib/drink-menu/ext/ns_menu_item.rb