ims-lti 2.0.0.beta.23 → 2.0.0.beta.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46cfe426f57a5755921c2495ea068c65df5bd0aa
-  data.tar.gz: 371d56f289c38af52ff1ec733b891cf3bf553fe5
+  metadata.gz: a141b93c1db01859d53a90b291a16a30d3e4246b
+  data.tar.gz: c4ee32017b85bb0515bb3e6c959f3a6ce71f83bc
 SHA512:
-  metadata.gz: d776a2e25856be8a7b32844a69430b5854bffeedc2ca2db1f76d322c6675f476958ae183a306b580b195df102570645c533646a0b8f3ecc5e4cf99121e77ae85
-  data.tar.gz: 8f3a02b6c135870c68d737a22253fafae9b73df0b57d0204d193129efa8190c0bbc4892e97632269d670109196e2b6cd2831962f212b78cae07574377e230973
+  metadata.gz: fdf42e04d1d73ea680d707836616074947a0029fcced366f9615aa5344eb9c4b4719ba67cca7810295cb68f6ec6b313b8b0188ded3d1a65317fc998c87b7d8b7
+  data.tar.gz: 80305bf0f10e63501dbbf75c992951b533f3049230ada4db87193135e1b61270b80d9c65a615b08efe37a5b7282aa4183ab4b815560883ce4ecd89f3fc0fe7c4

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

@@ -11,8 +11,10 @@ module IMS::LTI::Models
       window: 'http://purl.imsglobal.org/vocab/lti/v2/lti#window'
     }
 
-    add_attributes :display_height, :display_width, :window_target
-    add_attribute :presentation_document_target
+    add_attribute :display_height, json_key: 'displayHeight'
+    add_attribute :display_width, json_key: 'displayWidth'
+    add_attribute :window_target, json_key: 'windowTarget'
+    add_attribute :presentation_document_target, json_key: 'presentationDocumentTarget'
 
   end
 end

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

@@ -1,11 +1,12 @@
 module IMS::LTI::Models::ContentItems
   class ContentItem < IMS::LTI::Models::LTIModel
 
-    add_attributes :media_type, :text, :title, :url
+    add_attributes :text, :title, :url
+    add_attribute :media_type, json_key: 'mediaType'
     add_attribute :type, json_key: '@type'
     add_attribute :id, json_key: '@id'
     add_attribute :icon, relation: 'IMS::LTI::Models::Image'
-    add_attribute :placement_advice, relation: 'IMS::LTI::Models::ContentItemPlacement'
+    add_attribute :placement_advice, json_key:'placementAdvice', relation: 'IMS::LTI::Models::ContentItemPlacement'
     add_attribute :thumbnail, relation: 'IMS::LTI::Models::Image'
 
     TYPE = "ContentItem"

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

@@ -1,7 +1,8 @@
 module IMS::LTI::Models::ContentItems
   class FileItem < ContentItem
 
-    add_attributes :copyAdvice, :expires_at
+    add_attribute :copy_advice, json_key: 'copyAdvice'
+    add_attribute :expires_at, json_key: 'expiresAt'
 
     TYPE = "FileItem"
 

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

@@ -63,7 +63,7 @@ module IMS::LTI::Models
       serialization_attrs_for(:relation).each do |attr|
         val = attributes[attr.to_s]
         if val && val.is_a?(Array)
-          json_hash[json_key(attr)] = val.map {|v| v.as_json }
+          json_hash[json_key(attr)] = val.map { |v| v.as_json }
         elsif val
           json_hash[json_key(attr)] = val.as_json
         end
@@ -177,10 +177,13 @@ module IMS::LTI::Models
     end
 
     def self.serialization_options()
+      @serialization_options ||= {}
       if name == "IMS::LTI::Models::LTIModel"
-        @serialization_options || {}
+        @serialization_options
       else
-        superclass.send(:serialization_options).merge(@serialization_options || {})
+        opts = superclass.send(:serialization_options) || {}
+        keys = opts.keys | @serialization_options.keys
+        keys.each_with_object({}) {|k, h| h[k] = (opts[k] || {}).merge(@serialization_options[k] || {})}
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ims-lti
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.23
+  version: 2.0.0.beta.24
 platform: ruby
 authors:
 - Instructure