glossa 1.0.5 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e773d2de3588b814543656a2a5906ea1ea7d786
-  data.tar.gz: c1e019a4319148fe43220c7014a414d6309c00b3
+  metadata.gz: 2b47036eb93fd38c2ab9647f4cc24dece0ec6bfc
+  data.tar.gz: f8535e218e76b8adee01c132bad266ed7dbcf879
 SHA512:
-  metadata.gz: 8a2c83198b18eb0973a7e66bac8994a4885a65f11eb3b01baf7dfbcfbf26f314f019b1cd993025e0d64e2fc2a925374fd0b38202160d01ca74061cbeedc3ca09
-  data.tar.gz: 3e133f7cd59dfca1f870334abcc5aa39a2ae86df9cbb7e06b68824fcf8c317ac764c1de153b550f86d65f657537715d1f605c34c45ed82d662ced322010be343
+  metadata.gz: faf673d1bbf5f986d170d164b889edb64fedde2401b232da04ddb5866f54b98105677e9efad7f10a503675eb8a3ccd179df486ce33fe854c134191374ccb1043
+  data.tar.gz: 95f9e6c0f064c07e06e18d27dbb3431b3c3cfe1d414e19ac7b14607bc076f1403dbd54cbb19d2d9f04b68b59bbab89c308dbdca446fd5ce211df19b22d3a368f

data/lib/glossa/import_export.rb

@@ -0,0 +1,33 @@
+require "json"
+
+class Glossa::Language
+	def self.import(path = nil)
+		path = gets "File path:" if path.nil?
+
+		# Get file from path
+		json = '';
+		File.open(path).each do |line|
+			json << line
+		end
+
+		options = JSON.parse(json)
+		self.new(false, options)
+	end
+
+	def export(path = nil)
+		if File.exist? path 
+			raise "That file already exists!"
+			return
+		elsif path.nil?
+			raise "File path required"
+			return
+		end
+
+		lang_state = {}
+		self.instance_variables.each do |attribute|
+			a = attribute[1..attribute.length]
+	      	lang_state[a] = self.instance_variable_get(attribute)
+	    end
+		File.open(path, "w") { |file| file.write(lang_state.to_json) }
+	end
+end

data/lib/glossa/language.rb

@@ -39,22 +39,22 @@ class Glossa::Language
 	            "F" => "mn",
 	            "L" => "rl"
 	        }
-			@structure 	= options[:structure] 	|| "CVC"
-			@exponent 	= options[:exponent] 	|| 2
-			@restricts 	= options[:restricts] 	|| []
-			@cortho 	= options[:cortho] 		|| {}
-			@vortho 	= options[:vortho] 		|| {}
-			@noortho 	= options[:noortho] 	|| true
-			@nomorph 	= options[:nomorph] 	|| true
-			@nowordpool = options[:nowordpool] 	|| true
-			@minsyll 	= options[:minsyll] 	|| 1
-			@maxsyll 	= options[:maxsyll] 	|| 1
-			@morphemes 	= options[:morphemes] 	|| {}
-			@words 		= options[:words] 		|| {}
-			@names 		= options[:names] 		|| []
-			@joiner 	= options[:joiner] 		|| ' '
-			@maxchar 	= options[:maxchar] 	|| 12
-			@minchar 	= options[:minchar] 	|| 5
+			@structure 	= options['structure'] 	|| "CVC"
+			@exponent 	= options['exponent'] 	|| 2
+			@restricts 	= options['restricts'] 	|| []
+			@cortho 	= options['cortho'] 		|| {}
+			@vortho 	= options['vortho'] 		|| {}
+			@noortho 	= options['noortho'] 	|| true
+			@nomorph 	= options['nomorph'] 	|| true
+			@nowordpool = options['nowordpool'] 	|| true
+			@minsyll 	= options['minsyll'] 	|| 1
+			@maxsyll 	= options['maxsyll'] 	|| 1
+			@morphemes 	= options['morphemes'] 	|| {}
+			@words 		= options['words'] 		|| {}
+			@names 		= options['names'] 		|| []
+			@joiner 	= options['joiner'] 		|| ' '
+			@maxchar 	= options['maxchar'] 	|| 12
+			@minchar 	= options['minchar'] 	|| 5
 		end
 
 		@genitive 	= get_morpheme('of')
@@ -135,6 +135,7 @@ class Glossa::Language
 	# phonetic word according to the language's orthography.
 	def make_syllable
 		structure = self.structure.chars
+
 		while true
 			syll = ''
 			structure.each do |ptype|
@@ -153,7 +154,7 @@ class Glossa::Language
 			# Make sure this syllable doesn't violate a restriction
 			bad = false
 			self.restricts.each do |regex|
-				if regex =~ syll
+				if /#{regex}/ =~ syll
 					bad = true
 					break
 				end

data/lib/glossa.rb

@@ -249,13 +249,14 @@ module Glossa
 	    },
 	    {
 	        :name => "Double sounds",
-	        :res => [/(.)\1/]
+	        :res => ['(.)\1']
 	    },
 	    {
 	        :name => "Doubles and hard clusters",
-	        :res => [/[sʃf][sʃ]/, /(.)\1/, /[rl][rl]/]
+	        :res => ['[sʃf][sʃ]', '(.)\1', '[rl][rl]']
 	    }
 	]
 end
 
-require "glossa/language"
+require "glossa/language"
+require "glossa/import_export"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glossa
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors:
 - Jake Franklin
@@ -20,6 +20,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/glossa.rb
+- lib/glossa/import_export.rb
 - lib/glossa/language.rb
 homepage: http://rubygems.org/gems/glossa
 licenses: