metro 0.1.5 → 0.1.6

data/lib/metro/transitions/scene_transitions.rb

@@ -33,4 +33,12 @@ module Metro
     end
 
   end
+
+  #
+  # The Scene Transition should act as a filter and allow for
+  # common or custom scenes to be inserted between the scene
+  # that was about to be displayed.
+  #
+  Scenes.register_post_filter SceneTransitions
+
 end

data/lib/metro/version.rb

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

data/lib/metro/views/view.rb

@@ -26,7 +26,15 @@ module Metro
       end
     end
 
-    attr_writer :content
+    #
+    # Set the content of the view.
+    #
+    # @param [Hash] value the hash content that will represent this view
+    #
+    def content=(value)
+      value.default = {}
+      @content = value
+    end
 
     #
     # A Scene view path is based on the view name.

data/lib/templates/game/metro.tt

@@ -58,7 +58,7 @@ end
 #
 # Enable debug mode for the game. Which could
 # allow different logic. When this is set the
-# Metro::Game.debug? method will return a true
+# Game.debug? method will return a true
 # value.
 #
 # debug true

data/lib/templates/game/models/game_model.rb

@@ -0,0 +1,3 @@
+class GameModel < Metro::Model
+
+end

data/lib/templates/game/scenes/brand_scene.rb

@@ -1,4 +1,4 @@
-class BrandScene < Metro::Scene
+class BrandScene < GameScene
 
   draws :brand
 

data/lib/templates/game/scenes/brand_to_title_scene.rb

@@ -1,4 +1,4 @@
-class BrandToTitleScene < Metro::Scene
+class BrandToTitleScene < GameScene
 
   draws :title
 

data/lib/templates/game/scenes/game_scene.rb

@@ -0,0 +1,19 @@
+class GameScene < Metro::Scene
+
+  #
+  # The game scene is a place where you can define actors and
+  # events here that will be present within all the subclassed
+  # scenes.
+
+  #
+  # @example Setting up the ability for all subclassed scenes
+  #   to be reloaded with the 'Ctrl+R' event
+  #
+  event :on_up, KbR do |event|
+    if event.control?
+      Metro.reload!
+      transition_to self.class.scene_name
+    end
+  end
+
+end

data/lib/templates/game/scenes/title_scene.rb

@@ -1,4 +1,4 @@
-class TitleScene < Metro::Scene
+class TitleScene < GameScene
 
   draw :title
 

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

@@ -1,7 +1,7 @@
 title:
   model: metro::models::label
-  text: "#{Metro::Game.name}"
-  size: 40
+  text: "#{Game.name}"
+  font_size: 40
   y: 100
   color: rgba(255,255,255,0.0)
   

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

@@ -1,7 +1,7 @@
 title:
   model: metro::models::label
-  text: "#{Metro::Game.name}"
-  size: 40
+  text: "#{Game.name}"
+  font_size: 40
   y: 100
   color: rgba(255,255,255,1.0)
 menu:
@@ -9,4 +9,4 @@ menu:
   x: 260
   y: 200
   color: rgb(127,127,127)
-  highlight-color: rgb(255,255,255)
+  highlight-color: rgb(255,255,255)

data/lib/templates/{model.rb.erb → model.rb.tt}

@@ -1,4 +1,4 @@
-class <%= model_name %> < Metro::Model
+class <%= model_name %> < GameModel
 
   #
   # Example Event Handling Definitions

data/lib/templates/{scene.rb.erb → scene.rb.tt}

@@ -1,4 +1,4 @@
-class <%= scene_class_name %> < Metro::Scene
+class <%= scene_class_name %> < GameScene
   # By default the Scene Name is based on the class name
   # but that can be overriden with the scene_name class method
   # scene_name "credits"

data/lib/templates/view.yaml.tt

@@ -0,0 +1,6 @@
+# title:
+#   model: metro::models::label
+#   x: 30
+#   y: 50
+#   z-order: 4
+#   color: "rgba(255,255,0,0.0)"

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

