metro 0.1.4 → 0.1.5

data/lib/metro/window.rb

@@ -60,5 +60,24 @@ module Metro
       scene.button_down(id)
     end
 
+    #
+    # Define an acessor that enables/disables the use of a cursor
+    # within the window. The value should be truthy/falsy.
+    #
+    attr_accessor :cursor
+
+    #
+    # Gosu uses this method to determine if the cursor should be shown.
+    #
+    alias_method :needs_cursor?, :cursor
+
+    def show_cursor
+      self.cursor = true
+    end
+
+    def hide_cursor
+      self.cursor = false
+    end
+
   end
 end

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 'i18n', '~> 0.6.1'
+  gem.add_dependency 'active_support', '~> 3.0.0'
   gem.add_development_dependency 'rspec', '~> 2.11'
 
   gem.files         = `git ls-files`.split($/)

data/spec/core_ext/string_spec.rb

@@ -2,52 +2,52 @@ require 'spec_helper'
 
 describe String do
 
-  describe "#snake_case" do
+  describe "#underscore" do
     context "when given a regular string" do
       subject { "String" }
       let(:expected_value) { "string" }
 
-      its(:snake_case) { should eq expected_value }
+      its(:underscore) { should eq expected_value }
     end
 
     context "when given an already snake cased string" do
-      subject { "snake_cased" }
-      let(:expected_value) { "snake_cased" }
+      subject { "underscored" }
+      let(:expected_value) { "underscored" }
 
-      its(:snake_case) { should eq expected_value }
+      its(:underscore) { should eq expected_value }
     end
 
     context "when given a camelCased string" do
       subject { "SnakeCased" }
       let(:expected_value) { "snake_cased" }
 
-      its(:snake_case) { should eq expected_value }
+      its(:underscore) { should eq expected_value }
     end
 
     context "when given a partial camel_Cased string" do
       subject { "snake_Cased" }
       let(:expected_value) { "snake_cased" }
-      its(:snake_case) { should eq expected_value }
+      its(:underscore) { should eq expected_value }
     end
   end
 
-  describe "#camel_case" do
+  describe "#classify" do
     context "when given a regular string" do
       subject { "string" }
       let(:expected_value) { "String" }
-      its(:camel_case) { should eq expected_value }
+      its(:classify) { should eq expected_value }
     end
 
-    context "when given a snake_cased string" do
+    context "when given a underscored string" do
       subject { "camel_cased" }
       let(:expected_value) { "CamelCased" }
-      its(:camel_case) { should eq expected_value }
+      its(:classify) { should eq expected_value }
     end
 
     context "when given a partial camel_CasedString" do
       subject { "camel_CasedString" }
-      let(:expected_value) { "CamelCasedstring" }
-      its(:camel_case) { should eq expected_value }
+      let(:expected_value) { "CamelCasedString" }
+      its(:classify) { should eq expected_value }
     end
   end
 end

data/spec/metro/scene_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Metro::Scene do
+
+  class SpecScene < Metro::Scene ; end
+
+  subject { SpecScene.new }
+
+  let(:expected_view_name) { "spec" }
+  its(:view_name) { should eq expected_view_name }
+  
+  let(:expected_scene_name) { "spec" }
+  its(:scene_name) { should eq expected_scene_name }
+
+end

data/spec/metro/scene_views/json_view_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe Metro::Views::JSONView 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 JSON" do
+      before do
+        File.stub(:exists?).with(filepath_that_exists).and_return(true)
+      end
+
+      let(:filepath_that_exists) { "#{view_name}.json" }
+
+      it "should return true" do
+        subject.exists?(view_name).should be_true
+      end
+
+    end
+  end
+
+end

data/spec/metro/scene_views/yaml_view_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Metro::SceneView::YAMLView do
+describe Metro::Views::YAMLView do
 
   subject { described_class }
   let(:view_name) { "example" }

data/spec/metro/views/view_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+describe Metro::View do
+  before do
+    subject.name = "spec"
+  end
+
+  let(:expected_view_path) { "views/spec" }
+  its(:view_path) { should eq expected_view_path }
+
+  describe "#parser" do
+    before do
+      subject.stub(:supported_parsers) { [ mock(exists?: false), expected_parser ] }
+    end
+
+    let(:expected_parser) { mock(exists?: true) }
+
+    it "should return the first parser which has a existing view" do
+      subject.parser.should eq expected_parser
+    end
+  end
+
+  describe "#writer" do
+
+    context "when the parser has a format that matches a writer" do
+      before do
+        subject.stub(:parser) { mock(format: :json) }
+        subject.stub(:supported_writers) { [ mock(format: :yaml), expected_writer ] }
+      end
+
+      let(:expected_writer) { mock(format: :json) }
+
+      it "should match the parser format" do
+        subject.writer.format.should eq :json
+      end
+    end
+
+    context "when the format has been specified" do
+      before do
+        subject.stub(:parser) { mock(format: :json) }
+        subject.stub(:supported_writers) { [ expected_writer, mock(format: :json) ] }
+      end
+
+      let(:expected_writer) { mock(format: :yaml) }
+
+      it "should match the format (ignoring the parser format)" do
+        subject.format = :yaml
+        subject.writer.format.should eq :yaml
+      end
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metro
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-29 00:00:00.000000000 Z
+date: 2012-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -59,6 +59,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.1
+- !ruby/object:Gem::Dependency
+  name: active_support
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -100,7 +116,6 @@ files:
 - 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
@@ -116,9 +131,11 @@ files:
 - lib/metro/asset_path.rb
 - lib/metro/events/control_definition.rb
 - lib/metro/events/controls.rb
