Merge pull request #378 from ConorSheehan1/lang_string_patch_squash

lang string patch

Author: gkellogg

lib/rdf/model/literal.rb

@@ -362,7 +362,6 @@ def has_datatype?
     def valid?
       return false if language? && language.to_s !~ /^[a-zA-Z]+(-[a-zA-Z0-9]+)*$/
       return false if datatype? && datatype.invalid?
-      return false if language? && !@language
       grammar = self.class.const_get(:GRAMMAR) rescue nil
       grammar.nil? || !!(value =~ grammar)
     end

spec/model_literal_spec.rb

@@ -12,6 +12,10 @@ def self.literal(selector)
     when :plain       then ['Hello'.freeze]
     when :empty_lang  then [''.freeze, {language: :en}]
     when :plain_lang  then ['Hello'.freeze, {language: :en}]
+    # langString language: must not contain spaces
+    when :wrong_lang  then ['WrongLang'.freeze, {language: "en f"}]
+    # langString language: must be non-empty valid language
+    when :unset_lang  then ['NoLanguage'.freeze, {datatype: RDF::langString}]
     when :string      then ['String.freeze', {datatype: RDF::XSD.string}]
     when :false       then [false]
     when :true        then [true]
@@ -33,6 +37,7 @@ def self.literals(*selector)
       when :all_simple        then [:empty, :plain, :string].map {|s| literal(s)}
       when :all_plain_lang    then [:empty_lang, :plain_lang].map {|s| literal(s)}
       when :all_native        then [:false, :true, :int, :long, :double, :time, :date, :datetime].map {|s| literal(s)}
+      when :all_invalid_lang  then [:wrong_lang, :unset_lang].map {|s| literal(s)}
       when :all_plain         then literals(:all_simple, :all_plain_lang)
       else                         literals(:all_plain, :all_native)
       end
@@ -347,12 +352,20 @@ def self.literals(*selector)
       end
     end
 
-    it "invalidates ['foo', datatype: 'rdf:langString']" do
-      expect(RDF::Literal.new("foo", datatype: RDF::langString)).not_to be_valid
+    literals(:all_invalid_lang).each do |args|
+      it "invalidates #{args.inspect}" do
+        expect(RDF::Literal.new(*args)).not_to be_valid
+      end
     end
 
-    it "invalidates ['foo', :language => 'en f']" do
-      expect(RDF::Literal.new("foo", language: "en f")).not_to be_valid
+    # test to make sure extra validation is not needed 
+    context "when language? && !@language" do
+      langString = RDF::Literal.new("hello", datatype: RDF::langString)
+      it "should be invalid" do
+        expect(langString.language?).to be true
+        expect(!langString.instance_variable_get("@language")).to be true
+        expect(langString).not_to be_valid
+      end
     end
   end