metro 0.2.3 → 0.2.4

data/changelog.md

@@ -1,5 +1,11 @@
 # Metro
 
+## 0.2.4 / 2012-11-15
+
+* All retrieved models from properties are now cached for better performance
+* Animations were re-vamped to accept more parameters
+* Metro models names in code are now refered to as "metro::models::*" to "metro::ui::*"
+
 ## 0.2.3 / 2012-11-11
 
 * FIX metro generators and templates generating out-of-date formats

data/lib/metro.rb

@@ -11,10 +11,6 @@ require 'active_support/core_ext/hash'
 require 'active_support/hash_with_indifferent_access'
 
 require 'gosu_ext/color'
-require 'gosu_ext/image'
-require 'gosu_ext/animation'
-require 'gosu_ext/song'
-require 'gosu_ext/sample'
 require 'gosu_ext/gosu_constants'
 require 'core_ext/numeric'
 
@@ -24,6 +20,10 @@ require 'metro/asset_path'
 require 'metro/units/units'
 require 'metro/logging'
 require 'metro/version'
+require 'metro/animation'
+require 'metro/image'
+require 'metro/sample'
+require 'metro/song'
 require 'metro/template_message'
 require 'metro/window'
 require 'metro/game'

data/lib/metro/animation.rb

@@ -0,0 +1,135 @@
+module Metro
+
+  #
+  # The animation is an wrapper object for an array of Gosu::Images that also contains
+  # the additional information on the path, height, width, and tileability.
+  #
+  class Animation
+
+    attr_accessor :images, :path, :height, :width, :tileable, :time_per_image
+
+    def initialize(params = {})
+      @images = Array(params[:images])
+      @path = params[:path]
+      @height = params[:height]
+      @width = params[:width]
+      @tileable = params[:tileable]
+      @time_per_image = params[:time_per_image]
+    end
+
+    #
+    # @return a hash representation of the Animation
+    #
+    def to_hash
+      { path: path,
+        width: width.to_i, height: height.to_i,
+        tileable: !!tileable,
+        time_per_image: time_per_image }
+    end
+
+    #
+    # @return [Fixnum] the game time when the animation started to display.
+    #
+    def start_time
+      @start_time ||= current_time
+    end
+
+    #
+    # @return [Fixnum] the current time in the game.
+    #
+    def current_time
+      Gosu::milliseconds
+    end
+
+    #
+    # @return [Fixnum] the age of the animation.
+    #
+    def age
+      current_time - start_time
+    end
+
+    #
+    # @return the current animation image count.
+    #
+    def current_index
+      age / time_per_image
+    end
+
+    #
+    # @return the current animation image to display.
+    #
+    def current_image_index
+      current_index % images.size
+    end
+
+    #
+    # @return the animation is complete if it the current index exceeds the
+    #   number of images.
+    #
+    def complete?
+      current_index > (images.size - 1)
+    end
+
+    #
+    # @return a Gosu::Image to be displayed in a animation sequence.
+    #
+    def image
+      images[current_image_index]
+    end
+
+    #
+    # Finds an existing image or creates a new image given the window, path,
+    # width, height and tileablilty.
+    #
+    # @example Finding or creating an Animation image
+    #
+    #     Metro::Animation.find_or_create window: model.window,
+    #       path: "asset_path", tileable: tileable, width: 64, height: 64,
+    #       time_per_image: 50
+    #
+    def self.find_or_create(options)
+      new options.merge(images: find_or_create_gosu_images(options))
+    end
+
+    #
+    # Create an animation image given the window, path, width, height,
+    #  and tileability.
+    #
+    # @example Creating an Animation Image
+    #
+    #     Metro::Animation.create window: model.window,
+    #       path: "asset_path", tileable: tileable, width: 64, height: 64,
+    #       time_per_image: 50
+    #
+    def self.create(options)
+      new options.merge(images: create_gosu_images(options))
+    end
+
+    private
+
+    def self.create_gosu_images(options)
+      path = AssetPath.with(options[:path]).to_s
+      images[path] = Gosu::Image.load_tiles(*create_params(options))
+    end
+
+    def self.find_or_create_gosu_images(options)
+      path = AssetPath.with(options[:path]).to_s
+      images[path] or create_gosu_images(options)
+    end
+
+    def self.create_params(options)
+      options.symbolize_keys!
+      window = options[:window]
+      asset_path = AssetPath.with(options[:path]).filepath
+      width = options[:width].to_i
+      height = options[:height].to_i
+      tileable = !!options[:tileable]
+      [ window, asset_path, width, height, tileable ]
+    end
+
+    def self.images
+      @images ||= {}
+    end
+
+  end
+end

