metro 0.2.1 → 0.2.2

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

@@ -11,10 +11,10 @@ describe Metro::Models::Label do
   before do
     # Reset the position of the label to the default
     subject.position = nil
-    subject.scale = Metro::Scale.one
+    subject.scale = Scale.one
   end
 
-  let(:expected_position) { Metro::Point.zero }
+  let(:expected_position) { Point.zero }
   its(:position) { should eq expected_position }
 
   its(:x) { should eq expected_position.x }
@@ -26,7 +26,7 @@ describe Metro::Models::Label do
     
     it "should be set succesfully" do
       subject.position = "10,10"
-      subject.position.should eq Metro::Point.at(10,10)
+      subject.position.should eq Point.at(10,10)
     end
 
     context "when setting the x property" do
@@ -93,7 +93,7 @@ describe Metro::Models::Label do
 
   end
 
-  let(:expected_scale) { Metro::Scale.one }
+  let(:expected_scale) { Scale.one }
 
   its(:scale) { should eq expected_scale }
   its(:x_factor) { should eq expected_scale.x_factor }

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

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe Metro::Model::DimensionsProperty do
+
+  subject { desribed_class.new model }
+  let(:model) { mock("model", window: window) }
+  let(:window) do
+    mock('window',dimensions: window_dimensions )
+  end
+
+  let(:window_dimensions) { Dimensions.of(1,1) }
+
+  context "when defined with a default block" do
+
+    subject do
+      described_class.new model do
+        model.window.dimensions
+      end
+    end
+
+    let(:expected_dimensions) { window_dimensions }
+
+    it "should calculate the correct default value" do
+      subject.get(nil).should eq expected_dimensions
+    end
+
+  end
+
+end

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

@@ -10,7 +10,7 @@ describe Metro::Model::PositionProperty 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 }
+        let(:expected_position) { Point.at 0.0, 0.0 }
 
         it "should return the default position" do
           subject.get(nil).should eq expected_position
@@ -20,7 +20,7 @@ describe Metro::Model::PositionProperty do
       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 }
+        let(:expected_position) { Point.at 4.0, 3.3 }
 
         it "should return the specified default position" do
           subject.get(nil).should eq expected_position
@@ -31,7 +31,7 @@ describe Metro::Model::PositionProperty do
     context "when the value is a string" do
 
       let(:point) { "22.0,33.0" }
-      let(:expected_position) { Metro::Point.at 22.0, 33.0 }
+      let(:expected_position) { Point.at 22.0, 33.0 }
 
       it "should return the position" do
         subject.get(point).should eq expected_position
@@ -56,7 +56,7 @@ describe Metro::Model::PositionProperty do
       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(:default_point) { Point.at 12, 24 }
         let(:expected_position) { "12.0,24.0,0.0" }
 
         it "should return the specified default position" do
@@ -67,7 +67,7 @@ describe Metro::Model::PositionProperty do
 
     context "when the value is a point" do
 
-      let(:point) { Metro::Point.at 10.0, 20.0 }
+      let(:point) { Point.at 10.0, 20.0 }
       let(:expected_position) { "10.0,20.0,0.0" }
 
       it "should return the same position" do

data/spec/spec_helper.rb

@@ -15,4 +15,6 @@ RSpec.configure do |config|
   # the seed, which is printed after each run.
   #     --seed 1234
   config.order = 'random'
-end
+end
+
+include Metro::Units

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metro
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-08 00:00:00.000000000 Z
+date: 2012-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -110,7 +110,9 @@ files:
 - Rakefile
 - bin/metro
 - changelog.md
+- lib/assets/missing.mp3
 - lib/assets/missing.png
+- lib/assets/missing.wav
 - lib/assets/missing_animation.png
 - lib/commands/generate_game.rb
 - lib/commands/generate_model.rb
@@ -122,12 +124,16 @@ files:
 - lib/gosu_ext/color.rb
 - lib/gosu_ext/gosu_constants.rb
 - lib/gosu_ext/image.rb
+- lib/gosu_ext/sample.rb
+- lib/gosu_ext/song.rb
 - lib/locale/en.yml
 - lib/locale/locale.rb
 - lib/metro.rb
 - lib/metro/animation/after_interval_factory.rb
 - lib/metro/animation/animation_factory.rb
-- lib/metro/animation/easing.rb
+- lib/metro/animation/easing/ease_in.rb
+- lib/metro/animation/easing/easing.rb
+- lib/metro/animation/easing/linear.rb
 - lib/metro/animation/has_animations.rb
 - lib/metro/animation/implicit_animation.rb
 - lib/metro/animation/on_update_operation.rb
@@ -156,6 +162,7 @@ files:
 - lib/metro/models/models/label.rb
 - lib/metro/models/models/menu.rb
 - lib/metro/models/models/rectangle.rb
+- lib/metro/models/models/song.rb
 - lib/metro/models/properties/animation_property.rb
 - lib/metro/models/properties/color_property.rb
 - lib/metro/models/properties/dimensions_property.rb
@@ -164,9 +171,10 @@ 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/sample_property.rb
 - lib/metro/models/properties/scale_property.rb
+- lib/metro/models/properties/song_property.rb
 - lib/metro/models/properties/text_property.rb
-- lib/metro/models/rectangle_bounds.rb
 - lib/metro/scene.rb
 - lib/metro/scenes.rb
 - lib/metro/template_message.rb
@@ -174,8 +182,10 @@ files:
 - lib/metro/transitions/fade_transition_scene.rb
 - lib/metro/transitions/scene_transitions.rb
 - lib/metro/transitions/transition_scene.rb
+- lib/metro/units/bounds.rb
 - lib/metro/units/dimensions.rb
 - lib/metro/units/point.rb
+- lib/metro/units/rectangle_bounds.rb
 - lib/metro/units/scale.rb
 - lib/metro/units/units.rb
 - lib/metro/version.rb
@@ -209,6 +219,7 @@ files:
 - 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
@@ -223,11 +234,12 @@ licenses: []
 post_install_message: ! "    ______  ___      _____\n    ___   |/  /_____ __  /_______________\n
   \   __  /|_/ / _  _ \\_  __/__  ___/_  __ \\\n    _  /  / /  /  __// /_  _  /    /
   /_/ /\n    /_/  /_/   \\___/  \\__/ /_/     \\____/\n\n  Thank you for installing
-  metro 0.2.1 / 2012-11-08.\n  ---------------------------------------------------------------------\n
-  \ Changes:\n    \n  * FIX Scene fade transition color changing and implicit animations
-  \n    for colors\n  * Games creating custom properties will appear in the property
-  list\n  * Properties now correctly default to numeric properties\n  * Point objects
-  can be added to other point objects. \n  \n\n  ---------------------------------------------------------------------\n"
+  metro 0.2.2 / 2012-11-10.\n  ---------------------------------------------------------------------\n
+  \ Changes:\n    \n  * Song support added (scene methods and model properties)\n
+  \ * Sample support added (model properties)\n  * Added a missing sample/song\n  *
+  Implicit Animation easings can now be more easily created and registered.\n  * Properties
+  can now be defined with a block\n  * FIX Dimensions parse creation called wrong
+  method\n  * Removed support for specifying a color in animation\n  \n\n  ---------------------------------------------------------------------\n"
 rdoc_options: []
 require_paths:
 - lib
@@ -258,6 +270,7 @@ test_files:
 - 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

data/lib/metro/animation/easing.rb

@@ -1,31 +0,0 @@
-module Metro
-  module Easing
-
-    module Linear
-      extend self
-
-      def linear(moment,start,change,interval)
-        change * moment / interval + start
-      end
-
-      def calculate(start,final,interval)
-        change = final - start
-        (1..interval).map { |time| linear(time.to_f,start,change,interval) }
-      end
-    end
-
-    module EaseIn
-      extend self
-
-      def ease_in_quad(moment,start,change,interval)
-        change * (moment = moment / interval) * moment + start
-      end
-
-      def calculate(start,final,interval)
-        change = final - start
-        (1..interval).map { |time| ease_in_quad(time.to_f,start,change,interval) }
-      end
-    end
-
-  end
-end

data/lib/metro/models/rectangle_bounds.rb

@@ -1,28 +0,0 @@
-module Metro
-  module Models
-
-    class RectangleBounds
-
-      attr_reader :min_x, :min_y, :max_x, :max_y
-
-      def initialize(min_x,min_y,max_x,max_y)
-        @min_x = min_x
-        @min_y = min_y
-        @max_x = max_x
-        @max_y = max_y
-      end
-
-      def contains?(x,y)
-        x > min_x and x < max_x and y > min_y and y < max_y
-      end
-
-      def to_s
-        "(#{min_x},#{min_y}) to (#{max_x},#{max_y})"
-      end
-
-    end
-
-    Bounds = RectangleBounds
-
-  end
-end