slow_blink 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b20c76ea29b079aed8bb47ede4c0515a6630c0a
-  data.tar.gz: e5171c66c8049f7a8389eda54392d8c5de708e0b
+  metadata.gz: 20d7c9ee2ab3bde244ae63f132424510c5157a25
+  data.tar.gz: 3f69a1496d4696214ad7dfb780f94631ea76367b
 SHA512:
-  metadata.gz: 45c24a4c329cd4250bd14caf3dbcdd105e965a3a1ed0a4582808498a757974e6ad56924ae7e02ded5142d8c546da058cf9415f3d5da88deaf9b39a484a4a1ae5
-  data.tar.gz: 5036b7877cab2a8311b36fd7adda148da864a2dd9a8158c7b9cf5156c1d9a259c05a11edf886bbffcaa29bffbd1f571f7a143d88f37838d27726d9e8c9cecac3
+  metadata.gz: 7d2f085b62ac487a53aaa03c6b839728411db49d9f1a78d7ca593ee9c5e5e5d6469ed34a3066d75af7f972ae61715896185e9e84262a1070e01f89131467c91c
+  data.tar.gz: 3c17d9832aca43cbdc2d32975251b127c90a2c74dbb8b6c448ee901d26e34d7186360b523bd10585890c741a7781b53949ecb9fa302c2cfca98f538196fe8c01

data/.yardopts

@@ -0,0 +1,9 @@
+--markup markdown
+--tag license:"License"
+--hide-tag license
+--no-private
+--title "SlowBlink: Blink Protocol for Ruby"
+lib/slow_blink/schema.rb
+lib/slow_blink/message/model.rb
+lib/**/*.rb -
+readme.md

data/ext/slow_blink/ext_schema_parser/parser.c

@@ -120,7 +120,7 @@ static VALUE cFieldTypeRef;
 
 static VALUE cLog;
 
-static VALUE cError;
+static VALUE cParseError;
 
 /* generated **********************************************************/
 
@@ -3773,7 +3773,7 @@ void Init_ext_schema_parser(void)
 
     cLog = rb_const_get(cSlowBlink, rb_intern("Log"));
 
-    cError = rb_const_get(cSlowBlink, rb_intern("Error"));
+    cParseError = rb_const_get(cSlowBlink, rb_intern("ParseError"));
 
     rb_define_singleton_method(cNamespace, "parse", parseFileBuffer, -1);
 }
@@ -3800,7 +3800,7 @@ static VALUE parseFileBuffer(int argc, VALUE* argv, VALUE self)
     rb_scan_args(argc, argv, "10:", &buffer, &opts);
 
     if(buffer == Qnil){
-        rb_raise(cError, "error: input must be a string");
+        rb_raise(rb_eTypeError, "error: input must be a string");
     }
 
     if(opts == Qnil){
@@ -3821,7 +3821,7 @@ static VALUE parseFileBuffer(int argc, VALUE* argv, VALUE self)
             case 0:
                 break;
             case 1:
-                rb_raise(cError, "parse error");
+                rb_raise(cParseError, "parse error");
                 break;
             case 2:
                 rb_bug("yyparse: bison parser reports memory exhaustion");

data/ext/slow_blink/message/ext_compact_encoder/compact_encoder.c

@@ -118,19 +118,19 @@ uint8_t BLINK_getSizeSigned(int64_t value)
         else if(value <= 0x7fffL){
             retval = 3U;
         }
-        else if(value < 0x7fffffffL){
+        else if(value <= 0x7fffffL){
             retval = 4U;
         }
-        else if(value < 0x7fffffffffL){
+        else if(value <= 0x7fffffffL){
             retval = 5U;
         }
-        else if(value < 0x7fffffffffffL){
+        else if(value <= 0x7fffffffffL){
             retval = 6U;
         }
-        else if(value < 0x7fffffffffffffL){
+        else if(value <= 0x7fffffffffffL){
             retval = 7U;
         }
-        else if(value < 0x7fffffffffffffffL){
+        else if(value <= 0x7fffffffffffffL){
             retval = 8U;
         }
         else{

data/ext/slow_blink/message/ext_compact_encoder/ext_compact_encoder.c

@@ -89,18 +89,31 @@ static VALUE getInt(VALUE input, int64_t min, int64_t max, bool isSigned);
 
 /* static variables ***************************************************/
 
-static VALUE cError;
+static VALUE cStrongError1;
+
+static VALUE cWeakError3;
+static VALUE cWeakError4;
+static VALUE cWeakError9;
+static VALUE cWeakError11;
+
+
 
 /* functions **********************************************************/
 
 void Init_ext_compact_encoder(void)
 {
     VALUE cSlowBlink;
-
-    rb_require("slow_blink/message/model.rb");
+    VALUE cMessage;
 
     cSlowBlink = rb_define_module("SlowBlink");
-    cError = rb_const_get(rb_define_module_under(cSlowBlink, "Message"), rb_intern("Error"));
+    cMessage = rb_const_get(cSlowBlink, rb_intern("Message"));
+
+    cStrongError1 = rb_const_get(cMessage, rb_intern("StrongError1"));
+
+    cWeakError3 = rb_const_get(cMessage, rb_intern("WeakError3"));
+    cWeakError4 = rb_const_get(cMessage, rb_intern("WeakError4"));
+    cWeakError9 = rb_const_get(cMessage, rb_intern("WeakError9"));
+    cWeakError11 = rb_const_get(cMessage, rb_intern("WeakError11"));
     
     rb_define_method(rb_cString, "putNull", putNull, 0);
     rb_define_method(rb_cString, "putPresent", putPresent, 0);
@@ -298,7 +311,7 @@ static VALUE putInt(VALUE self, VALUE val, int64_t min, int64_t max, bool isSign
 
             if((value < min) || (value > max)){
 
-                rb_raise(cError, "Input exceeds allowable range of type");
+                rb_raise(rb_eRangeError, "Input exceeds allowable range of type");
             }
 
             retval = rb_str_buf_cat(self, (const char *)out, BLINK_putVLC((uint64_t)value, true, out, sizeof(out)));
@@ -309,7 +322,7 @@ static VALUE putInt(VALUE self, VALUE val, int64_t min, int64_t max, bool isSign
 
             if(value > (uint64_t)max){
 
-                rb_raise(cError, "Input exceeds allowable range of type");
+                rb_raise(rb_eRangeError, "Input exceeds allowable range of type");
             }
 
             retval = rb_str_buf_cat(self, (const char *)out, BLINK_putVLC(value, false, out, sizeof(out)));
@@ -378,7 +391,7 @@ static VALUE getF64(VALUE self)
     }
     else{
 
-        rb_raise(cError, "S1: Group encoding ends prematurely");
+        rb_raise(cStrongError1, "S1: Group encoding ends prematurely");
     }
 
     return retval;
@@ -411,7 +424,7 @@ static VALUE getBool(VALUE self)
     }
     else{
 
-        rb_raise(cError, "W11: Decoded value is not 0x00 or 0x01");
+        rb_raise(cWeakError11, "W11: Decoded value is not 0x00 or 0x01");
     }
 
     return retval;
@@ -425,7 +438,7 @@ static VALUE getBinary(VALUE self)
     if(size != Qnil){
 
         if(NUM2UINT(size) > RSTRING_LEN(self)){
-            rb_raise(cError, "S1: Group encoding ends prematurely");
+            rb_raise(cStrongError1, "S1: Group encoding ends prematurely");
         }
 
         retval = rb_str_substr(self, 0, NUM2UINT(size));
@@ -453,7 +466,7 @@ static VALUE getFixed(VALUE self, VALUE size)
 
     if(NUM2UINT(size) > RSTRING_LEN(self)){
 
-        rb_raise(cError, "S1: Group encoding ends prematurely");
+        rb_raise(cStrongError1, "S1: Group encoding ends prematurely");
     }
 
     retval = rb_str_substr(self, 0, NUM2UINT(size));
@@ -485,19 +498,19 @@ static VALUE getFixedOptional(VALUE self, VALUE size)
 
             if(RSTRING_LEN(retval) != NUM2UINT(size)){
 
-                rb_raise(cError, "S1: Group encoding ends prematurely");
+                rb_raise(cStrongError1, "S1: Group encoding ends prematurely");
             }
 
             rb_str_drop_bytes(self, NUM2UINT(size));
         }
         else{
 
-            rb_raise(cError, "W9: Presence flag is not 0xC0 or 0x01");
+            rb_raise(cWeakError9, "W9: Presence flag is not 0xC0 or 0x01");
         }   
     }
     else{
 
-        rb_raise(cError, "S1: Group encoding ends prematurely");
+        rb_raise(cStrongError1, "S1: Group encoding ends prematurely");
     }
 
     return retval;
@@ -522,12 +535,12 @@ static VALUE getInt(VALUE input, int64_t min, int64_t max, bool isSigned)
 
                 if(((int64_t)out < min) || ((int64_t)out > max)){
 
-                    rb_raise(cError, "W3: Decoded value overflows range");            
+                    rb_raise(cWeakError3, "W3: Decoded value overflows range");            
                 }
 
                 if(BLINK_getSizeSigned((int64_t)out) != ret){
 
-                    rb_raise(cError, "W4: VLC entity contains more bytes than needed to express full width of type");
+                    rb_raise(cWeakError4, "W4: VLC entity contains more bytes than needed to express full width of type");
                 }
 
                 retval = LL2NUM((int64_t)out);
@@ -536,12 +549,12 @@ static VALUE getInt(VALUE input, int64_t min, int64_t max, bool isSigned)
                 
                 if(out > (uint64_t)max){
 
-                    rb_raise(cError, "W3: Decoded value overflows range");            
+                    rb_raise(cWeakError3, "W3: Decoded value overflows range");            
                 }
 
                 if(BLINK_getSizeUnsigned(out) != ret){
 
-                    rb_raise(cError, "W4: VLC entity contains more bytes than needed to express full width of type");
+                    rb_raise(cWeakError4, "W4: VLC entity contains more bytes than needed to express full width of type");
                 }
 
                 retval = ULL2NUM(out);
@@ -550,7 +563,7 @@ static VALUE getInt(VALUE input, int64_t min, int64_t max, bool isSigned)
     }
     else{
 
-        rb_raise(cError, "S1: Group encoding ends prematurely");
+        rb_raise(cStrongError1, "S1: Group encoding ends prematurely");
     }
 
     return retval;

data/lib/slow_blink/annotatable.rb

@@ -1,21 +1,24 @@
-# Copyright (c) 2016 Cameron Harper
+# @license
+#   
+#   Copyright (c) 2016 Cameron Harper
+#     
+#   Permission is hereby granted, free of charge, to any person obtaining a copy of
+#   this software and associated documentation files (the "Software"), to deal in
+#   the Software without restriction, including without limitation the rights to
+#   use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+#   the Software, and to permit persons to whom the Software is furnished to do so,
+#   subject to the following conditions:
+#   
+#   The above copyright notice and this permission notice shall be included in all
+#   copies or substantial portions of the Software.
 # 
-# Permission is hereby granted, free of charge, to any person obtaining a copy of
-# this software and associated documentation files (the "Software"), to deal in
-# the Software without restriction, including without limitation the rights to
-# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-# the Software, and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
-#  
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+#   FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+#   COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+#   IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+#   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 
 module SlowBlink
 

data/lib/slow_blink/annotation.rb

@@ -1,22 +1,24 @@
-
-# Copyright (c) 2016 Cameron Harper
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy of
-# this software and associated documentation files (the "Software"), to deal in
-# the Software without restriction, including without limitation the rights to
-# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-# the Software, and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
-#  
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
+# @license
+#   
+#   Copyright (c) 2016 Cameron Harper
+#     
+#   Permission is hereby granted, free of charge, to any person obtaining a copy of
+#   this software and associated documentation files (the "Software"), to deal in
+#   the Software without restriction, including without limitation the rights to
+#   use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+#   the Software, and to permit persons to whom the Software is furnished to do so,
+#   subject to the following conditions:
+#   
+#   The above copyright notice and this permission notice shall be included in all
+#   copies or substantial portions of the Software.
 # 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+#   FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+#   COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+#   IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+#   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 
 module SlowBlink
 

data/lib/slow_blink/binary.rb

@@ -1,21 +1,24 @@
-# Copyright (c) 2016 Cameron Harper
+# @license
+#   
+#   Copyright (c) 2016 Cameron Harper
+#     
+#   Permission is hereby granted, free of charge, to any person obtaining a copy of
+#   this software and associated documentation files (the "Software"), to deal in
+#   the Software without restriction, including without limitation the rights to
+#   use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+#   the Software, and to permit persons to whom the Software is furnished to do so,
+#   subject to the following conditions:
+#   
+#   The above copyright notice and this permission notice shall be included in all
+#   copies or substantial portions of the Software.
 # 
-# Permission is hereby granted, free of charge, to any person obtaining a copy of
-# this software and associated documentation files (the "Software"), to deal in
-# the Software without restriction, including without limitation the rights to
-# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-# the Software, and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
-#  
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+#   FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+#   COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+#   IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+#   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 
 module SlowBlink
 

data/lib/slow_blink/boolean.rb

@@ -1,21 +1,24 @@
-# Copyright (c) 2016 Cameron Harper
+# @license
+#   
+#   Copyright (c) 2016 Cameron Harper
+#     
+#   Permission is hereby granted, free of charge, to any person obtaining a copy of
+#   this software and associated documentation files (the "Software"), to deal in
+#   the Software without restriction, including without limitation the rights to
+#   use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+#   the Software, and to permit persons to whom the Software is furnished to do so,
+#   subject to the following conditions:
+#   
+#   The above copyright notice and this permission notice shall be included in all
+#   copies or substantial portions of the Software.
 # 
-# Permission is hereby granted, free of charge, to any person obtaining a copy of
-# this software and associated documentation files (the "Software"), to deal in
-# the Software without restriction, including without limitation the rights to
-# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-# the Software, and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
-#  
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+#   FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+#   COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+#   IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+#   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 
 module SlowBlink
 

data/lib/slow_blink/date.rb

@@ -1,21 +1,24 @@
-# Copyright (c) 2016 Cameron Harper
+# @license
+#   
+#   Copyright (c) 2016 Cameron Harper
+#     
+#   Permission is hereby granted, free of charge, to any person obtaining a copy of
+#   this software and associated documentation files (the "Software"), to deal in
+#   the Software without restriction, including without limitation the rights to
+#   use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+#   the Software, and to permit persons to whom the Software is furnished to do so,
+#   subject to the following conditions:
+#   
+#   The above copyright notice and this permission notice shall be included in all
+#   copies or substantial portions of the Software.
 # 
-# Permission is hereby granted, free of charge, to any person obtaining a copy of
-# this software and associated documentation files (the "Software"), to deal in
-# the Software without restriction, including without limitation the rights to
-# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-# the Software, and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
-#  
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+#   FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+#   COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+#   IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+#   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 
 module SlowBlink
 

data/lib/slow_blink/decimal.rb

@@ -1,21 +1,24 @@
-# Copyright (c) 2016 Cameron Harper
+# @license
+#   
+#   Copyright (c) 2016 Cameron Harper
+#     
+#   Permission is hereby granted, free of charge, to any person obtaining a copy of
+#   this software and associated documentation files (the "Software"), to deal in
+#   the Software without restriction, including without limitation the rights to
+#   use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+#   the Software, and to permit persons to whom the Software is furnished to do so,
+#   subject to the following conditions:
+#   
+#   The above copyright notice and this permission notice shall be included in all
+#   copies or substantial portions of the Software.
 # 
-# Permission is hereby granted, free of charge, to any person obtaining a copy of
-# this software and associated documentation files (the "Software"), to deal in
-# the Software without restriction, including without limitation the rights to
-# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-# the Software, and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
-#  
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+#   FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+#   COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+#   IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+#   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 
 module SlowBlink
 

data/lib/slow_blink/definition.rb

@@ -1,22 +1,24 @@
-
-# Copyright (c) 2016 Cameron Harper
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy of
-# this software and associated documentation files (the "Software"), to deal in
-# the Software without restriction, including without limitation the rights to
-# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-# the Software, and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
-#  
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
+# @license
+#   
+#   Copyright (c) 2016 Cameron Harper
+#     
+#   Permission is hereby granted, free of charge, to any person obtaining a copy of
+#   this software and associated documentation files (the "Software"), to deal in
+#   the Software without restriction, including without limitation the rights to
+#   use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+#   the Software, and to permit persons to whom the Software is furnished to do so,
+#   subject to the following conditions:
+#   
+#   The above copyright notice and this permission notice shall be included in all
+#   copies or substantial portions of the Software.
 # 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+#   FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+#   COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+#   IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+#   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 
 module SlowBlink
 
@@ -74,7 +76,7 @@ module SlowBlink
                                     return schema
                                 end
                             rescue StopIteration
-                                raise Error.new "#{self.location}: error: invalid cycle detected"
+                                raise ParseError.new "#{self.location}: error: invalid cycle detected"
                             end                                   
                         end
                     end