+- lib/metro/events/event_data.rb
 - lib/metro/events/event_factory.rb
 - lib/metro/events/event_relay.rb
 - lib/metro/events/has_events.rb
+- lib/metro/events/hit_list.rb
 - lib/metro/events/unknown_sender.rb
 - lib/metro/game.rb
 - lib/metro/game/dsl.rb
@@ -126,6 +143,7 @@ files:
 - lib/metro/missing_scene.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
@@ -133,17 +151,22 @@ files:
 - lib/metro/models/model.rb
 - lib/metro/models/model_factory.rb
 - lib/metro/models/rectangle.rb
+- lib/metro/models/rectangle_bounds.rb
 - lib/metro/scene.rb
-- lib/metro/scene_view/json_view.rb
-- lib/metro/scene_view/no_view.rb
-- lib/metro/scene_view/scene_view.rb
-- lib/metro/scene_view/yaml_view.rb
 - lib/metro/scenes.rb
 - lib/metro/template_message.rb
+- lib/metro/transitions/edit_transition_scene.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/views/json_view.rb
+- lib/metro/views/no_view.rb
+- lib/metro/views/parsers.rb
+- lib/metro/views/scene_view.rb
+- lib/metro/views/view.rb
+- lib/metro/views/writers.rb
+- lib/metro/views/yaml_view.rb
 - lib/metro/window.rb
 - lib/templates/game/README.md.tt
 - lib/templates/game/assets/brand.jpg
@@ -163,16 +186,21 @@ files:
 - spec/core_ext/string_spec.rb
 - spec/gosu_ext/color_spec.rb
 - spec/metro/models/key_value_coding_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/views/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.4 / 2012-10-28.\n  ---------------------------------------------------------------------\n
-  \ Changes:\n    \n  * Removed dependency on the sender gem so metro is playable
-  on Windows\n  \n\n  ---------------------------------------------------------------------\n"
+  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"
 rdoc_options: []
 require_paths:
 - lib
@@ -201,6 +229,8 @@ test_files:
 - spec/core_ext/string_spec.rb
 - spec/gosu_ext/color_spec.rb
 - spec/metro/models/key_value_coding_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/views/view_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 

data/lib/core_ext/string.rb

@@ -1,15 +0,0 @@
-class String
-
-  def snake_case
-    snaked_string = self.gsub(/([A-Z\d]+)([A-Z][a-z])/,'\1_\2')
-    snaked_string.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
-    snaked_string.downcase
-  end
-
-  def camel_case
-    camel_string = self.to_s.gsub(/Scene$/i,'')
-    camel_string = camel_string.sub(/^[a-z\d]*/) { $&.capitalize }
-    camel_string = camel_string.gsub(/(?:_|(\/))([a-z\d]*)/i) { "#{$1}#{$2.capitalize}" }.gsub('/', '::')
-  end
-
-end

data/lib/metro/scene_view/json_view.rb

@@ -1,41 +0,0 @@
-require 'json'
-
-module Metro
-  module SceneView
-
-    #
-    # Provides support for a JSON Representation of a view.
-    #
-    class JSONView
-
-      #
-      # Determine if a view exists for this specified format
-      #
-      # @param [String] view_name the name of the view to find
-      # @return a true if the json view exists and false if it does not exist.
-      #
-      def self.exists?(view_name)
-        File.exists? json_view_name(view_name)
-      end
-
-      #
-      # Parse the contents of the view given the name.
-      #
-      # @param [String] view_name the name of the view to read
-      # @return a Hash that contains the contents of the view.
-      #
-      def self.parse(view_name)
-        JSON.parse File.read json_view_name(view_name)
-      end
-
-      #
-      # A helper method to generate the name of the json view file. In this case
-      # it is the view name with the suffix .json.
-      #
-      def self.json_view_name(view_name)
-        File.extname(view_name) == "" ? "#{view_name}.json" : view_name
-      end
-    end
-
-  end
-end

data/lib/metro/scene_view/scene_view.rb

@@ -1,83 +0,0 @@
-require_relative 'yaml_view'
-require_relative 'json_view'
-require_relative 'no_view'
-
-module Metro
-
-  #
-  # SceneView provides support for a Scene to have a view as well as giving
-  # additional tools to also help draw that view.
-  #
-  module SceneView
-
-    #
-    # When the module is included insure that all the class helper methods are added
-    # at the same time.
-    #
-    def self.included(base)
-      base.extend ClassMethods
-    end
-
-    #
-    # Supported view formats
-    #
-    def _view_parsers
-      self.class._view_parsers
-    end
-
-    #
-    # Loads and caches the view content based on the avilable view parsers and
-    # the view files defined.
-    #
-    # @return a Hash of view content.
-    #
-    def view
-      self.class.view
-    end
-
-    module ClassMethods
-
-      #
-      # A Scene by default uses the name of the Scene to find it's associated
-      # view.
-      #
-      # @example Custom View Name
-      #
-      #     class ClosingScene < Metro::Scene
-      #       view_name 'alternative'
-      #     end
-      #
-      #     ClosingScene.view_name # => views/alternative
-      #
-      def view_name(filename = nil)
-        if filename
-          @view_name = File.join "views", filename.to_s
-        else
-          @view_name ||= File.join "views", scene_name
-        end
-      end
-
-      #
-      # Supported view formats
-      #
-      def _view_parsers
-        [ YAMLView, JSONView, NoView ]
-      end
-
-      #
-      # Loads and caches the view content based on the avilable view parsers and
-      # the view files defined.
-      #
-      # @return a Hash of view content.
-      #
-      def view
-        @view ||= begin
-          parser = _view_parsers.find { |parser| parser.exists? view_name }
-          parser.parse view_name
-        end
-      end
-
-    end
-
-  end
-end