RubyGems - opal-sprockets - Versions diffs - 0.1.1 → 0.2.0 - Mend

opal-sprockets 0.1.1 → 0.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (14) hide show

data/README.md +1 -2
data/example/Gemfile +4 -0
data/example/app/application.rb +4 -0
data/example/app/foo.rb +7 -0
data/example/config.ru +7 -0
data/example/index.html +10 -0
data/lib/opal/sprockets.rb +0 -1
data/lib/opal/sprockets/environment.rb +0 -1
data/lib/opal/sprockets/processor.rb +11 -4
data/lib/opal/sprockets/server.rb +1 -4
data/lib/opal/sprockets/version.rb +1 -1
data/opal-sprockets.gemspec +1 -1
metadata +9 -5
data/lib/opal/sprockets/parser.rb +0 -84

data/README.md CHANGED Viewed

@@ -1,4 +1,4 @@
-# opal-sprocets
+# opal-sprockets
 Adds sprockets support for Opal
@@ -25,4 +25,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.

data/example/Gemfile ADDED Viewed

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gem 'opal', :github => 'opal/opal'
+gem 'opal-sprockets', :path => '../'

data/example/app/application.rb ADDED Viewed

@@ -0,0 +1,4 @@
+require 'opal'
+require 'foo'
+puts "wow!"

data/example/app/foo.rb ADDED Viewed

@@ -0,0 +1,7 @@
+class Adam
+  def bar
+    raise "foo"
+  end
+end
+Adam.new.bar

data/example/config.ru ADDED Viewed

@@ -0,0 +1,7 @@
+require 'bundler'
+Bundler.require
+run Opal::Server.new { |s|
+  s.main = 'application'
+  s.append_path 'app'
+}

data/example/index.html ADDED Viewed

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>opal-sprockets demo</title>
+    <%= javascript_include_tag 'application' %>
+  </head>
+  <body>
+  </body>
+</html>

data/lib/opal/sprockets.rb CHANGED Viewed

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

data/lib/opal/sprockets/environment.rb CHANGED Viewed

@@ -20,4 +20,3 @@ module Opal
     end
   end
 end

data/lib/opal/sprockets/processor.rb CHANGED Viewed

@@ -1,5 +1,6 @@
 require 'sprockets'
-require 'opal/sprockets/parser'
+$OPAL_SOURCE_MAPS = {}
 module Opal
@@ -65,18 +66,24 @@ module Opal
         :source_map_enabled       => self.class.source_map_enabled,
         :irb                      => self.class.irb_enabled,
         :file                     => context.logical_path,
-        :source_file              => context.pathname.to_s,
+        :source_file              => context.pathname.to_s
       }
-      parser = Opal::SprocketsParser.new
+      parser = Opal::RequireParser.new
       result = parser.parse data, options
       parser.requires.each do |r|
         path = find_opal_require context.environment, r
         context.require_asset path
       end
-      result
+      if self.class.source_map_enabled
+        $OPAL_SOURCE_MAPS[context.pathname] = Opal::SourceMap.new(parser.fragments, "file://#{context.pathname.to_s}").to_s
+        "#{result}\n//@ sourceMappingURL=/__opal_source_maps__/#{context.logical_path}.js.map\n"
+      else
+        result
+      end
     end
     def find_opal_require(environment, r)

data/lib/opal/sprockets/server.rb CHANGED Viewed

@@ -30,10 +30,7 @@ module Opal
       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]]
+      return [200, {"Content-Type" => "text/json"}, [$OPAL_SOURCE_MAPS[asset.pathname].to_s]]
     end
   end

data/lib/opal/sprockets/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 module Opal
   module Sprockets
-    VERSION = '0.1.1'
+    VERSION = '0.2.0'
   end
 end

data/opal-sprockets.gemspec CHANGED Viewed

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.require_paths  = ['lib']
   s.add_dependency 'sprockets'
-  s.add_dependency 'opal', '~> 0.4.0'
+  s.add_dependency 'opal', '~> 0.4.4'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opal-sprockets
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-07-19 00:00:00.000000000 Z
+date: 2013-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -85,11 +85,15 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- example/Gemfile
+- example/app/application.rb
+- example/app/foo.rb
+- example/config.ru
+- example/index.html
 - lib/opal-sprockets.rb
 - lib/opal/sprockets.rb
 - lib/opal/sprockets/environment.rb
 - lib/opal/sprockets/erb.rb
-- lib/opal/sprockets/parser.rb
 - lib/opal/sprockets/processor.rb
 - lib/opal/sprockets/server.rb
 - lib/opal/sprockets/source_map_header.rb

data/lib/opal/sprockets/parser.rb DELETED Viewed

@@ -1,84 +0,0 @@
-require 'opal/parser'
-module Opal
-  # A subclass of Opal::Parser used exclusively by opal-sprockets to handle
-  # require statements automatically. We basically intercept any top level
-  # require statement, remove it from the code generation, and then pass it
-  # off to our sprockets context to handle it. This lets us use the ruby
-  # require syntax instead of having to use sprockets style comments.
-  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