llt-db_handler 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa007dd6e48c47bac100eaa76ac6484c55dc5a4b
-  data.tar.gz: 83dab819a52dc1c89568178bbebb5679771a4bfe
+  metadata.gz: 3cc718fecd6ac4a57695656193d0cdd1e96110ae
+  data.tar.gz: 859d0dc77ca0e4f648773caf9a98bac4d58a060a
 SHA512:
-  metadata.gz: 891f06577b73c2cbe770f375f2d6cfba28fc4acfe5c26e3a6b7def3e34e2c4d838a962845e423ac18f38e973f3c051a7a45a8a036d79e889dcfa1ae2ffa3a0db
-  data.tar.gz: c88fbd64c91305eb40536d5e0f13f0e7e1c7e59aaa16aed5816a888ff820b6b5687252707268dbebe621e62c99fc320bea1f7a55273d3601980ac5e8d5d4b8d2
+  metadata.gz: c79bf40c2ae4eb534f446bdaf4b29387a5cc9a181b4194dc2df6353ea1b40455665becf6882f233b825d3060c46cde4316ec4960867fb0d7cb1e2b48eefb958b
+  data.tar.gz: b14306513551b5436bd6bc3f9d6b077604b4f26bb5c34c2393867535c2698af170af39232adf530078419062891050052e2d177bcdd4e85deca66dacd962811b

data/Gemfile

@@ -5,6 +5,7 @@ gemspec
 gem 'coveralls', require: false
 gem 'llt-core_extensions', git: 'git@github.com:latin-language-toolkit/llt-core_extensions.git'
 gem 'llt-constants', git: 'git@github.com:latin-language-toolkit/llt-constants.git'
+gem 'llt-db_handler-stub', git: 'git@github.com:latin-language-toolkit/llt-db_handler-stub.git'
 gem 'llt-form_builder', git: 'git@github.com:latin-language-toolkit/llt-form_builder.git'
 gem 'llt-helpers', git: 'git@github.com:latin-language-toolkit/llt-helpers.git'
 

data/lib/llt/db_handler/tasks.rb

@@ -1,6 +1,6 @@
 namespace :db do
   namespace :prometheus do
-    DUMP_FILE = 'lib/llt/db_handler/prometheus/db/prometheus_stems.dump'
+    DUMP_FILE = File.expand_path('../prometheus/db/prometheus_stems.dump', __FILE__)
 
     desc 'Opens a pry console with a prometheus instance preloaded as db'
     task :console do

data/lib/llt/db_handler/version.rb

@@ -1,5 +1,5 @@
 module LLT
   module DbHandler
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/llt-db_handler.gemspec

@@ -24,6 +24,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "simplecov", "~> 0.7"
   spec.add_development_dependency "yard"
+
+  spec.add_development_dependency "llt-db_handler-stub"
+
   spec.add_dependency 'activerecord', "~> 3.2"
   spec.add_dependency "llt-core_extensions"
   spec.add_dependency "llt-constants"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: llt-db_handler
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - LFDM
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-08 00:00:00.000000000 Z
+date: 2014-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: llt-db_handler-stub
+  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: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -185,15 +199,12 @@ files:
 - lib/llt/db_handler/prometheus/db/prometheus_stems.dump
 - lib/llt/db_handler/prometheus/db_to_lemma.rb
 - lib/llt/db_handler/prometheus/stats.rb
-- lib/llt/db_handler/stub.rb
-- lib/llt/db_handler/stub/stub_entries.rb
 - lib/llt/db_handler/tasks.rb
 - lib/llt/db_handler/version.rb
 - llt-db_handler.gemspec
 - spec/lib/llt/db_handler/prometheus/db_to_lemma_spec.rb
 - spec/lib/llt/db_handler/prometheus/stats_spec.rb
 - spec/lib/llt/db_handler/prometheus_spec.rb
-- spec/lib/llt/db_handler/stub_spec.rb
 - spec/lib/llt/db_handler_spec.rb
 - spec/spec_helper.rb
 homepage: ''
@@ -224,7 +235,6 @@ test_files:
 - spec/lib/llt/db_handler/prometheus/db_to_lemma_spec.rb
 - spec/lib/llt/db_handler/prometheus/stats_spec.rb
 - spec/lib/llt/db_handler/prometheus_spec.rb
-- spec/lib/llt/db_handler/stub_spec.rb
 - spec/lib/llt/db_handler_spec.rb
 - spec/spec_helper.rb
 has_rdoc: 

data/lib/llt/db_handler/stub.rb

@@ -1,61 +0,0 @@
-require 'llt/db_handler/common_db'
-
-module LLT
-  module DbHandler
-    class Stub < CommonDb
-      require 'llt/db_handler/stub/stub_entries'
-
-      @stems = {}
-
-      class << self
-        include Helpers::Normalizer
-
-        attr_reader :stems
-
-        def create_stem_stub(return_val, args)
-          args = normalize_args(args)
-          @stems[args] = return_val
-        end
-        alias :create :create_stem_stub
-
-        def setup
-          StubEntries.setup
-        end
-      end
-
-      def type
-        :stub
-      end
-
-      def look_up_stem(args)
-        super
-        stems.select do |stored_args|
-          if stored_args.merge(args_to_query) == stored_args
-            if restr = @args[:restrictions]
-              restr[:values].include?(stored_args[restr[:type]])
-            end
-          end
-        end.values
-      end
-
-      def direct_lookup(type, string)
-        args = dl_to_query(type, string)
-        stems.select do |stored|
-          stored.merge(args) == stored
-        end.values
-      end
-
-      def dl_to_query(type, string)
-        { type: type, word: string}
-      end
-
-      def args_to_query
-        {type: @args[:type], @args[:stem_type] => @args[:stem] }
-      end
-
-      def stems
-        self.class.stems
-      end
-    end
-  end
-end

data/lib/llt/db_handler/stub/stub_entries.rb

@@ -1,90 +0,0 @@
-require 'ostruct'
-
-class LLT::DbHandler::Stub::StubEntries
-  class << self
-    def setup(size = :medium)
-      db_stub.stems.clear
-
-      medium_setup
-      # not implemented yet
-      #case size
-      #when :big   then big_setup
-      #when :small then small_setup
-      #else medium_setup
-      #end
-    end
-
-    private
-
-    def small_setup
-    end
-
-    def medium_setup
-      wsr(type: :noun,      nom: "homo",      stem: "homin",      itype: 3, sexus: :m)
-      wsr(type: :noun,      nom: "vir",       stem: "vir",        itype: 2, sexus: :m)
-      wsr(type: :noun,      nom: "ratio",     stem: "ration",     itype: 3, sexus: :f)
-      wsr(type: :noun,      nom: "magnitudo", stem: "magnitudin", itype: 3, sexus: :f)
-      wsr(type: :noun,      nom: "libido",    stem: "libidin",    itype: 3, sexus: :f)
-      wsr(type: :noun,      nom: "nox",       stem: "noct",       itype: 3, sexus: :f)
-      wsr(type: :noun,      nom: "filius",    stem: "fili",       itype: 2, sexus: :m)
-      wsr(type: :noun,      nom: "servus",    stem: "serv",       itype: 2, sexus: :m)
-      wsr(type: :noun,      nom: "dominus",   stem: "domin",      itype: 2, sexus: :m)
-
-      wsr(type: :noun,      nom: "flumen",    stem: "flumin",     itype: 3, sexus: :n)
-      wsr(type: :noun,      nom: "arma",      stem: "arm",        itype: 2, sexus: :n) # this might actually be wrong?
-
-      wsr(type: :persona,   nom: "Plato",     stem: "Platon",     itype: 3)
-      wsr(type: :persona,   nom: "Solon",     stem: "Solon",      itype: 3)
-      wsr(type: :persona,   nom: "Paulinus",  stem: "Paulin",     itype: 2)
-
-      wsr(type: :adjective, nom: "communis",  stem: "commun",     itype: 3, number_of_endings: 1)
-      wsr(type: :adjective, nom: "diligens",  stem: "diligent",   itype: 3, number_of_endings: 1)
-      wsr(type: :adjective, nom: "laetus",    stem: "laet",       itype: 1, number_of_endings: 3)
-      wsr(type: :adjective, nom: "ferus",     stem: "fer",        itype: 1, number_of_endings: 3)
-      wsr(type: :adjective, nom: "bonus",     stem: "bon",        itype: 1, number_of_endings: 3)
-
-      wsr(type: :adjective, nom: "aestivus",  stem: "aestiv",     itype: 1, number_of_endings: 3)
-      wsr(type: :adjective, nom: "suavis",    stem: "suav",       itype: 3, number_of_endings: 2)
-
-
-      wsr(type: :ethnic, stem: "Haedu", inflection_class: 1)
-      wsr(type: :ethnic, stem: "Redon", inflection_class: 3)
-
-      wsr(type: :verb, pr: "ita",   pf: "itav",                 pf_composition: "v", itype: 1, dep: false, dir_objs: "", indir_objs: "")
-      wsr(type: :verb, pr: "cana",  pf: "canav", ppp: "canat",  pf_composition: "v", itype: 1, dep: false, dir_objs: "", indir_objs: "")
-      wsr(type: :verb, pr: "mone",  pf: "monu",  ppp: "monit",  pf_composition: "u", itype: 2, dep: false, dir_objs: "", indir_objs: "")
-      wsr(type: :verb, pr: "move",  pf: "movi",  ppp: "mot",    pf_composition: "ablaut", itype: 2, dep: false, dir_objs: "", indir_objs: "")
-      wsr(type: :verb, pr: "mitt",  pf: "mis",   ppp: "miss",   pf_composition: "s", itype: 3, dep: false, dir_objs: "", indir_objs: "")
-      wsr(type: :verb, pr: "viv",   pf: "vix",   ppp: "-",      pf_composition: "s", itype: 3, dep: false, dir_objs: "", indir_objs: "")
-      wsr(type: :verb, pr: "audi",  pf: "audiv", ppp: "audit",  pf_composition: "v", itype: 4, dep: false, dir_objs: "", indir_objs: "")
-      wsr(type: :verb, pr: "horta",              ppp: "hortat",                      itype: 1, dep: true , dir_objs: "", indir_objs: "")
-
-      dl(type: :adverb, word: "ita")
-      dl(type: :adverb, word: "iam")
-      dl(type: :adverb, word: "subito")
-    end
-
-    def big_setup
-    end
-
-    def db_stub
-      LLT::DbHandler::Stub
-    end
-
-    def factory(type, args)
-      LLT::StemBuilder.build(type, args, "stub")
-    end
-
-    # with_single_return
-    def wsr(args)
-      ret_val = factory(args[:type], args.reject { |k, _| k == :type })
-      db_stub.create(ret_val, args)
-    end
-
-    # direct_lookup
-    def dl(args)
-      ret_val = OpenStruct.new(word: args[:word])
-      db_stub.create(ret_val, args)
-    end
-  end
-end

data/spec/lib/llt/db_handler/stub_spec.rb

@@ -1,54 +0,0 @@
-require 'spec_helper'
-require 'llt/db_handler/stub'
-
-describe LLT::DbHandler::Stub do
-  let(:db_stub) { LLT::DbHandler::Stub }
-
-  describe "#type" do
-    it "identifies the db_stub as stub" do
-      db_stub.new.type.should == :stub
-    end
-  end
-  describe ".create_stem_stub" do
-    it "creates a new stem stub" do
-      db_stub.stems.clear
-      db_stub.create_stem_stub("test", test: "val")
-      db_stub.stems.should have(1).item
-    end
-
-    it "has alias create" do
-      db_stub.stems.clear
-      db_stub.create("test", test: "val")
-      db_stub.stems.should have(1).item
-    end
-  end
-
-  describe "#look_up_stem" do
-    it "returns an array of db entries" do
-      db_stub.create_stem_stub("test", type: :noun, nom: "rosa", stem: "ros", inflection_class: 1)
-      result  = db_stub.new.look_up_stem(type: :noun, stem_type: :stem, stem: "ros", restrictions: { type: :inflection_class, values: [1] })
-      result2 = db_stub.new.look_up_stem(type: :noun, stem_type: :stem, stem: "ros", restrictions: { type: :inflection_class, values: [2] })
-      result.should have(1).item
-      result.first.should == "test"
-
-      result2.should be_empty
-    end
-  end
-
-  describe "#direct_lookup" do
-    it "returns an array of db entries" do
-      db_stub.create(:success, type: :adverb, word: "ita")
-      result = db_stub.new.direct_lookup(:adverb, "ita")
-      result.should have(1).item
-      result.first.should == :success
-    end
-  end
-
-  describe ".setup" do
-    it "creates stub entries as defined in stub_entries.rb" do
-      db_stub.stems.clear
-      db_stub.setup
-      db_stub.stems.should_not be_empty
-    end
-  end
-end