From 764450ac69d4e69b47b9a54ed41639afb81a4bb8 Mon Sep 17 00:00:00 2001 From: Rob Emery Date: Sat, 28 Jun 2014 19:28:37 +0100 Subject: [PATCH 1/5] PrivateNetwork: markup & stylesheet changes --- lib/DDG/Goodie/PrivateNetwork.pm | 8 ++- .../private_network/private_network.html | 56 +++++++++++++------ share/goodie/private_network/style.css | 11 ++++ 3 files changed, 57 insertions(+), 18 deletions(-) create mode 100644 share/goodie/private_network/style.css diff --git a/lib/DDG/Goodie/PrivateNetwork.pm b/lib/DDG/Goodie/PrivateNetwork.pm index 6fcff0914..3ae8f11ea 100644 --- a/lib/DDG/Goodie/PrivateNetwork.pm +++ b/lib/DDG/Goodie/PrivateNetwork.pm @@ -19,9 +19,15 @@ attribution twitter => 'crazedpsyc', my $text = scalar share('private_network.txt')->slurp, my $html = scalar share('private_network.html')->slurp; +my $css = scalar share('style.css')->slurp; +sub append_css { + my $html = shift; + return "$html"; +} + handle sub { - $text, html => $html; + $text, html => append_css($html) }; 1; diff --git a/share/goodie/private_network/private_network.html b/share/goodie/private_network/private_network.html index d77aa0a0a..3c260e18c 100644 --- a/share/goodie/private_network/private_network.html +++ b/share/goodie/private_network/private_network.html @@ -1,17 +1,39 @@ -Private network IP addresses: -
IPv4 addresses (rfc1918): -
10.0.0.0 - 10.255.255.255 | 10.0.0.0/8 -
172.16.0.0 - 172.31.255.255 | 172.16.0.0/12 -
192.168.0.0 - 192.168.255.255 | 192.168.0.0/16 -
-
Carrier NAT (rfc6598): -
100.64.0.0 - 100.127.255.255 | 100.64.0.0/10 -
-
Test Networks (rfc5735): -
TEST-NET-1: 192.0.2.0 - 192.0.2.255 | 192.0.2.0/24 -
TEST-NET-2: 198.51.100.0 - 198.51.100.255 | 198.51.100.0/24 -
TEST-NET-3: 203.0.113.0 - 203.0.113.255 | 203.0.113.0/24 -
Benchmarks: 198.18.0.1 - 198.19.255.255 | 198.18.0.0/15 -
-
Private network IPv6 addresses (rfc4193): -
Unique local addresses: fd00::/8 +
+
+
+ IPv4 addresses (rfc1918): +
+
+

10.0.0.0 - 10.255.255.255 | 10.0.0.0/8

+

172.16.0.0 - 172.31.255.255 | 172.16.0.0/12

+

192.168.0.0 - 192.168.255.255 | 192.168.0.0/16

+
+
+
+
+ Carrier NAT (rfc6598): +
+
+ 100.64.0.0 - 100.127.255.255 | 100.64.0.0/10 +
+
+
+
+ Test Networks (rfc5735): +
+
+

TEST-NET-1: 192.0.2.0 - 192.0.2.255 | 192.0.2.0/24

+

TEST-NET-2: 198.51.100.0 - 198.51.100.255 | 198.51.100.0/24

+

TEST-NET-3: 203.0.113.0 - 203.0.113.255 | 203.0.113.0/24

+

Benchmarks: 198.18.0.1 - 198.19.255.255 | 198.18.0.0/15

+
+
+
+
+ IPv6 addresses (rfc4193): +
+
+ Unique local addresses: fd00::/8 +
+
+
\ No newline at end of file diff --git a/share/goodie/private_network/style.css b/share/goodie/private_network/style.css new file mode 100644 index 000000000..05e65c0e5 --- /dev/null +++ b/share/goodie/private_network/style.css @@ -0,0 +1,11 @@ +.private_network .left-column { + vertical-align: top; + display: inline-block; + width: 30%; +} + +.private_network .right-column { + vertical-align: top; + display: inline-block; + width: 70%; +} \ No newline at end of file From 713fedfc342f82ea0935952ca5ef456578344168 Mon Sep 17 00:00:00 2001 From: Rob Emery Date: Sat, 28 Jun 2014 19:33:30 +0100 Subject: [PATCH 2/5] PrivateNetwork: Updating Tests for new css etc --- t/PrivateNetwork.t | 77 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 54 insertions(+), 23 deletions(-) diff --git a/t/PrivateNetwork.t b/t/PrivateNetwork.t index 368cc1e2a..0ef8f5712 100644 --- a/t/PrivateNetwork.t +++ b/t/PrivateNetwork.t @@ -9,11 +9,11 @@ zci answer_type => 'private_network'; zci is_cached => 1; ddg_goodie_test( - [qw( - DDG::Goodie::PrivateNetwork - )], - map { ("$_" => test_zci( - 'Private network IPv4 addresses (rfc1918): + [qw( + DDG::Goodie::PrivateNetwork + )], + map { ("$_" => test_zci( + 'Private network IPv4 addresses (rfc1918): 10.0.0.0 - 10.255.255.255 | 10.0.0.0/8 172.16.0.0 - 172.31.255.255 | 172.16.0.0/12 192.168.0.0 - 192.168.255.255 | 192.168.0.0/16 @@ -30,24 +30,55 @@ Benchmarks: 198.18.0.1 - 198.19.255.255 | 198.18.0.0/15 Private network IPv6 addresses (rfc4193): Unique local addresses: fd00::/8 ', - html => 'Private network IP addresses: -
IPv4 addresses (rfc1918): -
10.0.0.0 - 10.255.255.255 | 10.0.0.0/8 -
172.16.0.0 - 172.31.255.255 | 172.16.0.0/12 -
192.168.0.0 - 192.168.255.255 | 192.168.0.0/16 -
-
Carrier NAT (rfc6598): -
100.64.0.0 - 100.127.255.255 | 100.64.0.0/10 -
-
Test Networks (rfc5735): -
TEST-NET-1: 192.0.2.0 - 192.0.2.255 | 192.0.2.0/24 -
TEST-NET-2: 198.51.100.0 - 198.51.100.255 | 198.51.100.0/24 -
TEST-NET-3: 203.0.113.0 - 203.0.113.255 | 203.0.113.0/24 -
Benchmarks: 198.18.0.1 - 198.19.255.255 | 198.18.0.0/15 -
-
Private network IPv6 addresses (rfc4193): -
Unique local addresses: fd00::/8 -' + html => q#
+
+
+ IPv4 addresses (rfc1918): +
+
+

10.0.0.0 - 10.255.255.255 | 10.0.0.0/8

+

172.16.0.0 - 172.31.255.255 | 172.16.0.0/12

+

192.168.0.0 - 192.168.255.255 | 192.168.0.0/16

+
+
+
+
+ Carrier NAT (rfc6598): +
+
+ 100.64.0.0 - 100.127.255.255 | 100.64.0.0/10 +
+
+
+
+ Test Networks (rfc5735): +
+
+

TEST-NET-1: 192.0.2.0 - 192.0.2.255 | 192.0.2.0/24

+

TEST-NET-2: 198.51.100.0 - 198.51.100.255 | 198.51.100.0/24

+

TEST-NET-3: 203.0.113.0 - 203.0.113.255 | 203.0.113.0/24

+

Benchmarks: 198.18.0.1 - 198.19.255.255 | 198.18.0.0/15

+
+
+
+
+ IPv6 addresses (rfc4193): +
+
+ Unique local addresses: fd00::/8 +
+
+
# )) } ( 'private network', 'private networks', 'private ips' ) ); From 6bb0c426aa8d8878d7b30b8d0612950606ac8e86 Mon Sep 17 00:00:00 2001 From: Rob Emery Date: Thu, 3 Jul 2014 22:36:11 +0100 Subject: [PATCH 3/5] PrivateNetwork: Switching colourclasses and ensuring the labels & values line up --- .../private_network/private_network.html | 38 +++++++------- t/PrivateNetwork.t | 50 +------------------ 2 files changed, 20 insertions(+), 68 deletions(-) diff --git a/share/goodie/private_network/private_network.html b/share/goodie/private_network/private_network.html index 3c260e18c..3835202c5 100644 --- a/share/goodie/private_network/private_network.html +++ b/share/goodie/private_network/private_network.html @@ -1,39 +1,39 @@ -
-
-
- IPv4 addresses (rfc1918): +
+
+
+

IPv4 addresses (rfc1918):

-
+

10.0.0.0 - 10.255.255.255 | 10.0.0.0/8

172.16.0.0 - 172.31.255.255 | 172.16.0.0/12

192.168.0.0 - 192.168.255.255 | 192.168.0.0/16

-
-
- Carrier NAT (rfc6598): +
+
+

Carrier NAT (rfc6598):

-
- 100.64.0.0 - 100.127.255.255 | 100.64.0.0/10 +
+

100.64.0.0 - 100.127.255.255 | 100.64.0.0/10

-
-
- Test Networks (rfc5735): +
+
+

Test Networks (rfc5735):

-
+

TEST-NET-1: 192.0.2.0 - 192.0.2.255 | 192.0.2.0/24

TEST-NET-2: 198.51.100.0 - 198.51.100.255 | 198.51.100.0/24

TEST-NET-3: 203.0.113.0 - 203.0.113.255 | 203.0.113.0/24

Benchmarks: 198.18.0.1 - 198.19.255.255 | 198.18.0.0/15

-
-
- IPv6 addresses (rfc4193): +
+
+

IPv6 addresses (rfc4193):

-
- Unique local addresses: fd00::/8 +
+

Unique local addresses: fd00::/8

\ No newline at end of file diff --git a/t/PrivateNetwork.t b/t/PrivateNetwork.t index 0ef8f5712..bc079cbbb 100644 --- a/t/PrivateNetwork.t +++ b/t/PrivateNetwork.t @@ -30,55 +30,7 @@ Benchmarks: 198.18.0.1 - 198.19.255.255 | 198.18.0.0/15 Private network IPv6 addresses (rfc4193): Unique local addresses: fd00::/8 ', - html => q#
-
-
- IPv4 addresses (rfc1918): -
-
-

10.0.0.0 - 10.255.255.255 | 10.0.0.0/8

-

172.16.0.0 - 172.31.255.255 | 172.16.0.0/12

-

192.168.0.0 - 192.168.255.255 | 192.168.0.0/16

-
-
-
-
- Carrier NAT (rfc6598): -
-
- 100.64.0.0 - 100.127.255.255 | 100.64.0.0/10 -
-
-
-
- Test Networks (rfc5735): -
-
-

TEST-NET-1: 192.0.2.0 - 192.0.2.255 | 192.0.2.0/24

-

TEST-NET-2: 198.51.100.0 - 198.51.100.255 | 198.51.100.0/24

-

TEST-NET-3: 203.0.113.0 - 203.0.113.255 | 203.0.113.0/24

-

Benchmarks: 198.18.0.1 - 198.19.255.255 | 198.18.0.0/15

-
-
-
-
- IPv6 addresses (rfc4193): -
-
- Unique local addresses: fd00::/8 -
-
-
# + html => qr#.*# )) } ( 'private network', 'private networks', 'private ips' ) ); From 520acd3a76c1bfd8de4e7237b6564c83facf600a Mon Sep 17 00:00:00 2001 From: Rob Emery Date: Thu, 3 Jul 2014 22:47:47 +0100 Subject: [PATCH 4/5] PrivateNetwork: Hacking in a background colour similiar to the leakdb spice --- share/goodie/private_network/style.css | 4 ++++ 1 file changed, 4 insertions(+) mode change 100644 => 100755 share/goodie/private_network/style.css diff --git a/share/goodie/private_network/style.css b/share/goodie/private_network/style.css old mode 100644 new mode 100755 index 05e65c0e5..5e98976fe --- a/share/goodie/private_network/style.css +++ b/share/goodie/private_network/style.css @@ -8,4 +8,8 @@ vertical-align: top; display: inline-block; width: 70%; +} + +.private_network .record__highlight:nth-of-type(2n) { + background: rgba(150,150,150,0.3); } \ No newline at end of file From a70b1cd65ecaa41b9761fc73d8dac6c46fdadcd6 Mon Sep 17 00:00:00 2001 From: Rob Emery Date: Thu, 10 Jul 2014 21:15:54 +0100 Subject: [PATCH 5/5] PrivateNetwork: Applying @jagtalon's styling changes --- .../private_network/private_network.html | 52 ++++++++++--------- share/goodie/private_network/style.css | 16 +++--- 2 files changed, 33 insertions(+), 35 deletions(-) diff --git a/share/goodie/private_network/private_network.html b/share/goodie/private_network/private_network.html index 3835202c5..0655c0d96 100644 --- a/share/goodie/private_network/private_network.html +++ b/share/goodie/private_network/private_network.html @@ -1,39 +1,41 @@
-
-
+ + + + + + + + + + + + + + + + + +

IPv4 addresses (rfc1918):

- -
+

10.0.0.0 - 10.255.255.255 | 10.0.0.0/8

172.16.0.0 - 172.31.255.255 | 172.16.0.0/12

192.168.0.0 - 192.168.255.255 | 192.168.0.0/16

- - -
-
+

Carrier NAT (rfc6598):

- -
+

100.64.0.0 - 100.127.255.255 | 100.64.0.0/10

- - -
-
-

Test Networks (rfc5735):

-
-
+
+

Test Networks (rfc5735):

+

TEST-NET-1: 192.0.2.0 - 192.0.2.255 | 192.0.2.0/24

TEST-NET-2: 198.51.100.0 - 198.51.100.255 | 198.51.100.0/24

TEST-NET-3: 203.0.113.0 - 203.0.113.255 | 203.0.113.0/24

Benchmarks: 198.18.0.1 - 198.19.255.255 | 198.18.0.0/15

- - -
-
+

IPv6 addresses (rfc4193):

- -
+

Unique local addresses: fd00::/8

- - +
\ No newline at end of file diff --git a/share/goodie/private_network/style.css b/share/goodie/private_network/style.css index 5e98976fe..e9bc3e6e8 100755 --- a/share/goodie/private_network/style.css +++ b/share/goodie/private_network/style.css @@ -1,15 +1,11 @@ -.private_network .left-column { - vertical-align: top; - display: inline-block; - width: 30%; +.zci--answer .private_network .record__cell__key { + padding: 0.4em; } -.private_network .right-column { - vertical-align: top; - display: inline-block; - width: 70%; +.zci--answer .private_network .record__cell__value { + padding: 0.4em; } -.private_network .record__highlight:nth-of-type(2n) { - background: rgba(150,150,150,0.3); +.zci--answer .private_network p { + padding: 0; } \ No newline at end of file