data/lib/metro/asset_path.rb

@@ -2,12 +2,12 @@
 # The asset_path is a helper which will generate a filepath based on the current working
 # directory of the game. This allows for game author's to specify a path relative within
 # the assets directory of their game.
-# 
+#
 # @note Paths that are defined within views use this helper and are assumed to be paths
 #   relative within the assets directory of the game.
-# 
+#
 # @example Loading the branding image for the player model.
-# 
+#
 #     class Player < Metro::Model
 #       def image
 #         @image ||= Gosu::Image.new( window, asset_path("player.png"), false )
@@ -16,7 +16,7 @@
 #         image.draw_rot(x,y,2,angle)
 #       end
 #     end
-# 
+#
 def asset_path(name)
   File.join Dir.pwd, "assets", name
 end
@@ -25,7 +25,55 @@ end
 #
 # The metro_asset_path is a helper which will generate a filepath based on the directory
 # of the metro library. This is used to retrieve assets internally for missing images.
-# 
+#
 def metro_asset_path(name)
   File.join Metro.asset_dir, name
+end
+
+module Metro
+
+  #
+  # An AssetPath searches through the various paths based on the path provided.
+  #
+  # First it assumes the path is absolute, second it assuemts that path is within
+  # the game, and third it assumes it is within metro itself.
+  #
+  class AssetPath
+
+    def self.with(path)
+      path.is_a?(AssetPath) ? path : new(path.to_s)
+    end
+
+    def initialize(path)
+      @path = path
+    end
+
+    attr_reader :path
+
+    def filepath
+      @filepath ||= begin
+        absolute_asset?(path) or game_asset?(path) or metro_asset?(path)
+      end
+    end
+
+    def absolute_asset?(path)
+      asset_at_path? path
+    end
+
+    def game_asset?(path)
+      asset_at_path? asset_path(path)
+    end
+
+    def metro_asset?(path)
+      asset_at_path? metro_asset_path(path)
+    end
+
+    alias_method :to_s, :filepath
+
+    private
+
+    def asset_at_path?(asset_path)
+      asset_path if File.exists?(asset_path) and File.file?(asset_path)
+    end
+  end
 end

data/lib/metro/image.rb

@@ -0,0 +1,67 @@
+module Metro
+
+  #
+  # Image is a wrapper class for a Gosu Image. This allows for additional data to be stored
+  # without relying on monkey-patching on functionality.
+  #
+  class Image < SimpleDelegator
+
+    def initialize(gosu_image,path,tileable)
+      super(gosu_image)
+      @path = path
+      @tileable = tileable
+    end
+
+    # The relative path of the image
+    attr_reader :path
+
+    # The tileability of the image
+    attr_reader :tileable
+
+    def dimensions
+      Metro::Units::Dimensions.of width, height
+    end
+
+    #
+    # Finds an existing image or creates a new image given the window, path, and tileablilty.
+    #
+    # @example Finding or creating an Image
+    #
+    #     Metro::Image.find_or_create window: model.window,
+    #       path: "asset_path", tileable: tileable
+    #
+    def self.find_or_create(options)
+      path = AssetPath.with(options[:path])
+      images[path.to_s] or (images[path.to_s] = create(options))
+    end
+
+    #
+    # Create an image given the window, path, and tileability.
+    #
+    # @example Creating an Image
+    #
+    #     Metro::Image.create window: model.window,
+    #       path: "asset_path", tileable: tileable
+    #
+    def self.create(options)
+      window, asset_path, tileable = create_params(options)
+      gosu_image = Gosu::Image.new(window,asset_path.filepath,tileable)
+      new gosu_image, asset_path.path, tileable
+    end
+
+    private
+
+    def self.create_params(options)
+      options.symbolize_keys!
+      asset_path = AssetPath.with(options[:path])
+      window = options[:window]
+      tileable = !!options[:tileable]
+      [ window, asset_path, tileable ]
+    end
+
+    def self.images
+      @images ||= {}
+    end
+
+  end
+end

data/lib/metro/models/{models → audio}/song.rb

@@ -1,5 +1,5 @@
 module Metro
-  module Models
+  module Audio
 
     #
     # A song represents an audio representation.

data/lib/metro/models/model.rb

@@ -68,7 +68,6 @@ 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.
@@ -103,10 +102,17 @@ module Metro
 
       define_method name do
         raw_value = properties[name]
-        property_class.new(self,options,&block).get raw_value
+
+        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
@@ -218,6 +224,18 @@ module Metro
     #
     include HasEvents
 
+    #
+    # @param [String] model_name the name of the model to be created.
+    # @return [Metro::Model] the metro model instance
+    #
+    def create(model_name)
+      model_class = Metro::Model.model(model_name).constantize
+      mc = model_class.new
+      mc.scene = scene
+      mc.window = window
+      mc
+    end
+
     def saveable?
       true
     end
@@ -319,10 +337,10 @@ module Metro
   end
 end
 
-require_relative 'models/generic'
-require_relative 'models/label'
-require_relative 'models/menu'
-require_relative 'models/image'
-require_relative 'models/rectangle'
-require_relative 'models/grid_drawer'
-require_relative 'models/song'
+require_relative 'ui/generic'
+require_relative 'ui/label'
+require_relative 'ui/menu'
+require_relative 'ui/image'
+require_relative 'ui/rectangle'
+require_relative 'ui/grid_drawer'
+require_relative 'audio/song'

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

@@ -37,7 +37,7 @@ module Metro
     # @example Using an animation property with a different property name
     #
     #     class Hero < Metro::Model
-    #       property :walking, type: :animation, path: "star.png", 
+    #       property :walking, type: :animation, path: "star.png",
     #         dimensions: Metro::Dimensions.of(25,25)
     #
     #       def draw
@@ -50,18 +50,18 @@ module Metro
       # By default return the default animation when getting a nil or
       # other unsupported value.
       get do
-        default_animation
+        create_animation default_properties
       end
 
       # When getting a hash, create the animation with the properties.
-      get Hash do |value|
-        self.class.animation_for value.merge(window: model.window)
+      get Hash do |loaded|
+        create_animation default_properties.merge(loaded)
       end
 
       # Setting the animation with a nil or other unsupported value
       # will default to the default animation.
       set do
-        default_animation.to_hash
+        defaults.except(:window)
       end
 
       # Setting with an animation will convert it to it's hash representation.
@@ -71,60 +71,38 @@ module Metro
 
       # Setting with a hash will assume the hash defines an animation.
       set Hash do |value|
-        value
+        value.except(:window)
       end
 
-      def default_animation
-        self.class.animation_for window: model.window,
-          path: default_image_path,
+      private
+      
+      def create_animation(properties)
+        self.class.animation_for properties
+      end
+
+      def default_properties
+        { window: model.window,
+          path: default_image_filename,
           width: default_dimensions.width,
           height: default_dimensions.height,
-          tileable: false
+          time_per_image: default_time_per_image,
+          tileable: false }
       end
 
-      def default_image_path
-        options[:path] ? options[:path] : metro_asset_path("missing_animation.png")
+      def default_image_filename
+        options[:path] or "missing_animation.png"
       end
 
       def default_dimensions
-        options[:dimensions] ? options[:dimensions] : Dimensions.of(16.0,16.0)
+        options[:dimensions] or Dimensions.of(16.0,16.0)
       end
 
