metro 0.1.2 → 0.1.3

data/lib/metro/transitions/scene_transitions.rb

@@ -0,0 +1,30 @@
+require_relative 'transition_scene'
+
+module Metro
+  module SceneTransitions
+    extend self
+
+    def insert_transition(scene,options)
+      return scene unless options.key?(:with)
+      generate_transition(name,scene,options)
+    end
+
+    alias_method :filter, :insert_transition
+
+    def generate_transition(name,next_scene,options)
+      transition = find_transition(name).new
+      transition.next_scene = next_scene
+      transition.options = options
+      transition
+    end
+
+    def find_transition(name)
+      supported_transitions[name]
+    end
+
+    def supported_transitions
+      Hash.new(FadeTransitionScene)
+    end
+
+  end
+end

data/lib/metro/transitions/transition_scene.rb

@@ -0,0 +1,18 @@
+module Metro
+  class TransitionScene < Scene
+
+    attr_accessor :next_scene, :previous_scene, :options
+
+    def prepare_transition_from(old_scene)
+      next_scene.prepare_transition_from(old_scene)
+      @previous_scene = old_scene
+    end
+
+    def prepare_transition_to(new_scene)
+      previous_scene.prepare_transition_to(new_scene)
+    end
+
+  end
+end
+
+require_relative 'fade_transition_scene'

data/lib/metro/version.rb

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

data/lib/metro/window.rb

@@ -1,5 +1,3 @@
-require_relative 'scenes'
-
 module Metro
 
   #

data/lib/templates/game/metro.tt

@@ -42,6 +42,19 @@ resolution 640, 480
 #
 first_scene :brand
 
+
+#
+# Defines controls which are meta events. They can be used group button
+# events together under a single name so that you can use it throughout
+# the game and also will allow for players of your game to redefine the
+# keys.
+#
+controls do
+  # NAME_OF_EVENT, is: EVENT TYPE, with: [ ALL_EVENTS ]
+  confirmation is: :button_up, with: [ KbReturn, KbEnter, KbSpace, GpButton0 ]
+  cancel is: :button_up, with: [ KbEscape, KbDelete ]
+end
+
 #
 # Enable debug mode for the game. Which could
 # allow different logic. When this is set the

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

@@ -2,12 +2,18 @@ class BrandScene < Metro::Scene
 
   draws :brand
 
-  event :on_up, Gosu::KbEscape, Gosu::KbSpace, Gosu::GpButton0 do
+  after 2.seconds do
+    transition_to_brand_to_title
+  end
+
+  event :confirmation do
+    transition_to_brand_to_title
+  end
 
-    animate actor: brand, to: { alpha: 0 }, interval: 60 do
+  def transition_to_brand_to_title
+    animate :brand, to: { alpha: 0 }, interval: 1.second do
       transition_to :brand_to_title
     end
-
   end
 
-end
+end

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

@@ -2,11 +2,11 @@ class BrandToTitleScene < Metro::Scene
 
   draws :title
 
-  animate actor: :title, to: { alpha: 255 }, interval: 120 do
-    transition_to :title
+  animate :title, to: { alpha: 255 }, interval: 2.seconds do
+    transition_to :title, with: :fade
   end
 
-  event :on_up, Gosu::KbEscape do
+  event :cancel do
     transition_to :title
   end
 

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

@@ -4,7 +4,7 @@ class TitleScene < Metro::Scene
 
   draw :menu, options: [ 'Start Game', 'Exit' ]
 
-  event :on_up, Gosu::KbEscape do
+  event :on_up, KbEscape do
     exit
   end
 

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

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

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

@@ -1,10 +1,8 @@
 title:
   model: metro::models::label
   text: "#{Metro::Game.name}"
-  x: 120
-  y: 40
-  x-factor: 2
-  y-factor: 2
+  size: 40
+  y: 100
   color: rgba(255,255,255,1.0)
 menu:
   model: metro::models::menu

data/lib/templates/message.erb

@@ -15,7 +15,7 @@
 
 ## Details
 
-<%= message.details %>
+<%= message.actions %>
 <% end %>
 ## Contact
 

data/lib/templates/model.rb.erb

@@ -11,11 +11,11 @@ class <%= model_name %> < Metro::Model
   #
   # @example Registering the keyboard up key to execute the method `jump`
   #
-  # event :on_up, Gosu::KbEscape, do: :jump
+  # event :on_up, KbEscape, do: :jump
   #
   # @example Registering for button held events that would build the model's acceleration
   #
-  # event :on_hold, Gosu::KbRight, Gosu::GpRight do
+  # event :on_hold, KbRight, Gosu::GpRight do
   #   acceleration += 1
   # end
   #

data/lib/templates/scene.rb.erb

@@ -29,7 +29,7 @@ class <%= scene_class_name %> < Metro::Scene
   #
   # @example of the title being moved to a new y position and the alpha level
   #
-  # animate actor: :title, to: { y: 80, alpha: 50 }, interval: 120 do
+  # animate :title, to: { y: 80, alpha: 50 }, interval: 120 do
   #   puts "Done Animating!"
   # end
   #
@@ -45,11 +45,11 @@ class <%= scene_class_name %> < Metro::Scene
   #
   # @example Registering the keyboard up key to execute the method `leave_scene`
   #
-  # event :on_up, Gosu::KbEscape, do: :leave_scene
+  # event :on_up, KbEscape, do: :leave_scene
   #
   # @example Registering for button held events that would move an actor named `player`
   #
-  # event :on_hold, Gosu::KbRight, Gosu::GpRight do
+  # event :on_hold, KbRight, Gosu::GpRight do
   #   title.alpha = title.alpha - 1
   # end
   # Keystroke and Game Event Reference

data/metro.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'gosu', '~> 0.7'
   gem.add_dependency 'thor', '~> 0.16.0'
   gem.add_dependency 'sender', '~> 1.5.10'
+  gem.add_dependency 'i18n', '~> 0.6.1'
   gem.add_development_dependency 'rspec', '~> 2.11'
 
   gem.files         = `git ls-files`.split($/)

data/spec/core_ext/numeric_spec.rb

@@ -0,0 +1,78 @@
+require 'spec_helper'
+
+describe Numeric do
+
+  before :each do
+    Numeric.tick_interval = 16.666666
+  end
+
+  describe "#tick(s)" do
+    context "when using an Integer" do
+      subject { 60 }
+      let(:expected_value) { 60 }
+
+      its(:tick) { should eq expected_value }
+      its(:ticks) { should eq expected_value }
+    end
+
+    context "when using a Float" do
+      subject { 70.1 }
+      let(:expected_value) { 70.1 }
+
+      its(:tick) { should eq expected_value }
+      its(:ticks) { should eq expected_value }
+    end
+  end
+
+  describe "#second(s)" do
+
+    context "when using an Integer" do
+      context "when the tick interval has not been set" do
+        subject { 2 }
+        let(:expected_value) { 120 }
+
+        its(:second) { should eq expected_value }
+        its(:seconds) { should eq expected_value }
+        its(:sec) { should eq expected_value }
+        its(:secs) { should eq expected_value }
+      end
+
+      context "when the tick interval has been set to 33.3333" do
+        before :each do
+          Numeric.tick_interval = 33.333333
+        end
+
+        subject { 2 }
+        let(:expected_value) { 60 }
+
+        its(:second) { should eq expected_value }
+        its(:seconds) { should eq expected_value }
+      end
+    end
+
+    context "when using a Float" do
+      context "when the tick interval has not been set" do
+        subject { 2.5 }
+        let(:expected_value) { 150 }
+
+        its(:second) { should eq expected_value }
+        its(:seconds) { should eq expected_value }
+        its(:sec) { should eq expected_value }
+        its(:secs) { should eq expected_value }
+      end
+
+      context "when the tick interval has been set" do
+        before :each do
+          Numeric.tick_interval = 33.333333
+        end
+
+        subject { 3.5 }
+        let(:expected_value) { 105 }
+
+        its(:second) { should eq expected_value }
+        its(:seconds) { should eq expected_value }
+      end
+    end
+  end
+
+end

data/spec/metro/models/key_value_coding_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+describe Metro::KeyValueCoding do
+
+  class KeyValueCodingObject
+    include Metro::KeyValueCoding
+    attr_accessor :description, :properties
+  end
+
+  subject do
+    object = KeyValueCodingObject.new
+
+    object.description = "Describe Yourself"
+    object.properties = { height: 100, width: 50 }
+
+    object
+  end
+
+  describe "#get" do
+    context "when given a key with a single attribute" do
+      let(:key) { :description }
+      let(:expected_value) { "Describe Yourself" }
+
+      it "should return the value" do
+        subject.get(key).should eq expected_value
+      end
+    end
+
+    context "when given a key with multiple attributes" do
+      let(:key) { "properties.keys" }
+      let(:expected_value) { [ :height, :width ] }
+
+      it "should return the expected value" do
+        subject.get(key).should eq expected_value
+      end
+    end
+  end
+
+  describe "#set" do
+    context "when given a key with a single attribute" do
+      let(:key) { :description }
+      let(:expected_value) { "New Description" }
+
+      it "should set the value" do
+        subject.set(key,expected_value)
+        subject.get(key).should eq expected_value
+      end
+    end
+
+    context "when given a key with multiple attributes" do
+      let(:key) { "properties.default" }
+      let(:expected_value) { 0 }
+
+      it "should set the value" do
+        subject.set(key,expected_value)
+        subject.get(key).should eq expected_value
+      end
+    end
+  end
+
+end

