opal 0.7.0.beta2 → 0.7.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9bd47fb47cabeb742adca4e6b377de113225b60
-  data.tar.gz: 0dfa5e47116f8d56b3d1a2ff0b9473fa9b563b87
+  metadata.gz: 56f72a2aa585530e324d1024147329f90ac699ef
+  data.tar.gz: a75ca4d5fc0abc995d98d6e9884286986fe54666
 SHA512:
-  metadata.gz: 3965105a918d9cfded13bf9526cdda32b73caa31c4ae7e3760f36c205f5cdb1e359604e9d6e4a519d0687ea0b0eced908140b54ddf952b4c7036ef0d0736a2b9
-  data.tar.gz: 5764370dc015b931115ab0bdb7e61b1a6699b067179545fdea0d5dd86366929e58b391726ef4257e752d5ebd33d9e9bdb316fd4f09309ec0c3ce24d28225f1b3
+  metadata.gz: 2dd0158e79a73ea54fed5a02fe222606b8a4d45198c1338f3c17f902a30e37e19da3d8347d82256a2f8e70faeb31c04a6076bc16a630662c93d9c0d52b657cd7
+  data.tar.gz: f59534fa214044c4cb01096f722745db095b4c67dc4b1129b5ec70fe24d4e7653729e219847b62445281ca061f905a83a945f917b92825d43c42a1059a4be0d8

data/.travis.yml

@@ -25,12 +25,16 @@ matrix:
     - rvm: jruby
       env: RUN=rspec
 
+    - rvm: jruby-head
+      env: RUN=rspec
+
   allow_failures:
     - rvm: 1.8.7
     - rvm: 1.9.3
     - rvm: 2.0.0
     - rvm: rbx
     - rvm: jruby
+    - rvm: jruby-head
 
 
 before_install:

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## edge (upcoming 0.7)
 
+*   `String#to_proc` now uses `__send__` instead of `send` for calling
+    methods on receivers.
+
+*   Deprecated `Opal::Sprockets::Environment`. It can easily be replaced by `Opal::Server` or by appending `Opal.paths` to a `Sprockets::Environment`:
+
+        Sprockets::Environment.new.tap { |e| Opal.paths.each {|p| e.append_path(p)} }
+
 *   Add `Set` methods `#classify`, `#collect!`, `#map!`, `#subtract` `#replace`,
     `#difference` and `#eql?`
 

data/Rakefile

@@ -76,6 +76,7 @@ Example: rake dist DIR=cdn/opal/master
 DESC
 task :dist do
   require 'opal/util'
+  require 'opal/sprockets/environment'
 
   Opal::Processor.arity_check_enabled = false
   Opal::Processor.const_missing_enabled = false

data/benchmarks/prova.js.rb

@@ -0,0 +1,13 @@
+# 'asdf' =~ /(a)./
+#
+# p $'
+# p $1
+# p $2
+# `console.log(2, $opal.gvars['1'])`
+# b = $1
+# `console.log(1, b)`
+# nil
+
+puts [*1..3].to_s
+puts [*(1..3)].to_s
+puts [*Object.new].to_s

data/lib/mspec/opal/new.html.erb

@@ -0,0 +1 @@
+

data/lib/opal/sprockets.rb

@@ -1,4 +1,3 @@
-require 'opal/sprockets/environment'
 require 'opal/sprockets/processor'
 require 'opal/sprockets/erb'
 require 'opal/sprockets/server'

data/lib/opal/sprockets/environment.rb

@@ -19,6 +19,8 @@ module Opal
   # do this for you.
   class Environment < ::Sprockets::Environment
     def initialize *args
+      warn "WARNING: Opal::Sprockets::Environment is deprecated. "\
+           "Please use Opal::Server directly or append Opal.paths to the environment manually."
       super
       append_opal_paths
     end

data/lib/opal/sprockets/processor.rb

@@ -75,7 +75,7 @@ module Opal
 
       if self.class.source_map_enabled
         register_source_map(context.logical_path, result.source_map.to_s)
-        "#{result.to_s}\n//# sourceMappingURL=#{context.logical_path}.map\n"
+        "#{result.to_s}\n//# sourceMappingURL=#{File.basename(context.logical_path)}.map\n"
       else
         result.to_s
       end