-      #
-      # Return an animation for the specified path. On first request it will be loaded from
-      # the file-system. On subsequent requests it will be pulled from the cache.
-      #
-      # @param [Hash] options the relative `path` to the image and the window for which it
-      #   will be displayed.
-      #
-      def self.animation_for(options)
-        options.symbolize_keys!
-        window = options[:window]
-
-        absolute_path = path = options[:path]
-        absolute_path = asset_path(absolute_path) unless absolute_path.start_with? "/"
-
-        width = options[:width].to_i
-        height = options[:height].to_i
-        tileable = options[:tileable]
-
-        animation_images = images[path]
-        unless animation_images
-          animation_images = create_images(window,absolute_path,width,height,tileable)
-          images[path] = animation_images
-        end
-
-        Animation.new options.merge(images: animation_images)
-      end
-
-      def self.images
-        @images ||= {}
+      def default_time_per_image
+        options[:time_per_image] or 50
       end
 
-      private
-
-      def self.create_images(window,path,width,height,tileable)
-        Gosu::Image.load_tiles(window,path,width,height,tileable)
+      def self.animation_for(options)
+        Metro::Animation.find_or_create(options)
       end
 
     end

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

@@ -9,9 +9,6 @@ module Metro
     # Property will attempt to use a image at that path that already meets that criteria if it has been
     # loaded.
     #
-    # The images are cached within the image property to help performance by reducing the unncessary
-    # creation of similar images.
-    #
     # @example Defining a image property
     #
     #     class Player < Metro::Model
@@ -41,22 +38,22 @@ module Metro
     #
     class ImageProperty < Property
 
+      # By default, getting will use the the default image.
       get do
         default_image
       end
 
       # Return the image at the specified path.
-      # @note The path should be the relative path within the game.
       get String do |path|
         self.class.image_for path: path, window: model.window
       end
 
+      # By default, setting will use the path of the default image.
       set do
         default_image.path
       end
 
       # Set the image with the specified path.
-      # @note The path should be the relative path within the game.
       set String do |path|
         path
       end
@@ -67,15 +64,21 @@ module Metro
         image.path
       end
 
+      #
+      # @return the default image based on the default image path specified.
+      #
       def default_image
         self.class.image_for path: default_image_path, window: model.window
       end
 
+      #
+      # @return the path provided as the default or if one has not been specified
+      # the default "missing.png"
+      #
       def default_image_path
-        options[:path] || metro_asset_path("missing.png")
+        options[:path] or "missing.png"
       end
 
-
       #
       # Return an image for the specified path. On first request it will be loaded from
       # the file-system. On subsequent requests it will be pulled from the cache.
@@ -84,31 +87,7 @@ module Metro
       #   will be displayed.
       #
       def self.image_for(options)
-        options.symbolize_keys!
-
-        absolute_path = path = options[:path]
-        absolute_path = asset_path(absolute_path) unless absolute_path.start_with? "/"
-
-        tileable = !!options[:tileable]
-        window = options[:window]
-
-        gosu_image = images[path]
-        unless gosu_image
-          gosu_image = create_image(window,absolute_path,tileable)
-          images[path] = gosu_image
-        end
-
-        Metro::Image.new gosu_image, path, tileable
-      end
-
-      def self.images
-        @images ||= {}
-      end
-
-      private
-
-      def self.create_image(window,path,tileable)
-        Gosu::Image.new(window,path,tileable)
+        Metro::Image.find_or_create(options)
       end
 
     end

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

@@ -25,14 +25,14 @@ module Metro
     #     class Hero < Metro::Model
     #       property :pickup_sample, type: :sample, path: 'pickup.wav'
     #     end
-    #    
+    #
     class SampleProperty < Metro::Model::Property
 
       # By default, getting an unsupported value will return the default sample
       get do |value|
         default_sample
       end
-      
+
       # Bu default, setting sn unsupported value will save the default sample filename
       set do |value|
         default_sample_filename
@@ -52,7 +52,7 @@ module Metro
       set Metro::Sample do |sample|
         sample.path
       end
