sourcemap 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b4a81026175f484ceb522205f323e81f4a70557
-  data.tar.gz: ab163856d4087ae34952f1bc5a6d543789acdfa2
+  metadata.gz: d45b71f869e6eb34bf0c4307a3fce317e29eb35f
+  data.tar.gz: cc38f062d61b03058b367fd1fd43108c75897dcd
 SHA512:
-  metadata.gz: 79a8c966756ef258e67acebd246ce3f10f340428785b502387161599406dc7cacb183fec9e546b59ad34b30248fa6a01371e42f1750b24500c1673ae3fad022a
-  data.tar.gz: 370b5fb6762a23d60419a38651cf6f9166a51d08b43091e57a61020821b1d52680a896a7e1e1ef4cc24f6cb15c67d7fe66a34de13c6bb4813be40a859bbc3399
+  metadata.gz: a9c182c120450f8bcfe19a69c7b93b4898a19fb01f05f7773ff08943f79b9c3bb580eb2f35cf02ea2d6e1614d47a8610d0e21902675c570b46b46dbf9a32cae3
+  data.tar.gz: ba03b03caae7ea67c1a4dcce63572ae751d979b91c03ca6d0f601ad09762d7a23f0c6ac74941538c8d2327de98ede248e54c7fc855306a2b130799387091ba84

data/.gitignore

@@ -1 +1,3 @@
 Gemfile.lock
+.DS_Store
+pkg

data/.travis.yml

@@ -1,6 +1,8 @@
 rvm:
   - 1.9.3
   - 2.0.0
+  - jruby-19mode
+  - rbx-19mode
 
 notifications:
   email: false

data/README.md

@@ -34,7 +34,7 @@ Base one source map of another.
 ``` ruby
 cs_map = SourceMap::Map.from_json File.read("examples/index.map")
 min_map = SourceMap::Map.from_json File.read("examples/index.min.map")
-combined_map = cs_map + min_map
+combined_map = cs_map | min_map
 combined_map.to_json
 ```
 
@@ -64,7 +64,6 @@ Create a new `Map` instance from a hash.
     hash = {
       'version'   => 3,
       'file'      => "script.min.js",
-      'lineCount' => 1,
       'mappings'  => "AAEAA,QAASA,MAAK,EAAG,CACfC,OAAAC,IAAA,CAAY,eAAZ,CADe",
       'sources'   => ["script.js"],
       'names'     => ["hello", "console", "log"]
@@ -81,10 +80,6 @@ Instantiate a `Map` instance, passing in an optional array of `Mapping`s and fil
       SourceMap::Mapping.new('c.js', SourceMap::Offset.new(2, 0), SourceMap::Offset.new(30, 0))
     ])
 
-### Map#line_count
-
-Returns the line number of the last mapping.
-
 ### Map#size
 
 Returns the amount of mappings
@@ -170,4 +165,4 @@ Compare the position of two offsets, first the line than the column.
 
 ## Offset#to_s
 
-Get a pretty representation of an offset.
+Get a pretty representation of an offset.

data/examples/foobar.map

