metro 0.2.5 → 0.2.6

data/spec/metro/models/properties/options_property/no_option_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe Metro::Model::OptionsProperty::NoOption do
+
+  context "when attempting to an attribute like color of the no option" do
+
+    let(:log) { mock('log') }
+
+    it "should generate a warning message" do
+      log.should_receive(:warn).with(subject.warning_message)
+      subject.stub(:log) { log }
+      subject.color = :unknown
+    end
+  end
+
+  context "when queried for its action" do
+
+    let(:expected_action) { :missing_menu_action }
+
+    it "should return 'missing_menu_action'" do
+      subject.properties[:action].should eq expected_action
+    end
+  end
+
+end

data/spec/metro/models/properties/options_property/options_property_spec.rb

@@ -0,0 +1,133 @@
+require 'spec_helper'
+
+describe Metro::Model::OptionsProperty do
+
+  subject { described_class.new model }
+  let(:model) { mock("model", create: 'builds models for a living') }
+
+  describe "#get" do
+    context "when the value is nil" do
+      context "when no menu has been specified" do
+        it "should return empty options" do
+          subject.get(nil).count.should eq 0
+        end
+      end
+    end
+
+
+    context "when the value is an array of options names" do
+      before do
+        model.stub(:create) { |model_type,options| mock(model_type,options) }
+      end
+
+      let(:names) { [ 'Start Game', 'Options', 'Exit Game' ] }
+      let(:actions) { [ :start_game, :options, :exit_game ] }
+
+      let(:options) { subject.get(names) }
+
+      it "should return an option for each name" do
+        options.count.should eq names.count
+      end
+
+      it "should create labels with text with each name" do
+        options.map { |option| option.text }.should eq names
+      end
+
+      it "should create actions based on each name" do
+        options.map { |option| option.action }.should eq actions
+      end
+
+      it "should set the default selected as the first item" do
+        options.selected.should eq options.first
+      end
+    end
+
+
+    context "when the value is a hash which is a set of option names and the selected index" do
+      before do
+        model.stub(:create) { |model_type,options| mock(model_type,options) }
+      end
+
+      let(:names_and_selected_index) do
+        { 'selected' => selected_index, 'items' => names  }
+      end
+
+      let(:names) { [ 'Start Game', 'Options', 'Exit Game' ] }
+      let(:actions) { [ :start_game, :options, :exit_game ] }
+      let(:selected_index) { 1 }
+      
+      let(:label_model_class) { 'metro::ui::label' }
+      
+
+      let(:options) { subject.get(names_and_selected_index) }
+
+      it "should return an option for each name" do
+        options.count.should eq names.count
+      end
+
+      it "should create labels for each name" do
+        options.each { |option| option.model.should eq label_model_class }
+      end
+
+      it "should create labels with text with each name" do
+        options.map { |option| option.text }.should eq names
+      end
+
+      it "should create actions based on each name" do
+        options.map { |option| option.action }.should eq actions
+      end
+
+      it "should set the default selected as the first item" do
+        options.selected.should eq options[selected_index]
+      end
+    end
+
+
+    context "when the value is hash that contains a set of options (with specific ui details) and the seelcted index" do
+      before do
+        model.stub(:create) { |model_type,options| mock(model_type,options) }
+      end
+
+      let(:names_and_selected_index) do
+        { 'selected' => selected_index, 'items' => details  }
+      end
+
+      let(:details) do
+        [ { model: 'metro::ui::label', text: 'Start Game!', action: 'start_game' },
+          { model: 'metro::ui::image', text: 'Settings', action: 'open_settings' },
+          { model: 'metro::ui::label', text: 'Exit' } ]
+      end
+      
+
+      let(:names) { [ 'Start Game!', 'Settings', 'Exit' ] }
+      let(:actions) { [ :start_game, :open_settings, :exit ] }
+      let(:models) { [ 'metro::ui::label', 'metro::ui::image', 'metro::ui::label' ] }
+      
+      let(:selected_index) { 1 }
+      
+      let(:options) { subject.get(names_and_selected_index) }
+
+      it "should return an option for each name" do
+        options.count.should eq names.count
+      end
+
+      it "should create labels for each name" do
+        options.map { |option| option.model }.should eq models
+      end
+
+      it "should create labels with text with each name" do
+        options.map { |option| option.text }.should eq names
+      end
+
+      it "should create actions based on each name" do
+        options.map { |option| option.action }.should eq actions
+      end
+
+      it "should set the default selected as the first item" do
+        options.selected.should eq options[selected_index]
+      end
+    end
+
+  end
+
+end

