metro 0.1.5 → 0.1.6

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

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+describe Metro::Model::NumericProperty do
+
+  subject { described_class.new model }
+  let(:model) { "model" }
+
+  describe "#get" do
+    context "when the value is nil" do
+      context "when no default value has been specified" do
+
+        let(:expected_number) { 0.0 }
+
+        it "should return the default position" do
+          subject.get(nil).should eq expected_number
+        end
+      end
+
+      context "when a default value has been specified" do
+
+        subject { described_class.new model, default: expected_number }
+        let(:expected_number) { 1.0 }
+
+        it "should return the specified default position" do
+          subject.get(nil).should eq expected_number
+        end
+      end
+    end
+
+    context "when the value is a String" do
+
+      let(:number) { "4.3" }
+      let(:expected_number) { 4.3 }
+
+      it "should get the float value of the string" do
+        subject.get(number).should eq expected_number
+      end
+    end
+
+  end
+
+  describe "#set" do
+
+  end
+
+end

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

@@ -0,0 +1,90 @@
+require 'spec_helper'
+
+describe Metro::Model::PositionProperty do
+
+  subject { described_class.new model }
+  let(:model) { "model" }
+
+  describe "#get" do
+
+    context "when the value is nil" do
+      context "when no default value has been specified" do
+
+        let(:expected_position) { Metro::Point.at 0.0, 0.0 }
+
+        it "should return the default position" do
+          subject.get(nil).should eq expected_position
+        end
+      end
+
+      context "when a default value has been specified" do
+
+        subject { described_class.new model, default: expected_position }
+        let(:expected_position) { Metro::Point.at 4.0, 3.3 }
+
+        it "should return the specified default position" do
+          subject.get(nil).should eq expected_position
+        end
+      end
+    end
+
+    context "when the value is a string" do
+
+      let(:point) { "22.0,33.0" }
+      let(:expected_position) { Metro::Point.at 22.0, 33.0 }
+
+      it "should return the position" do
+        subject.get(point).should eq expected_position
+      end
+    end
+
+  end
+
+
+  describe "#set" do
+
+    context "when the value is nil" do
+      context "when no default value has been specified" do
+
+        let(:expected_position) { "0.0,0.0,0.0" }
+
+        it "should return the default position" do
+          subject.set(nil).should eq expected_position
+        end
+      end
+
+      context "when a default value has been specified" do
+
+        subject { described_class.new model, default: default_point }
+        let(:default_point) { Metro::Point.at 12, 24 }
+        let(:expected_position) { "12.0,24.0,0.0" }
+
+        it "should return the specified default position" do
+          subject.set(nil).should eq expected_position
+        end
+      end
+    end
+
+    context "when the value is a point" do
+
+      let(:point) { Metro::Point.at 10.0, 20.0 }
+      let(:expected_position) { "10.0,20.0,0.0" }
+
+      it "should return the same position" do
+        subject.set(point).should eq expected_position
+      end
+    end
+
+    context "when the value is a string" do
+
+      let(:point) { "22.0,33.0" }
+      let(:expected_position) { "22.0,33.0,0.0" }
+
+      it "should return the position" do
+        subject.set(point).should eq expected_position
+      end
+    end
+
+  end
+
+end

data/spec/metro/scenes_spec.rb

@@ -0,0 +1,77 @@
+require 'spec_helper'
+
+describe Metro::Scenes do
+
+  subject { described_class }
+
+  class SpecScene < Metro::Scene ; end
+  let(:existing_scene_name) { :spec }
+
+  describe ".find" do
+    context "when a scene does exist" do
+
+      let(:expected_value) { SpecScene }
+
+      it "should return the scene" do
+        subject.find(existing_scene_name).should eq expected_value
+      end
+    end
+
+    context "when a scene does not exist" do
+      let(:unknown_scene_name) { :unknown }
+
+      it "should return a missing scene" do
+        missing_scene = subject.find(unknown_scene_name)
+        missing_scene.missing_scene.should eq unknown_scene_name
+      end
+    end
+  end
+
+  describe ".generate" do
+    let(:existing_scene_name) { :spec }
+
+    context "when the provided scene name does exist" do
+
+      let(:expected_scene_class) { SpecScene }
+
+      it "should return an instance of the scene" do
+        subject.generate(existing_scene_name).should be_kind_of expected_scene_class
+      end
+    end
+
+    context "when the provided scene object does exist" do
+
+      let(:scene_instance) { SpecScene.new }
+
+      it "should return the same instance of scene" do
+        subject.generate(scene_instance).should eq scene_instance
+      end
+    end
+
+    it "should process the scene through the post filters" do
+      subject.should_receive(:apply_post_filters)
+      subject.generate(existing_scene_name)
+    end
+  end
+
+  describe ".register_post_filter" do
+
+    class SpecScenesPostFilter
+      def self.filter(scene,options)
+        scene
+      end
+    end
+
+    context "when a post filter is added" do
+      let(:post_filter) { SpecScenesPostFilter }
+
+      it "should be in the list of post filters" do
+        subject.register_post_filter SpecScenesPostFilter
+        subject.post_filters.should include(post_filter)
+      end
+    end
+
+  end
+
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metro
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-02 00:00:00.000000000 Z
+date: 2012-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -110,6 +110,7 @@ files:
 - Rakefile
 - bin/metro
 - changelog.md