@@ -1 +1 @@
-{"version":3,"file":null,"lineCount":74,"mappings":";AACA;CAAA,KAAA,gDAAA;KAAA,aAAA;;CAAA,CAAA,CAAW,GAAX;;CAAA,CACA,CAAW,CADX,IACA;;CAGA,CAAA,EAAgB,IAAhB;AAAU,CAAV,CAAA,CAAS,CAAT,EAAA;IAJA;;CAAA,CAOA,CAAS,GAAT,GAAU;CAAM,EAAI,QAAJ;CAPhB,EAOS;;CAPT,CAUA,CAAO,CAAP;;CAVA,CAaA,CACE,CADF;CACE,CAAQ,EAAR;CAAA,CACQ,EAAR,EAAA;CADA,CAEQ,CAAA,CAAR,KAAS;CAAM,EAAI,GAAA,OAAJ;CAFf,IAEQ;CAhBV,GAAA;;CAAA,CAmBA,CAAO,CAAP,KAAO;CACL,OAAA,OAAA;CAAA,CADc,EAAR,mDACN;CAAM,CAAQ,GAAd,CAAA,CAAA,IAAA;CApBF,EAmBO;;CAIP,CAAA,EAAsB,0CAAtB;CAAA,GAAA,CAAA,OAAA;IAvBA;;CAAA,CA0BA,GAAA;;AAAS,CAAA;UAAA,iCAAA;sBAAA;CAAA,EAAA,CAAI;CAAJ;;CA1BT;CAAA;;;ACAA;CAAA,KAAA,6DAAA;;CAAA;CAAA,MAAA,oCAAA;qBAAA;CAAA,EAAA,CAAA;CAAA,EAAA;;CAAA,CAGA,CAAU,GAAA,CAAV,CAAU,EAAA;;AACV,CAAA,MAAA,iDAAA;uBAAA;CAAA,CAAY,CAAH,CAAT;CAAA,EAJA;;CAAA,CAOA,CAAQ,EAAR,IAAQ,CAAA,CAAA;;AACR,CAAA,MAAA,uCAAA;sBAAA;IAAgC,CAAU;CAA1C,EAAA,CAAA,EAAA;MAAA;CAAA,EARA;CAAA;","sources":["foo.coffee","bar.coffee"],"names":[]}
+{"version":3,"file":null,"mappings":";AACA;CAAA,KAAA,gDAAA;KAAA,aAAA;;CAAA,CAAA,CAAW,GAAX;;CAAA,CACA,CAAW,CADX,IACA;;CAGA,CAAA,EAAgB,IAAhB;AAAU,CAAV,CAAA,CAAS,CAAT,EAAA;IAJA;;CAAA,CAOA,CAAS,GAAT,GAAU;CAAM,EAAI,QAAJ;CAPhB,EAOS;;CAPT,CAUA,CAAO,CAAP;;CAVA,CAaA,CACE,CADF;CACE,CAAQ,EAAR;CAAA,CACQ,EAAR,EAAA;CADA,CAEQ,CAAA,CAAR,KAAS;CAAM,EAAI,GAAA,OAAJ;CAFf,IAEQ;CAhBV,GAAA;;CAAA,CAmBA,CAAO,CAAP,KAAO;CACL,OAAA,OAAA;CAAA,CADc,EAAR,mDACN;CAAM,CAAQ,GAAd,CAAA,CAAA,IAAA;CApBF,EAmBO;;CAIP,CAAA,EAAsB,0CAAtB;CAAA,GAAA,CAAA,OAAA;IAvBA;;CAAA,CA0BA,GAAA;;AAAS,CAAA;UAAA,iCAAA;sBAAA;CAAA,EAAA,CAAI;CAAJ;;CA1BT;CAAA;;;ACAA;CAAA,KAAA,6DAAA;;CAAA;CAAA,MAAA,oCAAA;qBAAA;CAAA,EAAA,CAAA;CAAA,EAAA;;CAAA,CAGA,CAAU,GAAA,CAAV,CAAU,EAAA;;AACV,CAAA,MAAA,iDAAA;uBAAA;CAAA,CAAY,CAAH,CAAT;CAAA,EAJA;;CAAA,CAOA,CAAQ,EAAR,IAAQ,CAAA,CAAA;;AACR,CAAA,MAAA,uCAAA;sBAAA;IAAgC,CAAU;CAA1C,EAAA,CAAA,EAAA;MAAA;CAAA,EARA;CAAA;","sources":["foo.coffee","bar.coffee"],"names":[]}

data/lib/source_map.rb

@@ -1,4 +1,5 @@
 require 'source_map/map'
+require 'source_map/mapping'
 require 'source_map/offset'
 require 'source_map/version'
 require 'source_map/vlq'

data/lib/source_map/map.rb

@@ -1,17 +1,10 @@
 require 'json'
 
 require 'source_map/offset'
+require 'source_map/mapping'
 require 'source_map/vlq'
 
 module SourceMap
-  Mapping = Struct.new(:source, :generated, :original, :name) do
-    def to_s
-      "#{generated.line}:#{generated.column}->#{original.line}:#{original.column}"
-    end
-
-    alias_method :inspect, :to_s
-  end
-
   class Map
     include Enumerable
 
@@ -81,10 +74,6 @@ module SourceMap
 
     attr_reader :filename
 
-    def line_count
-      @line_count ||= @mappings.any? ? @mappings.last.generated.line : 0
-    end
-
     def size
       @mappings.size
     end
@@ -109,19 +98,31 @@ module SourceMap
       @names ||= @mappings.map(&:name).uniq.compact
     end
 
+    def ==(other)
+      eql?(other)
+    end
+
+    def eql?(other)
+      other.is_a?(self.class) &&
+        self.mappings == other.mappings &&
+        self.filename == other.filename
+    end
+
     def +(other)
       mappings = @mappings.dup
-      offset   = line_count + 1
+      offset   = @mappings.any? ? @mappings.last.generated.line+1 : 0
       other.each do |m|
         mappings << Mapping.new(
           m.source, m.generated + offset,
           m.original, m.name
         )
       end
-      self.class.new(mappings)
+      self.class.new(mappings, other.filename)
     end
 
     def |(other)
+      return other.dup if self.mappings.empty?
+
       mappings = []
 
       other.each do |m|
@@ -161,14 +162,26 @@ module SourceMap
       {
         "version"   => 3,
         "file"      => filename,
-        "lineCount" => line_count,
         "mappings"  => to_s,
         "sources"   => sources,
         "names"     => names
       }
     end
 
+    # Public: Get a pretty inspect output for debugging purposes.
+    #
+    # Returns a String.
+    def inspect
+      str = "#<#{self.class}"
+      str << " filename=#{filename.inspect}" if filename
+      str << " mappings=#{mappings.map(&:to_s).inspect}" if mappings.any?
+      str << ">"
+      str
+    end
+
     protected
+      attr_reader :mappings
+
       def build_vlq_string
         source_id        = 0
         source_line      = 1
@@ -177,6 +190,9 @@ module SourceMap
 
         by_lines = @mappings.group_by { |m| m.generated.line }
 
+        sources_index = Hash[sources.each_with_index.to_a]
+        names_index   = Hash[names.each_with_index.to_a]
+
         ary = (1..by_lines.keys.max).map do |line|
           generated_column = 0
 
@@ -200,20 +216,5 @@ module SourceMap
 
         VLQ.encode_mappings(ary)
       end
-
-      def sources_index
-        @sources_index ||= build_index(sources)
-      end
-
-      def names_index
-        @names_index ||= build_index(names)
-      end
-
-    private
-      def build_index(array)
-        index = {}
-        array.each_with_index { |v, i| index[v] = i }
-        index
-      end
   end
 end

data/lib/source_map/mapping.rb

@@ -0,0 +1,26 @@
+require 'source_map/offset'
+
+module SourceMap
+  class Mapping < Struct.new(:source, :generated, :original, :name)
+    # Public: Get a simple string representation of the mapping.
+    #
+    # Returns a String.
+    def to_s
+      str = "#{generated.line}:#{generated.column}"
+      str << "->#{source}@#{original.line}:#{original.column}"
+      str << "##{name}" if name
+      str
+    end
+
+    # Public: Get a pretty inspect output for debugging purposes.
+    #
+    # Returns a String.
+    def inspect
+      str = "#<#{self.class} source=#{source.inspect}"
+      str << " generated=#{generated}, original=#{original}"
+      str << " name=#{name.inspect}" if name
+      str << ">"
+      str
+    end
+  end
+end

data/lib/source_map/offset.rb

@@ -71,7 +71,11 @@ module SourceMap
     #
     # Returns a String.
     def to_s
-      "#{line}:#{column}"
+      if column == 0
+        "#{line}"
+      else
+        "#{line}:#{column}"
+      end
     end
 
     # Public: Get a pretty inspect output for debugging purposes.

data/lib/source_map/version.rb

@@ -1,3 +1,3 @@
 module SourceMap
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/test/test_map.rb

@@ -1,7 +1,7 @@
 require 'minitest/autorun'
 require 'source_map/map'
 
-class TestMap < MiniTest::Unit::TestCase
+class TestMap < MiniTest::Test
   include SourceMap
 
   def setup
@@ -16,7 +16,6 @@ class TestMap < MiniTest::Unit::TestCase
     hash = {
       'version' => 3,
       'file' => "script.min.js",
-      'lineCount' => 1,
       'mappings' => "AAEAA,QAASA,MAAK,EAAG,CACfC,OAAAC,IAAA,CAAY,eAAZ,CADe",
       'sources' => ["script.js"],
       'names' => ["hello", "console", "log"]
@@ -39,10 +38,9 @@ class TestMap < MiniTest::Unit::TestCase
     assert_equal 'script.js', mapping.source
     assert_equal nil, mapping.name
 
-    assert_equal hash['lineCount'], map.line_count
-    assert_equal hash['sources'],   map.sources
-    assert_equal hash['names'],     map.names
-    assert_equal hash['mappings'],  map.to_s
+    assert_equal hash['sources'],  map.sources
+    assert_equal hash['names'],    map.names
+    assert_equal hash['mappings'], map.to_s
 
     assert_equal hash, map.as_json
   end
@@ -51,7 +49,6 @@ class TestMap < MiniTest::Unit::TestCase
     hash = {
       'version' => 3,
       'file' => "example.js",
-      'lineCount' => 43,
       'mappings' => ";;;;;EACAA;;EACAC;;EAGA;IAAA;;;EAGAC;IAAS;;;EAGTC;;EAGAC;IACE;IACA;IACA;MAAQ;;;;EAGVC;;;IACE;;;EAGF;IAAA;;;EAGAC;;;IAAQ;;MAAA",
       'sources' => ["example.coffee"],
       'names' => ["number", "opposite", "square", "list", "math", "race", "cubes"]
@@ -74,17 +71,15 @@ class TestMap < MiniTest::Unit::TestCase
     assert_equal 'example.coffee', mapping.source
     assert_equal nil, mapping.name
 
-    assert_equal hash['lineCount'], map.line_count
-    assert_equal hash['sources'],   map.sources
-    assert_equal hash['names'],     map.names
-    assert_equal hash['mappings'],  map.to_s
+    assert_equal hash['sources'],  map.sources
+    assert_equal hash['names'],    map.names
+    assert_equal hash['mappings'], map.to_s
   end
 
   def test_map3
     hash = {
       'version' => 3,
       'file' => "example.min.js",
-      'lineCount' => 1,
       'mappings' => "AACC,SAAQ,EAAG,CAAA,IACCA,CADD,CACOC,CADP,CACaC,CADb,CAC0CC,CAWpDA,EAAA,CAASA,QAAQ,CAACC,CAAD,CAAI,CACnB,MAAOA,EAAP,CAAWA,CADQ,CAIrBJ,EAAA,CAAO,CAAC,CAAD,CAAI,CAAJ,CAAO,CAAP,CAAU,CAAV,CAAa,CAAb,CAEPC,EAAA,CAAO,MACCI,IAAAC,KADD,QAEGH,CAFH,MAGCI,QAAQ,CAACH,CAAD,CAAI,CAChB,MAAOA,EAAP,CAAWD,CAAA,CAAOC,CAAP,CADK,CAHb,CAcc,YAArB,GAAI,MAAOI,MAAX,EAA8C,IAA9C,GAAoCA,KAApC,EACEC,KAAA,CAAM,YAAN,CAGO,UAAQ,EAAG,CAAA,IACdC,CADc,CACVC,CADU,CACJC,CACdA,EAAA,CAAW,EACNF,EAAA,CAAK,CAAV,KAAaC,CAAb,CAAoBX,CAAAa,OAApB,CAAiCH,CAAjC,CAAsCC,CAAtC,CAA4CD,CAAA,EAA5C,CACER,CACA,CADMF,CAAA,CAAKU,CAAL,CACN,CAAAE,CAAAE,KAAA,CAAcb,CAAAM,KAAA,CAAUL,CAAV,CAAd,CAEF,OAAOU,EAPW,CAAX,CAAA,EApCC,CAAX,CAAAG,KAAA,CA8CO,IA9CP",
       'sources' => ["example.js"],
       'names' => ["list","math","num","square","x","Math","sqrt","cube","elvis","alert","_i","_len","_results","length","push","call"]
@@ -107,14 +102,9 @@ class TestMap < MiniTest::Unit::TestCase
     assert_equal 'example.js', mapping.source
     assert_equal nil, mapping.name
 
-    assert_equal hash['lineCount'], map.line_count
-    assert_equal hash['sources'],   map.sources
-    assert_equal hash['names'],     map.names
-    assert_equal hash['mappings'],  map.to_s
-  end
-
-  def test_line_count
-    # assert_equal 3, @mappings.line_count
+    assert_equal hash['sources'],  map.sources
+    assert_equal hash['names'],    map.names
+    assert_equal hash['mappings'], map.to_s
   end
 
   def test_to_s
@@ -129,6 +119,40 @@ class TestMap < MiniTest::Unit::TestCase
     assert_equal [], @mappings.names
   end
 
+  def test_eql
+    map1 = @mappings
+    map2 = @mappings.dup
+    map3 = Map.new([
+      Mapping.new('a.js', Offset.new(0, 0), Offset.new(0, 0)),
+      Mapping.new('b.js', Offset.new(1, 0), Offset.new(20, 0)),
+      Mapping.new('c.js', Offset.new(2, 0), Offset.new(30, 0))
+    ])
+    map4 = Map.new
+    map5 = Map.new([
+      Mapping.new('a.js', Offset.new(0, 0), Offset.new(0, 0))
+    ])
+    map6 = Map.new([
+      Mapping.new('a.js', Offset.new(0, 0), Offset.new(0, 0)),
+      Mapping.new('b.js', Offset.new(1, 0), Offset.new(20, 0)),
+      Mapping.new('z.js', Offset.new(2, 0), Offset.new(30, 0))
+    ])
+    map7 = Map.new([
+      Mapping.new('a.js', Offset.new(0, 0), Offset.new(0, 0)),
+      Mapping.new('b.js', Offset.new(1, 0), Offset.new(20, 0)),
+      Mapping.new('c.js', Offset.new(2, 0), Offset.new(30, 0))
+    ], 'bar.js')
+
+    assert map1.eql?(map1)
+    assert map1.eql?(map2)
+    assert map1.eql?(map3)
+
+    refute map1.eql?(true)
+    refute map1.eql?(map4)
+    refute map1.eql?(map5)
+    refute map1.eql?(map6)
+    refute map1.eql?(map7)
+  end
+
   def test_add
     mappings2 = Map.new([
       Mapping.new('d.js', Offset.new(0, 0), Offset.new(0, 0))
@@ -140,6 +164,13 @@ class TestMap < MiniTest::Unit::TestCase
     assert_equal 3, mappings3[3].generated.line
   end
 
+  def test_add_identity
+    identity_map = Map.new
+
+    assert_equal @mappings, identity_map + @mappings
+    assert_equal @mappings, @mappings + identity_map
+  end
+
   def test_pipe
     mappings1 = Map.from_json(%{
       {
@@ -168,6 +199,12 @@ class TestMap < MiniTest::Unit::TestCase
     assert_equal 'CAAA,WAAA,GAAA,KAAA,MAAO,WAAA,MACL,OAAM,eAER,IAAW,KAAX,CAAG,SAHH,KAAA', mappings3.to_s
   end
 
+  def test_pipe_identity
+    identity_map = Map.new
+
+    assert_equal @mappings, identity_map | @mappings
+  end
+
   def test_bsearch
     assert_equal Offset.new(0, 0), @mappings.bsearch(Offset.new(0, 0)).original
     assert_equal Offset.new(0, 0), @mappings.bsearch(Offset.new(0, 5)).original
@@ -175,4 +212,8 @@ class TestMap < MiniTest::Unit::TestCase
     assert_equal Offset.new(20, 0), @mappings.bsearch(Offset.new(1, 0)).original
     assert_equal Offset.new(30, 0), @mappings.bsearch(Offset.new(2, 0)).original
   end
+
+  def test_inspect
+    assert_equal "#<SourceMap::Map mappings=[\"0:0->a.js@0:0\", \"1:0->b.js@20:0\", \"2:0->c.js@30:0\"]>", @mappings.inspect
+  end
 end

data/test/test_mapping.rb

@@ -0,0 +1,42 @@
+require 'minitest/autorun'
+require 'source_map/offset'
+
+class TestMapping < MiniTest::Test
+  include SourceMap
+
+  def setup
+    @mapping = Mapping.new("a.js", Offset.new(1, 5), Offset.new(2, 0), "foo")
+  end
+
+  def test_equal
+    assert @mapping.dup == @mapping
+    assert Mapping.new("b.js", Offset.new(1, 5), Offset.new(2, 0), "foo") != @mapping
+    assert Mapping.new("a.js", Offset.new(1, 5), Offset.new(2, 0), "bar") != @mapping
+    assert Mapping.new("a.js", Offset.new(1, 6), Offset.new(2, 0), "foo") != @mapping
+    assert Mapping.new("a.js", Offset.new(1, 5), Offset.new(3, 0), "foo") != @mapping
+  end
+
+  def test_source
+    assert_equal "a.js", @mapping.source
+  end
+
+  def test_generated
+    assert_equal Offset.new(1, 5), @mapping.generated
+  end
+
+  def test_original
+    assert_equal Offset.new(2, 0), @mapping.original
+  end
+
+  def test_name
+    assert_equal "foo", @mapping.name
+  end
+
+  def test_to_s
+    assert_equal "1:5->a.js@2:0#foo", @mapping.to_s
+  end
+
+  def test_inspect
+    assert_equal "#<SourceMap::Mapping source=\"a.js\" generated=1:5, original=2 name=\"foo\">", @mapping.inspect
+  end
+end

data/test/test_offset.rb

@@ -1,7 +1,7 @@
 require 'minitest/autorun'
 require 'source_map/offset'
 
-class TestOffset < MiniTest::Unit::TestCase
+class TestOffset < MiniTest::Test
   include SourceMap
 
   def setup
@@ -31,7 +31,9 @@ class TestOffset < MiniTest::Unit::TestCase
   end
 
   def test_to_s
-    assert_equal "1:5", @offset.to_s
+    assert_equal "0", Offset.new(0, 0).to_s
+    assert_equal "1", Offset.new(1, 0).to_s
+    assert_equal "1:5", Offset.new(1, 5).to_s
   end
 
   def test_inspect

data/test/test_vlq.rb

@@ -1,7 +1,7 @@
 require 'minitest/autorun'
 require 'source_map/vlq'
 
-class TestVLQ < MiniTest::Unit::TestCase
+class TestVLQ < MiniTest::Test
   include SourceMap
 
   TESTS = {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sourcemap
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Josh Peek
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-20 00:00:00.000000000 Z
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -79,12 +79,14 @@ files:
 - examples/foobar.map
 - lib/source_map.rb
 - lib/source_map/map.rb
+- lib/source_map/mapping.rb
 - lib/source_map/offset.rb
 - lib/source_map/version.rb
 - lib/source_map/vlq.rb
 - lib/sourcemap.rb
 - sourcemap.gemspec
 - test/test_map.rb
+- test/test_mapping.rb
 - test/test_offset.rb
 - test/test_vlq.rb
 homepage: http://github.com/maccman/sourcemap
@@ -113,5 +115,6 @@ specification_version: 4
 summary: Ruby source maps
 test_files:
 - test/test_map.rb
+- test/test_mapping.rb
 - test/test_offset.rb
 - test/test_vlq.rb