tjson 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3062690d7f47d6c5294c379941cc4638495879a6
-  data.tar.gz: 7ff998fe639a348f1c4b3a15a8003c8246764014
+  metadata.gz: 5324e4ee4f01304e7330ed40c78c55eadfa8419e
+  data.tar.gz: 957686c2c7a4f589912a04e734b0aef2572621c7
 SHA512:
-  metadata.gz: 5d6c02ed1b8bc9b78b79d6008ea9bc58d9f4ac82769a7ab6fd7e5c6acaad4ccdfb2259bb9e9dfaad7d19cae1e32b82834eefd7e9c10259259a4048f347867311
-  data.tar.gz: bbaf0cc3b31ba54a020a9fd8985201040f3e64832d7d1bc53c648ebff667bfd3372ded56e7ce56adf90d9b088bae9cc7e58890f2d0e4e70aea2634293888dfa9
+  metadata.gz: 6f8ef3abc0f62a1f70ad46c285866c4d5847ec69c8112e0005d73564082c34d3d6c3b3c75f8b45bcaac8f9bb39eb14e23e281b88c9e46346abb6a54b5a2c3bf6
+  data.tar.gz: e020ee6c927f8ac48b17e00b09905ff7951ea50a5cfc65d1117d5d143b0f1ead6d291a9f86037cb1cae4d9a77b936b930d3796d553761f6cfa24c14f5009a59c

data/.rakeTasks

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Settings><!--This file was automatically generated by Ruby plugin.
+You are allowed to: 
+1. Remove rake task
+2. Add existing rake tasks
+To add existing rake tasks automatically delete this file and reload the project.
+--><RakeGroup description="" fullCmd="" taksId="rake"><RakeTask description="Build tjson-0.3.0.gem into the pkg directory" fullCmd="build" taksId="build" /><RakeTask description="Remove any temporary products" fullCmd="clean" taksId="clean" /><RakeTask description="Remove any generated files" fullCmd="clobber" taksId="clobber" /><RakeTask description="Build and install tjson-0.3.0.gem into system gems" fullCmd="install" taksId="install" /><RakeGroup description="" fullCmd="" taksId="install"><RakeTask description="Build and install tjson-0.3.0.gem into system gems without network access" fullCmd="install:local" taksId="local" /></RakeGroup><RakeTask description="Create tag v0.3.0 and build and push tjson-0.3.0.gem to Rubygems" fullCmd="release[remote]" taksId="release[remote]" /><RakeTask description="Run RuboCop" fullCmd="rubocop" taksId="rubocop" /><RakeGroup description="" fullCmd="" taksId="rubocop"><RakeTask description="Auto-correct RuboCop offenses" fullCmd="rubocop:auto_correct" taksId="auto_correct" /></RakeGroup><RakeTask description="Run RSpec code examples" fullCmd="spec" taksId="spec" /><RakeTask description="" fullCmd="default" taksId="default" /><RakeTask description="" fullCmd="release" taksId="release" /><RakeGroup description="" fullCmd="" taksId="release"><RakeTask description="" fullCmd="release:guard_clean" taksId="guard_clean" /><RakeTask description="" fullCmd="release:rubygem_push" taksId="rubygem_push" /><RakeTask description="" fullCmd="release:source_control_push" taksId="source_control_push" /></RakeGroup></RakeGroup></Settings>

data/.rubocop.yml

@@ -1,16 +1,6 @@
 AllCops:
   DisplayCopNames: true
 
-#
-# Style
-#
-
-LineLength:
-  Max: 128
-
-Style/StringLiterals:
-  EnforcedStyle: double_quotes
-
 #
 # Metrics
 #
@@ -18,6 +8,9 @@ Style/StringLiterals:
 Metrics/AbcSize:
   Enabled: false
 
+Metrics/BlockLength:
+  Max: 100
+
 Metrics/CyclomaticComplexity:
   Enabled: false
 
@@ -27,5 +20,24 @@ Metrics/PerceivedComplexity:
 Metrics/ClassLength:
   Max: 100
 
+Metrics/LineLength:
+  Max: 128
+
 Metrics/MethodLength:
   Max: 25
+
+#
+# Performance
+#
+
+Performance/RegexpMatch:
+  Enabled: false
+
+#
+# Style
+#
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+

data/.ruby-version

@@ -1 +1 @@
-2.3.1
+2.4.1

data/.travis.yml

@@ -9,6 +9,7 @@ rvm:
   - 2.1
   - 2.2
   - 2.3.1
+  - 2.4.1
   - jruby-9.1.5.0
 
 matrix:

data/CHANGES.md

@@ -1,3 +1,8 @@
+## 0.4.0 (2017-04-16)
+
+* Add support for Boolean Value and Set types
+* Add `TJSON.load` and `TJSON.load_file` methods
+
 ## 0.3.0 (2016-11-06)
 
 * Add `TJSON.pretty_generate`

data/Gemfile

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 source "https://rubygems.org"
+ruby RUBY_VERSION
 
 gemspec
 
@@ -10,7 +11,7 @@ end
 
 group :development, :test do
   gem "rake"
-  gem "toml-rb"
   gem "rspec", "~> 3.5"
-  gem "rubocop", "0.44.1"
+  gem "rubocop", "0.48.1"
+  gem "toml-rb"
 end

data/Guardfile

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # More info at https://github.com/guard/guard#readme
 
 guard :rspec, cmd: "GUARD_RSPEC=1 bundle exec rspec --no-profile" do

data/Rakefile

@@ -8,4 +8,4 @@ RSpec::Core::RakeTask.new
 require "rubocop/rake_task"
 RuboCop::RakeTask.new
 
-task default: %w(spec rubocop)
+task default: %w[spec rubocop]

data/lib/tjson.rb

@@ -3,7 +3,9 @@
 require "tjson/version"
 
 require "json"
+require "set"
 require "time"
+
 require "base32"
 require "base64"
 
@@ -59,6 +61,19 @@ module TJSON
     object
   end
 
+  class << self
+    alias load parse
+  end
+
+  # Load data from a file containing TJSON
+  #
+  # @param filename [String] name of the .tjson file
+  # @raise [TJSON::ParseError] an error occurred parsing the given file
+  # @return [Object] parsed data
+  def self.load_file(filename)
+    load(File.read(filename))
+  end
+
   # Generate TJSON from a Ruby Hash (TJSON only allows objects as toplevel values)
   #
   # @param obj [Hash] Ruby Hash to serialize as TJSON

data/lib/tjson/datatype.rb

@@ -30,9 +30,12 @@ module TJSON
       case obj
       when Hash               then self["O"]
       when ::Array            then TJSON::DataType::Array.identify_type(obj)
+      when ::Set              then TJSON::DataType::Set.identify_type(obj)
       when ::String, Symbol   then obj.encoding == Encoding::BINARY ? self["b"] : self["s"]
       when ::Integer          then self["i"]
       when ::Float            then self["f"]
+      when ::TrueClass        then self["v"]
+      when ::FalseClass       then self["v"]
       when ::Time, ::DateTime then self["t"]
       else raise TypeError, "don't know how to serialize #{obj.class} as TJSON"
       end
@@ -42,6 +45,18 @@ module TJSON
       identify_type(obj).generate(obj)
     end
 
+    def tag
+      raise NotImplementError, "no #tag defined for #{self.class}"
+    end
+
+    def convert(_value)
+      raise NotImplementedError, "#{self.class} does not implement #convert"
+    end
+
+    def generate(_value)
+      raise NotImplementedError, "#{self.class} does not implement #genreate"
+    end
+
     # Scalar types
     class Scalar < TJSON::DataType
       def scalar?
@@ -83,9 +98,11 @@ require "tjson/datatype/array"
 require "tjson/datatype/binary"
 require "tjson/datatype/float"
 require "tjson/datatype/integer"
+require "tjson/datatype/set"
 require "tjson/datatype/string"
 require "tjson/datatype/timestamp"
 require "tjson/datatype/object"
+require "tjson/datatype/value"
 
 # TJSON does not presently support user-extensible types
 TJSON::DataType::TAGS = {
@@ -94,6 +111,7 @@ TJSON::DataType::TAGS = {
 
   # Non-scalars
   "A" => TJSON::DataType::Array,
+  "S" => TJSON::DataType::Set,
 
   # Scalars
   "b"   => TJSON::DataType::Binary64.new.freeze,
@@ -104,5 +122,6 @@ TJSON::DataType::TAGS = {
   "i"   => TJSON::DataType::SignedInt.new.freeze,
   "s"   => TJSON::DataType::String.new.freeze,
   "t"   => TJSON::DataType::Timestamp.new.freeze,
-  "u"   => TJSON::DataType::UnsignedInt.new.freeze
+  "u"   => TJSON::DataType::UnsignedInt.new.freeze,
+  "v"   => TJSON::DataType::Value.new.freeze
 }.freeze

data/lib/tjson/datatype/float.rb

@@ -9,7 +9,7 @@ module TJSON
       end
 
       def convert(float)
-        raise TJSON::TypeError, "expected Float, got #{float.class}" unless float.is_a?(::Numeric)
+        raise TJSON::TypeError, "not a floating point value: #{float.inspect}" unless float.is_a?(::Numeric)
         float.to_f
       end
 

data/lib/tjson/datatype/object.rb

@@ -17,7 +17,7 @@ module TJSON
 
       def generate(obj)
         members = obj.map do |k, v|
-          raise TypeError, "expected String for key, got #{k.class}" unless k.is_a?(::String)
+          raise TypeError, "expected String for key, got #{k.class}" unless k.is_a?(::String) || k.is_a?(Symbol)
           type = TJSON::DataType.identify_type(v)
           ["#{k}:#{type.tag}", TJSON::DataType.generate(v)]
         end

data/lib/tjson/datatype/set.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module TJSON
+  class DataType
+    # TJSON sets
+    class Set < NonScalar
+      # Determine the type of a Ruby array (for serialization)
+      def self.identify_type(array)
+        inner_type = nil
+
+        array.each do |elem|
+          t = TJSON::DataType.identify_type(elem)
+          inner_type ||= t
+          raise TJSON::TypeError, "set contains heterogenous types: #{array.inspect}" unless inner_type == t
+        end
+
+        new(inner_type)
+      end
+
+      def tag
+        "S<#{@inner_type.tag}>"
+      end
+
+      def convert(array)
+        raise TJSON::TypeError, "expected Array, got #{array.class}" unless array.is_a?(::Array)
+
+        if @inner_type
+          result = ::Set.new(array.map { |o| @inner_type.convert(o) })
+          raise TJSON::ParseError, "set contains duplicate items" if result.size < array.size
+          return result
+        end
+
+        return ::Set.new if array.empty?
+        raise TJSON::ParseError, "no inner type specified for non-empty set: #{array.inspect}"
+      end
+
+      def generate(set)
+        set.map { |o| TJSON::DataType.generate(o) }
+      end
+    end
+  end
+end

data/lib/tjson/datatype/timestamp.rb

@@ -4,13 +4,16 @@ module TJSON
   class DataType
     # RFC3339 timestamp (Z-normalized)
     class Timestamp < Scalar
+      # Regular expression for matching timestamps
+      TIMESTAMP_REGEX = /\A\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z\z/
+
       def tag
         "t"
       end
 
       def convert(str)
         raise TJSON::TypeError, "expected String, got #{str.class}: #{str.inspect}" unless str.is_a?(::String)
-        raise TJSON::ParseError, "invalid timestamp: #{str.inspect}" unless str =~ /\A\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z\z/
+        raise TJSON::ParseError, "invalid timestamp: #{str.inspect}" unless str =~ TIMESTAMP_REGEX
 
         ::Time.iso8601(str)
       end

data/lib/tjson/datatype/value.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module TJSON
+  class DataType
+    # Boolean Value
+    class Value < Scalar
+      def tag
+        "v"
+      end
+
+      def convert(value)
+        raise TJSON::TypeError, "'null' is expressly disallowed in TJSON" if value.nil?
+        raise TJSON::TypeError, "not a boolean value: #{value.inspect}" unless [true, false].include?(value)
+        value
+      end
+
+      def generate(value)
+        value
+      end
+    end
+  end
+end

data/lib/tjson/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TJSON
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/tjson.gemspec

@@ -1,5 +1,6 @@
 # coding: utf-8
 # frozen_string_literal: true
+
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "tjson/version"

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: tjson
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Tony Arcieri
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-06 00:00:00.000000000 Z
+date: 2017-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base32
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.13'
 description: A JSON-compatible serialization format with rich type annotations
@@ -45,11 +45,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".ruby-version"
-- ".travis.yml"
+- .gitignore
+- .rakeTasks
+- .rspec
+- .rubocop.yml
+- .ruby-version
+- .travis.yml
 - CHANGES.md
 - Gemfile
 - Guardfile
@@ -63,8 +64,10 @@ files:
 - lib/tjson/datatype/float.rb
 - lib/tjson/datatype/integer.rb
 - lib/tjson/datatype/object.rb
+- lib/tjson/datatype/set.rb
 - lib/tjson/datatype/string.rb
 - lib/tjson/datatype/timestamp.rb
+- lib/tjson/datatype/value.rb
 - lib/tjson/object.rb
 - lib/tjson/version.rb
 - tjson.gemspec
@@ -78,17 +81,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Tagged JSON with Rich Types