+- lib/assets/missing_animation.png
 - lib/commands/generate_game.rb
 - lib/commands/generate_model.rb
 - lib/commands/generate_scene.rb
@@ -118,10 +119,12 @@ files:
 - lib/core_ext/numeric.rb
 - lib/gosu_ext/color.rb
 - lib/gosu_ext/gosu_constants.rb
+- lib/gosu_ext/image.rb
 - lib/locale/en.yml
 - lib/locale/locale.rb
 - lib/metro.rb
 - lib/metro/animation/after_interval_factory.rb
+- lib/metro/animation/animation.rb
 - lib/metro/animation/animation_factory.rb
 - lib/metro/animation/easing.rb
 - lib/metro/animation/has_animations.rb
@@ -132,6 +135,7 @@ files:
 - lib/metro/events/control_definition.rb
 - lib/metro/events/controls.rb
 - lib/metro/events/event_data.rb
+- lib/metro/events/event_dictionary.rb
 - lib/metro/events/event_factory.rb
 - lib/metro/events/event_relay.rb
 - lib/metro/events/has_events.rb
@@ -141,17 +145,32 @@ files:
 - lib/metro/game/dsl.rb
 - lib/metro/logging.rb
 - lib/metro/missing_scene.rb
+- lib/metro/models/dimensions.rb
 - lib/metro/models/draws.rb
-- lib/metro/models/generic.rb
-- lib/metro/models/grid_drawer.rb
-- lib/metro/models/image.rb
 - lib/metro/models/key_value_coding.rb
-- lib/metro/models/label.rb
-- lib/metro/models/menu.rb
 - lib/metro/models/model.rb
 - lib/metro/models/model_factory.rb
-- lib/metro/models/rectangle.rb
+- lib/metro/models/models/generic.rb
+- lib/metro/models/models/grid_drawer.rb
+- lib/metro/models/models/image.rb
+- lib/metro/models/models/label.rb
+- lib/metro/models/models/menu.rb
+- lib/metro/models/models/rectangle.rb
+- lib/metro/models/point.rb
+- lib/metro/models/properties/angle.rb
+- lib/metro/models/properties/animation.rb
+- lib/metro/models/properties/color.rb
+- lib/metro/models/properties/dimensions.rb
+- lib/metro/models/properties/font.rb
+- lib/metro/models/properties/image.rb
+- lib/metro/models/properties/numeric.rb
+- lib/metro/models/properties/position.rb
+- lib/metro/models/properties/property.rb
+- lib/metro/models/properties/scale.rb
+- lib/metro/models/properties/text.rb
+- lib/metro/models/properties/velocity.rb
 - lib/metro/models/rectangle_bounds.rb
+- lib/metro/models/scale.rb
 - lib/metro/scene.rb
 - lib/metro/scenes.rb
 - lib/metro/template_message.rb
@@ -171,24 +190,32 @@ files:
 - lib/templates/game/README.md.tt
 - lib/templates/game/assets/brand.jpg
 - lib/templates/game/metro.tt
+- lib/templates/game/models/game_model.rb
 - lib/templates/game/scenes/brand_scene.rb
 - lib/templates/game/scenes/brand_to_title_scene.rb
+- lib/templates/game/scenes/game_scene.rb
 - lib/templates/game/scenes/title_scene.rb
 - lib/templates/game/views/brand.yaml
 - lib/templates/game/views/brand_to_title.yaml
 - lib/templates/game/views/title.yaml
 - lib/templates/message.erb
-- lib/templates/model.rb.erb
-- lib/templates/scene.rb.erb
-- lib/templates/view.yaml.erb
+- lib/templates/model.rb.tt
+- lib/templates/scene.rb.tt
+- lib/templates/view.yaml.tt
 - metro.gemspec
 - spec/core_ext/numeric_spec.rb
 - 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/font_spec.rb
