ims-lti 2.0.0.beta.40 → 2.0.0.beta.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f74fbddac9cb15785f401b5de2614ccb054b62d
-  data.tar.gz: 73d89e8edfab8bc42a6789d3293f6a167ce5469e
+  metadata.gz: fe29bdb1f765a0a3bf91d6268d275f3f84a5d402
+  data.tar.gz: 8051d34738fcec8d0a10902492fa8f0621ab0e82
 SHA512:
-  metadata.gz: 6f9a9f3dcd4bd519e571d61d60049eff8ab18f79b49278062470523f348f83fc6bd44f48c27624a6b6a244f8678edaf8ff798d0c041302faaf90845db703310f
-  data.tar.gz: 1b6d0c9dbf0ca89cb95f949c1c21b64516adb56d2283f95747a89eb1c43af859d04d27898ce4eb82c44603dc122fc75fe11f2168747a176ce14a1451744499ac
+  metadata.gz: bb0eaa36739ed561812ebb7dd2d715a39ee3bb4e19d6e3bf886ee572ab22502d50898e06784b34580766678e9d6da9c9431eecf522a6f94b8fb405eb2c367cd9
+  data.tar.gz: 8848464d689ddf0267561efc1f6c31c4bb6107018833697dc27d72b0b76cdb4c7e4f164286b165f5916d70e7db0dc516288282e45643ab2166907f7e6177c55f

data/lib/ims/lti/models/content_items/content_item.rb

@@ -19,12 +19,12 @@ module IMS::LTI::Models::ContentItems
     def self.from_json(json)
       data = json.is_a?(String) ? JSON.parse(json) : json
       case data['@type']
-        when 'ContentItem'
-          ContentItem.new.from_json(data)
-        when 'FileItem'
-          FileItem.new.from_json(data)
-        when 'LtiLinkItem'
-          LtiLinkItem.new.from_json(data)
+      when 'FileItem'
+        FileItem.new.from_json(data)
+      when 'LtiLinkItem', 'LtiLink'
+        LtiLinkItem.new.from_json(data)
+      else
+        ContentItem.new.from_json(data)
       end
     end
 

data/lib/ims/lti/models/lti_model.rb

@@ -4,8 +4,9 @@ module IMS::LTI::Models
     LTI_VERSION_2P1 = 'LTI-2p1'.freeze
 
     def initialize(attributes = {})
-      self.attributes = attributes
       @ext_attributes = {}
+      @unknown_attributes = {}
+      self.attributes = attributes
     end
 
     def self.add_attributes(attribute, *attrs)
@@ -61,6 +62,7 @@ module IMS::LTI::Models
           @ext_attributes[k.to_sym] = v
         else
           warn("Unknown attribute '#{k}'")
+          @unknown_attributes[k.to_sym] = v
         end
       end
     end
@@ -76,6 +78,7 @@ module IMS::LTI::Models
           json_hash[json_key(attr)] = val.as_json
         end
       end
+      json_hash = @unknown_attributes.merge(json_hash)
       json_hash = @ext_attributes.merge(json_hash)
       json_hash.merge! to_json_conversions
       json_hash.merge! to_json_keys
@@ -97,8 +100,11 @@ module IMS::LTI::Models
     end
 
     def method_missing(meth, *args, &block)
-      if match = /^ext_([^=$]*)/.match(meth)
-        meth =~ /=$/ ? @ext_attributes[match.to_s.to_sym] = args[0] : @ext_attributes[match.to_s.to_sym]
+      proc = ->(attr, hash) {meth =~ /=$/ ? hash[attr] = args[0] : hash[attr] }
+      if (match = /^ext_([^=$]*)/.match(meth))
+        proc.call(match.to_s.to_sym, @ext_attributes)
+      elsif (match = /([^=$]*)/.match(meth))
+        proc.call(match.to_s.to_sym, @unknown_attributes)
       else
         super
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ims-lti
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.40
+  version: 2.0.0.beta.41
 platform: ruby
 authors:
 - Instructure
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-09 00:00:00.000000000 Z
+date: 2016-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_oauth