opal 0.4.0 → 0.4.1

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.4.1 2013-06-16
+
+*   Move sprockets logic out to external opal-sprockets gem. That now
+    handles the compiling and loading of opal files in sprockets.
+
 ## 0.4.0 2013-06-15
 
 *   Added fragments to parser. All parser methods now generate one or

data/Gemfile

@@ -1,3 +1,2 @@
 source 'https://rubygems.org'
-
 gemspec

data/Rakefile

@@ -3,6 +3,7 @@ Bundler.require
 
 require 'rack'
 require 'webrick'
+require 'opal-sprockets'
 
 class RunSpec
   def initialize(file=nil)

data/lib/opal.rb

@@ -1,6 +1,4 @@
 require 'opal/parser'
-require 'opal/processor'
-require 'opal/server'
 require 'opal/version'
 
 # Opal is a ruby to javascript compiler, with a runtime for running

data/lib/opal/version.rb

@@ -1,3 +1,3 @@
 module Opal
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/opal.gemspec

@@ -14,11 +14,11 @@ Gem::Specification.new do |s|
   s.test_files     = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths  = ['lib']
 
-  s.add_dependency 'rake'
-  s.add_dependency 'racc'
-  s.add_dependency 'sprockets'
   s.add_dependency 'source_map'
 
   s.add_development_dependency 'mspec', '1.5.18'
   s.add_development_dependency 'uglifier'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'racc'
+  s.add_development_dependency 'opal-sprockets', '~> 0.1.0'
 end

data/opal/opal.rb

@@ -1,23 +1,23 @@
-require 'opal/runtime'
-require 'opal/class'
-require 'opal/basic_object'
-require 'opal/kernel'
-require 'opal/nil_class'
-require 'opal/boolean'
-require 'opal/error'
-require 'opal/regexp'
-require 'opal/comparable'
-require 'opal/enumerable'
-require 'opal/enumerator'
-require 'opal/array'
-require 'opal/hash'
-require 'opal/string'
-require 'opal/numeric'
-require 'opal/proc'
-require 'opal/range'
-require 'opal/time'
-require 'opal/json'
-require 'opal/native'
+#= require 'opal/runtime'
+#= require 'opal/class'
+#= require 'opal/basic_object'
+#= require 'opal/kernel'
+#= require 'opal/nil_class'
+#= require 'opal/boolean'
+#= require 'opal/error'
+#= require 'opal/regexp'
+#= require 'opal/comparable'
+#= require 'opal/enumerable'
+#= require 'opal/enumerator'
+#= require 'opal/array'
+#= require 'opal/hash'
+#= require 'opal/string'
+#= require 'opal/numeric'
+#= require 'opal/proc'
+#= require 'opal/range'
+#= require 'opal/time'
+#= require 'opal/json'
+#= require 'opal/native'
 
 # regexp matches
 $& = $~ = $` = $' = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opal
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-15 00:00:00.000000000 Z
+date: 2013-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: source_map
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -28,30 +28,30 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: racc
+  name: mspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: 1.5.18
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.18
 - !ruby/object:Gem::Dependency
-  name: sprockets
+  name: uglifier
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -60,14 +60,14 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: source_map
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -76,37 +76,37 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mspec
+  name: racc
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.18
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.18
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: uglifier
+  name: opal-sprockets
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
 description: Ruby runtime and core library for javascript.
 email: adam.beynon@gmail.com
 executables: []
@@ -147,11 +147,7 @@ files:
 - lib/opal/lexer.rb
 - lib/opal/lexer_scope.rb
 - lib/opal/parser.rb
-- lib/opal/processor.rb
-- lib/opal/server.rb
 - lib/opal/source_map.rb
-- lib/opal/sprockets_parser.rb
-- lib/opal/sprockets_source_map_header.rb
 - lib/opal/target_scope.rb
 - lib/opal/version.rb
 - opal.gemspec

data/lib/opal/processor.rb

@@ -1,83 +0,0 @@
-require 'sprockets'
-require 'opal/sprockets_parser'
-
-module Opal
-  # Proccess using Sprockets
-  #
-  #   Opal.process('opal-jquery')   # => String
-  def self.process asset
-    Environment.new[asset].to_s
-  end
-
-  # The Processor class is used to make ruby files (with rb or opal extensions)
-  # available to any sprockets based server. Processor will then get passed any
-  # ruby source file to build. There are some options you can override globally
-  # which effect how certain ruby features are handled:
-  #
-  #   * method_missing_enabled      [true by default]
-  #   * optimized_operators_enabled [true by default]
-  #   * arity_check_enabled         [false by default]
-  #   * const_missing_enabled       [true by default]
-  #   * dynamic_require_severity    [true by default]
-  #   * source_map_enabled          [true by default]
-  #   * irb_enabled                 [false by default]
-  #
-  class Processor < Tilt::Template
-    self.default_mime_type = 'application/javascript'
-
-    def self.engine_initialized?
-      true
-    end
-
-    class << self
-      attr_accessor :method_missing_enabled
-      attr_accessor :optimized_operators_enabled
-      attr_accessor :arity_check_enabled
-      attr_accessor :const_missing_enabled
-      attr_accessor :dynamic_require_severity
-      attr_accessor :source_map_enabled
-      attr_accessor :irb_enabled
-    end
-
-    self.method_missing_enabled      = true
-    self.optimized_operators_enabled = true
-    self.arity_check_enabled         = false
-    self.const_missing_enabled       = true
-    self.dynamic_require_severity    = :error # :error, :warning or :ignore
-    self.source_map_enabled          = true
-    self.irb_enabled                 = false
-
-    def initialize_engine
-      require_template_library 'opal'
-    end
-
-    def prepare
-    end
-
-    def evaluate(context, locals, &block)
-      options = {
-        :method_missing           => self.class.method_missing_enabled,
-        :optimized_operators      => self.class.optimized_operators_enabled,
-        :arity_check              => self.class.arity_check_enabled,
-        :const_missing            => self.class.const_missing_enabled,
-        :dynamic_require_severity => self.class.dynamic_require_severity,
-        :source_map_enabled       => self.class.source_map_enabled,
-        :irb                      => self.class.irb_enabled,
-        :file                     => context.logical_path,
-        :source_file              => context.pathname.to_s,
-      }
-
-      parser = Opal::SprocketsParser.new
-      result = parser.parse data, options
-
-      parser.requires.each { |r| context.require_asset r }
-      result
-    end
-  end
-end
-
-Tilt.register 'rb',               Opal::Processor
-Sprockets.register_engine '.rb',  Opal::Processor
-
-Tilt.register 'opal',               Opal::Processor
-Sprockets.register_engine '.opal',  Opal::Processor

data/lib/opal/server.rb

@@ -1,150 +0,0 @@
-require 'erb'
-require 'rack'
-require 'rack/showexceptions'
-require 'opal/sprockets_source_map_header'
-require 'opal/source_map'
-
-module Opal
-  class Environment < ::Sprockets::Environment
-    def initialize *args
-      super
-      Opal.paths.each { |p| append_path p }
-    end
-
-    def use_gem gem_name
-      append_path File.join(Gem::Specification.find_by_name(gem_name).gem_dir, 'lib')
-    end
-  end
-
-  class SourceMapServer
-    def initialize sprockets
-      @sprockets = sprockets
-    end
-
-    attr_reader :sprockets
-
-    attr_writer :prefix
-
-    def prefix
-      @prefix ||= '/__opal_source_maps__'
-    end
-
-    def inspect
-      "#<#{self.class}:#{object_id}>"
-    end
-
-    def call(env)
-      path   = env['PATH_INFO'].gsub(/^\/|\.js\.map$/, '')
-      asset  = sprockets[path]
-      return [404, {}, []] if asset.nil?
-
-      source = asset.to_s
-      map    = Opal::SourceMap.new(source, asset.pathname.to_s)
-
-      return [200, {"Content-Type" => "text/json"}, [map.to_s]]
-    end
-  end
-
-  class Server
-
-    attr_accessor :debug, :index_path, :main, :public_dir, :sprockets
-
-    def initialize debug = true
-      @public_dir = '.'
-      @sprockets  = Environment.new
-      @debug      = debug
-
-      yield self if block_given?
-      create_app
-    end
-
-    def append_path path
-      @sprockets.append_path path
-    end
-
-    def use_gem gem_name
-      @sprockets.use_gem gem_name
-    end
-
-    def create_app
-      server, sprockets = self, @sprockets
-
-      @app = Rack::Builder.app do
-        use Rack::ShowExceptions
-        map('/assets') { run sprockets }
-        map(server.source_maps.prefix) { run server.source_maps }
-        use Index, server
-        run Rack::Directory.new(server.public_dir)
-      end
-    end
-
-    def source_maps
-      @source_maps ||= SourceMapServer.new(@sprockets)
-    end
-
-    def call(env)
-      @app.call env
-    end
-
-    class Index
-
-      def initialize(app, server)
-        @app = app
-        @server = server
-        @index_path = server.index_path
-      end
-
-      def call(env)
-        if %w[/ /index.html].include? env['PATH_INFO']
-          [200, { 'Content-Type' => 'text/html' }, [html]]
-        else
-          @app.call env
-        end
-      end
-
-      # Returns the html content for the root path. Supports ERB
-      def html
-        source = if @index_path
-          raise "index does not exist: #{@index_path}" unless File.exist?(@index_path)
-          File.read @index_path
-        elsif File.exist? 'index.html'
-          File.read 'index.html'
-        elsif File.exist? 'index.html.erb'
-          File.read 'index.html.erb'
-        else
-          SOURCE
-        end
-
-        ::ERB.new(source).result binding
-      end
-
-      def javascript_include_tag source
-        if @server.debug
-          assets = @server.sprockets[source].to_a
-
-          raise "Cannot find asset: #{source}" if assets.empty?
-
-          scripts = assets.map do |a|
-            %Q{<script src="/assets/#{ a.logical_path }?body=1"></script>}
-          end
-
-          scripts.join "\n"
-        else
-          "<script src=\"/assets/#{source}.js\"></script>"
-        end
-      end
-
-      SOURCE = <<-HTML
-  <!DOCTYPE html>
-  <html>
-  <head>
-    <title>Opal Server</title>
-  </head>
-  <body>
-    <%= javascript_include_tag @server.main %>
-  </body>
-  </html>
-      HTML
-    end
-  end
-end

data/lib/opal/sprockets_parser.rb

@@ -1,77 +0,0 @@
-require 'opal/parser'
-
-module Opal
-  class SprocketsParser < Parser
-
-    def self.parse source, options = {}
-      self.new.parse source, options
-    end
-
-    # Holds an array of paths which this file 'requires'.
-    # @return Array<String>
-    attr_reader :requires
-
-    def parse source, options = {}
-      @requires = []
-      @dynamic_require_severity = (options[:dynamic_require_severity] || :error)
-      super source, options
-    end
-
-    def process_call sexp, level
-      if sexp[1] == :require
-        return handle_require sexp[2][1]
-      end
-
-      super sexp, level
-    end
-
-    def handle_require(sexp)
-      str = handle_require_sexp sexp
-      @requires << str unless str.nil? if @requires
-      fragment("", sexp)
-    end
-
-    def handle_require_sexp(sexp)
-      type = sexp.shift
-
-      if type == :str
-        return sexp[0]
-      elsif type == :call
-        recv, meth, args = sexp
-        parts = args[1..-1].map { |s| handle_require_sexp s }
-
-        if recv == [:const, :File]
-          if meth == :expand_path
-            return handle_expand_path(*parts)
-          elsif meth == :join
-            return handle_expand_path parts.join("/")
-          elsif meth == :dirname
-            return handle_expand_path parts[0].split("/")[0...-1].join("/")
-          end
-        end
-      end
-
-
-      case @dynamic_require_severity
-      when :error
-        error "Cannot handle dynamic require"
-      when :warning
-        warning "Cannot handle dynamic require"
-      end
-    end
-
-    def handle_expand_path(path, base = '')
-      "#{base}/#{path}".split("/").inject([]) do |p, part|
-        if part == ''
-          # we had '//', so ignore
-        elsif part == '..'
-          p.pop
-        else
-          p << part
-        end
-
-        p
-      end.join "/"
-    end
-  end
-end

data/lib/opal/sprockets_source_map_header.rb

@@ -1,21 +0,0 @@
-require 'sprockets/server'
-
-module Sprockets
-  module Server
-
-    # Adds the source map header to all sprocket responses for assets
-    # with a .rb or .opal extension in the extension chain.
-    def headers_with_opal_source_maps(env, asset, length)
-      headers_without_opal_source_maps(env, asset, length).tap do |headers|
-        if asset.pathname.to_s =~ /\.(rb|opal)\b/
-          headers['X-SourceMap'] = '/__opal_source_maps__/'+asset.logical_path + '.map'
-        end
-      end
-    end
-
-    # Poor man's alias_method_chain :)
-    alias headers_without_opal_source_maps headers
-    alias headers headers_with_opal_source_maps
-
-  end
-end