hesabu 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43989f35e5c55382b8985d4bfeff88611eee628e4b24c5c69eea352b7629bdf2
-  data.tar.gz: 81d5ec393af329699291858a0f076bb39e8e70a9d0066d994bc8b4ef2c53bb08
+  metadata.gz: 9372fc461d5c52778243585448ddde3c5f5e51e8305bd0f9611e44f925703368
+  data.tar.gz: c1134317005e8f75b3ce98e020131cb81300748ab1246e075e0b495c62f3e6f7
 SHA512:
-  metadata.gz: 31c6b5bfcea143935d986e39a37867f4e880b745be84a7aeaf63b60300d2df1f5cbd1cfd67b62d51880e2fa2c0e3ad49bd4b80487911c480577508e75bdd21cb
-  data.tar.gz: 475030ad36e33ea939cfade9d9080a1bd40a538aeea3558090aa64441a262b3abffe18a86c7f31ca1a23af7135c58737ed1445bdbc7878980c29a27a8eed8835
+  metadata.gz: 4f777c09c72a305645acccf4c376484bfb4c958392b1528f629221adca39b2df8d2703fa0b0890f41b7aa9446a5cacb83a8d06f7d40050295846c50b3bb371cc
+  data.tar.gz: 923eefff5ceb4a10f7ec54514d05b444fd30d4a9b353d6c7eb70eda2b8823882149369fab831a2b6a4ae5b40852a5fe46bb1d75c1bdaa87da71ddac89973dd82

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hesabu (0.1.12)
+    hesabu (0.1.14)
 
 GEM
   remote: https://rubygems.org/
@@ -11,30 +11,36 @@ GEM
     ast (2.4.0)
     byebug (10.0.2)
     diff-lcs (1.3)
-    docile (1.3.0)
+    docile (1.3.1)
     erubis (2.7.0)
-    faraday (0.14.0)
+    faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    flay (2.10.0)
+    flay (2.12.0)
       erubis (~> 2.7.0)
       path_expander (~> 1.0)
       ruby_parser (~> 3.0)
       sexp_processor (~> 4.0)
-    gitlab (4.3.0)
-      httparty
-      terminal-table
-    httparty (0.16.2)
+    gitlab (4.8.0)
+      httparty (>= 0.14.0)
+      terminal-table (>= 1.5.1)
+    httparty (0.16.3)
+      mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
+    jaro_winkler (1.5.2)
     json (2.1.0)
