metro 0.2.4 → 0.2.5

data/README.md

@@ -59,9 +59,24 @@ This should generate a scene in the scenes directory. The scene file contains a
 
 ### Resources
 
+#### Programming
+
+* [YAML for Ruby](http://www.yaml.org/YAML_for_ruby.html) reference which can help you define views in the game.
+* [JSONLint](http://jsonlint.com/) is a JSON Validator
+
 #### Art
 
 * [Lost Garden](http://www.lostgarden.com/2007/05/dancs-miraculously-flexible-game.html)
+* [TimelieFX](http://www.rigzsoft.co.uk/) particle editor allows you to export animations.
+* [Text to ASCII Art Generator](http://patorjk.com/software/taag)
+* [Icons](http://css-tricks.com/flat-icons-icon-fonts/)
+* [Subtle Patterns](http://subtlepatterns.com/) various backgrounds and textures.
+
+#### Sound
+
+* [as3sfxr](http://www.superflashbros.net/as3sfxr/) generates unique sounds.
+* [Ableton](https://www.ableton.com/en/) music generation tool.
+
 
 #### Books
 

data/changelog.md

@@ -1,5 +1,12 @@
 # Metro
 
+## 0.2.5 / 2012-11-18
+
+* FIX metro::ui::rectangle calculation
+* FIX remaining references to metro::models::* to metro::ui::*
+* FIX Models will use their setters over setting raw properties
+* Metro::UI::Label now supports horizontal alignment, vertical alignment, and multiple lines
+
 ## 0.2.4 / 2012-11-15
 
 * All retrieved models from properties are now cached for better performance

data/lib/metro/missing_scene.rb

@@ -10,12 +10,12 @@ module Metro
       position: "20,20,1",
       color: "rgb(255,0,0)",
       font: {size: 80},
-      model: "metro::models::label"
+      model: "metro::ui::label"
     
     draw :message, text: 'The scene `#{self.class.missing_scene}` was requested, but is missing!',
       position: "20,100,1",
       color: "rgb(255,255,255)",
-      model: "metro::models::label"
+      model: "metro::ui::label"
 
   end
 end

data/lib/metro/models/draws.rb

@@ -22,7 +22,7 @@ module Metro
       #         'x' => 20, 'y' => 20, 'z-order' => 0,
       #         'x-factor' => 3, 'y-factor' => 3,
       #         'color' => 0xffffffff,
-      #         'model' => 'metro::models::label'
+      #         'model' => 'metro::ui::label'
       #
       #       def show
       #         puts "Where is my title? #{title.x},#{title.y}"
@@ -54,7 +54,7 @@ module Metro
       # @see #draw
       # 
       def play(song_name,options={})
-        draw song_name, options.merge(model: "metro::models::song")
+        draw song_name, options.merge(model: "metro::audio::song")
       end
 
       #

data/lib/metro/models/model.rb

@@ -13,6 +13,7 @@ module Metro
   # @see Models::Generic
   #
   class Model
+    include PropertyOwner
     include Units
 
     #
@@ -28,7 +29,6 @@ module Metro
     #
     def after_initialize ; end
 
-
     #
     # This is an entry point for customization. After the model's properties
     # have been set and the model has been assigned to the window and scene
@@ -39,7 +39,6 @@ module Metro
     #
     def show ; end
 
-
     #
     # This is called every update interval while the actor is in the scene
     #
@@ -47,7 +46,6 @@ module Metro
     #
     def update ; end
 
-
     #
     # This is called after an update. A model normally is not removed after
     # an update, however if the model responds true to #completed? then it
@@ -58,7 +56,6 @@ module Metro
     #
     def completed? ; false ; end
 
-
     #
     # This is called after every {#update} and when the OS wants the window to
     # repaint itself.
@@ -67,124 +64,16 @@ module Metro
     #
     def draw ; end
 
-
-    #
-    # Define a property for the model. A property has a name and then can optionally specify
-    # a property type which will receive additional options.
-    #
-    # @example Defining various propertys for a model
     #
-    #     class Player
-    #       property :position
-    #       property :angle, default: 0.0
-    #       property :turn_amount, default: 4.5
-    #       property :image, path: "player.png"
-    #       property :motto, type: :text, default: 'Hometown Heroes!'
-    #     end
+    # @return [String] the name of the model class.
     #
-    # When the property name matches a property definition with that name they will be used. This is what
-    # happens for the 'position' and 'image' properties defined above. Both of those map to respective
-    # properties with matching names.
-    #
-    # Properties by default are assumed to be numeric properties so the types does not have to be stated.
-    # This is the case for 'angle' and 'turn_amount' properties.
-    #
-    # You may use any particular name for your properties as long as you specify the type. This is the case
-    # for the 'motto' property.
-    #
-    def self.property(name,options={},&block)
-
-      # Use the name as the property type if one has not been provided.
-
-      property_type = options[:type] || name
-
-      property_class = Property.property(property_type)
-
-      define_method name do
-        raw_value = properties[name]
-
-        unless parsed_value = instance_variable_get("@_property_parsed_#{name}")
-          parsed_value = property_class.new(self,options,&block).get(raw_value)
-          instance_variable_set("@_property_parsed_#{name}",parsed_value)
-        end
-
-        parsed_value
-      end
-
-      define_method "#{name}=" do |value|
-        instance_variable_set("@_property_parsed_#{name}",nil)
-        prepared_value = property_class.new(self,options).set(value)
-        properties[name] = prepared_value
-      end
-
-      # Define any sub-properties defined on this property
-
-      # When the name does not match the property type then we want to force
-      # the prefixing to be on for our sub-properties. This is to make sure
-      # that when people define multiple fonts and colors that they do not
-      # overlap.
-
-      override_prefix = !(name == property_type)
-
-      property_class.defined_properties.each do |subproperty|
-        sub_options = { prefix: override_prefix }.merge(subproperty.options)
-        sub_options = sub_options.merge(parents: (Array(sub_options[:parents]) + [name]))
-        _sub_property subproperty.name, sub_options
-      end
-
-    end
+    property :model, type: :text
 
     #
-    # Defines the sub-properties defined within the property. This is to be used internally
-    # by the #property method.
+    # @return [String] the name of model as it is used within the view or the scene.
+    #   This is the common name, the key within the view file, or the name symbol
+    #   name specified in the scene.
     #
-    def self._sub_property(name,options={},&block)
-
-      # Use the name as the property type if one has not been provided.
-
-      property_type = options[:type] || name
-
-      property_class = Property.property(property_type)
-
-      parents = Array(options[:parents])
-
-      method_name = name
-
-      if options[:prefix]
-        method_name = (parents + [name]).join("_")
-      end
-
-      # Define a getter for the sub-property that will traverse the
-      # parent properties, finally returning the filtered value
-
-      define_method method_name do
-        raw_value = (parents + [name]).inject(self) {|current,method| current.send(method) }
-        property_class.new(self,options).get raw_value
-      end
-
-      # Define a setter for the sub-property that will find the parent
-      # value and set itself on that with the filtered value. The parent
-      # is then set.
-      #
-      # @TODO: If getters return dups and not instances of the original object then a very
-      #   deep setter will not be valid.
-      #
-      define_method "#{method_name}=" do |value|
-        parent_value = parents.inject(self) {|current,method| current.send(method) }
-
-        prepared_value = property_class.new(self,options,&block).set(value)
-        parent_value.send("#{name}=",prepared_value)
-
-        send("#{parents.last}=",parent_value)
-      end
-    end
-
-
-    def properties
-      @properties ||= {}
-    end
-
-    property :model, type: :text
     property :name, type: :text
 
     #
@@ -273,7 +162,13 @@ module Metro
 
       # Clean up and symbolize all the keys then merge  that with the existing properties
       options.keys.each do |key|
-        options[key.to_s.underscore.to_sym] = options.delete(key)
+        property_name = key.to_s.underscore.to_sym
+        if respond_to? "#{property_name}="
+          send("#{property_name}=",options.delete(key))
+        else
+          options[property_name] = options.delete(key)
+        end
+
       end
 
       properties.merge! options
@@ -331,7 +226,7 @@ module Metro
     end
 
     def self.models_hash
-      @models_hash ||= HashWithIndifferentAccess.new("Metro::Models::Generic")
+      @models_hash ||= HashWithIndifferentAccess.new("Metro::UI::Generic")
     end
 
   end

data/lib/metro/models/properties/property.rb

@@ -196,9 +196,10 @@ module Metro
 
 end
 
+require_relative 'property_owner'
+
 require_relative 'numeric_property'
 require_relative 'text_property'
-
 require_relative 'animation_property'
 require_relative 'color_property'
 require_relative 'dimensions_property'

data/lib/metro/models/properties/property_owner.rb

@@ -0,0 +1,136 @@
+module Metro
+
+  module PropertyOwner
+
+    def self.included(base)
+      base.extend ClassMethods
+    end
+
+    #
+    # The raw properties of the model. Most properties defined through the `property`
+    # class method will have getters/setters that will do the appropriate translation
+    # so this should in cases when you need access to the raw properties or there
+    # is not a property accessors defined.
+    #
+    # @return [Hash] the raw properties of the model.
+    #
+    def properties
+      @properties ||= {}
+    end
+
+    module ClassMethods
+
+      #
+      # Define a property for the model. A property has a name and then can optionally specify
+      # a property type which will receive additional options.
+      #
+      # @example Defining various propertys for a model
+      #
+      #     class Player
+      #       property :position
+      #       property :angle, default: 0.0
+      #       property :turn_amount, default: 4.5
+      #       property :image, path: "player.png"
+      #       property :motto, type: :text, default: 'Hometown Heroes!'
+      #     end
+      #
+      # When the property name matches a property definition with that name they will be used. This is what
+      # happens for the 'position' and 'image' properties defined above. Both of those map to respective
+      # properties with matching names.
+      #
+      # Properties by default are assumed to be numeric properties so the types does not have to be stated.
+      # This is the case for 'angle' and 'turn_amount' properties.
+      #
+      # You may use any particular name for your properties as long as you specify the type. This is the case
+      # for the 'motto' property.
+      #
+      def property(name,options={},&block)
+
+        # Use the name as the property type if one has not been provided.
+
+        property_type = options[:type] || name
+
+        property_class = Model::Property.property(property_type)
+
+        define_method name do
+          raw_value = properties[name]
+
+          unless parsed_value = instance_variable_get("@_property_parsed_#{name}")
+            parsed_value = property_class.new(self,options,&block).get(raw_value)
+            instance_variable_set("@_property_parsed_#{name}",parsed_value)
+          end
+
+          parsed_value
+        end
+
+        define_method "#{name}=" do |value|
+          instance_variable_set("@_property_parsed_#{name}",nil)
+          prepared_value = property_class.new(self,options).set(value)
+          properties[name] = prepared_value
+        end
+
+        # Define any sub-properties defined on this property
+
+        # When the name does not match the property type then we want to force
+        # the prefixing to be on for our sub-properties. This is to make sure
+        # that when people define multiple fonts and colors that they do not
+        # overlap.
+
+        override_prefix = !(name == property_type)
+
+        property_class.defined_properties.each do |subproperty|
+          sub_options = { prefix: override_prefix }.merge(subproperty.options)
+          sub_options = sub_options.merge(parents: (Array(sub_options[:parents]) + [name]))
+          _sub_property subproperty.name, sub_options
+        end
+
+      end
+
+      #
+      # Defines the sub-properties defined within the property. This is to be used internally
+      # by the #property method.
+      #
+      def _sub_property(name,options={},&block)
+
+        # Use the name as the property type if one has not been provided.
+
+        property_type = options[:type] || name
+
+        property_class = Model::Property.property(property_type)
+
+        parents = Array(options[:parents])
+
+        method_name = name
+
+        if options[:prefix]
+          method_name = (parents + [name]).join("_")
+        end
+
+        # Define a getter for the sub-property that will traverse the
+        # parent properties, finally returning the filtered value
+
+        define_method method_name do
+          raw_value = (parents + [name]).inject(self) {|current,method| current.send(method) }
+          property_class.new(self,options).get raw_value
+        end
+
+        # Define a setter for the sub-property that will find the parent
+        # value and set itself on that with the filtered value. The parent
+        # is then set.
+        #
+        # @TODO: If getters return dups and not instances of the original object then a very
+        #   deep setter will not be valid.
+        #
+        define_method "#{method_name}=" do |value|
+          parent_value = parents.inject(self) {|current,method| current.send(method) }
+
+          prepared_value = property_class.new(self,options,&block).set(value)
+          parent_value.send("#{name}=",prepared_value)
+
+          send("#{parents.last}=",parent_value)
+        end
+      end
+    end
+
+  end
+end

data/lib/metro/models/ui/image.rb

@@ -5,7 +5,7 @@ module Metro
     # Draws an Image
     #
     # @example Using the Image in a view file
-    #    model: "metro::models::image"
+    #    model: "metro::ui::image"
     #
     class Image < Model
 

data/lib/metro/models/ui/label.rb

@@ -2,10 +2,10 @@ module Metro
   module UI
 
     #
-    # Draws a string of text
+    # Draws a string of text.
     #
     # @example Using the Label in a view file
-    #    model: "metro::models::label"
+    #    model: "metro::ui::label"
     #
     class Label < Model
 
@@ -19,8 +19,17 @@ module Metro
 
       property :text
 
+      property :align, type: :text, default: "left"
+      property :vertical_align, type: :text, default: "top"
+
       property :dimensions do
-        Dimensions.of (font.text_width(text) * x_factor), (font.height * y_factor)
+        Dimensions.of (longest_line * x_factor), (line_height * line_count * 2 * y_factor)
+      end
+
+      def draw
+        parsed_text.each_with_index do |line,index|
+          font.draw line, x_position, y_position(index), z_order, x_factor, y_factor, color
+        end
       end
 
       def bounds
@@ -31,8 +40,83 @@ module Metro
         bounds.contains?(x,y)
       end
 
-      def draw
-        font.draw text, x, y, z_order, x_factor, y_factor, color
+      private
+
+      def line_height
+        font.height
+      end
+
+      def half_line_height
+        line_height / 2
+      end
+
+      def line_count
+        parsed_text.count
+      end
+
+      def parsed_text
+        text.split("\n")
+      end
+
+      def longest_line
+        parsed_text.map { |line| font.text_width(line) }.max
+      end
+
+      def x_left_alignment
+        x
+      end
+
+      def x_center_alignment
+        x - width / 2
+      end
+
+      def x_right_alignment
+        x - width
+      end
+
+      def horizontal_alignments
+        { left: :x_left_alignment,
+          center: :x_center_alignment,
+          right: :x_right_alignment }
+      end
+
+      def x_position
+        alignment = horizontal_alignments[align.to_sym]
+        send(alignment)
+      end
+
+      def y_top_alignment(index)
+        y + (index * line_height)
+      end
+
+      def y_bottom_alignment(index)
+        y - line_height * (line_count - index)
+      end
+
+      def y_center_alignment(index)
+        if line_count.even?
+          full_height = (line_count / 2 - index) * line_height
+        else
+          offset = (line_count / 2 - index)
+          if offset < 0
+            full_height = (offset + 1) * line_height - half_line_height
+          else
+            full_height = offset * line_height + half_line_height
+          end
+        end
+
+        y - full_height
+      end
+
+      def vertical_alignments
+        { top: :y_top_alignment,
+          center: :y_center_alignment,
+          bottom: :y_bottom_alignment }
+      end
+
+      def y_position(index)
+        alignment = vertical_alignments[vertical_align.to_sym]
+        send(alignment,index)
       end
 
     end

data/lib/metro/models/ui/rectangle.rb

@@ -12,12 +12,28 @@ module Metro
         window.dimensions
       end
 
+      def left_x
+        x
+      end
+
+      def right_x
+        x + width
+      end
+
+      def top_y
+        y
+      end
+
+      def bottom_y
+        y + height
+      end
+
       def draw
-        window.draw_quad(x,y,color,
-                         width,x,color,
-                         width,height,color,
-                         y,height,color,
-                         z_order)
+        window.draw_quad(left_x,top_y,color,
+          right_x,top_y,color,
+          right_x,bottom_y,color,
+          left_x,bottom_y,color,
+          z_order)
       end
     end
   end

data/lib/metro/transitions/edit_transition_scene.rb

@@ -15,7 +15,7 @@ module Metro
       # easier to dup scenes.
       #
       self.class.drawings.clear
-      self.class.draw :overlay, model: "Metro::Models::GridDrawer"
+      self.class.draw :overlay, model: "Metro::UI::GridDrawer"
       add_actors_to_scene
       after_initialize
     end

data/lib/metro/transitions/fade_transition_scene.rb

@@ -1,7 +1,7 @@
 module Metro
   class FadeTransitionScene < TransitionScene
 
-    draw :rectangle, model: "metro::models::rectangle"
+    draw :rectangle, model: "metro::ui::rectangle"
 
     #
     # When the scene is shown set up the starting color for the rectangle

data/lib/metro/version.rb

@@ -1,5 +1,5 @@
 module Metro
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
   WEBSITE = "https://github.com/burtlo/metro"
   CONTACT_EMAILS = ["franklin.webber@gmail.com"]
   

data/lib/templates/game/README.md.tt

@@ -12,11 +12,25 @@ possibly any notes or caveats about the game.
 
 ## Resources
 
-#### Art
+### Programming
+
+* [YAML for Ruby](http://www.yaml.org/YAML_for_ruby.html) reference which can help you define views in the game.
+* [JSONLint](http://jsonlint.com/) is a JSON Validator
+
+### Art
 
 * [Lost Garden](http://www.lostgarden.com/2007/05/dancs-miraculously-flexible-game.html)
+* [TimelieFX](http://www.rigzsoft.co.uk/) particle editor allows you to export animations.
+* [Text to ASCII Art Generator](http://patorjk.com/software/taag)
+* [Icons](http://css-tricks.com/flat-icons-icon-fonts/)
+* [Subtle Patterns](http://subtlepatterns.com/) various backgrounds and textures.
+
+### Sound
+
+* [as3sfxr](http://www.superflashbros.net/as3sfxr/) generates unique sounds.
+* [Ableton](https://www.ableton.com/en/) music generation tool.
 
-#### Books
+### Books
 
 * [Rules of Play](http://www.amazon.com/dp/0262240459)
 * [Game Programming Gems 8](http://www.amazon.com/dp/1584507020)
@@ -26,4 +40,4 @@ possibly any notes or caveats about the game.
 * [Challenges For Game Designers](http://www.amazon.com/dp/158450580X)
 * [The Art of Game Design: A book of lenses](http://www.amazon.com/dp/0123694965)
 * [A Theory of Fun](http://www.theoryoffun.com)
-* [Andrew Rollings and Ernest Adams on Game Design](http://www.amazon.com/dp/1592730019)
+* [Andrew Rollings and Ernest Adams on Game Design](http://www.amazon.com/dp/1592730019)

data/lib/templates/game/views/brand.yaml

@@ -1,4 +1,4 @@
 brand:
-  model: metro::models::image
+  model: metro::ui::image
   image: brand.jpg
   position: "320,240,1"

data/lib/templates/game/views/brand_to_title.yaml

@@ -1,5 +1,5 @@
 title:
-  model: metro::models::label
+  model: metro::ui::label
   text: "#{Game.name}"
   font:
     size: 40

data/lib/templates/game/views/first.yaml

@@ -1,5 +1,5 @@
 instruction: &instruction
-  model: metro::models::label
+  model: metro::ui::label
   font:
     name: Arial
     size: 40

data/lib/templates/game/views/title.yaml

@@ -1,10 +1,10 @@
 title:
-  model: metro::models::label
+  model: metro::ui::label
   text: "#{Game.name}"
   font:
     size: 40
   position: "320,100,1"
   color: rgba(255,255,255,1.0)
 menu:
-  model: metro::models::menu
+  model: metro::ui::menu
   position: "260,200,1"

data/lib/templates/scene.rb.tt

@@ -14,7 +14,7 @@ class <%= scene_class_name %> < GameScene
   #   position: '20,20,0',
   #   font: { size: 60 },
   #   color: 'rgb(255,255,255)',
-  #   model: 'metro::models::label'
+  #   model: 'metro::ui::label'
   #
   # The draw method can be simplier for models that have content defined
   # for them in the view or the models themselves define the appropriate

data/lib/templates/view.yaml.tt

@@ -1,7 +1,7 @@
 # http://www.yaml.org/YAML_for_ruby.html
 ---
 title:
-  model: "metro::models::label"
+  model: "metro::ui::label"
   text: "Your Scene"
   position: "190,200,4"
   font:

data/spec/metro/models/properties/dimensions_spec.rb

@@ -14,7 +14,7 @@ describe Metro::Model::DimensionsProperty do
 
     subject do
       described_class.new model do
-        model.window.dimensions
+        window.dimensions
       end
     end
 

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

@@ -0,0 +1,218 @@
+require 'spec_helper'
+
+describe Metro::UI::Label do
+
+  subject do
+    label = described_class.new text: expected_text
+    label.window = mock('window')
+    label
+  end
+
+  before do
+    # Reset the position of the label to the default
+    subject.position = nil
+    subject.scale = Scale.one
+  end
+
+  let(:expected_position) { Point.zero }
+  its(:position) { should eq expected_position }
+
+  its(:x) { should eq expected_position.x }
+  its(:y) { should eq expected_position.y }
+  its(:z) { should eq expected_position.z }
+  its(:z_order) { should eq expected_position.z_order }
+
+  context "when setting the position" do
+
+    it "should be set succesfully" do
+      subject.position = "10,10"
+      subject.position.should eq Point.at(10,10)
+    end
+
+    context "when setting the x property" do
+      let(:expected_x) { 11 }
+      let(:expected_y) { 0 }
+
+      it "should update successfully" do
+        subject.x = expected_x
+        subject.x.should eq expected_x
+        subject.position.x.should eq expected_x
+      end
+
+      it "should not effect the paired y property" do
+        subject.x = expected_x
+        subject.y.should eq expected_y
+        subject.position.y.should eq expected_y
+      end
+    end
+
+    context "when setting the y property" do
+      before do
+        subject.position = "#{expected_x},#{expected_y}"
+      end
+
+      let(:expected_x) { 320 }
+      let(:expected_y) { 66 }
+
+      it "should update successfully" do
+        subject.y = expected_y
+        subject.y.should eq expected_y
+        subject.position.y.should eq expected_y
+      end
+
+      it "should not effect the paired x property" do
+        subject.y = expected_y
+        subject.x.should eq expected_x
+      end
+    end
+
+  end
+
+  let(:expected_color) { Gosu::Color.new "rgb(255,255,255)" }
+  let(:expected_alpha) { 255 }
+
+  its(:color) { should eq expected_color }
+  its(:alpha) { should eq expected_alpha }
+
+  describe "font" do
+    before do
+      Metro::Model::FontProperty.stub(:create_font).and_return(font)
+    end
+
+    let(:font) { mock('font', name: expected_font_name, size: expected_font_size) }
+
+    let(:expected_font) { font }
+    its(:font) { should eq expected_font }
+
+    let(:expected_font_name) { 'mock_font_name' }
+    its(:font_name) { should eq expected_font_name }
+
+    let(:expected_font_size) { 12.0 }
+    its(:font_size) { should eq expected_font_size }
+
+  end
+
+  let(:expected_scale) { Scale.one }
+
+  its(:scale) { should eq expected_scale }
+  its(:x_factor) { should eq expected_scale.x_factor }
+  its(:y_factor) { should eq expected_scale.y_factor }
+
+  context "when setting the scale" do
+    it "should be set successfully" do
+      subject.x_factor = 2.0
+      subject.x_factor.should eq 2.0
+      subject.scale.x_factor.should eq 2.0
+    end
+  end
+
+  its(:align) { should eq expected_horizontal_alignment }
+  let(:expected_horizontal_alignment) { "left" }
+
+  its(:vertical_align) { should eq expected_vertical_alignment }
+  let(:expected_vertical_alignment) { "top" }
+
+  its(:text) { should eq expected_text }
+  let(:expected_text) { "Four Score and Seven Years Ago" }
+
+  context "when the text defines multiple lines (lines separated by newline characters)" do
+
+    let(:given_text) { "My name is something that takes\ntwo lines to express!" }
+    let(:first_line) { given_text.split("\n").first }
+    let(:last_line)  { given_text.split("\n").last }
+
+    let(:x_position) { 320 }
+    let(:y_position) { 200 }
+    let(:z_order) { 12 }
+
+    let(:scale_x) { 1.0 }
+    let(:scale_y) { 1.0 }
+
+
+    let(:font_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
+    end
+
+    it "should have the font draw each of the lines" do
+      font.should_receive(:draw).twice
+      subject.draw
+    end
+
+    context "when the vertical alignment is top" do
+
+      before do
+        subject.vertical_align = "top"
+      end
+
+      let(:first_line_y_position) { y_position }
+      let(:second_line_y_position) { y_position + font_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))
+        font.should_receive(:draw).with(last_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 center" do
+
+      before do
+        subject.text = text
+        subject.vertical_align = "center"
+      end
+
+      let(:text) { "Three Lines\nOf Text\nWill Create Fun!" }
+
+
+      let(:first_line) { text.split("\n")[0] }
+      let(:second_line) { text.split("\n")[1] }
+      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 }
+
+      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))
+        font.should_receive(:draw).with(second_line,x_position,second_line_y_position,z_order,scale_x,scale_y,an_instance_of(Gosu::Color))
+        font.should_receive(:draw).with(third_line,x_position,third_line_y_position,z_order,scale_x,scale_y,an_instance_of(Gosu::Color))
+        subject.draw
+      end
+
+    end
+
+    context "when the vertical alignment is bottom" do
+
+      before 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 }
+
+      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))
+        font.should_receive(:draw).with(last_line,x_position,second_line_y_position,z_order,scale_x,scale_y,an_instance_of(Gosu::Color))
+        subject.draw
+      end
+
+    end
+
+  end
+
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metro
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-16 00:00:00.000000000 Z
+date: 2012-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -163,6 +163,7 @@ files:
 - lib/metro/models/properties/numeric_property.rb
 - lib/metro/models/properties/position_property.rb
 - lib/metro/models/properties/property.rb
+- lib/metro/models/properties/property_owner.rb
 - lib/metro/models/properties/sample_property.rb
 - lib/metro/models/properties/scale_property.rb
 - lib/metro/models/properties/song_property.rb
@@ -220,12 +221,12 @@ files:
 - spec/core_ext/string_spec.rb
 - spec/gosu_ext/color_spec.rb
 - spec/metro/models/key_value_coding_spec.rb
-- spec/metro/models/models/label_spec.rb
 - spec/metro/models/properties/color_spec.rb
 - spec/metro/models/properties/dimensions_spec.rb
 - spec/metro/models/properties/font_spec.rb
 - spec/metro/models/properties/numeric_property_spec.rb
 - spec/metro/models/properties/position_property_spec.rb
+- spec/metro/models/ui/label_spec.rb
 - spec/metro/scene_spec.rb
 - spec/metro/scene_views/json_view_spec.rb
 - spec/metro/scene_views/yaml_view_spec.rb
@@ -237,11 +238,11 @@ licenses: []
 post_install_message: ! "    ______  ___      _____\n    ___   |/  /_____ __  /_______________\n
   \   __  /|_/ / _  _ \\_  __/__  ___/_  __ \\\n    _  /  / /  /  __// /_  _  /    /
   /_/ /\n    /_/  /_/   \\___/  \\__/ /_/     \\____/\n\n  Thank you for installing
-  metro 0.2.4 / 2012-11-15.\n  ---------------------------------------------------------------------\n
-  \ Changes:\n    \n  * All retrieved models from properties are now cached for better
-  performance\n  * Animations were re-vamped to accept more parameters\n  * Metro
-  models names in code are now refered to as \"metro::models::*\" to \"metro::ui::*\"\n
-  \ \n\n  ---------------------------------------------------------------------\n"
+  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"
 rdoc_options: []
 require_paths:
 - lib
@@ -270,12 +271,12 @@ 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/models/label_spec.rb
 - spec/metro/models/properties/color_spec.rb
 - spec/metro/models/properties/dimensions_spec.rb
 - spec/metro/models/properties/font_spec.rb
 - spec/metro/models/properties/numeric_property_spec.rb
 - spec/metro/models/properties/position_property_spec.rb
+- spec/metro/models/ui/label_spec.rb
 - spec/metro/scene_spec.rb
 - spec/metro/scene_views/json_view_spec.rb
 - spec/metro/scene_views/yaml_view_spec.rb

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

@@ -1,110 +0,0 @@
-require 'spec_helper'
-
-describe Metro::Models::Label do
-
-  subject do
-    label = described_class.new
-    label.window = mock('window')
-    label
-  end
-
-  before do
-    # Reset the position of the label to the default
-    subject.position = nil
-    subject.scale = Scale.one
-  end
-
-  let(:expected_position) { Point.zero }
-  its(:position) { should eq expected_position }
-
-  its(:x) { should eq expected_position.x }
-  its(:y) { should eq expected_position.y }
-  its(:z) { should eq expected_position.z }
-  its(:z_order) { should eq expected_position.z_order }
-
-  context "when setting the position" do
-    
-    it "should be set succesfully" do
-      subject.position = "10,10"
-      subject.position.should eq Point.at(10,10)
-    end
-
-    context "when setting the x property" do
-      let(:expected_x) { 11 }
-      let(:expected_y) { 0 }
-
-      it "should update successfully" do
-        subject.x = expected_x
-        subject.x.should eq expected_x
-        subject.position.x.should eq expected_x
-      end
-
-      it "should not effect the paired y property" do
-        subject.x = expected_x
-        subject.y.should eq expected_y
-        subject.position.y.should eq expected_y
-      end
-    end
-
-    context "when setting the y property" do
-      before do
-        subject.position = "#{expected_x},#{expected_y}"
-      end
-
-      let(:expected_x) { 320 }
-      let(:expected_y) { 66 }
-
-      it "should update successfully" do
-        subject.y = expected_y
-        subject.y.should eq expected_y
-        subject.position.y.should eq expected_y
-      end
-
-      it "should not effect the paired x property" do
-        subject.y = expected_y
-        subject.x.should eq expected_x
-      end
-    end
-
-  end
-
-  let(:expected_color) { Gosu::Color.new "rgb(255,255,255)" }
-  let(:expected_alpha) { 255 }
-
-  its(:color) { should eq expected_color }
-  its(:alpha) { should eq expected_alpha }
-
-
-  describe "font" do
-    before do
-      Metro::Model::FontProperty.stub(:create_font).and_return(font)
-    end
-
-    let(:font) { mock('font', name: expected_font_name, size: expected_font_size) }
-
-    let(:expected_font) { font }
-    its(:font) { should eq expected_font }
-
-    let(:expected_font_name) { 'mock_font_name' }
-    its(:font_name) { should eq expected_font_name }
-
-    let(:expected_font_size) { 12.0 }
-    its(:font_size) { should eq expected_font_size }
-
-  end
-
-  let(:expected_scale) { Scale.one }
-
-  its(:scale) { should eq expected_scale }
-  its(:x_factor) { should eq expected_scale.x_factor }
-  its(:y_factor) { should eq expected_scale.y_factor }
-
-  context "when setting the scale" do
-    it "should set" do
-      subject.x_factor = 2.0
-      # subject.x_factor.should eq 2.0
-      subject.scale.x_factor.should eq 2.0
-    end
-  end
-
-end