data/spec/metro/models/properties/options_property/options_spec.rb

@@ -0,0 +1,125 @@
+require 'spec_helper'
+
+describe Metro::Model::OptionsProperty::Options do
+
+  describe "ClassMethods" do
+    describe "#empty" do
+      it "should generate an empty set of options" do
+        described_class.empty.should be_kind_of described_class
+      end
+    end
+  end
+
+  subject { described_class.new [ :a, :b ] }
+
+  describe "#current_selected_index" do
+    it "should by default be 0" do
+      subject.current_selected_index.should eq 0
+    end
+
+    context "when the value is set to negative value" do
+      let(:expected_index) { subject.count - 1 }
+
+      it "should set the current_selected_index to the last item" do
+        subject.current_selected_index = -1
+        subject.current_selected_index.should eq expected_index
+      end
+    end
+
+    context "when the value is set to a value greater than the count" do
+      let(:expected_index) { 0 }
+
+      it "should set the current_selected_index to the first item" do
+        subject.current_selected_index = 4
+        subject.current_selected_index.should eq expected_index
+      end
+    end
+  end
+
+  describe "#next!" do
+    before do
+      subject.current_selected_index = 0
+    end
+
+    let(:expected_index) { 1 }
+
+    it "should move the index to the next item" do
+      subject.next!
+      subject.current_selected_index.should eq expected_index
+    end
+
+    context "when next will pass the last item" do
+      before do
+        subject.current_selected_index = (subject.count - 1)
+      end
+
+      let(:expected_index) { 0 }
+
+      it "should return to the first item" do
+        subject.next!
+        subject.current_selected_index.should eq expected_index
+      end
+    end
+  end
+
+  describe "#previous!" do
+    before do
+      subject.current_selected_index = 1
+    end
+
+    let(:expected_index) { 0 }
+
+    it "should move to the item previous of the current one" do
+      subject.previous!
+      subject.current_selected_index.should eq expected_index
+    end
+
+    context "when previous! will move before the first item" do
+      let(:expected_index) { subject.count - 1 }
+
+      it "should return to the last item" do
+        subject.previous!
+        subject.previous!
+        subject.current_selected_index.should eq expected_index
+      end
+    end
+  end
+
+  describe "#selected" do
+    context "when their are options defined" do
+      let(:expected_selected) { subject[subject.current_selected_index] }
+
+      it "should return the item at the current_selected index" do
+        subject.selected.should eq expected_selected
+      end
+    end
+
+    context "when there are no options defined" do
+      subject { described_class.new [] }
+
+      it "should return a NoOption" do
+        subject.selected.should be_kind_of Metro::Model::OptionsProperty::NoOption
+      end
+    end
+  end
+
+  describe "#selected_action" do
+    context "when there are options defined" do
+      subject { described_class.new [ mock('first-option',properties: { action: expected_action }), mock('second-option') ] }
+      let(:expected_action) { :execute_this_action }
+      
+      it "should return the action defined on the current selected item" do
+        subject.selected_action.should eq expected_action
+      end
+    end
+    
+    context "when there are no options defined" do
+      subject { described_class.new [] }
+      
+      it "should return the action on the NoOption" do
+        subject.selected_action.should eq :missing_menu_action
+      end
+    end
+  end
+
+end

data/spec/metro/models/ui/label_spec.rb

@@ -76,7 +76,7 @@ describe Metro::UI::Label do
 
   describe "font" do
     before do
-      Metro::Model::FontProperty.stub(:create_font).and_return(font)
+      Metro::Font.stub(:find_or_create).and_return(font)
     end
 
     let(:font) { mock('font', name: expected_font_name, size: expected_font_size) }
@@ -128,21 +128,16 @@ describe Metro::UI::Label do
     let(:scale_x) { 1.0 }
     let(:scale_y) { 1.0 }
 
+    let(:font) { mock('font') }
 
-    let(:font_height) { 20 }
+    let(:line_height) { 20 }
 
     before do
       subject.text = given_text
       subject.position = Point.at(x_position,y_position,z_order)
       subject.scale = Scale.to(scale_x,scale_y)
       subject.stub(:font).and_return(font)
-    end
-
-    let(:font) do
-      font = mock('font')
-      font.stub(:text_width) { 12 }
-      font.stub(:height) { font_height }
-      font
+      subject.stub(:line_height) { line_height }
     end
 
     it "should have the font draw each of the lines" do
@@ -150,6 +145,52 @@ describe Metro::UI::Label do
       subject.draw
     end
 
+    context "when the horizontal alignment is center" do
+
+      before do
+        subject.align = "center"
+        subject.vertical_align = "top"
+        subject.stub(:line_width).with(first_line) { 60 }
+        subject.stub(:line_width).with(last_line) { 42 }
+      end
+
+      let(:first_line_x_position) { x_position - 30 }
+      let(:second_line_x_position) { x_position - 21 }
+
+      let(:first_line_y_position) { y_position }
+      let(:second_line_y_position) { y_position + line_height }
+
+      it "should draw the lines correctly based on their on their respective widths" do
+        font.should_receive(:draw).with(first_line,first_line_x_position,first_line_y_position,z_order,scale_x,scale_y,an_instance_of(Gosu::Color))
+        font.should_receive(:draw).with(last_line,second_line_x_position,second_line_y_position,z_order,scale_x,scale_y,an_instance_of(Gosu::Color))
+        subject.draw
+      end
+
+    end
+
+    context "when the horizontal alignment is right" do
+
+      before do
+        subject.align = "right"
+        subject.vertical_align = "top"
+        subject.stub(:line_width).with(first_line) { 60 }
+        subject.stub(:line_width).with(last_line) { 42 }
+      end
+
+      let(:first_line_x_position) { x_position - 60 }
+      let(:second_line_x_position) { x_position - 42 }
+
+      let(:first_line_y_position) { y_position }
+      let(:second_line_y_position) { y_position + line_height }
+
+      it "should draw the lines correctly based on their on their respective widths" do
+        font.should_receive(:draw).with(first_line,first_line_x_position,first_line_y_position,z_order,scale_x,scale_y,an_instance_of(Gosu::Color))
+        font.should_receive(:draw).with(last_line,second_line_x_position,second_line_y_position,z_order,scale_x,scale_y,an_instance_of(Gosu::Color))
+        subject.draw
+      end
+
+    end
+
     context "when the vertical alignment is top" do
 
       before do
@@ -157,7 +198,7 @@ describe Metro::UI::Label do
       end
 
       let(:first_line_y_position) { y_position }
-      let(:second_line_y_position) { y_position + font_height }
+      let(:second_line_y_position) { y_position + line_height }
 
       it "should draw the first line at the y position" do
         font.should_receive(:draw).with(first_line,x_position,first_line_y_position,z_order,scale_x,scale_y,an_instance_of(Gosu::Color))
@@ -182,9 +223,9 @@ describe Metro::UI::Label do
       let(:third_line) { text.split("\n")[2] }
 
 
-      let(:first_line_y_position) { y_position - font_height - font_height / 2 }
-      let(:second_line_y_position) { y_position - font_height / 2 }
-      let(:third_line_y_position) { y_position + font_height / 2 }
+      let(:first_line_y_position) { y_position - line_height - line_height / 2 }
+      let(:second_line_y_position) { y_position - line_height / 2 }
+      let(:third_line_y_position) { y_position + line_height / 2 }
 
       it "should draw the first line at the y position" do
         font.should_receive(:draw).with(first_line,x_position,first_line_y_position,z_order,scale_x,scale_y,an_instance_of(Gosu::Color))
@@ -201,8 +242,8 @@ describe Metro::UI::Label do
         subject.vertical_align = "bottom"
       end
 
-      let(:first_line_y_position) { y_position - font_height * 2 }
-      let(:second_line_y_position) { y_position - font_height }
+      let(:first_line_y_position) { y_position - line_height * 2 }
+      let(:second_line_y_position) { y_position - line_height }
 
       it "should draw the first line at the y position" do
         font.should_receive(:draw).with(first_line,x_position,first_line_y_position,z_order,scale_x,scale_y,an_instance_of(Gosu::Color))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metro
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-18 00:00:00.000000000 Z
+date: 2012-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -110,6 +110,8 @@ files:
 - Rakefile
 - bin/metro
 - changelog.md
+- lib/assets/menu-movement.wav
+- lib/assets/menu-selection.wav
 - lib/assets/missing.ogg
 - lib/assets/missing.png
 - lib/assets/missing.wav
@@ -145,6 +147,7 @@ files:
 - lib/metro/events/has_events.rb
 - lib/metro/events/hit_list.rb
 - lib/metro/events/unknown_sender.rb