@@ -104,7 +104,7 @@ module Opal
         :const_missing            => const_missing_enabled,
         :dynamic_require_severity => dynamic_require_severity,
         :irb                      => irb_enabled,
-        :inline_operators         => inline_operators_enabled
+        :inline_operators         => inline_operators_enabled,
       }
 
       path_reader = ::Opal::Sprockets::PathReader.new(context.environment, context)

data/lib/opal/sprockets/server.rb

@@ -6,7 +6,8 @@ require 'rack/deflater'
 require 'rack/directory'
 require 'rack/showexceptions'
 require 'opal/source_map'
-require 'opal/sprockets/environment'
+require 'sprockets'
+require 'sourcemap'
 require 'erb'
 
 module Opal
@@ -35,6 +36,9 @@ module Opal
 
         # "logical_name" of a BundledAsset keeps the .js extension
         source = register[asset.logical_path.sub(/\.js$/, '')]
+        map = JSON.parse(source)
+        map['sources'] = map['sources'].map {|s| "#{prefix}/#{s}"}
+        source = map.to_json
         return not_found(asset) if source.nil?
 
         return [200, {"Content-Type" => "text/json"}, [source.to_s]]
@@ -73,10 +77,12 @@ module Opal
       @use_index   = true
       @public_root = nil
       @public_urls = ['/']
-      @sprockets   = options.fetch(:sprockets, Environment.new)
+      @sprockets   = options.fetch(:sprockets, ::Sprockets::Environment.new)
       @debug       = options.fetch(:debug, true)
       @prefix      = options.fetch(:prefix, '/assets')
 
+      Opal.paths.each { |p| @sprockets.append_path(p) }
+
       yield self if block_given?
       create_app
     end

data/lib/opal/version.rb

@@ -1,3 +1,3 @@
 module Opal
-  VERSION = '0.7.0.beta2'
+  VERSION = '0.7.0.beta3'
 end

data/opal/corelib/enumerable.rb

@@ -16,7 +16,7 @@ module Enumerable
             result = false;
             return $breaker;
           }
-        }
+        };
       }
       else {
         self.$each.$$p = function(obj) {
@@ -24,7 +24,7 @@ module Enumerable
             result = false;
             return $breaker;
           }
-        }
+        };
       }
 
       self.$each();

data/opal/corelib/hash.rb

@@ -501,6 +501,44 @@ class Hash
     }
   end
 
+  `var hash_ids = null;`
+  def hash
+    %x{
+      var top = (hash_ids === null);
+      try {
+        var key, value,
+            hash = ['Hash'],
+            keys = self.keys,
+            id = self.$object_id(),
+            counter = 0;
+
+        if (top) {
+          hash_ids = {}
+        }
+
+        if (hash_ids.hasOwnProperty(id)) {
+          return 'self';
+        }
+
+        hash_ids[id] = true;
+
+        for (var i = 0, length = keys.length; i < length; i++) {
+          key   = keys[i];
+          value = key.$$is_string ? self.smap[key] : self.map[key.$hash()];
+          key   = key.$hash();
+          value = (typeof(value) === 'undefined') ? '' : value.$hash();
+          hash.push([key,value]);
+        }
+
+        return hash.sort().join();
+      } finally {
+        if (top) {
+          hash_ids = null;
+        }
+      }
+    }
+  end
+
   alias include? has_key?
 
   def index(object)
@@ -569,11 +607,12 @@ class Hash
     %x{
       var top = (inspect_ids === null);
       try {
-        var inspect = [],
+
+        var key, value,
+            inspect = [],
             keys = self.keys
-            _map = self.map,
-            smap = self.smap,
-            id = #{object_id};
+            id = self.$object_id(),
+            counter = 0;
 
         if (top) {
           inspect_ids = {}
@@ -586,12 +625,11 @@ class Hash
         inspect_ids[id] = true;
 
         for (var i = 0, length = keys.length; i < length; i++) {
-          var key = keys[i],
-              value = key.$$is_string ? smap[key] : _map[key.$hash()];
-
-          value = value;
-          key = key;
-          inspect.push(key.$inspect() + '=>' + value.$inspect());
+          key   = keys[i];
+          value = key.$$is_string ? self.smap[key] : self.map[key.$hash()];
+          key   = key.$inspect();
+          value = value.$inspect();
+          inspect.push(key + '=>' + value);
         }
 
         return '{' + inspect.join(', ') + '}';

data/opal/corelib/regexp.rb

@@ -4,7 +4,7 @@ class Regexp
   class << self
     def escape(string)
       %x{
-        return string.replace(/([-[\]/{}()*+?.^$\\| ])/g, '\\$1')
+        return string.replace(/([-[\]\/{}()*+?.^$\\| ])/g, '\\$1')
                      .replace(/[\n]/g, '\\n')
                      .replace(/[\r]/g, '\\r')
                      .replace(/[\f]/g, '\\f')

data/opal/corelib/string.rb

@@ -926,7 +926,7 @@ class String
     proc do |*args, &block|
       raise ArgumentError, "no receiver given" if args.empty?
       obj = args.shift
-      obj.send(sym, *args, &block)
+      obj.__send__(sym, *args, &block)
     end
   end
 

data/spec/filters/bugs/hash.rb

@@ -57,8 +57,8 @@ opal_filter "Hash" do
 
   fails "Hash#hash returns the same hash for recursive hashes through arrays"
   fails "Hash#hash returns the same hash for recursive hashes"
-  fails "Hash#hash generates a hash for recursive hash structures"
-  fails "Hash#hash returns a value which doesn't depend on the hash order"
+  # fails "Hash#hash generates a hash for recursive hash structures"
+  # fails "Hash#hash returns a value which doesn't depend on the hash order"
 
   fails "Hash#invert compares new keys with eql? semantics"
 

data/spec/lib/fixtures/source_map.rb

@@ -0,0 +1 @@
+puts 'smap!'

data/spec/lib/fixtures/source_map/subfolder/other_file.rb

@@ -0,0 +1 @@
+puts 'other!'

data/spec/lib/sprockets/path_reader_spec.rb

@@ -5,7 +5,7 @@ require 'opal/sprockets/path_reader'
 describe Opal::Sprockets::PathReader do
   subject(:path_reader) { described_class.new(env, context) }
 
-  let(:env) { Opal::Environment.new }
+  let(:env) { Sprockets::Environment.new.tap { |e| Opal.paths.each {|p| e.append_path(p)} } }
   let(:context) { double('context', depend_on: nil, depend_on_asset: nil) }
 
   let(:logical_path) { 'sprockets_file' }

data/spec/lib/sprockets/server_spec.rb

@@ -1,4 +1,5 @@
 require 'lib/spec_helper'
+require 'sourcemap'
 require 'rack/test'
 
 describe Opal::Server do
@@ -8,6 +9,7 @@ describe Opal::Server do
     described_class.new { |s|
       s.main = 'opal'
       s.debug = false
+      s.append_path File.expand_path('../../fixtures', __FILE__)
       s.sprockets.logger = Logger.new('/dev/null')
     }
   end
@@ -17,4 +19,50 @@ describe Opal::Server do
     expect(last_response).to be_ok
   end
 
+  describe 'source maps' do
+    it 'serves map on a top level file' do
+      get '/assets/source_map.js'
+      expect(last_response).to be_ok
+
+      get '/assets/source_map.map'
+      expect(last_response).to be_ok
+    end
+
+    it 'serves map on a subfolder file' do
+      js_path = '/assets/source_map/subfolder/other_file.js'
+      map_path = '/assets/source_map/subfolder/other_file.map'
+
+      get js_path
+
+      expect(last_response).to be_ok
+      received_map_path = extract_linked_map(last_response.body)
+      expect(File.expand_path(received_map_path, js_path+'/..')).to eq(map_path)
+
+      get '/assets/source_map/subfolder/other_file.map'
+      expect(last_response).to be_ok
+    end
+
+    it 'serves map on a subfolder file' do
+      js_path = '/assets/source_map/subfolder/other_file.js'
+      map_path = '/assets/source_map/subfolder/other_file.map'
+
+      get js_path
+
+      expect(last_response).to be_ok
+      received_map_path = extract_linked_map(last_response.body)
+      expect(File.expand_path(received_map_path, js_path+'/..')).to eq(map_path)
+
+
+      get '/assets/source_map/subfolder/other_file.map'
+      expect(last_response).to be_ok
+      map = ::SourceMap::Map.from_json(last_response.body)
+      expect(map.sources).to include('/assets/source_map/subfolder/other_file.rb')
+    end
+  end
+
+  def extract_linked_map(body)
+    source_map_comment_regexp = %r{//# sourceMappingURL=(.*)$}
+    expect(body).to match(source_map_comment_regexp)
+    body.scan(source_map_comment_regexp).first.first
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal
 version: !ruby/object:Gem::Version
-  version: 0.7.0.beta2
+  version: 0.7.0.beta3
 platform: ruby
 authors:
 - Adam Beynon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
+date: 2014-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sourcemap
@@ -209,6 +209,7 @@ files:
 - README.md
 - Rakefile
 - benchmarks/operators.rb
+- benchmarks/prova.js.rb
 - bin/opal
 - bin/opal-build
 - bin/opal-mspec
@@ -223,6 +224,7 @@ files:
 - examples/sinatra/app/application.rb
 - examples/sinatra/config.ru
 - lib/mspec/opal/main.rb.erb
+- lib/mspec/opal/new.html.erb
 - lib/mspec/opal/rake_task.rb
 - lib/mspec/opal/runner.rb
 - lib/mspec/opal/special_calls.rb
@@ -378,6 +380,8 @@ files:
 - spec/lib/fixtures/required_tree_test/required_file1.rb
 - spec/lib/fixtures/required_tree_test/required_file2.rb
 - spec/lib/fixtures/requires.rb
+- spec/lib/fixtures/source_map.rb
+- spec/lib/fixtures/source_map/subfolder/other_file.rb
 - spec/lib/fixtures/sprockets_file.js.rb
 - spec/lib/fixtures/sprockets_require_tree_test.rb
 - spec/lib/hike_path_finder_spec.rb
@@ -416,7 +420,6 @@ files:
 - spec/lib/shared/path_finder_shared.rb
 - spec/lib/shared/path_reader_shared.rb
 - spec/lib/spec_helper.rb
-- spec/lib/sprockets/environment_spec.rb
 - spec/lib/sprockets/erb_spec.rb
 - spec/lib/sprockets/path_reader_spec.rb
 - spec/lib/sprockets/processor_spec.rb
@@ -695,7 +698,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Ruby runtime and core library for javascript
@@ -751,6 +754,8 @@ test_files:
 - spec/lib/fixtures/required_tree_test/required_file1.rb
 - spec/lib/fixtures/required_tree_test/required_file2.rb
 - spec/lib/fixtures/requires.rb
+- spec/lib/fixtures/source_map.rb
+- spec/lib/fixtures/source_map/subfolder/other_file.rb
 - spec/lib/fixtures/sprockets_file.js.rb
 - spec/lib/fixtures/sprockets_require_tree_test.rb
 - spec/lib/hike_path_finder_spec.rb
@@ -789,7 +794,6 @@ test_files:
 - spec/lib/shared/path_finder_shared.rb
 - spec/lib/shared/path_reader_shared.rb
 - spec/lib/spec_helper.rb
-- spec/lib/sprockets/environment_spec.rb
 - spec/lib/sprockets/erb_spec.rb
 - spec/lib/sprockets/path_reader_spec.rb
 - spec/lib/sprockets/processor_spec.rb

data/spec/lib/sprockets/environment_spec.rb

@@ -1,30 +0,0 @@
-require 'lib/spec_helper'
-require 'opal/sprockets/environment'
-
-describe Opal::Environment do
-  let(:env) { described_class.new }
-  let(:logical_path) { 'sprockets_file' }
-
-  before { env.append_path File.expand_path('../../fixtures/', __FILE__) }
-
-  it 'compiles Ruby to JS' do
-    expect(env[logical_path].source).to include('$puts(')
-    expect(env[logical_path+'.js'].source).to include('$puts(')
-  end
-
-  describe 'require_tree sprockets directive' do
-    it 'is still supported' do
-      source = env['sprockets_require_tree_test'].source
-      expect(source).to include('required_file1')
-      expect(source).to include('required_file2')
-    end
-  end
-
-  describe 'require_tree helper' do
-    it 'is handled by the processor' do
-      source = env['require_tree_test'].source
-      expect(source).to include('required_file1')
-      expect(source).to include('required_file2')
-    end
-  end
-end