unidom-stapar 0.5 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbfcbda29d967437d90d3d8578b33a801600a050ccb72f32ef81e801c2e101ce
-  data.tar.gz: e93dd8faf4d27b239fd6f4b1d3af472428875aab451b871ff0fd038831a31bc4
+  metadata.gz: 98418d2822f1c06426c28b46ad5fcd207f692debb6587a5439d495db2e0145ab
+  data.tar.gz: 9b8c23e582da81dc5a6ef76ef11a8c4dde011d7996cf24b865d8d526f8aa0308
 SHA512:
-  metadata.gz: 323b9e86fe4c642f7e3c4a58b5582bb772a546116b6f071fa3b6e69b920807e6d8c6b1f11257e3edff3f5d43d101ed426848a4811266558a9a5bc8dd859a5dcc
-  data.tar.gz: 80d4fd85e3f7a682b423a01d9da92b0814540f0d1d01aafca504c7e1ba35bea5951462ca5819b7be4441cc6011ebdf7956e1d272512fc7f28c477a55611e440b
+  metadata.gz: 9dd73bebf75f953d569de601b03fad8fd10820b7fc494caf6c5c2bfa86abe23ee3d7614c86fd428b9a215bdbc15e6d9c68abd99fb4905375b11b4974fcab0e86
+  data.tar.gz: cc6b03c87babe6c8d8e0fa738a74fb4633cc593966b9963e3dbbb48dd5353e82c9c5261436fd43b45cc07d6ebc89340c9d958498116cfea3ed72436cdc2b9081

data/README.md

@@ -6,7 +6,7 @@
 [![Gem Version](https://badge.fury.io/rb/unidom-stapar.svg)](https://badge.fury.io/rb/unidom-stapar)
 [![Dependency Status](https://gemnasium.com/badges/github.com/topbitdu/unidom-stapar.svg)](https://gemnasium.com/github.com/topbitdu/unidom-stapar)
 
-Unidom (UNIfied Domain Object Model) is a series of domain model engines. The Stapar domain model engine includes Sample and Matching models.
+Unidom (UNIfied Domain Object Model) is a series of domain model engines. The StAPaR (Statistical Approach of Pattern Recognition) domain model engine includes Classifier, Sample, Feature, Pattern Library, Pattern Library Inclusion, and Pattern Matching models.
 Unidom (统一领域对象模型)是一系列的领域模型引擎。统计模式识别领域模型引擎包括采样和匹配的模型。
 
 

data/app/models/unidom/stapar/concerns/as_sample.rb

@@ -14,6 +14,10 @@ module Unidom::Stapar
         #has_many :pattern_library_inclusions, through: :features
         #has_many :pattern_libraries,          through: :pattern_library_inclusions
 
+        belongs_to :taker_equipment, polymorphic: true
+
+        scope :taker_equipment_is, -> (taker_equipment) { where taker_equipment: taker_equipment }
+
       end
 
       module ClassMethods

data/app/models/unidom/stapar/sample.rb

@@ -17,7 +17,7 @@ module Unidom::Stapar
 
     validates :sampled_at, presence: true
 
-    scope :raw_data_link_is, -> (raw_data_link) { where raw_data_link: raw_data_link }
+    scope :raw_data_link_is,   -> (raw_data_link)   { where raw_data_link:   raw_data_link   }
 
   end unless Unidom::Common::Neglection.namespace_neglected? 'Unidom::Stapar::Sample'
 end

data/db/migrate/20060103000000_create_unidom_samples.rb

@@ -4,7 +4,9 @@ class CreateUnidomSamples < ActiveRecord::Migration[6.0]
 
     create_table :unidom_samples, id: :uuid do |t|
 
-      t.references :substance, type: :uuid, null: false,
+      t.references :substance,       type: :uuid, null: false,
+        polymorphic: { null: false, default: '', limit: 200 }, index: false
+      t.references :taker_equipment, type: :uuid, null: false,
         polymorphic: { null: false, default: '', limit: 200 }, index: false
 
       t.string   :raw_data_link,      null: false, default: '', limit: 200
@@ -21,11 +23,13 @@ class CreateUnidomSamples < ActiveRecord::Migration[6.0]
       t.boolean  :defunct,          null: false, default: false
       t.jsonb    :notation,         null: false, default: {}
 
+
       t.timestamps null: false
 
     end
 
     add_index :unidom_samples, :substance_id
+    add_index :unidom_samples, :taker_equipment_id
 
   end
 

data/lib/rspec/models/unidom/stapar/feature_spec.rb

@@ -15,14 +15,17 @@ describe Unidom::Stapar::Feature, type: :model do
       data_format_version: 1,
       applied_species:     'Homo sapiens',
       applied_field_code:  'FACE'
-    substance = classifier
+    substance       = classifier
+    taker_equipment = classifier
 
     sample = Unidom::Stapar::Sample.first_or_create! substance_id: substance.id,
-      substance_type:     substance.class.name,
-      raw_data_link:      'https://objectstore/{id}.jpg',
-      raw_data_mime_type: 'image/jpeg',
-      raw_data_file_size: 1.megabytes,
-      sampled_at:         Time.now
+      substance_type:       substance.class.name,
+      taker_equipment_id:   taker_equipment.id,
+      taker_equipment_type: taker_equipment.class.name,
+      raw_data_link:        'https://objectstore/substances/{substance_id}/samples/{id}.jpg',
+      raw_data_mime_type:   'image/jpeg',
+      raw_data_file_size:   1.megabytes,
+      sampled_at:           Time.now
 
     model_attributes = {
       sample_id:           sample.id,

data/lib/rspec/models/unidom/stapar/sample_spec.rb

@@ -15,15 +15,18 @@ describe Unidom::Stapar::Sample, type: :model do
       data_format_version: 1,
       applied_species:     'Homo sapiens',
       applied_field_code:  'FACE'
-    substance = classifier
+    substance       = classifier
+    taker_equipment = classifier
 
     model_attributes = {
-      substance_id:       substance.id,
-      substance_type:     substance.class.name,
-      raw_data_link:      'https://objectstore/{id}.jpg',
-      raw_data_mime_type: 'image/jpeg',
-      raw_data_file_size: 1.megabytes,
-      sampled_at:         Time.now,
+      substance_id:         substance.id,
+      substance_type:       substance.class.name,
+      taker_equipment_id:   taker_equipment.id,
+      taker_equipment_type: taker_equipment.class.name,
+      raw_data_link:        'https://objectstore/substances/{substance_id}/samples/{id}.jpg',
+      raw_data_mime_type:   'image/jpeg',
+      raw_data_file_size:   1.megabytes,
+      sampled_at:           Time.now,
     }
 
     it_behaves_like 'Unidom::Common::Concerns::ModelExtension', model_attributes

data/lib/unidom/stapar/version.rb

@@ -1,5 +1,5 @@
 module Unidom
   module Stapar
-    VERSION = '0.5'
+    VERSION = '0.6'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-stapar
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.6'
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-04 00:00:00.000000000 Z
+date: 2020-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-common
@@ -25,8 +25,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 description: Unidom (UNIfied Domain Object Model) is a series of domain model engines.
-  The Statistical Approach of Pattern Recognition domain model engine includes Sample
-  and Matching models. Unidom (统一领域对象模型)是一系列的领域模型引擎。统计模式识别领域模型引擎包括采样和匹配的模型。
+  The StAPaR (Statistical Approach of Pattern Recognition) domain model engine includes
+  Sample and Matching models. Unidom (统一领域对象模型)是一系列的领域模型引擎。统计模式识别领域模型引擎包括采样和匹配的模型。
 email:
 - topbit.du@gmail.com
 executables: []