+- lib/metro/font.rb
 - lib/metro/game.rb
 - lib/metro/game/dsl.rb
 - lib/metro/image.rb
@@ -156,11 +159,16 @@ files:
 - lib/metro/models/model.rb
 - lib/metro/models/model_factory.rb
 - lib/metro/models/properties/animation_property.rb
+- lib/metro/models/properties/array_property.rb
+- lib/metro/models/properties/boolean_property.rb
 - lib/metro/models/properties/color_property.rb
 - lib/metro/models/properties/dimensions_property.rb
 - lib/metro/models/properties/font_property.rb
 - lib/metro/models/properties/image_property.rb
 - lib/metro/models/properties/numeric_property.rb
+- lib/metro/models/properties/options_property/no_option.rb
+- lib/metro/models/properties/options_property/options.rb
+- lib/metro/models/properties/options_property/options_property.rb
 - lib/metro/models/properties/position_property.rb
 - lib/metro/models/properties/property.rb
 - lib/metro/models/properties/property_owner.rb
@@ -221,10 +229,14 @@ files:
 - spec/core_ext/string_spec.rb
 - spec/gosu_ext/color_spec.rb
 - spec/metro/models/key_value_coding_spec.rb
-- spec/metro/models/properties/color_spec.rb
+- spec/metro/models/properties/array_property_spec.rb
+- spec/metro/models/properties/color_property_spec.rb
 - spec/metro/models/properties/dimensions_spec.rb
-- spec/metro/models/properties/font_spec.rb
+- spec/metro/models/properties/font_property_spec.rb
 - spec/metro/models/properties/numeric_property_spec.rb
+- spec/metro/models/properties/options_property/no_option_spec.rb
+- spec/metro/models/properties/options_property/options_property_spec.rb
+- spec/metro/models/properties/options_property/options_spec.rb
 - spec/metro/models/properties/position_property_spec.rb
 - spec/metro/models/ui/label_spec.rb
 - spec/metro/scene_spec.rb
@@ -238,11 +250,13 @@ licenses: []
 post_install_message: ! "    ______  ___      _____\n    ___   |/  /_____ __  /_______________\n
   \   __  /|_/ / _  _ \\_  __/__  ___/_  __ \\\n    _  /  / /  /  __// /_  _  /    /
   /_/ /\n    /_/  /_/   \\___/  \\__/ /_/     \\____/\n\n  Thank you for installing
-  metro 0.2.5 / 2012-11-18.\n  ---------------------------------------------------------------------\n
-  \ Changes:\n    \n  * FIX metro::ui::rectangle calculation\n  * FIX remaining references
-  to metro::models::* to metro::ui::*\n  * FIX Models will use their setters over
-  setting raw properties\n  * Metro::UI::Label now supports horizontal alignment,
-  vertical alignment, and multiple lines\n  \n\n  ---------------------------------------------------------------------\n"
+  metro 0.2.6 / 2012/11-20.\n  ---------------------------------------------------------------------\n
+  \ Changes:\n    \n  * Menus now support vertical and horizontal layout\n  * Menus
+  now support movement and selection noises\n  * Menus can now have a default selection\n
+  \ * Menus can be enabled/disabled\n  * Added Array Property, Boolean Property, and
+  Menu Options Property\n  * FIX label horizontal center and right alignments\n  *
+  Generic Models will now show a warning instead of raising an exception\n  * Removed
+  event chain debug messaging\n  \n\n  ---------------------------------------------------------------------\n"
 rdoc_options: []
 require_paths:
 - lib
@@ -271,10 +285,14 @@ test_files:
 - spec/core_ext/string_spec.rb
 - spec/gosu_ext/color_spec.rb
 - spec/metro/models/key_value_coding_spec.rb
-- spec/metro/models/properties/color_spec.rb
+- spec/metro/models/properties/array_property_spec.rb
+- spec/metro/models/properties/color_property_spec.rb
 - spec/metro/models/properties/dimensions_spec.rb
-- spec/metro/models/properties/font_spec.rb
+- spec/metro/models/properties/font_property_spec.rb
 - spec/metro/models/properties/numeric_property_spec.rb
+- spec/metro/models/properties/options_property/no_option_spec.rb
+- spec/metro/models/properties/options_property/options_property_spec.rb
+- spec/metro/models/properties/options_property/options_spec.rb
 - spec/metro/models/properties/position_property_spec.rb
 - spec/metro/models/ui/label_spec.rb
 - spec/metro/scene_spec.rb