-      
+
       #
       # @return the default sample for the sample property. This is based on the default
       #   sample name.
@@ -60,15 +60,15 @@ module Metro
       def default_sample
         self.class.sample_for path: default_sample_filename, window: model.window
       end
-      
+
       #
       # @return a string sample name that is default. If the property was not created with
       #   a default value the the default sample is the missing sample found in Metro.
       #
       def default_sample_filename
-        options[:path] || metro_asset_path("missing.wav")
+        options[:path] or "missing.wav"
       end
-      
+
       #
       # Returns a Metro::Sample. This is composed of the metadata provided and a Gosu::Sample.
       #
@@ -76,20 +76,7 @@ module Metro
       #   a sample.
       #
       def self.sample_for(options)
-        options.symbolize_keys!
-        relative_path = options[:path]
-        window = options[:window]
-
-        absolute_path = path = options[:path]
-        absolute_path = asset_path(absolute_path) unless absolute_path.start_with? "/"
-
-        gosu_sample = create_sample(window,absolute_path)
-
-        Metro::Sample.new gosu_sample, relative_path
-      end
-
-      def self.create_sample(window,filename)
-        Gosu::Sample.new(window, filename)
+        Metro::Sample.create(options)
       end
 
     end

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

@@ -69,7 +69,7 @@ module Metro
       #   a default value the the default song is the missing song found in Metro.
       #
       def default_song_name
-        options[:path] || metro_asset_path('missing.ogg')
+        options[:path] or 'missing.ogg'
       end
 
       #
@@ -81,31 +81,7 @@ module Metro
       #   a song.
       #
       def self.song_for(options)
-        options.symbolize_keys!
-        relative_path = options[:path]
-        window = options[:window]
-
-        absolute_path = path = options[:path]
-        absolute_path = asset_path(absolute_path) unless absolute_path.start_with? "/"
-
-        gosu_song = songs[relative_path]
-
-        unless gosu_song
-          gosu_song = create_song(window,absolute_path)
-          songs[relative_path] = gosu_song
-        end
-
-        Metro::Song.new gosu_song, relative_path
-      end
-
-      def self.songs
-        @songs ||= {}
-      end
-
-      private
-
-      def self.create_song(window,filename)
-        Gosu::Song.new(window, filename)
+        Song.find_or_create(options)
       end
 
     end

data/lib/metro/models/{models → ui}/generic.rb

@@ -1,5 +1,5 @@
 module Metro
-  module Models
+  module UI
 
     #
     # Generic model is used when no model is cannot not be found

data/lib/metro/models/{models → ui}/grid_drawer.rb

@@ -1,5 +1,5 @@
 module Metro
-  module Models
+  module UI
     
     class GridDrawer < Model
 

data/lib/metro/models/{models → ui}/image.rb

@@ -1,5 +1,5 @@
 module Metro
-  module Models
+  module UI
 
     #
     # Draws an Image

data/lib/metro/models/{models → ui}/label.rb

@@ -1,5 +1,5 @@
 module Metro
-  module Models
+  module UI
 
     #
     # Draws a string of text

data/lib/metro/models/{models → ui}/menu.rb

@@ -1,5 +1,5 @@
 module Metro
-  module Models
+  module UI
 
     #
     # Draws a a menu of options. A menu model inserts itself into the scene as an event

data/lib/metro/models/{models → ui}/rectangle.rb

@@ -1,5 +1,5 @@
 module Metro
-  module Models
+  module UI
 
     class Rectangle < ::Metro::Model
 

data/lib/metro/sample.rb

