SassyJSON 1.0.9 → 1.0.10

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1cf04a52495a225d84b9f238e9fb8f33209ae5a3
+  data.tar.gz: 5ecabfe827ede30ad3ba986cc1f7d82379c42787
+SHA512:
+  metadata.gz: 828cb801f2757a8b9e9bd9115031e1928263df28fba4f5337fe1d6ce336d93119ed544f94108e96a3f06cc0338773e9d66ccaa2f33b2c7bd233f8d09b0ac6520
+  data.tar.gz: 59bf68fe6d86dc866c27ad802c93afda71aa82ddd8723e477b6955df8899ac1ec44d50cb8b9aa057d5c4d7f82a252f54d7bb4813e71065f408f4c1ef0e821128

data/README.md

@@ -79,7 +79,7 @@ All you need is a clean version of Sass 3.3. Otherwise it's just pure Sass madne
 
   * [NodeJS](http://nodejs.org)
   * [Ruby](https://www.ruby-lang.org/)
-  * Sass 3.3 via `gem instals sass --pre`
+  * Sass 3.3 via `gem install sass --pre`
   * `grunt-cli` via `npm install -g grunt-cli`
 
 ### How to

data/lib/SassyJSON.rb

@@ -5,8 +5,8 @@ Compass::Frameworks.register('SassyJSON', :path => extension_path)
 #  Version is a number. If a version contains alphas, it will be created as a prerelease version
 #  Date is in the form of YYYY-MM-DD
 module SassyJSON
-  VERSION = "1.0.9"
-  DATE = "2014-01-21"
+  VERSION = "1.0.10"
+  DATE = "2014-01-23"
 end
 
 module Sass::Script::Functions

data/stylesheets/decode/helpers/number/_find-digits.scss

@@ -9,25 +9,23 @@
 
 @function _find-digits($source, $pointer) {
   $length: str-length($source);
-  $strings: '0' '1' '2' '3' '4' '5' '6' '7' '8' '9';
-  $numbers:  0   1   2   3   4   5   6   7   8   9;
+  $numbers: '0' '1' '2' '3' '4' '5' '6' '7' '8' '9';
   $result: null;
   $runs: 1;
 
   @while $pointer <= $length {
     $token: to-lower-case(str-slice($source, $pointer, $pointer));
-    $index: index($strings, $token);
+    $index: index($numbers, $token);
 
     @if $token == '.' {
       // @continue;
     }
     @else if $index and $index > 0 {
-      $number: nth($numbers, $index);
       $runs: $runs * 10;
-      $result: if($result == null, $number, $result * 10 + $number);
+      $result: if($result == null, ($index - 1), $result * 10 + ($index - 1));
     }
     @else {
-      @if index('e' '.' ',' ']' '}' ' ', $token) {
+      @if index('e' '.' ' ' ',' ']' '}', $token) {
         @return $pointer, if($result != null, $result / $runs, $result);
       }
       @return _throw("Unexpected token `" + $token + "`.", $pointer);

data/stylesheets/decode/helpers/number/_find-exponent.scss

@@ -9,14 +9,13 @@
 
 @function _find-exponent($source, $pointer) {
   $length: str-length($source);
-  $strings: '0' '1' '2' '3' '4' '5' '6' '7' '8' '9';
-  $numbers:  0   1   2   3   4   5   6   7   8   9;
+  $numbers: '0' '1' '2' '3' '4' '5' '6' '7' '8' '9';
   $result: null;
   $minus: false;
 
   @while $pointer <= $length {
     $token: to-lower-case(str-slice($source, $pointer, $pointer));
-    $index: index($strings, $token);
+    $index: index($numbers, $token);
 
     @if $token == 'e' {
       // @continue;
@@ -28,11 +27,10 @@
       $minus: false;
     }
     @else if $index and $index > 0 {
-      $number: nth($numbers, $index);
-      $result: if($result == null, $number, $result * 10 + $number);
+      $result: if($result == null, ($index - 1), $result * 10 + ($index - 1));
     }
     @else {
-      @if not index(" " " " "]" "}", $token) {
+      @if not index(' ' ',' ']' '}', $token) {
         @return _throw("Unexpected token `" + $token + "`.", $pointer);
       }
 

data/stylesheets/decode/helpers/number/_find-integer.scss

@@ -9,23 +9,21 @@
 
 @function _find-integer($source, $pointer) {
   $length: str-length($source);
-  $strings: '0' '1' '2' '3' '4' '5' '6' '7' '8' '9';
-  $numbers:  0   1   2   3   4   5   6   7   8   9;
+  $numbers: '0' '1' '2' '3' '4' '5' '6' '7' '8' '9';
   $result: 0;
 
   @while $pointer <= $length {
     $token: to-lower-case(str-slice($source, $pointer, $pointer));
-    $index: index($strings, $token);
+    $index: index($numbers, $token);
 
     @if $token == '-' {
       // do nothing
     }
     @else if $index {
-      $number: nth($numbers, $index);
-      $result: $result * 10 + $number;
+      $result: $result * 10 + ($index - 1);
     }
     @else {
-      @if index('e' '.' ',' ']' '}' ' ', $token) {
+      @if index('e' '.' ' ' ',' ']' '}', $token) {
         @return $pointer, $result;
       }
       @return _throw("Unexpected token `" + $token + "`.", $pointer);

data/stylesheets/decode/helpers/string/_find-ending-quote.scss

@@ -2,35 +2,56 @@
 // --------------------------------------------------------------------------------
 // @param [string] $string: to search in
 // --------------------------------------------------------------------------------
-// @return [number] position of the last non escaped quote
+// @return [number] position of the first non escaped quote
 
 @function _find-ending-quote($string){
-  $backslash: str-slice("\\", 1, 1); // Dirty hack to have a single backslash
-  $search: $string;
-
-  $end-quote-found: false;
-  $position: 0;
-
-
-  @while not $end-quote-found {
-    $index: str-index($search, '"');
-
-    @if not $index or $index == 0 { // No end of string found
-      @return $index;
+  $backslash: str-slice('\\', 1, 1); // Dirty hack to have a single backslash
+  $escaped-chars: '"\/bfnrtu'; // Characters that can be escaped in JSON
+  $hexadecimal-chars: '0' '1' '2' '3' '4' '5' '6' '7' '8' '9' '0' 'a' 'b' 'c' 'd' 'e' 'f';
+
+  $pos: 1;
+  $length: str-length($string);
+  $backslash-found: false;
+
+  @while $pos <= $length {
+    $char: to-lower-case(str-slice($string, $pos, $pos));
+
+    // Previous char was a backslash
+    @if $backslash-found {
+
+      // Special case, the 'u' character
+      @if $char == 'u' {
+        // Next 4 characters must be hexadecimal
+        @if not index($hexadecimal-chars, str-slice($string, $pos + 1, $pos + 1)) or
+            not index($hexadecimal-chars, str-slice($string, $pos + 2, $pos + 2)) or
+            not index($hexadecimal-chars, str-slice($string, $pos + 3, $pos + 3)) or
+            not index($hexadecimal-chars, str-slice($string, $pos + 4, $pos + 4)) {
+            @return 0;
+        }
+
+        $pos: $pos + 4;
+      }
+
+      // Invalid character escaped
+      @else if not str-index($escaped-chars, $char) {
+        @return 0;
+      }
+
+      $backslash-found: false;
     }
 
-    @else {
-      $position: $position + $index;
+    @else if $char == $backslash {
+      $backslash-found: true;
     }
 
-    $char-before-quote: str-slice($search, $index - 1, $index - 1);
-
-    @if $char-before-quote != $backslash {
-      $end-quote-found: true;
+    // Unescaped quote found
+    @else if $char == '"' {
+      @return $pos;
     }
 
-    $search: str-slice($search, $index + 1);
+    $pos: $pos + 1;
   }
 
-  @return $position;
+  // No end of string found
+  @return 0;
 }

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: SassyJSON
 version: !ruby/object:Gem::Version
-  version: 1.0.9
-  prerelease: 
+  version: 1.0.10
 platform: ruby
 authors:
 - Hugo Giraudel
@@ -10,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-01-23 00:00:00.000000000 Z
 dependencies: []
 description: Sass API for JSON
 email:
@@ -61,27 +60,26 @@ files:
 - stylesheets/SassyJSON.scss
 homepage: https://github.com/HugoGiraudel/SassyJSON/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: SassyJSON
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: SassyJSON is a Sass-powered API for JSON. It provides you the classic json-encode
   and json-decode directly from your Sass files.
 test_files: []