ruby2js 2.1.21 → 2.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fd198d03a42622d892e15287ba692ea3a0a461d
-  data.tar.gz: 860b7348d5983c7766d8f562ccd3bdc5830ca483
+  metadata.gz: cfd51a5b122b0cc53549b8fb3c44ae847f1183b6
+  data.tar.gz: befcb08dff3c11d5570fab15f3a2a462f01b442c
 SHA512:
-  metadata.gz: a64759da3a262e849a1450f2dd2328ea5e05caace6f825d93a54ff04221d85aaf7698d479b7d063d60798d2bd71605ed425cca5e9971b6546f76f4f4235f912e
-  data.tar.gz: eb3fd74024f204601a2732628460ced5b072331deaa149745ecf6ac285773ae39fd9f407e2a22693c2ce8d9a06c36591288b3a2aa25fd0815142a7206cd09dee
+  metadata.gz: 3894c89a49fd835b781c2187e0495950742895297d8f5d3e6987064a18ab3c795ea1fb9d4780d6ab042397f8f7bb97a9ed1170cf3ae90dd7f63ef42917bd57e2
+  data.tar.gz: fd8740c03765bf694e9099d35a42f896feea4714644c68a201c1532d5f55aee52674f7a79697938cd7d60ab20ce787ad8857ab93bfca89f00a3addfad9ea06d7

data/README.md

@@ -3,7 +3,7 @@ Ruby2js
 
 Minimal yet extensible Ruby to JavaScript conversion.  
 
-[![Build Status](https://travis-ci.org/rubys/ruby2js.svg)](https://travis-ci.org/rubys/ruby2js) 
+[![Build Status](https://travis-ci.org/rubys/ruby2js.svg)](https://travis-ci.org/rubys/ruby2js)
 [![Gem Version](https://badge.fury.io/rb/ruby2js.svg)](https://badge.fury.io/rb/ruby2js)
 
 Description
@@ -20,7 +20,7 @@ Ruby attribute accessors, methods defined with no parameters and no
 parenthesis, as well as setter method definitions, are
 mapped to
 [Object.defineProperty](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/defineProperty?redirectlocale=en-US&redirectslug=JavaScript%2FReference%2FGlobal_Objects%2FObject%2FdefineProperty),
-so avoid these if you wish to target users running IE8 or lower. 
+so avoid these if you wish to target users running IE8 or lower.
 
 Filters may be provided to add Ruby-specific or framework specific
 behavior.  Filters are essentially macro facilities that operate on
@@ -83,7 +83,7 @@ objects to handle this.  This is the approach that [Opal](http://opalrb.org/)
 takes.  It is a fine approach, with a number of benefits.  It also has some
 notable drawbacks.  For example,
 [readability](http://opalrb.org/try/#code:a%20%3D%20%22abc%22%3B%20puts%20a[-1])
-and 
+and
 [compatibility with other frameworks](https://github.com/opal/opal/issues/400).
 
 Another approach is to simply accept JavaScript semantics for what they are.
@@ -127,6 +127,7 @@ includes three such integrations:
 *  [CGI](https://github.com/rubys/ruby2js/blob/master/lib/ruby2js/cgi.rb)
 *  [Sinatra](https://github.com/rubys/ruby2js/blob/master/lib/ruby2js/sinatra.rb)
 *  [Rails](https://github.com/rubys/ruby2js/blob/master/lib/ruby2js/rails.rb)
+*  [Haml](https://github.com/rubys/ruby2js/blob/master/lib/ruby2js/haml.rb)
 
 As you might expect, CGI is a bit sluggish.  By contrast, Sinatra and Rails
 are quite speedy as the bulk of the time is spent on the initial load of the
@@ -201,7 +202,7 @@ the script.
     * `[/r/, n]` becomes `.match(/r/)[n]`
     * `"string" * length` becomes `new Array(length + 1).join("string")`
     * `.sub!` and `.gsub!` become equivalent `x = x.replace` statements
-    * `.map!`, `.reverse!`, and `.select` become equivalent 
+    * `.map!`, `.reverse!`, and `.select` become equivalent
       `.splice(0, .length, *.method())` statements
     * `@foo.call(args)` becomes `this._foo(args)`
     * `@@foo.call(args)` becomes `this.constructor._foo(args)`
@@ -309,7 +310,7 @@ the script.
     * `.zip()` becomes `_.zip()`
     * `(n...m)` becomes `_.range(n, m)`
     * `(n..m)` becomes `_.range(n, m+1)`
-    * `.compact!`, `.flatten!`, `shuffle!`, `reject!`, `sort_by!`, and 
+    * `.compact!`, `.flatten!`, `shuffle!`, `reject!`, `sort_by!`, and
       `.uniq` become equivalent `.splice(0, .length, *.method())` statements
     * for the following methods, if the block consists entirely of a simple
       expression (or ends with one), a `return` is added prior to the
@@ -344,7 +345,7 @@ the script.
     * maps constant assignments in an angular module to a filter
     * maps class definitions in an angular module to a filter
     * within a controller or within a `link` method in a directive:
-        * maps `apply`, `broadcast`, `digest`, `emit`, `eval`, `evalAsync`, and 
+        * maps `apply`, `broadcast`, `digest`, `emit`, `eval`, `evalAsync`, and
           `parent` calls to `$scope` functions.
         * maps `apply!`, `broadcast!`, `digest!`, `eval!`, and `evalAsync!`
           calls to `$rootScope` functions.
@@ -393,7 +394,7 @@ the script.
   use of the jquery filter.
 
 * [angularjs](https://github.com/rubys/wunderbar/blob/master/demo/angularjs.rb)
-  makes use of the angular filters to implement the 
+  makes use of the angular filters to implement the
   [angular.js tutorial](http://docs.angularjs.org/tutorial).  This demo
   includes:
     * [view](https://github.com/rubys/wunderbar/blob/master/demo/views/index._html)
@@ -404,7 +405,7 @@ Picking a Ruby to JS mapping tool
 ---
 
 > dsl — A domain specific language, where code is written in one language and
-> errors are given in another. 
+> errors are given in another.
 > -- [Devil’s Dictionary of Programming](http://programmingisterrible.com/post/65781074112/devils-dictionary-of-programming)
 
 If you simply want to get a job done, and would like a mature and tested

data/lib/ruby2js/converter/block.rb

@@ -15,23 +15,29 @@ module Ruby2JS
         call.children[1] == :step and
         [:irange, :erange].include? call.children.first.children.first.type
       then
-        # convert combinations of range, step and block to a for loop
-        var = args.children.first
-        expression = call.children.first.children.first
-        comp = (expression.type == :irange ? '<=' : '<')
-        put "for (var "; parse var; put " = "; parse expression.children.first
-        put "; "; parse var; 
-        if call.children[2].type == :int and call.children[2].children[0] < 0
-          put " #{comp.sub('<', '>')} "; parse expression.children.last
-          put "; "; parse var; put " -= "
-          parse s(:int, -call.children[2].children[0])
-        else
-          put " #{comp} "; parse expression.children.last
-          put "; "; parse var; put " += "; parse call.children[2]
+        begin
+          next_token, @next_token = @next_token, :continue
+
+          # convert combinations of range, step and block to a for loop
+          var = args.children.first
+          expression = call.children.first.children.first
+          comp = (expression.type == :irange ? '<=' : '<')
+          put "for (var "; parse var; put " = "; parse expression.children.first
+          put "; "; parse var; 
+          if call.children[2].type == :int and call.children[2].children[0] < 0
+            put " #{comp.sub('<', '>')} "; parse expression.children.last
+            put "; "; parse var; put " -= "
+            parse s(:int, -call.children[2].children[0])
+          else
+            put " #{comp} "; parse expression.children.last
+            put "; "; parse var; put " += "; parse call.children[2]
+          end
+          puts ") {"
+          scope block
+          sput "}"
+        ensure
+          @next_token = next_token
         end
-        puts ") {"
-        scope block
-        sput "}"
 
       elsif
         call.children[0] == nil and call.children[1] == :function and

data/lib/ruby2js/haml.rb

@@ -0,0 +1,27 @@
+# Example usage:
+#
+#   Add:
+#      gem 'ruby2js'
+# to your gemfile and bundle
+#  Add:
+#  require "ruby2js/haml"
+#   to any initializer ot config/application.rb
+#
+#  Use :ruby2js filter in your templates like
+#
+#  :ruby2js
+#    alert "Hello"
+#
+# (Note missing brackets: ruby syntax, js sematics)
+#
+require "haml"
+
+module Ruby2JS
+  module Haml::Ruby2JS
+    include Haml::Filters::Base
+    def render(text)
+      converted = Ruby2JS.convert(text).to_s
+      "<script type='text/javascript'>\n#{converted}\n</script>"
+    end
+  end
+end

data/lib/ruby2js/rails.rb

@@ -17,12 +17,13 @@ module Ruby2JS
   module Rails
     class Template
       cattr_accessor :default_format
-      self.default_format = Mime::JS
+      self.default_format = Mime[:js]
       def self.call(template)
-        "Ruby2JS.convert(#{template.source.inspect})"
+        "Ruby2JS.convert(#{template.source.inspect}).to_s"
       end
     end
 
     ActionView::Template.register_template_handler :rb, Template
   end
+
 end

data/lib/ruby2js/version.rb

@@ -2,7 +2,7 @@ module Ruby2JS
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 1
-    TINY  = 21
+    TINY  = 22
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/ruby2js.gemspec

@@ -1,17 +1,17 @@
 # -*- encoding: utf-8 -*-
-# stub: ruby2js 2.1.21 ruby lib
+# stub: ruby2js 2.1.22 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ruby2js".freeze
-  s.version = "2.1.21"
+  s.version = "2.1.22"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Sam Ruby".freeze]
-  s.date = "2017-10-11"
+  s.date = "2017-11-13"
   s.description = "    The base package maps Ruby syntax to JavaScript semantics.\n    Filters may be provided to add Ruby-specific or framework specific\n    behavior.\n".freeze
   s.email = "rubys@intertwingly.net".freeze
-  s.files = ["README.md".freeze, "lib/ruby2js".freeze, "lib/ruby2js.rb".freeze, "lib/ruby2js/cgi.rb".freeze, "lib/ruby2js/converter".freeze, "lib/ruby2js/converter.rb".freeze, "lib/ruby2js/converter/arg.rb".freeze, "lib/ruby2js/converter/args.rb".freeze, "lib/ruby2js/converter/array.rb".freeze, "lib/ruby2js/converter/begin.rb".freeze, "lib/ruby2js/converter/block.rb".freeze, "lib/ruby2js/converter/blockpass.rb".freeze, "lib/ruby2js/converter/boolean.rb".freeze, "lib/ruby2js/converter/break.rb".freeze, "lib/ruby2js/converter/case.rb".freeze, "lib/ruby2js/converter/casgn.rb".freeze, "lib/ruby2js/converter/class.rb".freeze, "lib/ruby2js/converter/const.rb".freeze, "lib/ruby2js/converter/cvar.rb".freeze, "lib/ruby2js/converter/cvasgn.rb".freeze, "lib/ruby2js/converter/def.rb".freeze, "lib/ruby2js/converter/defined.rb".freeze, "lib/ruby2js/converter/defs.rb".freeze, "lib/ruby2js/converter/dstr.rb".freeze, "lib/ruby2js/converter/for.rb".freeze, "lib/ruby2js/converter/hash.rb".freeze, "lib/ruby2js/converter/if.rb".freeze, "lib/ruby2js/converter/in.rb".freeze, "lib/ruby2js/converter/ivar.rb".freeze, "lib/ruby2js/converter/ivasgn.rb".freeze, "lib/ruby2js/converter/kwbegin.rb".freeze, "lib/ruby2js/converter/literal.rb".freeze, "lib/ruby2js/converter/logical.rb".freeze, "lib/ruby2js/converter/masgn.rb".freeze, "lib/ruby2js/converter/module.rb".freeze, "lib/ruby2js/converter/next.rb".freeze, "lib/ruby2js/converter/nil.rb".freeze, "lib/ruby2js/converter/nthref.rb".freeze, "lib/ruby2js/converter/opasgn.rb".freeze, "lib/ruby2js/converter/prototype.rb".freeze, "lib/ruby2js/converter/regexp.rb".freeze, "lib/ruby2js/converter/return.rb".freeze, "lib/ruby2js/converter/self.rb".freeze, "lib/ruby2js/converter/send.rb".freeze, "lib/ruby2js/converter/super.rb".freeze, "lib/ruby2js/converter/sym.rb".freeze, "lib/ruby2js/converter/undef.rb".freeze, "lib/ruby2js/converter/until.rb".freeze, "lib/ruby2js/converter/untilpost.rb".freeze, "lib/ruby2js/converter/var.rb".freeze, "lib/ruby2js/converter/vasgn.rb".freeze, "lib/ruby2js/converter/while.rb".freeze, "lib/ruby2js/converter/whilepost.rb".freeze, "lib/ruby2js/converter/xstr.rb".freeze, "lib/ruby2js/execjs.rb".freeze, "lib/ruby2js/filter".freeze, "lib/ruby2js/filter/angular-resource.rb".freeze, "lib/ruby2js/filter/angular-route.rb".freeze, "lib/ruby2js/filter/angularrb.rb".freeze, "lib/ruby2js/filter/camelCase.rb".freeze, "lib/ruby2js/filter/functions.rb".freeze, "lib/ruby2js/filter/jquery.rb".freeze, "lib/ruby2js/filter/minitest-jasmine.rb".freeze, "lib/ruby2js/filter/react.rb".freeze, "lib/ruby2js/filter/require.rb".freeze, "lib/ruby2js/filter/return.rb".freeze, "lib/ruby2js/filter/rubyjs.rb".freeze, "lib/ruby2js/filter/strict.rb".freeze, "lib/ruby2js/filter/underscore.rb".freeze, "lib/ruby2js/filter/vue.rb".freeze, "lib/ruby2js/rails.rb".freeze, "lib/ruby2js/serializer.rb".freeze, "lib/ruby2js/sinatra.rb".freeze, "lib/ruby2js/version.rb".freeze, "ruby2js.gemspec".freeze]
+  s.files = ["README.md".freeze, "lib/ruby2js".freeze, "lib/ruby2js.rb".freeze, "lib/ruby2js/cgi.rb".freeze, "lib/ruby2js/converter".freeze, "lib/ruby2js/converter.rb".freeze, "lib/ruby2js/converter/arg.rb".freeze, "lib/ruby2js/converter/args.rb".freeze, "lib/ruby2js/converter/array.rb".freeze, "lib/ruby2js/converter/begin.rb".freeze, "lib/ruby2js/converter/block.rb".freeze, "lib/ruby2js/converter/blockpass.rb".freeze, "lib/ruby2js/converter/boolean.rb".freeze, "lib/ruby2js/converter/break.rb".freeze, "lib/ruby2js/converter/case.rb".freeze, "lib/ruby2js/converter/casgn.rb".freeze, "lib/ruby2js/converter/class.rb".freeze, "lib/ruby2js/converter/const.rb".freeze, "lib/ruby2js/converter/cvar.rb".freeze, "lib/ruby2js/converter/cvasgn.rb".freeze, "lib/ruby2js/converter/def.rb".freeze, "lib/ruby2js/converter/defined.rb".freeze, "lib/ruby2js/converter/defs.rb".freeze, "lib/ruby2js/converter/dstr.rb".freeze, "lib/ruby2js/converter/for.rb".freeze, "lib/ruby2js/converter/hash.rb".freeze, "lib/ruby2js/converter/if.rb".freeze, "lib/ruby2js/converter/in.rb".freeze, "lib/ruby2js/converter/ivar.rb".freeze, "lib/ruby2js/converter/ivasgn.rb".freeze, "lib/ruby2js/converter/kwbegin.rb".freeze, "lib/ruby2js/converter/literal.rb".freeze, "lib/ruby2js/converter/logical.rb".freeze, "lib/ruby2js/converter/masgn.rb".freeze, "lib/ruby2js/converter/module.rb".freeze, "lib/ruby2js/converter/next.rb".freeze, "lib/ruby2js/converter/nil.rb".freeze, "lib/ruby2js/converter/nthref.rb".freeze, "lib/ruby2js/converter/opasgn.rb".freeze, "lib/ruby2js/converter/prototype.rb".freeze, "lib/ruby2js/converter/regexp.rb".freeze, "lib/ruby2js/converter/return.rb".freeze, "lib/ruby2js/converter/self.rb".freeze, "lib/ruby2js/converter/send.rb".freeze, "lib/ruby2js/converter/super.rb".freeze, "lib/ruby2js/converter/sym.rb".freeze, "lib/ruby2js/converter/undef.rb".freeze, "lib/ruby2js/converter/until.rb".freeze, "lib/ruby2js/converter/untilpost.rb".freeze, "lib/ruby2js/converter/var.rb".freeze, "lib/ruby2js/converter/vasgn.rb".freeze, "lib/ruby2js/converter/while.rb".freeze, "lib/ruby2js/converter/whilepost.rb".freeze, "lib/ruby2js/converter/xstr.rb".freeze, "lib/ruby2js/execjs.rb".freeze, "lib/ruby2js/filter".freeze, "lib/ruby2js/filter/angular-resource.rb".freeze, "lib/ruby2js/filter/angular-route.rb".freeze, "lib/ruby2js/filter/angularrb.rb".freeze, "lib/ruby2js/filter/camelCase.rb".freeze, "lib/ruby2js/filter/functions.rb".freeze, "lib/ruby2js/filter/jquery.rb".freeze, "lib/ruby2js/filter/minitest-jasmine.rb".freeze, "lib/ruby2js/filter/react.rb".freeze, "lib/ruby2js/filter/require.rb".freeze, "lib/ruby2js/filter/return.rb".freeze, "lib/ruby2js/filter/rubyjs.rb".freeze, "lib/ruby2js/filter/strict.rb".freeze, "lib/ruby2js/filter/underscore.rb".freeze, "lib/ruby2js/filter/vue.rb".freeze, "lib/ruby2js/haml.rb".freeze, "lib/ruby2js/rails.rb".freeze, "lib/ruby2js/serializer.rb".freeze, "lib/ruby2js/sinatra.rb".freeze, "lib/ruby2js/version.rb".freeze, "ruby2js.gemspec".freeze]
   s.homepage = "http://github.com/rubys/ruby2js".freeze
   s.licenses = ["MIT".freeze]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9.3".freeze)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby2js
 version: !ruby/object:Gem::Version
-  version: 2.1.21
+  version: 2.1.22
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-11 00:00:00.000000000 Z
+date: 2017-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -100,6 +100,7 @@ files:
 - lib/ruby2js/filter/strict.rb
 - lib/ruby2js/filter/underscore.rb
 - lib/ruby2js/filter/vue.rb
+- lib/ruby2js/haml.rb
 - lib/ruby2js/rails.rb
 - lib/ruby2js/serializer.rb
 - lib/ruby2js/sinatra.rb