data/spec/metro/scene_views/yaml_view_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe Metro::SceneView::YAMLView do
+
+  subject { described_class }
+  let(:view_name) { "example" }
+
+  before do
+    File.stub(:exists?).and_return(false)
+  end
+
+  describe ".exists?" do
+    context "when a view file exists with the extension YAML" do
+      before do
+        File.stub(:exists?).with(filepath_that_exists).and_return(true)
+      end
+
+      let(:filepath_that_exists) { "#{view_name}.yaml" }
+
+      it "should return true" do
+        subject.exists?(view_name).should be_true
+      end
+
+    end
+    context "when a view file exists with the extension YML" do
+      before :each do
+        File.stub(:exists?).with(filepath_that_exists).and_return(true)
+      end
+
+      let(:filepath_that_exists) { "#{view_name}.yml" }
+
+      it "should return true" do
+        subject.exists?(view_name).should be_true
+      end
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metro
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-27 00:00:00.000000000 Z
+date: 2012-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -59,6 +59,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.10
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -99,15 +115,22 @@ files:
 - lib/commands/generate_scene.rb
 - lib/commands/generate_view.rb
 - lib/commands/thor.rb
+- lib/core_ext/numeric.rb
 - lib/core_ext/string.rb
 - lib/gosu_ext/color.rb
+- lib/gosu_ext/gosu_constants.rb
+- lib/locale/en.yml
+- lib/locale/locale.rb
 - lib/metro.rb
-- lib/metro/animation/animation.rb
+- lib/metro/animation/after_interval_factory.rb
 - lib/metro/animation/animation_factory.rb
 - lib/metro/animation/easing.rb
 - lib/metro/animation/has_animations.rb
 - lib/metro/animation/implicit_animation.rb
-- lib/metro/error.rb
+- lib/metro/animation/on_update_operation.rb
+- lib/metro/animation/scene_animation.rb
+- lib/metro/events/control_definition.rb
+- lib/metro/events/controls.rb
 - lib/metro/events/event_factory.rb
 - lib/metro/events/event_relay.rb
 - lib/metro/events/has_events.rb
@@ -118,10 +141,12 @@ files:
 - lib/metro/models/draws.rb
 - lib/metro/models/generic.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/scene.rb
 - lib/metro/scene_view/json_view.rb
 - lib/metro/scene_view/no_view.rb
@@ -129,6 +154,9 @@ files:
 - lib/metro/scene_view/yaml_view.rb
 - lib/metro/scenes.rb
 - lib/metro/template_message.rb
+- lib/metro/transitions/fade_transition_scene.rb
+- lib/metro/transitions/scene_transitions.rb
+- lib/metro/transitions/transition_scene.rb
 - lib/metro/version.rb
 - lib/metro/window.rb
 - lib/templates/game/README.md.tt
@@ -145,16 +173,23 @@ files:
 - lib/templates/scene.rb.erb
 - lib/templates/view.yaml.erb
 - 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/scene_views/yaml_view_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/burtlo/metro
 licenses: []
 post_install_message: ! "    ______  ___      _____\n    ___   |/  /_____ __  /_______________\n
   \   __  /|_/ / _  _ \\_  __/__  ___/_  __ \\\n    _  /  / /  /  __// /_  _  /    /
   /_/ /\n    /_/  /_/   \\___/  \\__/ /_/     \\____/\n\n  Thank you for installing
-  metro 0.1.2 / 2012-10-26.\n  ---------------------------------------------------------------------\n
-  \ Changes:\n    \n  * Generators for games, scenes, models, and views\n  \n\n  ---------------------------------------------------------------------\n"
+  metro 0.1.3 / 2012-10-28.\n  ---------------------------------------------------------------------\n
+  \ Changes:\n    \n  * Fade Scene Transition support added\n  * Numeric#seconds and
+  Numeric#ticks helpers added\n  * Scenes can now define delayed events `after 2.seconds
+  do ; end`\n  * Labels have more defaults and more font options and size\n  * Labels
+  and images will default to center of screen\n  * Able to define game controls within
+  your metro file\n  * Implicit animations support color change.\n  \n\n  ---------------------------------------------------------------------\n"
 rdoc_options: []
 require_paths:
 - lib
@@ -179,7 +214,10 @@ summary: Metro is a 2D Gaming framework built around gosu (game development libr
   Metro makes it easy to create games by enforcing common conceptual structures and
   conventions.
 test_files:
+- 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/scene_views/yaml_view_spec.rb
 - spec/spec_helper.rb
 has_rdoc: