jsduck 5.0.0.beta4 → 5.0.0.beta5

data/jsduck.gemspec

@@ -2,7 +2,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.5"
 
   s.name = 'jsduck'
-  s.version = '5.0.0.beta4'
+  s.version = '5.0.0.beta5'
   s.date = Time.new.strftime('%Y-%m-%d')
   s.summary = "Simple JavaScript Duckumentation generator"
   s.description = "Documentation generator for Sencha JS frameworks"
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'rdiscount'
   s.add_dependency 'json'
   s.add_dependency 'parallel'
-  s.add_dependency 'rkelly-remix', '= 0.0.1'
+  s.add_dependency 'rkelly-remix', '~> 0.0.2'
   s.add_dependency 'dimensions'
 
   s.add_development_dependency 'rspec'

data/lib/jsduck/js/{rkelly_parser.rb → parser.rb}

@@ -5,10 +5,10 @@ require 'rkelly'
 module JsDuck
   module Js
 
-    # An alternative JsDuck::Js::Parser implementation that uses
-    # RKelly instead of Esprima.
-    class RKellyParser
-      RKELLY = RKelly::Parser.new
+    # A JavaScript parser implementation that uses RKelly and adapts
+    # its output to be the same as the old Esprima parser used to
+    # produce.
+    class Parser
       ADAPTER = Js::RKellyAdapter.new
 
       def initialize(input, options={})

data/lib/jsduck/js/returns.rb

@@ -79,10 +79,10 @@ module JsDuck
           :this
         elsif boolean?(ast)
           "Boolean"
-        elsif string?(ast)
-          "String"
         elsif regexp?(ast)
           "RegExp"
+        elsif string?(ast)
+          "String"
         else
           :other
         end

data/lib/jsduck/js/rkelly_adapter.rb

@@ -101,6 +101,13 @@ module JsDuck
             "left" => adapt_node(node.left),
             "right" => adapt_node(node.value),
           })
