scorm2004-manifest 1.0.0 → 1.1.0

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/lib/scorm2004/manifest/attributes.rb

@@ -32,7 +32,7 @@ module Scorm2004
           base = basename(name)
           attributes << base
           define_method("raw_#{base}") do
-            @el.at("./@#{name}").try(:content) || options[:default].try(:to_s)
+            @el.at("./@#{name}", NS).try(:content) || options[:default].try(:to_s)
           end
           send("#{type}_attribute", name, options)
           attr_reader base
@@ -67,10 +67,10 @@ module Scorm2004
         def id_attribute(name, options)
           base = basename(name)
           define_method("check_#{base}".intern) do
-            raw = send("raw_#{base}")
-            error("No #{name} attribute.") unless options[:allow_nil] || raw
-            error("Non xs:ID value for the #{name} attribute: #{raw}") unless xs_id?(raw)
-            instance_variable_set("@#{base}".intern, raw)
+            value = send("raw_#{base}").try(:strip)
+            error("No #{name} attribute.") unless options[:allow_nil] || value
+            error("Non xs:ID value for the #{name} attribute: #{value}") unless xs_id?(value)
+            instance_variable_set("@#{base}".intern, value)
           end
         end
         alias :idref_attribute :id_attribute

data/lib/scorm2004/manifest/dependency.rb

@@ -6,17 +6,7 @@ module Scorm2004
       
       # @attribute [r] identifierref
       # @return [String] The identifierref attribute of <dependency>
-      attribute :string, 'identifierref'
-
-      private
-      
-      def do_visit
-        error('Referenced <resource> not found:') unless referenced_resource
-      end
-
-      def referenced_resource
-        @el.at("/imscp:manifest/imscp:resources/imscp:resource[@identifier='#{identifierref}']", NS)
-      end
+      attribute :id, 'identifierref'
     end
   end
 end

data/lib/scorm2004/manifest/item.rb

@@ -52,18 +52,6 @@ module Scorm2004
       # @attribute [r] data
       # @return [Data, nil] <adlcp:data>
       has_zero_or_one      'adlcp:data'
-
-      private
-      
-      def do_visit
-        if identifierref && resource.nil?
-          error("A <resource> element whose identifier is #{identifierref} not found:")
-        end
-      end
-
-      def resource
-        @el.at("/imscp:manifest/imscp:resources/imscp:resource[@identifier='#{identifierref}']", NS)
-      end
     end
   end
 end

data/lib/scorm2004/manifest/organizations.rb

@@ -16,12 +16,12 @@ module Scorm2004
 
       private
       
-      def do_visit
-        error('Default <resource> not found: ' + default) unless default_resource
+      def post_visit
+        error('Default <organization> not found: ' + default) unless default_organization
       end
 
-      def default_resource
-        @el.at("/imscp:manifest/imscp:organizations/imscp:organization[@identifier='#{default}']", NS)
+      def default_organization
+        organizations.find { |org| org.identifier == default }
       end
     end
   end

data/lib/scorm2004/manifest/rule_condition.rb

@@ -25,7 +25,7 @@ module Scorm2004
 
       # @attribute [r] referenced_objective
       # @return [String] The +referencedObjective+ attribute of <ruleCondition>
-      attribute :string,  'referencedObjective', allow_nil: true
+      attribute :any_uri,  'referencedObjective', allow_nil: true
 
       # @attribute [r] measure_threshold
       # @return [Float] The +measureThreshold+ attribute of <ruleCondition>

data/lib/scorm2004/manifest/time_limit_action.rb

@@ -5,9 +5,9 @@ module Scorm2004
       include TextNode
       
       VOCABULARY = [
-        'exit, message',
+        'exit,message',
         'exit,no message',
-        'continue, message',
+        'continue,message',
         'continue,no message'
       ]
 

data/lib/scorm2004/manifest/visitor_pattern.rb

@@ -16,6 +16,7 @@ module Scorm2004
         check_attributes if self.class.respond_to?(:attributes)
         do_visit         if self.respond_to?(:do_visit, true)
         visit_children   if self.class.respond_to?(:children)
+        post_visit       if self.respond_to?(:post_visit, true)
         self
       end
 

data/test/scorm2004/manifest/dependency_test.rb

@@ -33,14 +33,6 @@ module Scorm2004
             end
           end
         end
-
-        context 'visiting a dependency element with its referencing resource nonexistent' do
-          should 'raise exceptoin' do
-            assert_error do
-              el('<dependency identifierref="k22" />').accept(@v)
-            end
-          end
-        end
       end
 
       private

data/test/scorm2004/manifest/organizations_test.rb

@@ -9,6 +9,7 @@ module Scorm2004
         setup do
           @v = Organizations.new
           @v.stubs(:organization_visitor).returns(stub(:visit))
+          @v.stubs(:default_organization).returns(:dummy)
         end
 
         context 'visiting an organizations element' do
@@ -48,6 +49,7 @@ module Scorm2004
           should 'handle XML Base' do
             @v = Organizations.new(base: Pathname('a/b/c'))
             @v.stubs(:organization_visitor).returns(stub(:visit))
+            @v.stubs(:default_organization).returns(:dummy)
             el(<<-XML).accept(@v)
               <organizations default="t41" xml:base="x/y/z/">
                 <organization identifier="t41" />

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scorm2004-manifest
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-03 00:00:00.000000000 Z
+date: 2012-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -277,7 +277,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -157757132896305828
+      hash: -2026558761935074370
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -286,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.20
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A manifest file parser/validator for SCORM 2004 4th Edition