waiter 2.0.0 → 2.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmQ1YzdlZmU3MDM4ZDgwOWQ0ZmNhMjI5MDcwNGYxZTUwMTE5YzI1MQ==
+    YjE2YjI1MjFlNjUzZTZiZWZhMTVlZDc0YjZjODg0Y2Y4YWExNjliMg==
   data.tar.gz: !binary |-
-    ZTg1ZmIzMDc1MmQ4MDQ0MDk1ZDRmZjIwNzViMDVmYmFlYzBjYzhiNQ==
+    ZmQzYTJmOWIwYjJlMTQxYjIxZmVkMWZkOWVmZGU0ZDMwMmEzNzFhYw==
 SHA512:
   metadata.gz: !binary |-
-    NTBhMTMxOWQ4ZmNiZWEwZmNkMDkwMDBiZDA3YjIyODNhYTM1M2ZhNDgwYjY2
-    OThhODZmYmQ3MDVhMWQzYTY4YWM4NWMwNGFiNzg5MTk4NWM1OTlkODIxMDM3
-    ZTAwYjFhMTE1YWU3ZDhjYzE5ZDkyODI1ZjllNjdmMDEyZTY2ZGQ=
+    ZGY5ZTllYmVkMDJjYTQ5OGYwN2ZhYTcyNmY2MDBmZjgxMzAzM2U4ZjZiNjMz
+    ODQzMDAyN2JmNjhiNWY4NDRjNjY4N2NmOTg3YmJhMDYwZWYxN2NmMTYwMjlm
+    MDM2ZDJjZmQxNDY0NTUxZTc3YjMxOTE4ZjZlY2I3MjFlNGRhOTA=
   data.tar.gz: !binary |-
-    MGVjZTZmMWY4NmY3MTM4NDI0NGQyNjBkMTc1MTFkZGM4OWFkYjU1YTc2MmIz
-    MWNkNWYwNjhiMWY5YTRhNGQ2NWNkMzdjMDQzZDA3YzBkN2FlNzEwMzc4OTIz
-    NzU4YmZjZTA2YjFhNDVmNWEwMTM2NTJhMzk1ZGIyOTZkMzVjNGY=
+    YjFhNjkzYzQwYTQ1OTRmNmY1M2I1ZmJmMDdlYmZhMjI0MWZjMDlkYjdkM2E4
+    MmUzNGVkNDIwZmM5NTA0ZWMxYTdmYzZjOTA0OGM1MDZkOWNhNGFjNjc2Nzky
+    YTIyOTU3NmIwY2FhZjkzZDc4NjU1YTRiNGViYWU3NWE1OTljYzY=

data/app/views/waiter/_section.haml

@@ -1,4 +1,4 @@
-- section.items.each do |subitem|
+- section.items(true).each do |subitem|
   = render 'waiter/sub_item', item: item, subitem: subitem
 
 - unless last

data/lib/waiter/menu.rb

@@ -3,6 +3,7 @@ require 'waiter/menu/item_list'
 require 'waiter/menu/item'
 require 'waiter/menu/section'
 require 'waiter/menu/drawer'
+require 'active_support/core_ext/hash/slice'
 
 module Waiter
   class Menu
@@ -50,11 +51,7 @@ module Waiter
 
     def items(sorted = false)
       return @items unless sorted
-
-      items = @items.dup
-      items.sort_by!(&options[:sort].to_sym) if options.fetch(:sort, false)
-      items.reverse! if options.fetch(:reverse, false)
-      ItemList.new(items)
+      ItemList.new(@items, options.slice(:sort, :reverse))
     end
 
     def top?

data/lib/waiter/menu/item_list.rb

@@ -1,6 +1,11 @@
 module Waiter
   class Menu
     class ItemList < Array
+      def initialize(ary = [], sort_options = {})
+        super(ary)
+        sort(sort_options)
+      end
+
       def include?(other)
         return map(&:name).include?(other) if other.is_a? Symbol
         super
@@ -14,6 +19,11 @@ module Waiter
       def names
         map(&:name)
       end
+
+      def sort(options = {})
+        sort_by!(&options[:sort].to_sym) if options.fetch(:sort, false)
+        reverse! if options.fetch(:reverse, false)
+      end
     end
   end
 end

data/lib/waiter/menu/section.rb

@@ -11,6 +11,11 @@ module Waiter
         true
       end
 
+      def items(sorted = false)
+        return super() unless sorted
+        ItemList.new(super(), options.slice(:sort, :reverse))
+      end
+
     private
 
       def complete_path_for(*)

data/lib/waiter/version.rb

@@ -1,3 +1,3 @@
 module Waiter
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/spec/waiter/menu/section_spec.rb

@@ -3,7 +3,7 @@ require 'waiter/menu/section'
 require 'waiter/menu'
 
 RSpec.describe Waiter::Menu::Section do
-  let(:parent) { double(Waiter::Menu, name: :parent, options: {}) }
+  let(:parent) { double(Waiter::Menu, name: :parent, context: nil, options: {}) }
   subject { described_class.new(parent) }
 
   before do
@@ -18,4 +18,32 @@ RSpec.describe Waiter::Menu::Section do
   its(:submenu) { is_expected.to be_nil }
 
   it_behaves_like 'a menu item', []
+
+  describe '#items' do
+    subject do
+      described_class.new(parent, @options) do
+        foo
+        bar
+        baz
+        quux
+      end
+    end
+
+    before { allow_any_instance_of(Waiter::Menu::Item).to receive(:translate) { |_, key| key.to_sym } }
+
+    it 'should sort by item title' do
+      @options = { sort: :item_title }
+      expect(subject.items(true).names).to match [:bar, :baz, :foo, :quux]
+    end
+
+    it 'should reverse' do
+      @options = { reverse: true }
+      expect(subject.items(true).names).to match [:quux, :baz, :bar, :foo]
+    end
+
+    it 'should sort and reverse at the same time' do
+      @options = { sort: :item_title, reverse: true }
+      expect(subject.items(true).names).to match [:quux, :foo, :baz, :bar]
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: waiter
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Daniel Vandersluis