inci_score 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ebdee369644b8101b581422186444045721e4fe
-  data.tar.gz: e1415f118ec88be4a4c6e7dcf5326e54cb390669
+  metadata.gz: 8bc9d1f6ee80c730c5d5f12837fed8d774950369
+  data.tar.gz: ccb0394552ba0e2966c5260e84c338aa61b58a09
 SHA512:
-  metadata.gz: 7eaede4cffde022ff2ca533a4658bcfa7735234549fcb35f66f8d2373bfb6998ba22171c897f0637f8520e2d8c4de2a369c9ef3d0ab043cb18dec5fa4032a632
-  data.tar.gz: 5a6a3adb64504755a04f22098c06037a5a6b9283a1509c0e26518ed4640f80c69c3bc69d678c04dd23593c23783babb4840a8eaa5266bdd01058372a933d6935
+  metadata.gz: 629adf023e81fa545af1dbb675abe4467ef9aae42bb9f22e73d691339a8e9e585e7719902cf2f3b09c9a4d64c46032d17e9d72d92a378ec6a8d4a4beb9ff8e25
+  data.tar.gz: 36af9780ea2534d18a92be8d122649596a692f18720d5da5eb63b1a44cc9d7c4afe6c55b9a57fc33810f61d8fba5811912481ec0f70b975c751fc7d26334a203

data/README.md

@@ -57,7 +57,7 @@ inci.score
 => 53.762874945799766
 ```
 
-As you see the results are wrapped by an *InciScore::Response* object, this is useful when dealing with the Web API (read below) and when printing them to standard output.
+As you see the results are wrapped by an *InciScore::Response* object, this is useful when dealing with the CLI and HTTP interfaces (read below).
 
 ### Unrecognized components
 The API treats unrecognized components as a common case by just marking the object as non valid and raise a warning in case more than 30% of the ingredients are not found.  
@@ -84,9 +84,9 @@ TOTAL SCORE:
 VALID STATE:
         true
 COMPONENTS (hazard - name): 
-        0 - aqua
-        4 - dimethicone
-        3 - peg-10
+        aqua
+        dimethicone
+        peg-10
 UNRECOGNIZED:
         noent
 ```
@@ -98,7 +98,7 @@ inci_score --fresh --src="aqua, dimethicone"
 ```
 
 ### HTTP server
-The CLI interface exposes a Web layer based on the [Puma](http://puma.io/) application server.
+The CLI interface exposes a Web layer based on the [Puma](http://puma.io/) application server.  
 The HTTP server is started on the specified port by spawning as many workers as your current workstation supports:
 ```shell
 inci_score --http=9292
@@ -107,7 +107,7 @@ Consider all other options are discarded when running HTTP server.
 
 #### Triggering a request
 The HTTP server responds with a JSON representation of the original *InciScore::Response* object.  
-You can pass the source string directly as a HTTP parameter:
+You can pass the source string directly as a HTTP parameter (URI escaped):
 
 ```shell
 curl http://127.0.0.1:9292?src=aqua,dimethicone
@@ -137,13 +137,14 @@ I registered these benchmarks with a MacBook PRO 15 mid 2015 having these specs:
 * OSX El Captain
 * 2,2 GHz Intel Core i7 (4 cores)
 * 16 GB 1600 MHz DDR3
+* Ruby 2.4
 
 ### Wrk
 As always i used [wrk](https://github.com/wg/wrk) as the loading tool.
-I measured each library three times, picking the best lap.  
+I measured the library three times, picking the best lap.  
 The following script command is used:
 
-```
+```shell
 wrk -t 4 -c 100 -d 30s --timeout 2000 http://127.0.0.1:9292/?src=<list_of_ingredients>
 ```
 

data/inci_score.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency "nokogiri", "~> 1.6"
   s.add_runtime_dependency "puma", "~> 3"
+  s.add_runtime_dependency "rack", ">= 1.6"
   s.add_runtime_dependency "RubyInline", "~> 3"
 
   s.add_development_dependency "bundler", "~> 1.11"

data/lib/inci_score/server.rb

@@ -28,10 +28,14 @@ module InciScore
       @config_klass.new do |c|
         c.rackup RACKUP_FILE
         c.bind "tcp://#{DEFAULT_HOST}:#{@port}"
-        c.workers @workers if @workers > 1
+        c.workers @workers if workers?
         c.threads *@threads
         c.preload_app! if @preload
       end
     end
+
+    private def workers?
+      @workers > 1 && !Puma.jruby? && !Puma.windows?
+    end
   end
 end

data/lib/inci_score/version.rb

@@ -1,3 +1,3 @@
 module InciScore
-  VERSION = "2.2.0"
+  VERSION = "2.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inci_score
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - costajob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-04 00:00:00.000000000 Z
+date: 2017-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: RubyInline
   requirement: !ruby/object:Gem::Requirement