chemistry_rails 0.1.1 → 0.1.2
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 +4 -4
- data/lib/chemistry_rails.rb +4 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 2f44b4a5c5f0cfba9d229090061619676cc3189d
|
|
4
|
+
data.tar.gz: 5ba0ea27ddf54b8ec29792452d17a9501da17156
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 085302b53c9d9017f139af4a2acc4793414433f9947a62eb48b8382c76e372c31f454dd91bca108fabd34a9d16abe5e33df79cb1c334fbd2428818342ada944b
|
|
7
|
+
data.tar.gz: 5364a9c54591068ab4b103bff470992b713aad9e5908d62b0385771b5a8f067ea068b11b05351eef651b283ad8f78bad487eaa55b2d16e329f969547b5b7efe5
|
data/lib/chemistry_rails.rb
CHANGED
|
@@ -178,6 +178,9 @@ module ChemistryRails
|
|
|
178
178
|
def initialize(formula, options={})
|
|
179
179
|
@formula = formula
|
|
180
180
|
@options = options
|
|
181
|
+
if @is_OH = (formula.scan(/OH$/).length > 0)
|
|
182
|
+
formula = formula.gsub(/OH$/,'')
|
|
183
|
+
end
|
|
181
184
|
@elements = Hash[formula.scan(/([A-Z][a-z]{0,2})(\d*)/).map{|k,v| [k, v.blank? ? 1 : v.to_i]}]
|
|
182
185
|
end
|
|
183
186
|
|
|
@@ -185,7 +188,7 @@ module ChemistryRails
|
|
|
185
188
|
def empty?; formula.blank?; end
|
|
186
189
|
|
|
187
190
|
def to_html
|
|
188
|
-
elements.map { |el, i| "#{el}<sub>#{i > 1 ? i : ''}</sub>" }.join('')
|
|
191
|
+
elements.map { |el, i| "#{el}<sub>#{i > 1 ? i : ''}</sub>" }.join('')+(@is_OH ? 'OH' : '')
|
|
189
192
|
end
|
|
190
193
|
|
|
191
194
|
def elemental_analysis(include_oxygen = false)
|