menu-motion 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 017c1789cf0bfe842b95fd4da3e14ab67fe563d1
-  data.tar.gz: 6a6d164c184310adfedf3dda0a938c28b32808fd
+  metadata.gz: 81a470e891e3ef0dc469a6184e66a3fc9261a6a0
+  data.tar.gz: 47c198b68132494dc529a7a7bcb622825bc4caf3
 SHA512:
-  metadata.gz: b9ea50176c4efd7f6ae481d2972bcc35115b9f66cb6a8b8d849984546c5dbadd838d044b793cc4c66fd9f17851843441c93c67957d62ca8a38fbd79d2463761f
-  data.tar.gz: 67dd921c1153d5cbfc0ac8aeac270243537f1d2045d67e3af336846ea88fd2c407e4c2dc666aef27e1b7da1c894752eff8729d8ef089e16db8c51654eba1e9b0
+  metadata.gz: 376ab57eac16f013695eb5fde29f28281ee6d6f73e5378ac32401be718f7313d2b13801fb5039d9fcbbae0109a702e033ecb42acba33e73b826193ca3ce68fd5
+  data.tar.gz: abbef473c9bd1ce0a81dfaa90ee98e20cce65abea2aac33c11c22f9e803f25ccb86a537f7e2cfd46efa9254552b61a3cb19e850f6c36d591b6244c2ecbd0b06c

data/README.md

@@ -32,10 +32,10 @@ Here's an awesome graphic of a menu:
 ```
 |‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾|
 | [icon] First Item > |‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾|
-|---------------------| First Subitem > |‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾|
-| About MenuMotion    |-----------------| First Action  |
-| Quit                | Some Action     | Second Action |
-|_____________________|_________________|_______________|
+|---------------------| First Subitem > |‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾|
+| About MenuMotion    |-----------------| First Action    |
+| Quit                | Some Action     | ✓ Second Action |
+|_____________________|_________________|_________________|
 ```
 
 And the Ruby to generate this menu:
@@ -57,14 +57,15 @@ menu = MenuMotion::Menu.new({
           }, {
             title: "Second Action",
             target: self,
-            action: "second_action"
+            action: "second_action",
+            checked: true
           }]
         }]
       }, {
         rows: [{
           title: "Some Action",
           target: self,
-          action: "some_action"
+          action: :some_action
         }]
       }]
     }]
@@ -115,14 +116,14 @@ menu = MenuMotion::Menu.new({
 ### Actions
 
 Adding an action to a menu item is easy. Just define the
-target and action parameters.
+target and action parameters. Actions that don't require the `sender` to be passed can be defined as a `String` or a `:symbol`.
 
 ```ruby
 menu = MenuMotion::Menu.new({
   rows: [{
     title: "Basic Action",
     target: self,
-    action: "basic_action"
+    action: :basic_action
   }, {
     title: "Pass the menu item to the action",
     target: self,

data/lib/menu-motion/menu_item.rb

@@ -17,6 +17,11 @@ module MenuMotion
       self.state = (value ? NSOnState : NSOffState)
     end
 
+    def image=(value)
+      value = NSImage.imageNamed(value) unless value.is_a?(NSImage)
+      self.setImage(value)
+    end
+
     def initialize(params = {})
       super()
       update(params)
@@ -34,13 +39,10 @@ module MenuMotion
     end
 
     def update(params)
-      self.checked     = params[:checked]   if params.has_key?(:checked)
-      self.item_action = params[:action]    if params.has_key?(:action)
-      self.item_target = params[:target]    if params.has_key?(:target)
-      self.object      = params[:object]    if params.has_key?(:object)
-      self.root_menu   = params[:root_menu] if params.has_key?(:root_menu)
-      self.title       = params[:title]     if params.has_key?(:title)
-      self.validate    = params[:validate]  if params.has_key?(:validate)
+      assign_attributes(params)
+
+      self.item_action = params[:action] if params.has_key?(:action)
+      self.item_target = params[:target] if params.has_key?(:target)
 
       # Set NSApp as the default target if no other target is given
       if self.item_action && self.item_target.nil?
@@ -116,6 +118,14 @@ module MenuMotion
       end
     end
 
+  private
+
+    def assign_attributes(params)
+      [:image, :view, :checked, :object, :root_menu, :title, :validate].each do |key|
+        self.send("#{key}=", params[key]) if params.has_key?(key)
+      end
+    end
+
   end
 
 end

data/lib/menu-motion/version.rb

@@ -1,3 +1,3 @@
 module MenuMotion
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: menu-motion
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Brian Pattison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2014-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake