rusty_json 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8229cb337a37bcc8564b5a89faea33d555df6baf
-  data.tar.gz: a59744de5deffd9f5e4574c9d2851da6b57a7552
+  metadata.gz: 80f45d09c233b8bd9a51eb44b6b1d494c50e5f6b
+  data.tar.gz: b90b6666fde5e38f12031528ce5f4051594d6790
 SHA512:
-  metadata.gz: feb861a20062c7e8fec5dd896dbd3783215568e8730a2c4e2e943f074020fa14876de0ecc19ce00ad8462f550768786d03e7318e6dd2a04dd8672fc95f8f04ee
-  data.tar.gz: b83f60923de006bffe464f745bccb756a898950161712ef37c3635b5ff5a59fb77c4ea20dade8b721d296b5b22ae1022823fd666fef90b8892e00e67f22bfc39
+  metadata.gz: 97bd1d4de345fd9da6052628fe12f8c2aa1026380d35bd5c4121c4d26912289fe8489e804520accbf9675856d4cedec138c1b2d50ebf230b317a42d6f5390778
+  data.tar.gz: 11f8b29588bafd836a4b557ee7c09e1b69e75a7e68419a390bfcdaddca72f101f77c0bbff66bd9a48949355ed05e77aa2b5e672ad35d6f02dcbfc6b6cc6e686c

data/.travis.yml

@@ -11,4 +11,6 @@ matrix:
 before_install: gem install bundler -v 1.10.6
 addons:
   code_climate:
-    repo_token: 34d0d282f871aa2247e5b461141fcec4ef02fcf0a952476f33216dec59091827
+    repo_token: 34d0d282f871aa2247e5b461141fcec4ef02fcf0a952476f33216dec59091827
+notifications:
+  email: false

data/bin/rusty_json

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+require "rusty_json"
+
+if $stdin.tty? && ARGV.empty?
+  puts "USAGE: $ echo '{\"test\":64}' | rusty_json"
+  puts "USAGE: $ rusty_json path/to/file.json"
+else
+  puts RustyJson.parse(ARGF.read)
+end

data/lib/rusty_json/parser.rb

@@ -1,5 +1,6 @@
 require 'json'
 require 'set'
+require 'active_support/inflector'
 
 module RustyJson
   # Parser is the base class that actually parses JSON into Rust structs
@@ -11,98 +12,72 @@ module RustyJson
   # parser = Parser.new(name, json)
   # parser.parse
   # ```
-
   class Parser
-    # BASE_TYPES are merely Rust base types that we use before adding our own
-    # Structs to them.
-    BASE_TYPES = {
-      String => 'String',
-      Fixnum => 'i64',
-      Float => 'f64',
-    }
-
     # @param name [String] the name of the returned root JSON struct
     # @param json [String] the JSON string to parse into a Rust struct
     def initialize(name, json)
       @name = name
       @json = json
-      @struct_names = Set.new
-      @structs = Set.new
     end
 
     # parse takes the given JSON string and turns it into a string of
     # Rust structs, suitable for use with rustc_serialize.
     def parse
-      @parsed = JSON.parse(@json)
-      if @parsed.is_a? Hash
-        struct = parse_hash(@name, @parsed)
-      end
-      struct.to_s
+      (type, subtype) = parse_object([@name], JSON.parse(@json))
+      (subtype || type).to_s.gsub(/\n\n$/, "\n")
     end
 
     private
 
-    def parse_name(n)
-      n = n.split('_').collect(&:capitalize).join
-
-      if @struct_names.include? n
-        i = 2
-        while @struct_names.include? "#{n}_#{i}"
-          i += 1
-        end
-        "#{n}_#{i}"
-      else
-        n
-      end
+    def clean_name(name)
+      name.gsub('-', '_').gsub(':', '_').gsub('__', '_')
     end
 
-    def possible_new_struct(s)
-      match = @structs.find{|st| s == st}
-      s = match || s
-      if match.nil?
-        @structs << s
-      end
-      s
+    def parse_name(name)
+      clean_name(name).split('_').map(&:capitalize).join
     end
 
-    def parse_parts(name, values, struct)
-      name = name.gsub('-', '_').gsub(':', '_').gsub('__', '_')
-      if values.is_a? Array
-        struct = parse_array(name, values, struct)
-      elsif values.is_a? Hash
-        n = parse_name(name)
-        @struct_names << n
-        s = possible_new_struct( parse_hash(n, values) )
-        struct.add_value(name, s)
+    def parse_object(key_path, object)
+      if object.is_a? Array
+        parse_array(key_path, object)
+      elsif object.is_a? Hash
+        parse_hash(key_path, object)
       else
-        struct = parse_value(name, values, struct)
+        parse_value(key_path, object)
       end
-      struct
     end
 
-    def parse_hash(n, hash)
-      struct = RustStruct.new(n)
-      @struct_names << n
-      hash.each do |name, values|
-        struct = parse_parts(name, values, struct)
+    def parse_hash(key_path, hash)
+      name = ActiveSupport::Inflector.singularize(key_path.map { |key| parse_name(key) }.join(''))
+      struct = RustStruct.new(name)
+      hash.each do |key, value|
+        struct.add_value(clean_name(key), *parse_object(key_path + [key], value))
       end
-      struct
+      [struct, nil]
     end
 
-    def parse_array(name, values, struct)
-      # binding.pry
-      types = Set.new
-      values.each do |v|
-        types << v.class
+    def parse_array(key_path, array)
+      if Set.new(array.map(&:class)).count > 1
+        fail('Cannot handle multi-typed arrays')
       end
-      fail("Cannot handle multi typed arrays") if types.count > 1
-      struct.add_value(name, Array, types.to_a.first)
-      struct
+      object = (array.first.is_a? Hash) ? densify_array(array) : array.first
+      subtype = array.empty? ? nil : parse_object(key_path, object).first
+      [Array, subtype]
+    end
+
+    def parse_value(_key_path, value)
+      [value.class, nil]
     end
 
-    def parse_value(name, value, struct)
-      struct.add_value(name, value.class)
-      struct
+    def densify_array(array)
+      # Try to get rid of as much ambiguity, as possible:
+      object = array.first
+      array.each do |hash|
+        hash.each do |key, value|
+          object[key] ||= value
+        end
+      end
+      object
     end
   end
-end
+end

data/lib/rusty_json/rust_struct.rb

@@ -16,7 +16,10 @@ module RustyJson
       String => 'String',
       Fixnum => 'i64',
       Float => 'f64',
+      TrueClass => 'bool',
+      FalseClass => 'bool',
       Array => 'Vec',
+      NilClass => 'Option<?>'
     }
     # @param name [String] the name of the returned struct
     # @param root [Boolean] is this the root struct
@@ -35,9 +38,7 @@ module RustyJson
     # input JSON
     def reset
       @printed = false
-      @structs.each do |s|
-        s.reset
-      end
+      @structs.each(&:reset)
     end
 
     # Add Value is how we add keys to the resulting Struct
@@ -56,64 +57,51 @@ module RustyJson
 
     def add_value(name, type, subtype = nil)
       if type.class == RustyJson::RustStruct || subtype.class == RustyJson::RustStruct
-        struct = if type.class == RustyJson::RustStruct
+        if type.class == RustyJson::RustStruct
           t = type
           type = type.name
-          t
+          struct = t
         elsif subtype.class == RustyJson::RustStruct
           s = subtype
           subtype = subtype.name
-          s
+          struct = s
         end
         @structs << struct
         RustStruct.add_type(struct.name, struct.name)
-        @values[name] = [type, subtype]
-      else
-        @values[name] = [type, subtype]
       end
+      @values[name] = [type, subtype]
       true
     end
 
     # two Rust structs are equal if all of their keys / value types are the same
-    def == other
-      self.values == other.values
+    def ==(other)
+      values == other.values
     end
 
     # to_s controlls how to display the RustStruct as a Rust Struct
     def to_s
-      return "" if @printed
+      return '' if @printed
       @printed = true
       struct = required_structs
-      # binding.pry
-      struct << <<-RUST
-struct #{@name} {
-      RUST
-      @values.each do |attr_name, type|
-        if type[1] == nil
-          struct += "  #{attr_name}: #{RustStruct.type_name(type[0])}"
-        else
-          struct += "  #{attr_name}: #{RustStruct.type_name(type[0])}<#{RustStruct.type_name(type[1])}>"
-        end
-        struct += ",\n"
-      end
-      struct << <<-RUST
-}
-      RUST
-      if @root
-        reset
+      members = @values.map do |key, value|
+        type = RustStruct.type_name(value[0])
+        subtype = RustStruct.type_name(value[1])
+        member = "    #{key}: #{type}"
+        member << "<#{subtype}>" unless value[1].nil?
+        member
       end
+      struct << "struct #{@name} {\n" + members.join(",\n") + ",\n}\n\n"
+      struct = struct.gsub("\n\n\n", "\n\n")
+      reset if @root
       struct
     end
 
     private
 
     def required_structs
-      struct = ""
-      # binding.pry
-      @structs.to_a.each do |nested_struct|
-        struct << nested_struct.to_s + "\n"
-      end
-      struct
+      s = @structs.map(&:to_s).join("\n")
+      return "" if s == "\n"
+      s
     end
 
     def self.add_type(name, value)
@@ -124,4 +112,4 @@ struct #{@name} {
       @@types[type]
     end
   end
-end
+end

data/lib/rusty_json/version.rb

@@ -1,3 +1,3 @@
 module RustyJson
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

data/rusty_json.gemspec

@@ -14,8 +14,8 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.bindir        = "bin"
+  spec.executables   = ["rusty_json"] # spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.10"
@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry"
   spec.add_development_dependency 'codeclimate-test-reporter'
   spec.add_dependency "json"
+  spec.add_dependency "activesupport"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rusty_json
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Chris MacNaughton
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2015-10-22 00:00:00.000000000 Z
+date: 2015-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,10 +94,25 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - chmacnaughton@gmail.com
-executables: []
+executables:
+- rusty_json
 extensions: []
 extra_rdoc_files: []
 files:
@@ -109,6 +124,7 @@ files:
 - README.md
 - Rakefile
 - bin/console
+- bin/rusty_json
 - bin/setup
 - lib/rusty_json.rb
 - lib/rusty_json/parser.rb