ingreedyfork 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 759c544ed7cfbe977ae98480e6511e51ce3c6398
-  data.tar.gz: f097040e73d47972e9172e44e0931eeca4c5711d
+SHA256:
+  metadata.gz: 8424ae8e7e7888a98e39a093ad74270089968819d9ecaa76a860fa1462b41c7a
+  data.tar.gz: c7e1792a794598eaf9aee10993fc4e4d69ab45afebe63b04167cfc1bc8c87805
 SHA512:
-  metadata.gz: 97aff1c6885ccf9655ecdc1b5b3e8b03859ef9f77d6e00b5ca4d8f8df5942f00046b7f1d921399995578bed70753b71a8b33ce07ab646d266a1084b6bf2efec8
-  data.tar.gz: dd00f7ed900419704bfa6f1f8cdd9158dfe3bb8180a17c57b80f84ac5bad86279cbde88b7940a1ffe655f38f2261988f02d500f781c9da9c2b54ac995338ec83
+  metadata.gz: 930fb7edb14bdbbdd7fc40672f6e7de3b8aeec2a459a9ce944f1e10ede534b98d984a6b9f5e877c401dd1eeee7ca0fa4aa572425ca4ee4e4ac44d55b9a86cfdb
+  data.tar.gz: cda6a23f88a198d9716e9c0ca8d9274c63582c282a08d68cc25308c2fc06e8ff1b5160bb9f01ffffb5a4a13a0efbbe43a3c3318fc85507154593c2dd22ea3ccf

data/.rubocop.yml

@@ -1,3 +1,7 @@
+inherit_gem:
+  matkoniecz-ruby-style:
+    - standard_rubocop_config.yml
+
 AllCops:
   Exclude:
     - db/schema.rb

data/build_push_new_gem_version.sh

@@ -0,0 +1 @@
+gem push *.gem

data/build_reinstall_gem_locally.sh

@@ -0,0 +1,3 @@
+rm *.gem
+gem build *.gemspec
+gem install --user-install *.gem

data/{ingreedy.gemspec → ingreedyfork.gemspec}

@@ -1,8 +1,8 @@
-require File.expand_path("../lib/ingreedy/version", __FILE__)
+require File.expand_path("../lib/ingreedyfork/version", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "ingreedyfork"
-  s.version     = Ingreedy::VERSION
+  s.version     = Ingreedy::VERSION # is in lib/ingreedyfork/version.rb file
   s.licenses    = ["MIT"]
   s.authors     = ["Ian C. Anderson, support for Polish added by Mateusz Konieczny "]
   s.email       = ["matkoniecz@gmail.com"]
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "rake", "~> 0.9", ">= 0.9"
   s.add_development_dependency "rspec", "~> 3.3.0", ">= 3.3.0"
+  s.add_development_dependency 'matkoniecz-ruby-style'
   s.add_development_dependency "coveralls", "~> 0.7.0", ">= 0.7.0"
   s.add_development_dependency "pry", '~> 0'
 end

data/lib/{ingreedy.rb → ingreedyfork.rb}

@@ -1,4 +1,4 @@
-path = File.expand_path(File.join(File.dirname(__FILE__), "ingreedy"))
+path = File.expand_path(File.join(File.dirname(__FILE__), "ingreedyfork"))
 
 require File.join(path, "case_insensitive_parser")
 require File.join(path, "ingreedy_parser")

data/lib/{ingreedy → ingreedyfork}/amount_parser.rb

@@ -59,7 +59,11 @@ module Ingreedy
     private
 
     def word_digits
-      Ingreedy.dictionaries.current.numbers.keys
+      # words are sorted by length, from longest to shortest to ensure that
+      # in case of word A that is prefix of word B
+      # word A appears after word B
+      # real example: words "kilka" and "kilkanaście" in Polish
+      Ingreedy.dictionaries.current.numbers.keys.sort_by { |word| -word.length }
     end
 
     def vulgar_fractions

data/lib/{ingreedy → ingreedyfork}/dictionaries/pl.yml

@@ -21,7 +21,7 @@
     - "łyżeczka"
     - "łyżeczek"
     - "łyżeczki"
-  :rounded_tablespoon:
+  :rounded_spoon:
     - "czubata łyżka"
     - "czubatych łyżek"
     - "czubate łyżki"
@@ -31,7 +31,7 @@
     - "czubatych łyżeczek"
     - "czubate łyżeczki"
     - "czubatej łyżeczki"
-  :heaped_tablespoon:
+  :heaped_spoon:
     - "kopiasta łyżka"
     - "kopiastych łyżek"
     - "kopiaste łyżki"
@@ -164,6 +164,12 @@
     - "łodyga"
     - "łodyg"
     - "łodygi"
+    - "gałąź"
+    - "gałęzie"
+    - "gałęzi"
+    - "gałązki"
+    - "gałązka"
+    - "gałązek"
   :metre:
     - "m"
     - "metr"
@@ -184,6 +190,9 @@
     - "szczur"
     - "szczury"
     - "szczura"
+  :washing:
+    - "pranie"
+    - "prań"
 :numbers:
   cwiartka: 0.25
   ćwiartka: 0.25
@@ -227,4 +236,6 @@
   dziesięć: 10
   dziesięciu: 10
 
+  kilkanaście: 15
+
 :prepositions:

data/lib/ingreedyfork/version.rb

@@ -0,0 +1,3 @@
+module Ingreedy
+  VERSION = "0.1.11"
+end

data/spec/ingreedy_spec.rb

@@ -416,6 +416,12 @@ describe Ingreedy, "unit parsing with :pl locale" do
       "2 łyżki mąki" => :spoon,
       "1 łyżka mąki" => :spoon,
       "1 płaska łyżka mąki" => :spoon,
+      "1 pęczek mąki" => :small_bundle,
+      "1929 pęczek mąki" => :small_bundle,
+      #failure with mutiple spaces is OK but not demanded
+      #"1929  pęczek  zazółći" => :small_bundle,
+      #"1929    pęczek     zazółći" => :small_bundle,
+      #"1929    pęczków     zazółći" => :small_bundle,
     }.each do |query, expected|
       it "parses the #{expected} unit correctly" do
         expect(Ingreedy.parse(query)).to parse_the_unit(expected)
@@ -433,7 +439,7 @@ describe Ingreedy, "without units" do
     after(:all) do
       Ingreedy.locale = nil
     end
-    it "parses correctly units that is prefix of other unit" do
+    it "parses correctly units" do
       result = Ingreedy.parse "3 płaskie łyżki majonezu"
 
       expect(result.amount).to eq(3)
@@ -443,6 +449,65 @@ describe Ingreedy, "without units" do
   end
 end
 
+describe Ingreedy, "parsing unitless case (dziesięć -> 10) with Polish locale" do
+  context "Polish locale" do
+    before(:all) do
+      Ingreedy.locale = :pl
+    end
+
+    after(:all) do
+      Ingreedy.locale = nil
+    end
+    it "parses correctly units that has number with prefix matching name of other number" do
+      result = Ingreedy.parse "dziesięć oliwek"
+
+      expect(result.amount).to eq(10)
+      expect(result.unit).to eq nil
+      expect(result.ingredient).to eq("oliwek")
+    end
+  end
+end
+
+describe Ingreedy, "parsing unitless case (kilkanaście -> 11 to 19)" do
+  context "Polish locale" do
+    before(:all) do
+      Ingreedy.locale = :pl
+    end
+
+    after(:all) do
+      Ingreedy.locale = nil
+    end
+    it "parses correctly units that has number with prefix matching name of other number" do
+      result = Ingreedy.parse "kilkanaście oliwek"
+
+      expect(result.amount).to be >= 11
+      expect(result.amount).to be <= 19
+      expect(result.unit).to eq nil
+      expect(result.ingredient).to eq("oliwek")
+    end
+  end
+end
+
+describe Ingreedy, "parsing unitless case (kilkanaście in reverse order -> 11 to 19)" do
+  context "Polish locale" do
+    before(:all) do
+      Ingreedy.locale = :pl
+    end
+
+    after(:all) do
+      Ingreedy.locale = nil
+    end
+    it "parses correctly units also when other unit is prefix of it" do
+      result = Ingreedy.parse "oliwek kilkanaście"
+
+      expect(result.amount).to be >= 11
+      expect(result.amount).to be <= 19
+      expect(result.unit).to eq nil
+      expect(result.ingredient).to eq("oliwek")
+    end
+  end
+end
+
 describe Ingreedy, "amount parsing with :pl locale" do
   context "Polish locale" do
     before(:all) do
@@ -483,17 +548,12 @@ describe Ingreedy, "amount parsing with :pl locale" do
       "marchewki trzy" => 3,
     }.each do |query, expected|
       it "parses the correct amount as a rational" do
-      	parsed = nil
-      	begin
-	      	parsed = Ingreedy.parse(query)
-	      rescue => e
-          puts "failed on #{query} with #{e.class}"
-	      	#puts e
-	      	#puts e.class
-	      	#necessary as raising e crashes rspec - for further investigation try to run parsing test on something like "banana"
-	      	# report on https://github.com/rspec/rspec-core/issues?page=2&q=is%3Aissue+is%3Aopen
-	      end
-        expect(parsed).to parse_the_amount(expected.to_r)
+        begin
+          expect(Ingreedy.parse(query)).to parse_the_amount(expected.to_r)
+        rescue Ingreedy::ParseFailed
+          puts "failed to parse <#{query}>"
+          raise
+        end
       end
     end
   end

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ if ENV["CI"]
   Coveralls.wear!
 end
 
-require "ingreedy"
+require "ingreedyfork"
 require "parslet/rig/rspec"
 require "pry"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ingreedyfork
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - 'Ian C. Anderson, support for Polish added by Mateusz Konieczny '
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-07 00:00:00.000000000 Z
+date: 2020-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -90,6 +90,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.3.0
+- !ruby/object:Gem::Dependency
+  name: matkoniecz-ruby-style
+  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: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -140,19 +154,21 @@ files:
 - Gemfile
 - README.md
 - Rakefile
-- ingreedy.gemspec
-- lib/ingreedy.rb
-- lib/ingreedy/amount_parser.rb
-- lib/ingreedy/case_insensitive_parser.rb
-- lib/ingreedy/dictionaries/en.yml
-- lib/ingreedy/dictionaries/pl.yml
-- lib/ingreedy/dictionary.rb
-- lib/ingreedy/dictionary_collection.rb
-- lib/ingreedy/ingreedy_parser.rb
-- lib/ingreedy/rationalizer.rb
-- lib/ingreedy/root_parser.rb
-- lib/ingreedy/unit_variation_mapper.rb
-- lib/ingreedy/version.rb
+- build_push_new_gem_version.sh
+- build_reinstall_gem_locally.sh
+- ingreedyfork.gemspec
+- lib/ingreedyfork.rb
+- lib/ingreedyfork/amount_parser.rb
+- lib/ingreedyfork/case_insensitive_parser.rb
+- lib/ingreedyfork/dictionaries/en.yml
+- lib/ingreedyfork/dictionaries/pl.yml
+- lib/ingreedyfork/dictionary.rb
+- lib/ingreedyfork/dictionary_collection.rb
+- lib/ingreedyfork/ingreedy_parser.rb
+- lib/ingreedyfork/rationalizer.rb
+- lib/ingreedyfork/root_parser.rb
+- lib/ingreedyfork/unit_variation_mapper.rb
+- lib/ingreedyfork/version.rb
 - spec/ingreedy/amount_parser_spec.rb
 - spec/ingreedy/rationalizer_spec.rb
 - spec/ingreedy/unit_variation_mapper_spec.rb
@@ -177,8 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Recipe parser (fork of ingreedy)

data/lib/ingreedy/version.rb

@@ -1,3 +0,0 @@
-module Ingreedy
-  VERSION = "0.1.10"
-end