okei 0.0.2 → 1.0.0.pre.rc

data/spec/examples/json_schemas/unit.json

@@ -5,7 +5,12 @@
   "type": "object",
 
   "properties": {
-    "uuid":     { "type": "string", "format": "^(a-f|\\d|-){36}$" },
+    "uuids":    {
+      "type": "array",
+      "items": { "type": "string", "format": "^(a-f|\\d|-){36}$" },
+      "minimumItems": 1,
+      "unique": true
+    },
     "name":     { "type": "string", "minLength": 1 },
     "code":     { "type": "string", "minLength": 1 },
     "num":      { "type": "string", "format": "^(\\d){3}$" },
@@ -16,5 +21,5 @@
   },
 
   "additionalProperties": false,
-  "required": ["uuid", "name", "code", "base", "factor", "measure"]
+  "required": ["uuids", "name", "code", "base", "factor", "measure"]
 }

data/spec/factories/units.rb

@@ -6,7 +6,6 @@ FactoryGirl.define do
   chars = ("A".."Z").to_a
 
   factory :unit, class: Okei::Unit do
-    uuid                { SecureRandom.uuid }
     sequence(:name)     { |n| "Единица #{ n }" }
     sequence(:code)     { |n| "ЕИ #{ n }" }
     sequence(:num)      { |n| format "%03d", (n + 1) % 999 }

data/spec/models/okei/unit_spec.rb

@@ -6,11 +6,14 @@ module Okei
 
     let!(:unit) { Unit.new }
 
-    describe "#uuid=" do
+    describe "#uuids" do
 
-      it "assigns a uuid" do
-        value = "48f53a7c-726f-4ec1-9b83-a12b247844a6"
-        expect { unit.uuid = value }.to change { unit.uuid }.to value
+      let!(:value) { "48f53a7c-726f-4ec1-9b83-a12b247844a6" }
+
+      it "has a list of uuids" do
+        expect(unit).to respond_to :uuids
+        expect(unit).to respond_to :uuid
+        expect(Unit).to respond_to :by_uuid
       end
     end
 
@@ -75,28 +78,6 @@ module Okei
       let!(:unit) { build :unit }
       before { expect(unit).to be_valid }
 
-      it "fails when a uuid is absent" do
-        unit.uuid = nil
-        expect(unit).not_to be_valid
-      end
-
-      it "fails when uuid has a wrong format" do
-        %w(
-          48f53a7c-726f-4ec1-9b83-a12b2478446
-          48f53a7c-726f-4ec1-9b83-a12b2478446g
-          48f53a7c-726f-4ec19-b83-a12b2478446g
-          48f53a7c-726f-4ec1-9b83-a12b2478446ee
-        ).each do |value|
-          unit.uuid = value
-          expect(unit).not_to be_valid
-        end
-      end
-
-      it "fails when a uuid is already taken" do
-        create :unit, uuid: unit.uuid
-        expect(unit).not_to be_valid
-      end
-
       it "fails when a name is absent" do
         unit.name = nil
         expect(unit).not_to be_valid

data/spec/requests/okei/api/v1/find_unit_spec.rb

@@ -8,14 +8,12 @@ module Okei
     # Prepare context
     # ==========================================================================
 
-    let!(:unit) { create :unit, code: "ТЫС ЧЕЛ-ЧАС" }
+    let!(:unit) { create :unit, code: "ТЫС М/С2" }
+    let!(:text) { "километров в сек" }
     before do
-      {
-        "1000"        => "ТЫС",
-        "ЧЕЛОВЕКО"    => "ЧЕЛ",
-        "ЧАСОВ"       => "ЧАС",
-        "ТЫС ЧЕЛ ЧАС" => "ТЫС ЧЕЛ-ЧАС"
-      }.each { |synonym, text| create :word, synonym: synonym, text: text }
+      allow(Corrector::Parse).to receive(:new) do |str, scope:|
+        (str == text) && (scope == "okei") ? unit.code : str
+      end
     end
 
     # ==========================================================================
@@ -32,7 +30,7 @@ module Okei
 
     context "with proper text" do
 
-      before { call_request "1000 человеко-часов" }
+      before { call_request text }
 
       it "responds with 200" do
         expect(response.status).to eq 200
@@ -44,14 +42,13 @@ module Okei
 
       it "responds with requested unit" do
         received = JSON.parse(response.body)["unit"]
-        %w(uuid name code num int_code base factor measure)
-          .each { |key| expect(received[key]).to eq unit.send(key) }
+        expect(received["uuids"]).to be_include unit.uuid
       end
     end
 
     context "with wrong text" do
 
-      before { call_request "wrong" }
+      before { call_request "wrong text" }
 
       it "responds with 404" do
         expect(response.status).to eq 404

data/spec/requests/okei/api/v1/get_unit_spec.rb

@@ -2,7 +2,7 @@
 require "spec_helper"
 
 module Okei
-  describe "Getting unit" do
+  describe "Getting unit"do
 
     # ==========================================================================
     # Prepare environment
@@ -36,8 +36,7 @@ module Okei
 
       it "responds with requested unit" do
         received = JSON.parse(response.body)["unit"]
-        %w(uuid name code num int_code base factor measure)
-          .each { |key| expect(received[key]).to eq unit.send(key) }
+        expect(received["uuids"]).to be_include unit.uuid
       end
     end
 

data/spec/requests/okei/api/v1/get_units_spec.rb

@@ -20,7 +20,7 @@ module Okei
     end
 
     let(:uuids) do
-      JSON.parse(response.body)["units"].map { |unit| unit["uuid"] }
+      JSON.parse(response.body)["units"].map { |unit| unit["uuids"] }.flatten
     end
 
     # ==========================================================================
@@ -39,7 +39,7 @@ module Okei
         expect(response.body).to match_json_schema(:get_units)
       end
 
-      it "receivesll units" do
+      it "receives all units" do
         expect(uuids).to eq [nmile.uuid, mole.uuid]
       end
     end

data/spec/support/initializers/factory_girl_rails.rb

@@ -1 +1,5 @@
 require "factory_girl_rails"
+
+RSpec.configure do |config|
+  config.include FactoryGirl::Syntax::Methods
+end

data/spec/use_cases/okei/find_unit_spec.rb

@@ -8,14 +8,12 @@ module Okei
     # Prepare context
     # ==========================================================================
 
-    let!(:unit) { create :unit, code: "ТЫС ЧЕЛ-ЧАС" }
+    let!(:unit) { create :unit, code: "ТЫС М/С2" }
+    let!(:text) { "километров в сек" }
     before do
-      {
-        "1000"        => "ТЫС",
-        "ЧЕЛОВЕКО"    => "ЧЕЛ",
-        "ЧАСОВ"       => "ЧАС",
-        "ТЫС ЧЕЛ ЧАС" => "ТЫС ЧЕЛ-ЧАС"
-      }.each { |synonym, text| create :word, synonym: synonym, text: text }
+      allow(Corrector::Parse).to receive(:new) do |str, scope:|
+        (str == text) && (scope == "okei") ? unit.code : str
+      end
     end
 
     # ==========================================================================
@@ -38,7 +36,6 @@ module Okei
 
       context "with proper text" do
 
-        let!(:text) { "1000 человеко-часов" }
         subject(:use_case) { prepare_case text }
 
         it "returns the unit" do
@@ -52,14 +49,14 @@ module Okei
 
         it "caches results of code preparing", :caching do
           use_case.run
-          expect(Word).not_to receive(:find_by_synonym)
+          expect(Corrector::Phrase).not_to receive(:scope)
           prepare_case(text).run
         end
       end
 
       context "with wrong text" do
 
-        subject(:use_case) { prepare_case "тысяч человеко-часов" }
+        subject(:use_case) { prepare_case "тысяч км в сек" }
 
         it "returns nil" do
           expect(use_case.run).to be_nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: okei
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.0.0.pre.rc
 platform: ruby
 authors:
 - Andrew Kozin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2014-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hexx
@@ -58,6 +58,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
+- !ruby/object:Gem::Dependency
+  name: corrector
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+- !ruby/object:Gem::Dependency
+  name: uuids
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0.pre.rc1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0.pre.rc1
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -201,10 +229,7 @@ files:
 - Rakefile
 - app/controllers/okei/api/v1/responder.rb
 - app/controllers/okei/api/v1/units_controller.rb
-- app/models/okei/line.rb
 - app/models/okei/unit.rb
-- app/models/okei/word.rb
-- app/models/okei/words.rb
 - app/use_cases/okei/find_unit.rb
 - app/use_cases/okei/get_unit.rb
 - app/use_cases/okei/get_units.rb
@@ -214,10 +239,11 @@ files:
 - app/views/okei/api/v1/units/show.json.jbuilder
 - config/locales/ru.yml
 - config/routes.rb
-- db/migrate/20141004212500_create_okei_units.rb
-- db/migrate/20141004212501_populate_okei_units.rb
-- db/migrate/20141004212502_create_okei_words.rb
-- db/migrate/20141004212503_populate_okei_words.rb
+- db/migrate/20141019072900_create_okei_units.rb
+- db/migrate/20141019072901_populate_okei_units.rb
+- db/migrate/20141019072902_populate_okei_correctors.rb
+- db/seeds/phrases.json
+- db/seeds/prefixes.json
 - db/seeds/units.json
 - db/seeds/words.json
 - lib/okei.rb
@@ -255,8 +281,11 @@ files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
+- spec/dummy/db/migrate/20141018085223_create_corrector_bases.corrector.rb
+- spec/dummy/db/migrate/20141018085226_create_uuids_uuids.uuids.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
+- spec/dummy/log/development.log
 - spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -268,11 +297,7 @@ files:
 - spec/examples/json_schemas/get_units.json
 - spec/examples/json_schemas/unit.json
 - spec/factories/units.rb
-- spec/factories/words.rb
-- spec/models/okei/line_spec.rb
 - spec/models/okei/unit_spec.rb
-- spec/models/okei/word_spec.rb
-- spec/models/okei/words_spec.rb
 - spec/requests/okei/api/v1/find_unit_spec.rb
 - spec/requests/okei/api/v1/get_unit_spec.rb
 - spec/requests/okei/api/v1/get_units_spec.rb
@@ -281,7 +306,6 @@ files:
 - spec/support/initializers/caching.rb
 - spec/support/initializers/coveralls.rb
 - spec/support/initializers/database_cleaner.rb
-- spec/support/initializers/factory_girl.rb
 - spec/support/initializers/factory_girl_rails.rb
 - spec/support/initializers/focus.rb
 - spec/support/initializers/garbage_collection.rb
@@ -312,9 +336,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -326,9 +350,6 @@ test_files:
 - spec/routing/okei/api/v1/units_routing_spec.rb
 - spec/spec_helper.rb
 - spec/models/okei/unit_spec.rb
-- spec/models/okei/words_spec.rb
-- spec/models/okei/word_spec.rb
-- spec/models/okei/line_spec.rb
 - spec/dummy/public/500.html
 - spec/dummy/public/422.html
 - spec/dummy/public/404.html
@@ -351,6 +372,8 @@ test_files:
 - spec/dummy/config/initializers/cookies_serializer.rb
 - spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/assets.rb
+- spec/dummy/db/migrate/20141018085223_create_corrector_bases.corrector.rb
+- spec/dummy/db/migrate/20141018085226_create_uuids_uuids.uuids.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/db/schema.rb
 - spec/dummy/app/views/layouts/application.html.erb
@@ -360,12 +383,12 @@ test_files:
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/Rakefile
 - spec/dummy/README.rdoc
+- spec/dummy/log/development.log
 - spec/dummy/log/test.log
 - spec/dummy/config.ru
 - spec/dummy/bin/rake
 - spec/dummy/bin/rails
 - spec/dummy/bin/bundle
-- spec/factories/words.rb
 - spec/factories/units.rb
 - spec/controllers/okei/api/v1/responder_spec.rb
 - spec/controllers/okei/api/v1/units_controller_spec.rb
@@ -381,7 +404,6 @@ test_files:
 - spec/support/matchers/controllers.rb
 - spec/support/initializers/garbage_collection.rb
 - spec/support/initializers/i18n.rb
-- spec/support/initializers/factory_girl.rb
 - spec/support/initializers/focus.rb
 - spec/support/initializers/timecop.rb
 - spec/support/initializers/factory_girl_rails.rb

data/app/models/okei/line.rb

@@ -1,63 +0,0 @@
-# encoding: utf-8
-
-module Okei
-
-  # Converts source string to standardized line of text with:
-  #
-  # * cyrillic letters un upper register
-  # * numbers
-  # * ^ - a symbol of word break
-  # * slashes
-  # * spaces
-  # * %
-  #
-  #     Line.new "1000шт в условн.эквивал."
-  #     # => "1000 ШТ В УСЛОВН ЭКВИВАЛ"
-  #
-  class Line < String
-
-    def initialize(str = "")
-      super str.to_s.mb_chars.upcase
-      to_cyrillic
-      remove_dots_and_commas
-      clear_text
-      add_breaks
-    end
-
-    private
-
-    # Converts latin letters to corresponding cyrillic
-    def to_cyrillic
-      {
-        "A" => "А", "B" => "В", "C" => "С", "D" => "Д", "E" => "Е",
-        "G" => "Д", "H" => "Н", "K" => "К", "M" => "М", "N" => "П",
-        "O" => "О", "P" => "Р", "Q" => "Д", "R" => "Г", "T" => "Т",
-        "U" => "И", "X" => "Х", "Y" => "У"
-      }.each { |lat, cyr| gsub! lat, cyr }
-    end
-
-    # Remove dots and commas except for dots between digits
-    def remove_dots_and_commas
-      gsub!(/\.+/, ",")
-      gsub!(/(\d),(\d)/, '\1.\2')
-      gsub!(/,/, " ")
-    end
-
-    # Removes unwanted symbols.
-    def clear_text
-      gsub!(/\%-[^\s]+/, "%")
-      gsub!(/[^А-Я\d\.\s\/\%]/, " ")
-      gsub!(/\A[^А-Я\d]+|[^А-Я\d]+\z/, " ")
-      gsub!(/\s{2,}/, " ")
-      strip!
-    end
-
-    # Add ^ to mark word breaks
-    def add_breaks
-      gsub!(
-        /\A(НАНО|МИКРО|МИЛЛИ|САНТИ|ПОЛ|ДЕКА|ДЕЦИ|ГЕКТО|КИЛО|МЕГА|ТЕРА)/, '\1 ^ '
-      )
-      gsub!(/([А-Я])[\s\.^]*(2|3)(?!\d)/, '\1 ^ \2')
-    end
-  end
-end

data/app/models/okei/word.rb

@@ -1,26 +0,0 @@
-# encoding: utf-8
-
-module Okei
-
-  # Stores dictionary of words:
-  #
-  #     Word.new synonym: "МЕТРЫ", text: "М"
-  #     Word.new synonym: "МЕТР",  text: "М"
-  #
-  # ...and units in their standard representation:
-  #
-  #     Word.new synonym: "КВ М", text: "М2"
-  #     Word.new synonym: "М КВ", text: "М2"
-  #
-  class Word < ActiveRecord::Base
-
-    validates :synonym, :text, presence: true
-    validates :synonym, uniqueness: { case_sensitive: false }, allow_nil: true
-
-    # Translates the line if a translation exists.
-    # Otherwise returns source line unchanged.
-    def self.translate(line)
-      find_by_synonym(line).try(:text) || line
-    end
-  end
-end