+        when LOGICAL_NODES[node.class]
+          make(node, {
+            "type" => "LogicalExpression",
+            "operator" => LOGICAL_NODES[node.class],
+            "left" => adapt_node(node.left),
+            "right" => adapt_node(node.value),
+          })
         when UNARY_NODES[node.class]
           make(node, {
             "type" => "UnaryExpression",
@@ -257,8 +264,8 @@ module JsDuck
         when RKelly::Nodes::DoWhileNode == node.class
           make(node, {
             "type" => "DoWhileStatement",
-            "test" => adapt_node(node.left),
-            "body" => adapt_node(node.value),
+            "test" => adapt_node(node.value),
+            "body" => adapt_node(node.left),
           })
         when RKelly::Nodes::ForNode == node.class
           make(node, {
@@ -271,7 +278,16 @@ module JsDuck
         when RKelly::Nodes::ForInNode == node.class
           make(node, {
             "type" => "ForInStatement",
-            "left" => adapt_node(node.left),
+            "left" =>
+              if node.left.class == RKelly::Nodes::VarDeclNode
+                make(node.left, {
+                    "type" => "VariableDeclaration",
+                    "kind" => "var",
+                    "declarations" => [adapt_node(node.left)]
+                  })
+              else
+                adapt_node(node.left)
+              end,
             "right" => adapt_node(node.right),
             "body" => adapt_node(node.value),
             "each" => false,
@@ -449,7 +465,6 @@ module JsDuck
         RKelly::Nodes::AddNode => "+",
         RKelly::Nodes::MultiplyNode => "*",
         RKelly::Nodes::NotEqualNode => "!=",
-        RKelly::Nodes::LogicalAndNode => "&&",
         RKelly::Nodes::UnsignedRightShiftNode => ">>>",
         RKelly::Nodes::ModulusNode => "%",
         RKelly::Nodes::NotStrictEqualNode => "!==",
@@ -458,7 +473,6 @@ module JsDuck
         RKelly::Nodes::GreaterNode => ">",
         RKelly::Nodes::BitOrNode => "|",
         RKelly::Nodes::StrictEqualNode => "===",
-        RKelly::Nodes::LogicalOrNode => "||",
         RKelly::Nodes::BitXOrNode => "^",
         RKelly::Nodes::LeftShiftNode => "<"+"<",
         RKelly::Nodes::EqualNode => "==",
@@ -468,6 +482,11 @@ module JsDuck
         RKelly::Nodes::RightShiftNode => ">>",
       }
 
+      LOGICAL_NODES = {
+        RKelly::Nodes::LogicalAndNode => "&&",
+        RKelly::Nodes::LogicalOrNode => "||",
+      }
+
       UNARY_NODES = {
         RKelly::Nodes::UnaryMinusNode => "-",
         RKelly::Nodes::UnaryPlusNode => "+",

data/lib/jsduck/options.rb

@@ -94,7 +94,7 @@ module JsDuck
       ]
       @ext4_events = nil
 
-      @version = "5.0.0.beta4"
+      @version = "5.0.0.beta5"
       # Customizing output
       @title = "Documentation - JSDuck"
       @header = "<strong>Documentation</strong> JSDuck"

data/lib/jsduck/parser.rb

@@ -1,4 +1,4 @@
-require 'jsduck/js/rkelly_parser'
+require 'jsduck/js/parser'
 require 'jsduck/js/ast'
 require 'jsduck/css/parser'
 require 'jsduck/doc/parser'
@@ -41,7 +41,7 @@ module JsDuck
       if filename =~ /\.s?css$/
         docs = Css::Parser.new(contents, options).parse
       else
-        docs = Js::RKellyParser.new(contents, options).parse
+        docs = Js::Parser.new(contents, options).parse
         docs = Js::Ast.new(docs).detect_all!
       end
     end

metadata

@@ -1,148 +1,152 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: jsduck
-version: !ruby/object:Gem::Version 
-  hash: -776968786
+version: !ruby/object:Gem::Version
+  version: 5.0.0.beta5
   prerelease: 6
-  segments: 
-  - 5
-  - 0
-  - 0
-  - beta
-  - 4
-  version: 5.0.0.beta4
 platform: ruby
-authors: 
+authors:
 - Rene Saarsoo
 - Nick Poulden
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-07-04 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-07-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rdiscount
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: parallel
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rkelly-remix
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rkelly-remix
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 0
-        - 0
-        - 1
-        version: 0.0.1
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.2
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: dimensions
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+- !ruby/object:Gem::Dependency
+  name: dimensions
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: compass
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: compass
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Documentation generator for Sencha JS frameworks
 email: rene.saarsoo@sencha.com
-executables: 
+executables:
 - jsduck
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - COPYING
@@ -223,10 +227,10 @@ files:
 - lib/jsduck/js/method_calls.rb
 - lib/jsduck/js/node.rb
 - lib/jsduck/js/node_array.rb
+- lib/jsduck/js/parser.rb
 - lib/jsduck/js/property.rb
 - lib/jsduck/js/returns.rb
 - lib/jsduck/js/rkelly_adapter.rb
-- lib/jsduck/js/rkelly_parser.rb
 - lib/jsduck/js/scoped_traverser.rb
 - lib/jsduck/js/serializer.rb
 - lib/jsduck/js/utils.rb
@@ -351,7 +355,7 @@ files:
 - template-min/template.html
 - template-min/favicon.ico
 - template-min/print-template.html
-- template-min/app-9e2b5792598a6c48013dbd19f7a176ad.js
+- template-min/app-437ace20e4b34ff36bb9071208984e6d.js
 - template-min/extjs/ext-all.js
 - template-min/extjs/resources/themes/images/default/dd/drop-add.gif
 - template-min/extjs/resources/themes/images/default/dd/drop-no.gif
@@ -774,38 +778,26 @@ files:
 - template-min/mobile-redirect.js
 homepage: https://github.com/senchalabs/jsduck
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: jsduck
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Simple JavaScript Duckumentation generator
 test_files: []
-