+- spec/metro/models/properties/numeric_property_spec.rb
+- spec/metro/models/properties/position_property_spec.rb
 - spec/metro/scene_spec.rb
 - spec/metro/scene_views/json_view_spec.rb
 - spec/metro/scene_views/yaml_view_spec.rb
+- spec/metro/scenes_spec.rb
 - spec/metro/views/view_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/burtlo/metro
@@ -196,11 +223,12 @@ licenses: []
 post_install_message: ! "    ______  ___      _____\n    ___   |/  /_____ __  /_______________\n
   \   __  /|_/ / _  _ \\_  __/__  ___/_  __ \\\n    _  /  / /  /  __// /_  _  /    /
   /_/ /\n    /_/  /_/   \\___/  \\__/ /_/     \\____/\n\n  Thank you for installing
-  metro 0.1.5 / 2012-11-01.\n  ---------------------------------------------------------------------\n
-  \ Changes:\n    \n  * Metro.reload! will reload all game classes\n  * Scenes can
-  now an editable state where the position of items can be\n    updated and saved.\n
-  \ * Event blocks can optionally receive an event object. The event object\n    includes
-  modifier key information.\n  \n  \n\n  ---------------------------------------------------------------------\n"
+  metro 0.1.6 / 2012-11-07.\n  ---------------------------------------------------------------------\n
+  \ Changes:\n    \n  * Events are shared from superclasses to subclases.\n  * Templates
+  updated to use GameScene and GameModel for each game.\n  * Models are automatically
+  added to the update loop\n  * Model properties now make it easier to store/retrieve
+  various\n    common numeric, position font, image, and animation properties.\n  \n\n
+  \ ---------------------------------------------------------------------\n"
 rdoc_options: []
 require_paths:
 - lib
@@ -229,8 +257,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/models/label_spec.rb
+- spec/metro/models/properties/color_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/scene_spec.rb
 - spec/metro/scene_views/json_view_spec.rb
 - spec/metro/scene_views/yaml_view_spec.rb
+- spec/metro/scenes_spec.rb
 - spec/metro/views/view_spec.rb
 - spec/spec_helper.rb

data/lib/metro/models/label.rb

@@ -1,63 +0,0 @@
-module Metro
-  module Models
-
-    #
-    # Draws a string of text
-    #
-    # @example Using the Label in a view file
-    #    model: "metro::models::label"
-    #
-    class Label < Model
-
-      attr_accessor :x, :y, :x_factor, :y_factor, :z_order
-      attr_accessor :size, :size, :font_family
-
-      def after_initialize
-        @text = ""
-        @x_factor = @y_factor = 1.0
-        @z_order = 0
-        @color = Gosu::Color.new "rgba(255,255,255,1.0)"
-        @size = 20
-        @font_family = Gosu::default_font_name
-      end
-
-      def font
-        @font ||= Gosu::Font.new(window, font_family, size)
-      end
-
-      def x
-        @x || (Game.width/2 - font.text_width(text)/2)
-      end
-
-      def y
-        @y || (Game.height/2 - font.height/2)
-      end
-
-      def bounds
-        Bounds.new x, y, x + width, y + height
-      end
-
-      def width
-        font.text_width(text) * x_factor
-      end
-
-      def height
-        font.height * y_factor
-      end
-
-      def contains?(x,y)
-        bounds.contains?(x,y)
-      end
-
-      def text
-        scene.instance_eval( "\"#{@text}\"" )
-      end
-
-      def draw
-        label_text = text
-        font.draw label_text, x, y, z_order, x_factor, y_factor, color
-      end
-
-    end
-  end
-end

data/lib/templates/view.yaml.erb

@@ -1,32 +0,0 @@
-title:
-  model: metro::models::label
-  text: STARRY KNIGHT
-  x: 30
-  y: 50
-  z-order: 4
-  x-factor: 3
-  y-factor: 3
-  color: "rgba(255,255,0,0.0)"
-logo:
-  model: metro::models::image
-  x: 540
-  y: 380
-  z-order: 4
-  path: "player.png"
-  color: "rgba(255,255,255,0.0)"
-star: &star_default
-  model: star
-  x: 100
-  y: 400
-  path: "star.png"
-  width: 25
-  height: 25
-  tileable: false
-star2:
-  <<: *star_default
-  x: 455
-  y: 333
-star3:
-  <<: *star_default
-  x: 515
-  y: 40