@@ -0,0 +1,40 @@
+module Metro
+
+  #
+  # Sample is a wrapper class for a Gosu Sample. This allows for additional data to be stored
+  # without relying on monkey-patching on functionality.
+  #
+  class Sample < SimpleDelegator
+
+    attr_accessor :sample, :path
+
+    def initialize(sample,path)
+      super(sample)
+      @sample = sample
+      @path = path
+    end
+
+    #
+    # Create a sample given the window and path.
+    #
+    # @example Creating a Sample
+    #
+    #     Metro::Sample.create window: model.window, path: "sample_path.wav"
+    #
+    def self.create(options)
+      window, asset_path = create_params(options)
+      gosu_sample = Gosu::Sample.new(window,asset_path.filepath)
+      new gosu_sample, asset_path.path
+    end
+
+    private
+
+    def self.create_params(options)
+      options.symbolize_keys!
+      asset_path = AssetPath.with(options[:path])
+      window = options[:window]
+      [ window, asset_path ]
+    end
+
+  end
+end

data/lib/metro/song.rb

@@ -0,0 +1,56 @@
+module Metro
+
+  #
+  # Song is a wrapper class for a Gosu Song. This allows for additional data to be stored
+  # without relying on monkey-patching on functionality.
+  #
+  class Song < SimpleDelegator
+
+    attr_accessor :song, :path
+
+    def initialize(song,path)
+      super(song)
+      @song = song
+      @path = path
+    end
+
+    #
+    # Finds an existing song or creates a new song given the window and path.
+    #
+    # @example Finding or creating an Song
+    #
+    #     Metro::Image.find_or_create window: model.window, path: "asset_path"
+    #
+    def self.find_or_create(options)
+      path = AssetPath.with(options[:path])
+      songs[path.to_s] or (songs[path.to_s] = create(options))
+    end
+
+    #
+    # Create an Song given the window and path.
+    #
+    # @example Creating an Song
+    #
+    #     Metro::Song.create window: model.window, path: "asset_path"
+    #
+    def self.create(options)
+      window, asset_path = create_params(options)
+      gosu_song = Gosu::Song.new(window,asset_path.filepath)
+      new gosu_song, asset_path.path
+    end
+
+    private
+
+    def self.create_params(options)
+      options.symbolize_keys!
+      asset_path = AssetPath.with(options[:path])
+      window = options[:window]
+      [ window, asset_path ]
+    end
+
+    def self.songs
+      @songs ||= {}
+    end
+
+  end
+end

data/lib/metro/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metro
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-11 00:00:00.000000000 Z
+date: 2012-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -120,15 +120,12 @@ files:
 - lib/commands/generate_view.rb
 - lib/commands/thor.rb
 - lib/core_ext/numeric.rb
-- lib/gosu_ext/animation.rb
 - 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.rb
 - lib/metro/animation/after_interval_factory.rb
 - lib/metro/animation/animation_factory.rb
 - lib/metro/animation/easing/ease_in.rb
@@ -150,19 +147,14 @@ files:
 - lib/metro/events/unknown_sender.rb
 - lib/metro/game.rb
 - lib/metro/game/dsl.rb
+- lib/metro/image.rb
 - lib/metro/logging.rb
 - lib/metro/missing_scene.rb
+- lib/metro/models/audio/song.rb
 - lib/metro/models/draws.rb
 - lib/metro/models/key_value_coding.rb
 - lib/metro/models/model.rb
 - lib/metro/models/model_factory.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/models/song.rb
 - lib/metro/models/properties/animation_property.rb
 - lib/metro/models/properties/color_property.rb
 - lib/metro/models/properties/dimensions_property.rb
@@ -175,8 +167,16 @@ files:
 - lib/metro/models/properties/scale_property.rb
 - lib/metro/models/properties/song_property.rb
 - lib/metro/models/properties/text_property.rb
+- lib/metro/models/ui/generic.rb
+- lib/metro/models/ui/grid_drawer.rb
+- lib/metro/models/ui/image.rb
+- lib/metro/models/ui/label.rb
+- lib/metro/models/ui/menu.rb
+- lib/metro/models/ui/rectangle.rb
+- lib/metro/sample.rb
 - lib/metro/scene.rb
 - lib/metro/scenes.rb
+- lib/metro/song.rb
 - lib/metro/template_message.rb
 - lib/metro/transitions/edit_transition_scene.rb
 - lib/metro/transitions/fade_transition_scene.rb
