yeah 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e63e1abe8491c77fbd17d9ae4b040bf8349afba3
-  data.tar.gz: d4d7d868f5f130a4bf1949d5b3eedc4b4a84f329
+  metadata.gz: 17da100f4d2feff2cb2eefb5f5f779d56404f044
+  data.tar.gz: ff877fec7e0cab390ebf0419e4aaf74dc93ae415
 SHA512:
-  metadata.gz: d77b196bb0caf20f8f5a95ff68c8cbe001508dbab5c138dbc7e3eab6cc3dac345bf2fc863203ea9873189a9c97ad98a66e4f0d31d6608520a28d14403b686569
-  data.tar.gz: d66c9ff09bf63fd247d22d1cf83866ea54aec9ab124309bb3aff0f8d49981ba71d57142bb6fa00934a963005f4fa792b4d260ff58cd4ab25592fcff764cb83cf
+  metadata.gz: 255e45b43495db3c4bf644a62b821bd7d8d34067f67f6be77f4bd19515d8b2813bd28e43d9612ae474bc3761f19c59286b7467f5095200e8debb7b844dcfb657
+  data.tar.gz: 4ad59ff0f089d070c2975a384e81a2124fbd653fb4cdb15a7388cb413fec3590f9162cf33b0ff3272f248df7d4ae11bc36e44202e794f1b59424d8180c42377a

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+0.3.5 (2014-08-24)
+------------------
+* Updated project structure; new entrypoint is `code/game.rb`
+* `yeah build` command through new `Web::Builder`
+* `yeah new` accepts name option (thanks fixnum)
+* `yeah serve` accepts port option
+* `Asset`: removed `#path=`, `#to_n`
+* `Image`: added `#to_n`
+* `Sound`: removed `#pause`, added `#stop`
+* `Web::Sound` can be played multiple times simultaneously
+* Benchmarking & `Vector` benchmarks (thanks meganemura)
+* `Vector` optimization (partly by meganemura)
+* New project game class name is based on name option.
+* Various code & documentation cleanup
+
 0.3.4 (2014-08-22)
 ------------------
 * Fixed `yeah version` command (thanks Chris Olszewski)
@@ -5,6 +20,7 @@
 * Flattened `Vector` math operator code
 * `Vector#magnitude` as alias for `Vector#length`
 * `Vector#unit` as alias for `Vector#normalize`
+* gemspec and Gemfile minor updates
 * Updated documentation
 
 0.3.3 (2014-08-18)

data/README.md

@@ -41,13 +41,13 @@ NOTE: This is alpha-stage software, expect changes!
 
 1. In a command line, enter `yeah new` to generate a new game project.
 2. Change into the new `game` directory, then enter `bundle install`.
