xdrgen 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d46409aae08052c63a25876ba5803d3b89f42a505f970dc4e757c17ab34c924c
-  data.tar.gz: '0681d041f3e67890030a43ebcce8ed73bbc22c8bb9417ae404387b2b1c56ec22'
+  metadata.gz: 30ccfde98b0baa13f03916b4b2d89c774ed8119e373e23541ca8e46e87f1db06
+  data.tar.gz: abd5834683ef1d6e74e6decf61b7c3155a0cf1ef5fd03a4592acb43abd2e7446
 SHA512:
-  metadata.gz: 971924929afa5eb9fc5bfc8664483fca5ec08f7b4cf2772117af283c709442634b816029e3ff35c1e0ebf7a4dea1b0af0f88c4d4f4146c9b0c065358362967e0
-  data.tar.gz: 2bc8ae446064e224a68d6f0f654a740165c41b9691eabd5fea77d72b8e67de6f12e174000690e1fd1542333fc8b2e7a9da9252d25d5d8322909f3890a6e61c73
+  metadata.gz: '040408ad8434aaa992df6533dd66954c85c389cfe76130ca188c2008c1592a758e315c0036929e9064b48d3d49bcf18fdf902455f1a7fdd0522da91d76d6085e'
+  data.tar.gz: ec2721ba15cb25ec6aff042a5c1c3697b557d1dab85e6c61a2cc242b5be87c6af815e1e685b335e21e7da98b0ebe4156cc39444057141e8fb8521231b2444d7e

data/.travis.yml

@@ -1,5 +1,4 @@
 language: ruby
 script: bundle exec rspec
 rvm:
-- 2.3.3
-- 2.4.0
+- 2.7.0

data/lib/xdrgen/generators/elixir.rb

@@ -164,7 +164,7 @@ module Xdrgen
         parent = name named.parent_defn if named.is_a?(AST::Concerns::NestedDefinition)
 
         # NOTE: classify will strip plurality, so we restore it if necessary
-        plural = named.name.pluralize == named.name
+        plural = named.name.downcase.pluralize == named.name.downcase
         base   = named.name.underscore.classify
         result = plural ? base.pluralize : base
 
@@ -172,10 +172,7 @@ module Xdrgen
       end
 
       def const_name(named)
-        # NOTE: classify will strip plurality, so we restore it if necessary
-        plural = named.name.pluralize == named.name
-        base   = named.name.underscore.upcase
-        plural ? base.pluralize : base
+        named.name.underscore.upcase
       end
 
       def member_name(member)

data/lib/xdrgen/generators/javascript.rb

@@ -170,7 +170,15 @@ module Xdrgen
         parent = name named.parent_defn if named.is_a?(AST::Concerns::NestedDefinition)
 
         # NOTE: classify will strip plurality, so we restore it if necessary
-        plural = named.name.pluralize == named.name
+        #
+        # Downcase the value since pluralize adds a lower case `s`.
+        #
+        # Without downcasing, the following appears as singular, but it's plural:
+        #
+        #  "BEGIN_SPONSORING_FUTURE_RESERVEs" == "BEGIN_SPONSORING_FUTURE_RESERVES"
+        #  => false
+        #
+        plural = named.name.downcase.pluralize == named.name.downcase
         base   = named.name.underscore.classify
         result = plural ? base.pluralize : base
 
@@ -178,10 +186,7 @@ module Xdrgen
       end
 
       def const_name(named)
-        # NOTE: classify will strip plurality, so we restore it if necessary
-        plural = named.name.pluralize == named.name
-        base   = named.name.underscore.upcase
-        plural ? base.pluralize : base
+        named.name.underscore.upcase
       end
 
       def member_name(member)

data/lib/xdrgen/grammar/union.treetop

@@ -12,7 +12,11 @@ grammar XdrUnionGrammar
   rule union_body
     "switch"
     space?
-    "(" discriminant:declaration ")"
+    "("
+    space?
+    discriminant:declaration
+    space?
+    ")"
     space?
     "{"
     space?

data/lib/xdrgen/version.rb

@@ -1,3 +1,3 @@
 module Xdrgen
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/spec/fixtures/parser/union.x

@@ -8,3 +8,14 @@ union MyUnion switch (UnionKey type)
 
 
 };
+
+union SomeVeryLongUnionNamePushingSwitchParamToNewLine switch (
+	SomeLongUnionKeyType type)
+{
+    case ERROR:
+        Error error;
+    case MULTI:
+        Multi things<>;
+    default:
+		void;
+};

data/xdrgen.gemspec

@@ -20,11 +20,11 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.1.0'
 
   spec.add_dependency "treetop", "~> 1.5.3"
-  spec.add_dependency "activesupport", "~> 5"
+  spec.add_dependency "activesupport", "~> 6"
   spec.add_dependency "slop", "~> 3.4"
   spec.add_dependency "memoist", "~> 0.11.0"
 
-  spec.add_development_dependency "bundler", "~> 1.7"
+  spec.add_development_dependency "bundler", "~> 2"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.1"
   spec.add_development_dependency "guard-rspec"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xdrgen
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Scott Fleckenstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-23 00:00:00.000000000 Z
+date: 2020-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: slop
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement