dm_panlex 0.2.0 → 0.2.1

data/{panlex.gemspec → dm_panlex.gemspec}

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
    s.name = 'dm_panlex'
-   s.version = '0.2.0'
+   s.version = '0.2.1'
    s.summary = 'Data mapper models for the Panlex database'
    s.description = 'https://github.com/laMarciana/dm_panlex/'
    s.license = 'GPL3'

data/lib/dm_panlex/models/ap.rb

@@ -20,9 +20,7 @@ module DmPanlex
       property :co, Text
       property :ad, Text
 
-      belongs_to :apli, :parent_key => :li, :child_key  => :li
-
-      has n, :avs, :parent_key => :ap, :child_key => :ap, :constraint => :destroy
-      has n, :mns, :parent_key => :ap, :child_key => :ap
+      has n, :avs, :model => 'Av', :child_key => :ap, :constraint => :destroy
+      has n, :mns, :model => 'Mn', :child_key => :ap
    end
 end

data/lib/dm_panlex/models/apli.rb

@@ -8,6 +8,6 @@ module DmPanlex
       property :li, String, :length => 2, :required => true, :unique_index => true
       property :pl, Text, :required => true, :unique_index => true
 
-      has n, :aps, :parent_key => :li, :child_key => :li
+      has n, :aps, :model => 'Ap', :parent_key => :li, :child_key => :li
    end
 end

data/lib/dm_panlex/models/av.rb

@@ -7,7 +7,5 @@ module DmPanlex
       property :ap, Integer, :key => true
       property :lv, Integer, :key => true
 
-      belongs_to :ap, :parent_key => :ap, :child_key => :ap
-      belongs_to :lv, :parent_key => :lv, :child_key => :lv
    end
 end

data/lib/dm_panlex/models/cp.rb

@@ -8,6 +8,5 @@ module DmPanlex
       property :c0, String, :length => 5, :key => true
       property :c1, String, :length => 5, :required => true, :unique_index => :cp_lv_key
 
-      belongs_to :lv, :parent_key => :lv, :child_key  => :lv
    end
 end

data/lib/dm_panlex/models/cu.rb

@@ -11,6 +11,5 @@ module DmPanlex
       property :loc, String, :length => 255, :key => true, :unique_index => [:cu_c0_key, :cu_c1_key]
       property :vb, String, :length => 255, :key => true, :required => true, :unique_index => [:cu_c0_key, :cu_c1_key]
 
-      belongs_to :lv, :parent_key => :lv, :child_key  => :lv
    end 
 end

data/lib/dm_panlex/models/df.rb

@@ -9,7 +9,5 @@ module DmPanlex
       property :lv, Integer, :required => true, :unique_index => :df_mn_key
       property :tt, Text, :required => true, :unique_index => :df_mn_key
 
-      belongs_to :lv, :parent_key => :lv, :child_key  => :lv
-      belongs_to :mn, :parent_key => :mn, :child_key  => :mn
    end
 end

data/lib/dm_panlex/models/dm.rb

@@ -8,7 +8,5 @@ module DmPanlex
       property :mn, Integer, :required => true, :unique_index => :dm_mn_key
       property :ex, Integer, :required => true, :unique_index => :dm_mn_key
 
-      belongs_to :ex, :parent_key => :ex, :child_key  => :ex
-      belongs_to :mn, :parent_key => :mn, :child_key  => :mn
    end
 end

data/lib/dm_panlex/models/dn.rb

@@ -8,10 +8,7 @@ module DmPanlex
       property :mn, Integer, :required => true, :unique_index => :dm_mn_ex_key, :index => true
       property :ex, Integer, :required => true, :unique_index => :dm_mn_ex_key, :index => true
 
-      belongs_to :ex, :parent_key => :ex, :child_key  => :ex
-      belongs_to :mn, :parent_key => :mn, :child_key  => :mn
-
-      has n, :mds, :parent_key => :dn, :child_key => :dn
-      has n, :wcs, :parent_key => :dn, :child_key => :dn
+      has n, :mds, :model => 'Md', :child_key => :dn
+      has n, :wcs, :model => 'Wc', :child_key => :dn
    end
 end

data/lib/dm_panlex/models/ex.rb

@@ -9,9 +9,7 @@ module DmPanlex
       property :tt, Text, :required => true, :unique_index => :ex_lv_tt_key, :index => true
       property :td, Text, :required => true, :index => true
 
-      belongs_to :lv, :parent_key => :lv, :child_key  => :lv
-
-      has n, :dms, :parent_key => :ex, :child_key => :ex
-      has n, :dns, :parent_key => :ex, :child_key => :ex
+      has n, :dms, :model => 'Dm', :child_key => :ex
+      has n, :dns, :model => 'Dn', :child_key => :ex
    end
 end

data/lib/dm_panlex/models/i1.rb

@@ -7,6 +7,5 @@ module DmPanlex
       property :iso1, String, :length => 2, :key => true
       property :iso3, String, :length => 3, :required => true
 
-      belongs_to :lc, :parent_key => :lc, :child_key  => :iso3
    end
 end

data/lib/dm_panlex/models/lc.rb

@@ -7,7 +7,7 @@ module DmPanlex
       property :lc, String, :length => 3, :key => true
       property :tp, String, :length => 1, :required => true
 
-      has n, :i1s, :parent_key => :lc, :child_key => :iso3
-      has n, :lvs, :parent_key => :lc, :child_key => :lc
+      has n, :i1s, :model => 'I1', :child_key => :iso3
+      has n, :lvs, :model => 'Lv', :child_key => :lc
    end
 end

data/lib/dm_panlex/models/lv.rb

@@ -11,12 +11,10 @@ module DmPanlex
       property :am, Boolean, :required => true, :default => true
       property :tt, Text, :required => true
 
-      belongs_to :lc, :parent_key => :lc, :child_key  => :lc
-
-      has n, :avs, :parent_key => :lv, :child_key => :lv, :constraint => :destroy
-      has n, :cps, :parent_key => :lv, :child_key => :lv
-      has n, :cus, :parent_key => :lv, :child_key => :lv
-      has n, :dfs, :parent_key => :lv, :child_key => :lv
-      has n, :exs, :parent_key => :lv, :child_key => :lv
+      has n, :avs, :model => 'Av', :child_key => :lv, :constraint => :destroy
+      has n, :cps, :model => 'Cp', :child_key => :lv
+      has n, :cus, :model => 'Cu', :child_key => :lv
+      has n, :dfs, :model => 'Df', :child_key => :lv
+      has n, :exs, :model => 'Ex', :child_key => :lv
    end
 end

data/lib/dm_panlex/models/md.rb

@@ -9,6 +9,5 @@ module DmPanlex
       property :vb, Text, :required => true, :unique_index => :md_dn_key
       property :vl, Text, :required => true, :unique_index => :md_dn_key
 
-      belongs_to :dn, :parent_key => :dn, :child_key  => :dn
    end
 end

data/lib/dm_panlex/models/mi.rb

@@ -7,6 +7,5 @@ module DmPanlex
       property :mn, Integer, :key => true
       property :tt, Text, :required => true
 
-      belongs_to :mn, :parent_key => :mn, :child_key  => :mn
    end
 end

data/lib/dm_panlex/models/mn.rb

@@ -7,11 +7,9 @@ module DmPanlex
       property :mn, Integer, :key => true
       property :ap, Integer, :required => true, :index => true
 
-      belongs_to :ap, :parent_key => :ap, :child_key  => :ap
-
-      has n, :dfs, :parent_key => :mn, :child_key => :mn
-      has n, :dms, :parent_key => :mn, :child_key => :mn
-      has n, :dns, :parent_key => :mn, :child_key => :mn
-      has n, :mis, :parent_key => :mn, :child_key => :mn
+      has n, :dfs, :model => 'Df', :child_key => :mn
+      has n, :dms, :model => 'Dm', :child_key => :mn
+      has n, :dns, :model => 'Dn', :child_key => :mn
+      has n, :mis, :model => 'Mi', :child_key => :mn
    end
 end

data/lib/dm_panlex/models/wc.rb

@@ -8,7 +8,5 @@ module DmPanlex
       property :dn, Integer, :required => true, :unique_index => :wc_dn_key
       property :ex, Integer, :required => true, :unique_index => :wc_dn_key
 
-      belongs_to :dn, :parent_key => :dn, :child_key  => :dn
-      belongs_to :wcex, :parent_key => :ex, :child_key  => :ex
    end
 end

data/lib/dm_panlex/models/wcex.rb

@@ -7,6 +7,6 @@ module DmPanlex
       property :ex, Integer, :key => true
       property :tt, Text, :required => true, :unique_index => true
 
-      has n, :wcs, :parent_key => :ex, :child_key => :ex
+      has n, :wcs, :model => 'Wc', :child_key => :ex
    end
 end

data/spec/dm_panlex/models/ap_spec.rb

@@ -62,9 +62,6 @@ module DmPanlex
       it "is not valid without a quality in editor's judgement" do
          should validate_presence_of :uq
       end
-      it "belongs to an approver license (apli)" do
-         should belong_to :apli
-      end
       it "has many approver varieties (av)" do
          should have_many :avs
       end

data/spec/dm_panlex/models/av_spec.rb

@@ -14,11 +14,5 @@ module DmPanlex
       it "is not valid without a variety" do
          should validate_presence_of :lv
       end
-      it "belongs to an approver (ap)" do
-         should belong_to :ap
-      end
-      it "belongs to a language variety (lv)" do
-         should belong_to :lv
-      end
    end
 end

data/spec/dm_panlex/models/cp_spec.rb

@@ -20,8 +20,5 @@ module DmPanlex
       it "is not valid without an end of character range" do
          should validate_presence_of :c1
       end
-      it "belongs to a language variety (lv)" do
-         should belong_to :lv
-      end
    end
 end

data/spec/dm_panlex/models/cu_spec.rb

@@ -29,8 +29,5 @@ module DmPanlex
       it "is not valid without a variable" do
          should validate_presence_of :vb
       end
-      it "belongs to a language variety (lv)" do
-         should belong_to :lv
-      end
    end
 end

data/spec/dm_panlex/models/df_spec.rb

@@ -26,11 +26,5 @@ module DmPanlex
       it "is not valid without a text" do
          should validate_presence_of :tt
       end
-      it "belongs to a language variety (lv)" do
-         should belong_to :lv
-      end
-      it "belongs to a meaning (mn)" do
-         should belong_to :mn
-      end
    end
 end

data/spec/dm_panlex/models/dm_spec.rb

@@ -20,11 +20,5 @@ module DmPanlex
       it "is not valid without an expression" do
          should validate_presence_of :ex
       end
-      it "belongs to an expression (ex)" do
-         should belong_to :ex
-      end
-      it "belongs to a meaning (mn)" do
-         should belong_to :mn
-      end
    end
 end

data/spec/dm_panlex/models/dn_spec.rb

@@ -20,12 +20,6 @@ module DmPanlex
       it "is not valid without an expression" do
          should validate_presence_of :ex
       end
-      it "belongs to an expression (ex)" do
-         should belong_to :ex
-      end
-      it "belongs to a meaning (mn)" do
-         should belong_to :mn
-      end
       it "has many metadata (md)" do
          should have_many :mds
       end

data/spec/dm_panlex/models/ex_spec.rb

@@ -26,9 +26,6 @@ module DmPanlex
       it "is not valid without a degraded text" do
          should validate_presence_of :td
       end
-      it "belongs to a language variety (lv)" do
-         should belong_to :lv
-      end
       it "has many denotations (dn)" do
          should have_many :dns
       end

data/spec/dm_panlex/models/i1_spec.rb

@@ -8,8 +8,5 @@ module DmPanlex
       it "has a property iso3 (iso3)" do
          should have_property :iso3
       end
-      it "belongs to a language code (lc)" do
-         should belong_to :lc
-      end
    end
 end

data/spec/dm_panlex/models/lv_spec.rb

@@ -38,9 +38,6 @@ module DmPanlex
       it "is not valid without a label" do
          should validate_presence_of :tt
       end
-      it "belongs to a language code (lc)" do
-         should belong_to :lc
-      end
       it "has many language approver varieties (av)" do
          should have_many :avs
       end

data/spec/dm_panlex/models/md_spec.rb

@@ -26,8 +26,5 @@ module DmPanlex
       it "is not valid without" do
          should validate_presence_of :vl
       end
-      it "belongs to a denotation (dn)" do
-         should belong_to :dn
-      end
    end
 end

data/spec/dm_panlex/models/mi_spec.rb

@@ -14,8 +14,5 @@ module DmPanlex
       it "is not valid without a text" do
          should validate_presence_of :tt
       end
-      it "belongs to a meaning (mn)" do
-         should belong_to :mn
-      end
    end
 end

data/spec/dm_panlex/models/mn_spec.rb

@@ -14,9 +14,6 @@ module DmPanlex
       it "is not valid without an approver" do
          should validate_presence_of :ap
       end
-      it "belongs to an approver (ap)" do
-         should belong_to :ap
-      end
       it "has many definitions (df)" do
          should have_many :dfs
       end

data/spec/dm_panlex/models/wc_spec.rb

@@ -20,11 +20,5 @@ module DmPanlex
       it "is not valid without a Panlex word-class expression" do
          should validate_presence_of :ex
       end
-      it "belongs to a denotation (dn)" do
-         should belong_to :dn
-      end
-      it "belongs to a word class expressions (wcex)" do
-         should belong_to :wcex
-      end
    end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dm_panlex
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -101,6 +101,7 @@ files:
 - .yardopts
 - COPYING.txt
 - README.md
+- dm_panlex.gemspec
 - lib/dm_panlex.rb
 - lib/dm_panlex/models/ap.rb
 - lib/dm_panlex/models/apli.rb
@@ -121,7 +122,6 @@ files:
 - lib/dm_panlex/models/wc.rb
 - lib/dm_panlex/models/wcex.rb
 - panlex-db-design.pdf
-- panlex.gemspec
 - spec/dm_panlex/models/ap_spec.rb
 - spec/dm_panlex/models/apli_spec.rb
 - spec/dm_panlex/models/av_spec.rb