+    mime-types (3.2.2)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2018.0812)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
-    octokit (4.8.0)
+    octokit (4.13.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    parallel (1.12.1)
-    parser (2.5.1.0)
+    oj (3.7.8)
+    parallel (1.13.0)
+    parser (2.6.0.0)
       ast (~> 2.4.0)
-    path_expander (1.0.2)
-    powerpack (0.1.1)
+    path_expander (1.0.3)
+    powerpack (0.1.2)
     pronto (0.9.5)
       gitlab (~> 4.0, >= 4.0.0)
       httparty (>= 0.13.7)
@@ -45,45 +51,46 @@ GEM
     pronto-flay (0.9.0)
       flay (~> 2.8)
       pronto (~> 0.9.0)
-    pronto-rubocop (0.9.0)
+    pronto-rubocop (0.9.1)
       pronto (~> 0.9.0)
-      rubocop (~> 0.38, >= 0.35.0)
-    pronto-simplecov (0.1.0)
+      rubocop (~> 0.50, >= 0.49.1)
+    pronto-simplecov (0.1.1)
       pronto (~> 0.9.0)
       simplecov
-    public_suffix (3.0.2)
+    public_suffix (3.0.3)
     rainbow (2.2.2)
       rake
     rake (10.5.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    rubocop (0.55.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    rubocop (0.63.1)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.5)
+      parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
+      unicode-display_width (~> 1.4.0)
     ruby-prof (0.17.0)
-    ruby-progressbar (1.9.0)
-    ruby_parser (3.11.0)
+    ruby-progressbar (1.10.0)
+    ruby_parser (3.12.0)
       sexp_processor (~> 4.9)
-    rugged (0.27.0)
+    rugged (0.27.7)
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
-    sexp_processor (4.10.1)
+    sexp_processor (4.11.0)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -92,7 +99,7 @@ GEM
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thor (0.19.4)
-    unicode-display_width (1.3.2)
+    unicode-display_width (1.4.1)
 
 PLATFORMS
   ruby
@@ -101,6 +108,7 @@ DEPENDENCIES
   bundler (~> 1.16)
   byebug
   hesabu!
+  oj
   pronto
   pronto-flay
   pronto-rubocop
@@ -111,4 +119,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   1.16.4
+   1.17.1

data/hesabu.gemspec

@@ -28,10 +28,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
 
   spec.add_development_dependency "byebug"
+  spec.add_development_dependency "oj"
   spec.add_development_dependency "pronto"
   spec.add_development_dependency "pronto-flay"
   spec.add_development_dependency "pronto-rubocop"
   spec.add_development_dependency "pronto-simplecov"
-  spec.add_development_dependency "simplecov"
   spec.add_development_dependency "ruby-prof"
+  spec.add_development_dependency "simplecov"
 end

data/lib/hesabu.rb

@@ -1,11 +1,12 @@
-require "hesabu/version"
+require_relative "./hesabu/version"
 
 require_relative "./hesabu/errors"
 require_relative "./hesabu/types/numeric"
 
-require_relative "./hesabu/equation_cleaner"
+require_relative "./hesabu/multi_json"
 require_relative "./hesabu/solver"
 
+
 module Hesabu
   HESABUCLI = File.expand_path("../bin/hesabucli", File.dirname(__FILE__))
   puts "************** HESABU cli location : " + HESABUCLI

data/lib/hesabu/multi_json.rb

@@ -0,0 +1,65 @@
+module Hesabu
+  # A wrapper to support both `oj` and normal `json`
+  #
+  # `oj` has some characteristics which make a very good candidate to
+  # be the preferred JSON parser for Hesabu. Mainly, it's fast, and it
+  # stays fast for large payloads.
+  #
+  # This module will check if `oj` is available and otherwise fall
+  # back to the regular JSON from the standard lib
+  #
+  #      Hesabu::MultiJSON::generate(object) # Generate JSON
+  #      Hesabu::MultiJSON::parse(string) # Parse JSON
+  module MultiJSON
+    # Takes a ruby object and transforms it to JSON.
+    def self.generate(object)
+      _fast_to_json(object)
+    rescue NameError
+      define_fast_json(Hesabu::MultiJSON, "to_json")
+      _fast_to_json(object)
+    end
+
+    # Takes a string (hopefully containing JSON) and parses it to Ruby
+    def self.parse(string)
+      _fast_from_json(string)
+    rescue NameError
+      define_fast_json(Hesabu::MultiJSON, "from_json")
+      _fast_from_json(string)
+    end
+
+    def self.to_json_method
+      body = begin
+               require "oj"
+               %(::Oj.dump(object, mode: :compat, time_format: :ruby, use_to_json: true))
+             rescue LoadError
+               %(JSON.fast_generate(object, create_additions: false, quirks_mode: true))
+             end
+      <<~METHOD
+        def _fast_to_json(object)
+          #{body}
+        end
+METHOD
+    end
+
+    def self.from_json_method
+      body = begin
+               require "oj"
+               %(::Oj.load(string, mode: :compat, time_format: :ruby, use_to_json: true))
+             rescue LoadError
+               %(JSON.parse(string, create_additions: false))
+             end
+      <<~METHOD
+        def _fast_from_json(string)
+          #{body}
+        end
+METHOD
+    end
+
+    def self.define_fast_json(receiver, name)
+      cl = caller_locations(1..1).first
+      method_body = public_send("#{name}_method")
+      warn "Defining #{receiver}._fast_#{name} as #{method_body.inspect}"
+      receiver.instance_eval method_body, cl.absolute_path, cl.lineno
+    end
+  end
+end

data/lib/hesabu/solver.rb

@@ -1,5 +1,3 @@
-
-
 module Hesabu
   class Solver
     def initialize
@@ -10,18 +8,18 @@ module Hesabu
       if raw_expression.nil? || name.nil?
         raise Hesabu::ArgumentError, "name or expression can't be nil : '#{name}', '#{raw_expression}'"
       end
-      @equations[name] = EquationCleaner.clean(raw_expression.to_s)
+      @equations[name] = raw_expression.to_s
     end
 
     def solve!
       return {} if @equations.empty?
       result = nil
       IO.popen(HESABUCLI, mode = "r+") do |io|
-        io.write @equations.to_json
+        io.write Hesabu::MultiJSON.generate(@equations)
         io.close_write # let the process know you've given it all the data
         result = io.read
       end
-      solution = JSON.parse(result)
+      solution = Hesabu::MultiJSON.parse(result)
       exit_status = $CHILD_STATUS.exitstatus
 
       log_everything(exit_status, result) if ENV["HESABU_DEBUG"] || exit_status != 0

data/lib/hesabu/version.rb

@@ -1,3 +1,3 @@
 module Hesabu
-  VERSION = "0.1.13".freeze
+  VERSION = "0.1.14".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hesabu
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - Stéphan Mestach
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-21 00:00:00.000000000 Z
+date: 2019-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pronto
   requirement: !ruby/object:Gem::Requirement
@@ -123,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby-prof
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -175,8 +189,8 @@ files:
 - bin/setup
 - hesabu.gemspec
 - lib/hesabu.rb
-- lib/hesabu/equation_cleaner.rb
 - lib/hesabu/errors.rb
+- lib/hesabu/multi_json.rb
 - lib/hesabu/solver.rb
 - lib/hesabu/types/numeric.rb
 - lib/hesabu/version.rb

data/lib/hesabu/equation_cleaner.rb

@@ -1,13 +0,0 @@
-
-module Hesabu
-  class EquationCleaner
-    def self.clean(eq)
-      return eq if !eq.include?("AND") && !eq.include?("=") && !eq.include?("OR")
-      clean_eq = eq.gsub(" AND ", " && ")
-      clean_eq = clean_eq.gsub(" OR ", " || ")
-      clean_eq.split(/(<=|>=|!=|==|=|\*|\s)/m)
-              .map { |a| a == "=" ? "==" : a }
-              .join("")
-    end
-  end
-end