-3. Add game code to `code/game.rb`. No tutorials yet; please take a look at the [example code](https://github.com/yeahrb/examples) and [API reference](http://rdoc.info/github/yeahrb/yeah/9f065a6/frames).
+3. Add game code to `code/game.rb`. No tutorials yet; please take a look at the [example code](https://github.com/yeahrb/examples) and [API reference](http://rdoc.info/github/yeahrb/yeah/85e75c5/frames).
 4. Enter `yeah serve` and visit [http://localhost:1234](http://localhost:1234) to try the game.
 
 
 ## Links
 
-[0.3.3 API reference](http://rdoc.info/github/yeahrb/yeah/9f065a6/frames)
+[0.3.4 API reference](http://rdoc.info/github/yeahrb/yeah/85e75c5/frames)
 
 [Issue & feature tracker](https://github.com/yeahrb/yeah/issues)
 

data/bin/yeah

@@ -1,31 +1,57 @@
 #!/usr/bin/env ruby
 
-require 'fileutils'
+command = ARGV.shift
 
-options = {}
+case command
 
-options[:command] = ARGV.shift
-
-case options[:command]
 when 'new'
-  if Dir['game'].any?
-    puts "Error: `game` directory already exists."
+  require 'fileutils'
+
+  name = ARGV.shift || 'new_game'
+
+  def underscore(string)
+    string.split(/(?=[A-Z])/).map(&:downcase).join('_')
+  end
+
+  def classify(string)
+    string.split('_').map(&:capitalize).join
+  end
+
+  project_path = underscore(name)
+
+  if Dir[project_path].any?
+    puts "Error: `#{project_path}` directory already exists."
   else
+    # Use project template for new project directory.
     template_path = File.expand_path('../../lib/yeah/_template', __FILE__)
-    FileUtils.cp_r(template_path, './game')
-    puts "Created new game project at `game`."
+    FileUtils.cp_r(template_path, project_path)
+
+    # Use name for Game subclass name.
+    game_path = "#{project_path}/code/game.rb"
+    File.write(game_path, File.read(game_path) % classify(name))
+
+    puts "Created new game project at `#{project_path}`."
   end
+
+when 'build'
+  require 'yeah/web/builder'
+  Yeah::Web::Builder.new.build
+
 when 'serve'
   require 'yeah/web/server'
-  Yeah::Web::Server.new.start
+  port = ARGV.shift
+  port ? Yeah::Web::Server.new.serve(port) : Yeah::Web::Server.new.serve
+
 when 'version'
   require 'yeah/version'
   puts Yeah::VERSION
+
 else
   puts "Usage: yeah <command>"
   puts ""
   puts "Commands:"
-  puts "  new - create a new game project"
-  puts "  serve - serve a game over the Internet"
+  puts "  new [name] - create a new game project"
+  puts "  build - build package for a game"
+  puts "  serve [port] - serve a game over the Internet"
   puts "  version - print installed version"
 end

data/lib/yeah/_platform/asset.rb

@@ -15,11 +15,7 @@ class Asset
     # Alias for ::new.
   end
 
-  # @!attribute path
-  # @param [String] path to asset relative to `assets/`
+  # @!attribute [r] path
   # @return [String] path to asset relative to `assets/`
-
-  # @!method to_n
-  # @return [Native] native representation of asset for platform
 end
 end

data/lib/yeah/_platform/image.rb

@@ -12,5 +12,8 @@ class Image < Asset
 
   # @!attribute [r] height
   # @return [Integer] height of image
+
+  # @!method to_n
+  # @return [Native] native reference
 end
 end

data/lib/yeah/_platform/sound.rb

@@ -9,7 +9,7 @@ class Sound < Asset
   # @!method play
   # Play sound.
 
-  # @!method pause
-  # Pause sound. A following call to {#play} will resume.
+  # @!method stop
+  # Stop all playback.
 end
 end

data/lib/yeah/_template/Gemfile

@@ -1,4 +1,4 @@
 source 'http://rubygems.org'
 
-gem 'yeah', '~> 0.3.3'
+gem 'yeah', '~> 0.3.5'
 gem 'opal', github: 'opal/opal', ref: '7e843b0'

data/lib/yeah/_template/code/game.rb

@@ -1,4 +1,4 @@
-class NewGame < Game
+class %s < Game
   def setup
   end
 

data/lib/yeah/vector.rb

@@ -113,15 +113,17 @@ class Vector
 
   # @return [Vector] negative vector
   def -@
-    self.class.new(*@components.map(&:-@))
+    self.class.new(-@components[0],
+                   -@components[1],
+                   -@components[2])
   end
 
   # @param [Vector] position
   # @return [Numeric] distance to a position
   def distance_to(position)
-    Math.sqrt((x - position.x) ** 2 +
-              (y - position.y) ** 2 +
-              (z - position.z) ** 2)
+    Math.sqrt((@components[0] - position.x) ** 2 +
+              (@components[1] - position.y) ** 2 +
+              (@components[2] - position.z) ** 2)
   end
 
   # @param [Vector] position
@@ -135,15 +137,16 @@ class Vector
   # @param [Numeric] distance to move
   # @return [Vector] position moved along an angle for a distance in 2D
   def along(angle, distance)
-    self.class.new(x + Math.cos(angle) * distance,
-                   y + Math.sin(angle) * distance)
+    self.class.new(@components[0] + Math.cos(angle) * distance,
+                   @components[1] + Math.sin(angle) * distance)
   end
 
   # @param (see #along)
   # @return [Vector] self after moving along an angle for a distance in 2D
   def along!(angle, distance)
-    self.x += Math.cos(angle) * distance
-    self.y += Math.sin(angle) * distance
+    @components[0] += Math.cos(angle) * distance
+    @components[1] += Math.sin(angle) * distance
+
     self
   end
 

data/lib/yeah/version.rb

@@ -1,3 +1,3 @@
 module Yeah
-  VERSION = '0.3.4'
+  VERSION = '0.3.5'
 end

data/lib/yeah/web/builder.rb

@@ -0,0 +1,93 @@
+require 'pathname'
+require 'fileutils'
+require 'erb'
+require 'opal'
+
+module Yeah
+module Web
+
+# `Web::Builder` builds a game into a standalone package that is playable
+# through a web browser. To build a game, enter `yeah build` in a command-line
+# within a game project.
+# @todo DRY internals with `Web::Server`.
+class Builder
+  # @return [nil]
+  # Build game in working directory.
+  def build
+    make_build_dirs
+    setup_compiler
+    compile
+
+    puts "Built game package to `build/web/`."
+  end
+
+  private
+
+  def make_build_dirs
+    # Make build directories.
+    FileUtils.mkpath 'build/web/assets/yeah/web'
+  end
+
+  def setup_compiler
+    @compiler = Opal::Environment.new
+
+    # Append standard library code paths.
+    $LOAD_PATH.each { |p| @compiler.append_path(p) }
+
+    # Append gem code paths.
+    @compiler.append_path gem_path.join('lib')
+    @compiler.append_path gem_path.join('opal')
+
+    # Append game code and asset paths.
+    @compiler.append_path 'assets'
+    @compiler.append_path 'code'
+  end
+
+  def compile
+    runner_path = Pathname.new(__FILE__).join('..', 'runner.html.erb')
+    html = ERB.new(File.read(runner_path)).result(binding)
+    File.write('build/web/runner.html', html)
+  end
+
+  def asset_include_tags
+    paths = Dir['assets/**/*'].select { |p| File.file? p }
+
+    paths.map do |path|
+      copy_asset(path)
+
+      case path
+      when /\.(ogg|wav|mp3)$/
+        "<audio src=\"./#{path}\"></audio>"
+      else
+        "<img src=\"./#{path}\" />"
+      end
+    end.join("\n")
+  end
+
+  def script_include_tag(path)
+    build_script(path)
+
+    "<script src=\"./assets/#{path}.js\"></script>"
+  end
+
+  def copy_asset(path)
+    destination_path = build_path.join(path)
+    FileUtils.mkpath(destination_path.join('..'))
+    FileUtils.cp(path, destination_path)
+  end
+
+  def build_script(path)
+    File.write(build_path.join("assets/#{path}.js"), @compiler[path].to_s)
+  end
+
+  def build_path
+    @build_path ||= Pathname.new("build/web")
+  end
+
+  def gem_path
+    @gem_path ||= Pathname.new(__FILE__).join('..', '..', '..', '..')
+  end
+end
+
+end
+end

data/lib/yeah/web/runner.html.erb

@@ -47,15 +47,15 @@
   <canvas></canvas>
 
   <div class="hidden">
-    <%= @server.asset_include_tags %>
+    <%= asset_include_tags %>
   </div>
 
-  <%= javascript_include_tag 'yeah/web/dependencies' %>
-  <%= javascript_include_tag 'yeah/web' %>
-  <%= javascript_include_tag 'yeah/web/setup' %>
+  <%= script_include_tag 'yeah/web/dependencies' %>
+  <%= script_include_tag 'yeah/web' %>
+  <%= script_include_tag 'yeah/web/setup' %>
 
-  <%= javascript_include_tag 'code' %>
+  <%= script_include_tag 'game' %>
 
-  <%= javascript_include_tag 'yeah/web/start' %>
+  <%= script_include_tag 'yeah/web/start' %>
 </body>
 </html>

data/lib/yeah/web/server.rb

@@ -1,60 +1,85 @@
 require 'pathname'
+require 'erb'
 require 'rack'
 require 'opal'
 
 module Yeah
 module Web
 
-# The `Web::Server` serves a game over the Internet. It can be started easily
-# by entering `yeah serve` in a command-line within a game project.
+# The `Web::Server` serves a game over the web. To serve a game, enter
+# `yeah serve` in a command-line within a game project.
 class Server
   # @param [Integer] port to serve game over
-  # Start serving the game.
-  def start(port = 1234)
-    Rack::Server.start(app: Application.new, Port: port)
-  end
+  # @return [nil]
+  # Serve game in working directory.
+  def serve(port = 1234)
+    runner = Runner.new
 
-  private
+    assets = Opal::Environment.new
 
-  # For internal usage.
-  # @see Yeah::Web::Server
-  class Application < Opal::Server
-    def initialize
-      @index_path = gem_path.join('lib', 'yeah', 'web', 'runner.html.erb').to_s
+    # Append standard library code paths.
+    $LOAD_PATH.each { |p| assets.append_path(p) }
 
-      super
+    # Append gem code paths.
+    assets.append_path gem_path.join('lib')
+    assets.append_path gem_path.join('opal')
 
-      # Append stdlib paths
-      $LOAD_PATH.each { |p| append_path(p) }
+    # Append game code and asset paths.
+    assets.append_path 'assets'
+    assets.append_path 'code'
 
-      # Append Yeah paths
-      append_path gem_path.join('lib')
-      append_path gem_path.join('opal')
+    application = Rack::Builder.new do
+      use Rack::Deflater
 
-      # Append game (working directory) paths
-      append_path 'assets'
-      append_path 'code'
+      map '/' do
+        run runner
+      end
+
+      map '/assets' do
+        run assets
+      end
     end
 
+    Rack::Server.start(app: application, Port: port)
+  end
+
+  private
+
+  def gem_path
+    @gem_path ||= Pathname.new(__FILE__).join('..', '..', '..', '..')
+  end
+
+  # `Web::Runner` is a Rack app that provides the runner webpage for
+  # `Web::Server`.
+  # @see Yeah::Web::Server
+  class Runner
+    def call(environment)
+      runner_path = Pathname.new(__FILE__).join('..', 'runner.html.erb')
+      html = ERB.new(File.read(runner_path)).result(binding)
+
+      [200, {'Content-Type' => 'text/html'}, [html]]
+    end
+
+    private
+
     def asset_include_tags
       paths = Dir['assets/**/*'].select { |p| File.file? p }
 
       paths.map do |path|
         case path
         when /\.(ogg|wav|mp3)$/
-          "<audio src=\"#{path}\"></audio>"
+          "<audio src=\"/#{path}\"></audio>"
         else
-          "<img src=\"#{path}\" />"
+          "<img src=\"/#{path}\" />"
         end
       end.join("\n")
     end
 
-    private
-
-    def gem_path
-      @gem_path ||= Pathname.new(__FILE__).join('..', '..', '..', '..')
+    def script_include_tag(path)
+      "<script src=\"/assets/#{path}.js\"></script>"
     end
   end
 end
+
 end
 end

data/opal/yeah/web/asset.opal

@@ -3,6 +3,8 @@ module Web
 class Asset
   ASSETS_PATH = "./assets"
 
+  attr_reader :path
+
   class << self
     def [](*args)
       new(*args)
@@ -10,28 +12,13 @@ class Asset
   end
 
   def initialize(path)
-    setup_native
-
-    self.path = path
-  end
-
-  def path
-    `#@native.src`.sub(/.*:\/\/.*#{ASSETS_PATH}\//i, '')
-  end
-  def path=(val)
-    # TODO: use Pathname#join if it is implemented in Opal
-    full_path = "#{ASSETS_PATH}/#{val}"
-    `#@native.src = #{full_path};`
-  end
-
-  def to_n
-    @native
+    @path = path
   end
 
   private
 
-  def setup_native
-    raise NotImplementedError
+  def full_path
+    "#{ASSETS_PATH}/#{@path}"
   end
 end
 end

data/opal/yeah/web/image.opal

@@ -1,6 +1,15 @@
 module Yeah
 module Web
 class Image < Asset
+  def initialize(path)
+    super
+
+    %x{
+      #@native = new Image();
+      #@native.src = #{full_path};
+    }
+  end
+
   def size
     V[`#@native.width`, `#@native.height`]
   end
@@ -13,10 +22,8 @@ class Image < Asset
     `#@native.height`
   end
 
-  private
-
-  def setup_native
-   `#@native = new Image();`
+  def to_n
+    @native
   end
 end
 end

data/opal/yeah/web/sound.opal

@@ -1,18 +1,49 @@
 module Yeah
 module Web
 class Sound < Asset
-  def play
-    `#@native.play()`
-  end
+  `window.AudioContext = window.AudioContext || window.webkitAudioContext`
+  CONTEXT = `new AudioContext()`
+
+  def initialize(path)
+    super
+
+    @sources = []
+
+    %x{
+      var request = new XMLHttpRequest();
+      request.open('GET', #{full_path}, true);
+      request.responseType = 'arraybuffer';
+
+      request.onload = function() {
+        #{CONTEXT}.decodeAudioData(request.response, function(buffer) {
+          #@buffer = buffer;
+        });
+      }
 
-  def pause
-    `#@native.pause()`
+      request.send();
+    }
   end
 
-  private
+  def play
+    return unless @buffer
+
+    %x{
+      var source = #{CONTEXT}.createBufferSource();
+      source.buffer = #@buffer;
+      source.connect(#{CONTEXT}.destination);
+
+      #{@sources << `source`}
+
+      source.onended = function() {
+        #{@sources.shift}
+      }
+
+      source.start(0);
+    }
+  end
 
-  def setup_native
-   ` #@native = new Audio()`
+  def stop
+    @sources.each { |s| `try { #{s}.stop(0) } catch(e) {}`; nil }
   end
 end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yeah
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Artur Ostrega
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-22 00:00:00.000000000 Z
+date: 2014-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -101,7 +101,6 @@ files:
 - lib/yeah/_platform/sound.rb
 - lib/yeah/_platform/ticker.rb
 - lib/yeah/_template/Gemfile
-- lib/yeah/_template/code/code.rb
 - lib/yeah/_template/code/game.rb
 - lib/yeah/_web.rb
 - lib/yeah/color.rb
@@ -109,6 +108,7 @@ files:
 - lib/yeah/game.rb
 - lib/yeah/vector.rb
 - lib/yeah/version.rb
+- lib/yeah/web/builder.rb
 - lib/yeah/web/dependencies.rb
 - lib/yeah/web/runner.html.erb
 - lib/yeah/web/server.rb

data/lib/yeah/_template/code/code.rb

@@ -1,4 +0,0 @@
-# Entry point
-# Specify dependencies and game code require order here.
-
-require 'game'