@@ -0,0 +1,110 @@
+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 = Metro::Scale.one
+  end
+
+  let(:expected_position) { Metro::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 Metro::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) { Metro::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

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

@@ -0,0 +1,85 @@
+require 'spec_helper'
+
+describe Metro::Model::ColorProperty do
+
+  subject { described_class.new model }
+  let(:model) { mock("model", window: window) }
+  let(:window) { mock('window') }
+
+  describe "#get" do
+    let(:expected_color) { mock('color') }
+
+    context "when the value is nil" do
+      context "when no default value has been specified" do
+        let(:default_color_string) { "rgba(255,255,255,1.0)" }
+
+
+        it "should return the default value" do
+          subject.stub(:create_color).with(default_color_string) { expected_color }
+          subject.get(nil).should eq expected_color
+        end
+      end
+
+      context "when a default value has been specified" do
+        subject do
+          described_class.new model, default: expected_color_string
+        end
+
+        let(:expected_color_string) { "rgba(255,255,127,0.5)" }
+
+        it "should return the specified default value" do
+          subject.stub(:create_color).with(expected_color_string) { expected_color }
+          subject.get(nil).should eq expected_color
+        end
+      end
+    end
+
+    context "when the value is a string" do
+
+      let(:color_string) { "#666666" }
+
+      it "should return the color" do
+        subject.stub(:create_color).with(color_string) { expected_color }
+        subject.get(color_string).should eq expected_color
+      end
+    end
+
+  end
+
+  describe "#set" do
+    let(:expected_color) { mock('color') }
+
+    context "when the value is nil" do
+
+      context "when no default value has been specified" do
+        let(:expected_color_string) { "rgba(255,255,255,1.0)" }
+
+        it "should return a string representation of the default color" do
+          subject.set(nil).should eq expected_color_string
+        end
+      end
+
+      context "when a default value has been specified" do
+        subject do
+          described_class.new model, default: expected_color_string
+        end
+
+        let(:expected_color_string) { "rgba(0,127,11,0.4)" }
+
+        it "should return a string representation of the specified default color" do
+          subject.set(nil).should eq expected_color_string
+        end
+      end
+    end
+
+    context "when the value is a color" do
+      let(:color) { Gosu::Color.new expected_color_string }
+      let(:expected_color_string) { "rgba(45,12,12,1.0)" }
+
+      it "should return a string representation of the color" do
+        subject.set(color).should eq expected_color_string
+      end
+    end
+  end
+
+end

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

@@ -0,0 +1,129 @@
+require 'spec_helper'
+
+describe Metro::Model::FontProperty do
+
+  subject { described_class.new model }
+  let(:model) { mock("model", window: window) }
+  let(:window) { mock('window') }
+
+  describe "#get" do
+    context "when the value is nil" do
+      context "when no default value has been specified" do
+        let(:expected_font_name) { Gosu::default_font_name }
+        let(:expected_font_size) { 40 }
+        let(:expected_font) { stub('font') }
+
+        it "should return the default value" do
+          described_class.stub(:create_font).with(window,expected_font_name,expected_font_size) { expected_font }
+          subject.get(nil).should eq expected_font
+        end
+      end
+
+      context "when a default value has been specified" do
+        subject do
+          described_class.new model, default: { name: expected_font_name, size: expected_font_size }
+        end
+
+        let(:expected_font_name) { 'Times New Roman' }
+        let(:expected_font_size) { 60 }
+        let(:expected_font) { stub('font') }
+
+        it "should return the specified default value" do
+          described_class.stub(:create_font).with(window,expected_font_name,expected_font_size) { expected_font }
+          subject.get(nil).should eq expected_font
+        end
+      end
+    end
+
+    context "when the value is a hash" do
+      let(:expected_font_name) { 'Helvetica' }
+      let(:expected_font_size) { 80 }
+      let(:expected_font) { stub('font') }
+
+      let(:font_hash) { { name: expected_font_name, size: expected_font_size } }
+
+
+      it "should return the font value" do
+        described_class.stub(:create_font).with(window,expected_font_name,expected_font_size) { expected_font }
+        subject.get(font_hash).should eq expected_font
+      end
+    end
+
+    context "when the same font is requested" do
+      let(:expected_font_name) { Gosu::default_font_name }
+      let(:expected_font_size) { 40 }
+      let(:expected_font) { stub('font') }
+
+      it "should not be created a second time (pullled from memory)" do
+        described_class.should_receive(:create_font).once.and_return(expected_font)
+        subject.get(nil)
+        subject.get(nil)
+      end
+    end
+
+
+  end
+
+  describe "#set" do
+    context "when the value is nil" do
+      context "when no default value has been specified" do
+        let(:expected_font_name) { Gosu::default_font_name }
+        let(:expected_font_size) { 40 }
+        let(:expected_font) { stub('font') }
+
+        let(:expected_result) { { name: expected_font_name, size: expected_font_size } }
+
+
+        it "should return a hash of the default value" do
+          described_class.stub(:create_font).with(window,expected_font_name,expected_font_size) { expected_font }
+          subject.set(nil).should eq expected_result
+        end
+      end
+
+      context "when a default value has been specified" do
+        subject do
+          described_class.new model, default: { name: expected_font_name, size: expected_font_size }
+        end
+
+        let(:expected_font_name) { 'Times New Roman' }
+        let(:expected_font_size) { 60 }
+
+        let(:expected_result) { { name: expected_font_name, size: expected_font_size } }
+
+        it "should return the specified default value" do
+          subject.set(nil).should eq expected_result
+        end
+      end
+    end
+
+    context "when the value is a font" do
+
+      let(:gosu_font) do
+        font = stub('font', name: expected_font_name, height: expected_font_size)
+        font.stub(:class) { Gosu::Font }
+        font
+      end
+
+      let(:expected_font_name) { 'Comic Sans' }
+      let(:expected_font_size) { 45 }
+
+      let(:expected_result) { { name: expected_font_name, size: expected_font_size } }
+
+      it "should return a hash of the font" do
+        subject.set(gosu_font).should eq expected_result
+      end
+    end
+
+    context "when the value is a hash" do
+      
+      let(:expected_font_name) { 'Wingdings' }
+      let(:expected_font_size) { 33 }
+      let(:expected_result) { { name: expected_font_name, size: expected_font_size } }
+      
+      it "should return the hash representation of the font" do
+        subject.set(expected_result).should eq expected_result
+      end
+    end
+  end
+
+end