@@ -1,3 +1,5 @@ +* Allow lowercased namespaces. [#2 state:resolved] (tobie) + * Remove trailing whitespaces. Outdent descriptions. [#1 state:resolved, #3 state:resolved] (tobie) * Switch argument type selector from `,` to `|`. (tobie) @@ -28,7 +30,7 @@ * Refactor PDoc::Generators::Html::Helpers (tobie) -* Rename rakefile as Rakefile. [savetheclocktower] +* Rename rakefile as Rakefile. (savetheclocktower) * Add PDoc::Runner. (tobie) CHANGELOG @@ -44,8 +44,16 @@ module EbnfExpression end class KlassMethod < Method - def full_name - "#{super}.#{name}" + def klass_name + js_namespace.to_a.slice(-2) + end + + def name + js_namespace.to_a.last + end + + def namespace + js_namespace.to_a.slice(0..-2).join(".") end end @@ -84,8 +92,16 @@ module EbnfExpression end class KlassProperty < Base - def full_name - "#{super}.#{name}" + def klass_name + js_namespace.to_a.slice(-2) + end + + def name + js_namespace.to_a.last + end + + def namespace + js_namespace.to_a.slice(0..-2).join(".") end end lib/pdoc/parser/ebnf_expression_nodes.rb @@ -21,7 +21,7 @@ grammar EbnfExpression end rule klass_method - space* js_namespace '.' js_variable args return_value <KlassMethod> + space* js_namespace args return_value <KlassMethod> end rule instance_method @@ -29,7 +29,7 @@ grammar EbnfExpression end rule klass_property - space* js_namespace '.' js_variable return_value <KlassProperty> + space* js_namespace return_value <KlassProperty> end rule instance_property lib/pdoc/parser/treetop_files/ebnf_expression.treetop @@ -33,7 +33,7 @@ grammar EbnfJavascript end rule js_namespace - js_constant ('.' js_constant)* { + (js_constant / js_variable) ('.' (js_constant / js_variable))* { def namespace to_a.slice(0..-2).join(".") end lib/pdoc/parser/treetop_files/ebnf_javascript.treetop @@ -35,6 +35,16 @@ class EbnfExpressionTest < Test::Unit::TestCase assert_equal "Responders", parse(ebnf).klass_name assert_equal "Array", parse(ebnf).returns assert_equal ebnf, parse(ebnf).to_s + + ebnf = "document.viewport.foo -> Bar" + assert_parsed ebnf + assert_equal KlassProperty, parse(ebnf).class + assert_equal "document.viewport", parse(ebnf).namespace + assert_equal "foo", parse(ebnf).name + assert_equal "document.viewport.foo", parse(ebnf).full_name + assert_equal "viewport", parse(ebnf).klass_name + assert_equal "Bar", parse(ebnf).returns + assert_equal ebnf, parse(ebnf).to_s end def test_utility @@ -64,6 +74,17 @@ class EbnfExpressionTest < Test::Unit::TestCase assert_equal %w[element content], parse(ebnf).arguments.map(&:name) assert_equal "Element", parse(ebnf).returns assert_equal ebnf, parse(ebnf).to_s + + ebnf = "document.viewport.getWidth() -> Number" + assert_parsed ebnf + assert_equal KlassMethod, parse(ebnf).class + assert_equal "document.viewport", parse(ebnf).namespace + assert_equal "getWidth", parse(ebnf).name + assert_equal "document.viewport.getWidth", parse(ebnf).full_name + assert_equal "viewport", parse(ebnf).klass_name + assert_equal [], parse(ebnf).arguments + assert_equal "Number", parse(ebnf).returns + assert_equal ebnf, parse(ebnf).to_s end def test_instance_method @@ -181,6 +202,26 @@ class EbnfExpressionTest < Test::Unit::TestCase assert_equal %w[Enumerable], parse(ebnf).mixins.map(&:name) assert_equal [""], parse(ebnf).mixins.map(&:namespace) assert_equal ebnf, parse(ebnf).to_s + + ebnf = "document" + assert_parsed ebnf + assert_equal Namespace, parse(ebnf).class + assert_equal "", parse(ebnf).namespace + assert_equal "document", parse(ebnf).name + assert_equal "document", parse(ebnf).full_name + assert_equal nil, parse(ebnf).klass_name + assert_equal [], parse(ebnf).mixins + assert_equal ebnf, parse(ebnf).to_s + + ebnf = "document.viewport" + assert_parsed ebnf + assert_equal Namespace, parse(ebnf).class + assert_equal "document", parse(ebnf).namespace + assert_equal "viewport", parse(ebnf).name + assert_equal "document.viewport", parse(ebnf).full_name + assert_equal nil, parse(ebnf).klass_name + assert_equal [], parse(ebnf).mixins + assert_equal ebnf, parse(ebnf).to_s end def test_mixin test/unit/parser/ebnf_expression_test.rb @@ -30,5 +30,8 @@ class EbnfJavascriptTest < Test::Unit::TestCase def test_namespace # basic and non-recursive assert_parsed "Foo.Bar" + assert_parsed "foo.bar" + assert_parsed "foo.Bar" + assert_parsed "Foo.bar" end end test/unit/parser/ebnf_javascript_test.rb 68ee9266c6ffb9c8f198c8dc152aedf7c11df24f Tobie Langel tobie.langel@gmail.com http://github.com/tobie/pdoc/commit/f46ae6877af6fd02125f8d61bf953413ae115fbf f46ae6877af6fd02125f8d61bf953413ae115fbf 2008-05-04T16:38:05-07:00 2008-05-04T16:38:05-07:00 Allow lowercased namespaces. 70761405769b03ed567ec7daebdbb33972ae5fb2 Tobie Langel tobie.langel@gmail.com