ts_routes 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41ebddaca537c82f8c13f7e16a1bf7c2e8e7a3a7
-  data.tar.gz: f6f82e0c73649d740fca92eb3648abd71de65044
+  metadata.gz: 5791b921e57c9b8768e01ec57f89ae9c6f0f4df3
+  data.tar.gz: f4b841749d954fea3dd98a8282d78ae6cac99a8a
 SHA512:
-  metadata.gz: 305e44d28094f5dc7dbea2e645d7d0034250288e04bc3de9b5c8152a155951bb46a44ac3bec5c78c1a8a523c45106fa15a932bf5f2d3d1d77eb9fbc5af275727
-  data.tar.gz: cb68c7e82175b4d52ef4ac5c80041e5f4a5c109345cf7083c1b5e3f02330e81eb883a1bd39948d47e65686ab2c951b506c2b071c03a2659ebd5b7163ad66e220
+  metadata.gz: 620ce508b12955929636d97a8206158a59d596263c7b5e66fef5d90ef068af62516052606dd551f9aed6e28a5b82e8ede3a20de73739e01af506200e3412c0fd
+  data.tar.gz: e145fbd28361b12b71bab30213479489ece90e92c511017f5ade3d5b2593d38152a1bf7e8306106a2c669a81a1961e6175581ad773f030b45600d96378b3c2c0

data/.rubocop.yml

@@ -2,7 +2,8 @@ AllCops:
   TargetRubyVersion: 2.3
   DisplayCopNames: true
   Exclude:
-    - tasks/**/*.*
+    - "vendor/**/*"
+    - "node_modules/**/*"
 
 Style:
   Enabled: false

data/.travis.yml

@@ -5,12 +5,14 @@ rvm:
   - "2.3"
   - "2.4"
 
-language: node_js
-node_js:
-  - "6"
+before_install:
+  - nvm install 8
+  - npm install
 
-install:
-  - bin/setup
+cache:
+  bundler: true
+  directories:
+    - node_modules
 
 script:
   - bundle exec rake

data/lib/ts_routes/runtime.ts

@@ -15,13 +15,19 @@ function $buildOptions(options: any, names: string[]): string {
       const value = options[ key ];
 
       if (key === "anchor") {
-        anchor = "#" + encodeURIComponent("" + value);
+        anchor = `#${$encode(value)}`;
+      } else if ($isScalarType(value)) {
+        q.push(`${$encode(key)}=${$encode(value)}`);
       } else if (Array.isArray(value)) {
         for (const v of value) {
-          q.push(encodeURIComponent(key + "[]") + "=" + encodeURIComponent("" + v));
+          const k = `${key}[]`;
+          q.push(`${$encode(k)}=${$encode(v)}`);
+        }
+      } else if($isNotNull(value)) { // i.e. non-null, non-scalar, non-array type
+        for (const k of Object.keys(value)) {
+          const hk = `${key}[${k}]`;
+          q.push(`${$encode(hk)}=${$encode(value[k])}`);
         }
-      } else if(value !== null && value !== undefined) {
-        q.push(encodeURIComponent(key) + "=" + encodeURIComponent("" + value));
       }
     }
     return (q.length > 0 ? "?" + q.join("&") : "") + anchor;
@@ -30,8 +36,20 @@ function $buildOptions(options: any, names: string[]): string {
   }
 }
 
+function $encode(value: any): string {
+  return encodeURIComponent(value);
+}
+
+function $isNotNull(value: any): boolean {
+  return value !== undefined && value !== null;
+}
+
+function $isScalarType(value: any): value is ScalarType {
+  return typeof(value) === "string" || typeof(value) === "number" || typeof(value) === "boolean";
+}
+
 function $isPresent(value: any): boolean {
-  return value !== undefined && value !== null && ("" + value).length > 0;
+  return $isNotNull(value) && ("" + value).length > 0;
 }
 
 function $hasPresentOwnProperty(options: any, key: string): boolean {

data/lib/ts_routes/version.rb

@@ -1,3 +1,3 @@
 module TsRoutes
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ts_routes
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - FUJI Goro (gfx)
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-17 00:00:00.000000000 Z
+date: 2017-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties