labimotion 2.1.0.rc17 → 2.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 2fe076ca6f32c99ea8a3fed2728d3f3f35e7d6ca48692a350ae07eddef5d7453
4
- data.tar.gz: aa98768282d9e3962f35444d97ce4c8b4165b864cef4d5a8c49d0d5e7fdd0222
3
+ metadata.gz: f544de920e1626452d5422b5dd60e29c65f6459c223c92c84176df619e8ddf2e
4
+ data.tar.gz: 16f3da4ab02efa4ac7e4bd0848640b35df87e3d5115809543dde0279cb0e43a1
5
5
  SHA512:
6
- metadata.gz: c7422991be491176c1bfee14269f7f3a473d0c002a5339e74ca17a3fa5157441cca59d772c6792584c5ec9fdc6f729296b7bf8aabd5af37549fc88fc33c8913c
7
- data.tar.gz: 8d3accbf6aa727559b7725bb99b14687f06a258c720732dc28278c8c305f1a0aaf48c1b828f81d55b6c96f04fab79de06b71726393bc602057e02dcb42f17c53
6
+ metadata.gz: 356d0de559510fbce5b90eb65db22363c4163d6aabb8281753edf953086ac504b25eea8b9dd1ecf5412873f192027ef8e38b0a38394d62fb79e7e9aa8338a617
7
+ data.tar.gz: 6e4fe1c4dba90988961c704671bc43ed57a310fc0fcf3c410b99e5797de3a6e247e82635ac94edd3d3f271b61091bc83230f57888a94decdc3254de6e73d1d53
@@ -13,9 +13,7 @@ module Labimotion
13
13
  private
14
14
 
15
15
  def process_layers
16
- return unless object&.properties.is_a?(Hash)
17
-
18
- (object.properties[Labimotion::Prop::LAYERS]&.keys || []).each do |key|
16
+ (object&.properties.is_a?(Hash) && (object.properties[Labimotion::Prop::LAYERS]&.keys || [])).each do |key|
19
17
  yield(key, object.properties[Labimotion::Prop::LAYERS][key])
20
18
  end
21
19
  end
@@ -87,12 +87,13 @@ module Labimotion
87
87
  }
88
88
  element = Labimotion::Element.new(attributes)
89
89
 
90
- if params[:collection_id]
90
+ all_coll = Collection.get_all_collection_for_user(current_user.id)
91
+ element.collections << all_coll
92
+
93
+ if params[:collection_id] && params[:collection_id] != all_coll.id
91
94
  collection = current_user.collections.find(params[:collection_id])
92
95
  element.collections << collection
93
96
  end
94
- all_coll = Collection.get_all_collection_for_user(current_user.id)
95
- element.collections << all_coll
96
97
  element.save!
97
98
  element.properties = update_sample_association(params[:properties], current_user, element)
98
99
  # element.properties = update_vocabularies(_properties, current_user, element)
@@ -154,13 +154,12 @@ module Labimotion
154
154
  ofile = Rails.root.join(data[:f], data[:a].filename)
155
155
  FileUtils.cp(data[:a].attachment_url, ofile)
156
156
 
157
- File.open(ofile, 'rb') do |f|
157
+ File.open(ofile, 'r') do |f|
158
158
  body = { file: f }
159
159
  response = HTTParty.post(
160
160
  uri('conversions'),
161
161
  basic_auth: auth,
162
162
  body: body,
163
- multipart: true,
164
163
  timeout: timeout,
165
164
  )
166
165
  end
@@ -307,13 +306,12 @@ module Labimotion
307
306
 
308
307
  def self.create_tables(tmpfile)
309
308
  res = {}
310
- File.open(tmpfile.path, 'rb') do |file|
309
+ File.open(tmpfile.path, 'r') do |file|
311
310
  body = { file: file }
312
311
  response = HTTParty.post(
313
312
  uri('tables'),
314
313
  basic_auth: auth,
315
314
  body: body,
316
- multipart: true,
317
315
  timeout: timeout,
318
316
  )
319
317
  res = response.parsed_response
@@ -2,5 +2,5 @@
2
2
 
3
3
  ## Labimotion Version
4
4
  module Labimotion
5
- VERSION = '2.1.0.rc17'
5
+ VERSION = '2.1.1'
6
6
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: labimotion
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.0.rc17
4
+ version: 2.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Chia-Lin Lin
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2026-01-23 00:00:00.000000000 Z
12
+ date: 2026-03-25 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: caxlsx
@@ -98,7 +98,6 @@ files:
98
98
  - lib/labimotion/helpers/vocabulary_helpers.rb
99
99
  - lib/labimotion/libs/attachment_handler.rb
100
100
  - lib/labimotion/libs/converter.rb
101
- - lib/labimotion/libs/data/layer/StdDataset.json
102
101
  - lib/labimotion/libs/data/mapper/Chemwiki.json
103
102
  - lib/labimotion/libs/data/mapper/Source.json
104
103
  - lib/labimotion/libs/data/vocab/Standard.json
@@ -183,9 +182,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
183
182
  version: '3.4'
184
183
  required_rubygems_version: !ruby/object:Gem::Requirement
185
184
  requirements:
186
- - - ">"
185
+ - - ">="
187
186
  - !ruby/object:Gem::Version
188
- version: 1.3.1
187
+ version: '0'
189
188
  requirements: []
190
189
  rubygems_version: 3.1.6
191
190
  signing_key:
@@ -1,212 +0,0 @@
1
- {
2
- "layers": {
3
- "std_general": {
4
- "wf": false,
5
- "key": "std_general",
6
- "std": true,
7
- "cols": 4,
8
- "color": "default",
9
- "label": "Standard General description",
10
- "style": "panel_generic_heading",
11
- "fields": [
12
- {
13
- "type": "text",
14
- "field": "title",
15
- "label": "title",
16
- "default": "",
17
- "ontology": {
18
- "id": "afo:class:http://purl.allotrope.org/ontologies/result#AFR_0001080",
19
- "iri": "http://purl.allotrope.org/ontologies/result#AFR_0001080",
20
- "type": "class",
21
- "label": "title",
22
- "obo_id": "AFR:0001080",
23
- "short_form": "AFR_0001080",
24
- "description": [
25
- "A title is a prefix or suffix added to a personal name. A title can be a title of honor, that is a title bestowed as an award, a honorary title (academic), that is a recognition of contributions by a non-employee or employee, a hereditary title, that is a title that remains in a family or a job title, that is a designation of a person's position in an organization. [Wikipedia]"
26
- ],
27
- "ontology_name": "afo",
28
- "ontology_prefix": "AFO"
29
- },
30
- "position": 1,
31
- "required": false,
32
- "sub_fields": [],
33
- "text_sub_fields": []
34
- },
35
- {
36
- "type": "text",
37
- "field": "data_type",
38
- "label": "Type of the data ",
39
- "default": "",
40
- "readonly": true,
41
- "position": 2,
42
- "required": false,
43
- "sub_fields": [],
44
- "description": "Ontologies!!!! type of entity",
45
- "placeholder": "e.g. sample or reaction analysis",
46
- "text_sub_fields": []
47
- },
48
- {
49
- "type": "text",
50
- "field": "date",
51
- "label": "date",
52
- "default": "",
53
- "position": 3,
54
- "required": false,
55
- "sub_fields": [],
56
- "text_sub_fields": []
57
- },
58
- {
59
- "type": "text",
60
- "field": "time",
61
- "label": "starting time",
62
- "default": "",
63
- "position": 4,
64
- "required": false,
65
- "sub_fields": [],
66
- "text_sub_fields": []
67
- },
68
- {
69
- "type": "text",
70
- "field": "contributor",
71
- "label": "contributor",
72
- "default": "",
73
- "position": 5,
74
- "required": false,
75
- "sub_fields": [],
76
- "description": "",
77
- "text_sub_fields": []
78
- },
79
- {
80
- "type": "text",
81
- "field": "creator",
82
- "label": "creator",
83
- "default": "",
84
- "position": 6,
85
- "required": false,
86
- "sub_fields": [],
87
- "description": "the person who upload the analysis",
88
- "text_sub_fields": []
89
- },
90
- {
91
- "type": "text",
92
- "field": "operator",
93
- "label": "operator",
94
- "default": "",
95
- "position": 7,
96
- "required": false,
97
- "sub_fields": [],
98
- "text_sub_fields": []
99
- },
100
- {
101
- "type": "text",
102
- "field": "comments",
103
- "label": "comments",
104
- "default": "",
105
- "position": 8,
106
- "required": false,
107
- "sub_fields": [],
108
- "text_sub_fields": []
109
- },
110
- {
111
- "opid": 8,
112
- "type": "text",
113
- "field": "Producer",
114
- "label": "Producer of the sample",
115
- "is_voc": true,
116
- "source": "Segment",
117
- "default": "",
118
- "field_id": "Producer",
119
- "layer_id": "bsi",
120
- "ontology": {
121
- "id": "schema:property:https://schema.org/producer",
122
- "iri": "https://schema.org/producer",
123
- "type": "property",
124
- "label": "producer",
125
- "obo_id": "schema:producer",
126
- "short_form": "schema_producer",
127
- "description": [
128
- "The person or organization who produced the work (e.g. music album, movie, TV/radio series etc.)."
129
- ],
130
- "ontology_name": "schema",
131
- "ontology_prefix": "schema"
132
- },
133
- "position": 9,
134
- "source_id": "dce363d5-56d0-4324-9914-0476be999016",
135
- "identifier": "357b7cd3-ca47-49e0-be47-154d907c2cf5",
136
- "sub_fields": [],
137
- "text_sub_fields": []
138
- }
139
- ],
140
- "position": -2,
141
- "condition": "",
142
- "wf_position": 0
143
- },
144
- "std_sample_details": {
145
- "wf": false,
146
- "key": "std_sample_details",
147
- "cols": 3,
148
- "std": true,
149
- "color": "none",
150
- "label": "Standard Sample details",
151
- "style": "panel_generic_heading",
152
- "fields": [
153
- {
154
- "type": "text",
155
- "field": "label",
156
- "label": "label",
157
- "default": "",
158
- "position": 1,
159
- "required": false,
160
- "sub_fields": [],
161
- "text_sub_fields": []
162
- },
163
- {
164
- "type": "text",
165
- "field": "id",
166
- "label": "id",
167
- "default": "",
168
- "position": 2,
169
- "required": false,
170
- "sub_fields": [],
171
- "text_sub_fields": []
172
- },
173
- {
174
- "type": "text",
175
- "field": "amount",
176
- "label": "amount",
177
- "default": "",
178
- "position": 3,
179
- "required": false,
180
- "sub_fields": [],
181
- "text_sub_fields": []
182
- },
183
- {
184
- "type": "text",
185
- "field": "volume",
186
- "label": "volume",
187
- "default": "",
188
- "position": 4,
189
- "required": false,
190
- "sub_fields": [],
191
- "text_sub_fields": []
192
- },
193
- {
194
- "type": "text",
195
- "field": "size",
196
- "label": "size",
197
- "default": "",
198
- "position": 5,
199
- "required": false,
200
- "sub_fields": [],
201
- "text_sub_fields": []
202
- }
203
- ],
204
- "position": -1,
205
- "timeRecord": "",
206
- "wf_position": 0
207
- }
208
- },
209
- "version": "0.1",
210
- "select_options": {
211
- }
212
- }