@@ -237,12 +237,11 @@ licenses: []
 post_install_message: ! "    ______  ___      _____\n    ___   |/  /_____ __  /_______________\n
   \   __  /|_/ / _  _ \\_  __/__  ___/_  __ \\\n    _  /  / /  /  __// /_  _  /    /
   /_/ /\n    /_/  /_/   \\___/  \\__/ /_/     \\____/\n\n  Thank you for installing
-  metro 0.2.3 / 2012-11-11.\n  ---------------------------------------------------------------------\n
-  \ Changes:\n    \n  * FIX metro generators and templates generating out-of-date
-  formats\n  * FIX YAML views wil now return an empty hash instead of false on empty
-  files\n  * Added first scene and model to template.\n  * FIX better error message
-  when a directory is specified\n  * Added the `g` generator shortcut: `metro g scene
-  NAME`\n  \n\n  ---------------------------------------------------------------------\n"
+  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"
 rdoc_options: []
 require_paths:
 - lib
@@ -283,3 +282,4 @@ test_files:
 - spec/metro/scenes_spec.rb
 - spec/metro/views/view_spec.rb
 - spec/spec_helper.rb
+has_rdoc: 

data/lib/gosu_ext/animation.rb

@@ -1,31 +0,0 @@
-module Metro
-
-  #
-  # The animation is an wrapper object for an array of Gosu::Images that also contains
-  # the additional information on the path, height, width, and tileability.
-  #
-  class Animation
-
-    attr_accessor :images, :path, :height, :width, :tileable
-
-    def initialize(params = {})
-      @images = Array(params[:images])
-      @path = params[:path]
-      @height = params[:height]
-      @width = params[:width]
-      @tileable = params[:tileable]
-    end
-
-    def to_hash
-      { path: path, width: width.to_i, height: height.to_i, tileable: !!tileable }
-    end
-
-    #
-    # @return a Gosu::Image to be displayed in a animation sequence.
-    #
-    def image
-      images[Gosu::milliseconds / 100 % images.size]
-    end
-
-  end
-end

data/lib/gosu_ext/image.rb

@@ -1,42 +0,0 @@
-module Metro
-
-  #
-  # Image is a wrapper class for a Gosu Image. This allows for additional data to be stored
-  # without relying on monkey-patching on functionality.
-  #
-  class Image < SimpleDelegator
-
-    #
-    # Generate an image given the Gosu window and path. Consider using a model and an image
-    # property instead of using this method.
-    #
-    # @note this goes through the image property because that current performs the caching.
-    #
-    # @example Creating an Image
-    #
-    #     Metro::Image.create path: "relative_imagepath.png", window: window
-    #
-    # @see Metro::Model::ImageProperty
-    #
-    def self.create(params = {})
-      Model::ImageProperty.image_for params
-    end
-
-    def initialize(gosu_image,path,tileable)
-      super(gosu_image)
-      @path = path
-      @tileable = tileable
-    end
-
-    # The relative path of the image
-    attr_reader :path
-
-    # The tileability of the image
-    attr_reader :tileable
-
-    def dimensions
-      Metro::Units::Dimensions.of width, height
-    end
-
-  end
-end

data/lib/gosu_ext/sample.rb

@@ -1,18 +0,0 @@
-module Metro
-
-  #
-  # Sample is a wrapper class for a Gosu Sample. This allows for additional data to be stored
-  # without relying on monkey-patching on functionality.
-  #
-  class Sample < SimpleDelegator
-
-    attr_accessor :sample, :path
-
-    def initialize(sample,path)
-      super(sample)
-      @sample = sample
-      @path = path
-    end
-
-  end
-end

data/lib/gosu_ext/song.rb

@@ -1,18 +0,0 @@
-module Metro
-
-  #
-  # Song is a wrapper class for a Gosu Song. This allows for additional data to be stored
-  # without relying on monkey-patching on functionality.
-  #
-  class Song < SimpleDelegator
-
-    attr_accessor :song, :path
-
-    def initialize(song,path)
-      super(song)
-      @song = song
-      @path = path
-    end
-
-  end
-end