scorm2004-manifest 0.1.2 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.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}").try(:content) || options[:default].try(:to_s)
           end
           send("#{type}_attribute", name, options)
           attr_reader base

data/lib/scorm2004/manifest/children.rb

@@ -9,12 +9,12 @@ module Scorm2004
 
       def at(xpath)
         xpath = './' + xpath unless /^\.\// =~ xpath
-        el.at(xpath, NS)
+        @el.at(xpath, NS)
       end
 
       def search(xpath)
         xpath = './' + xpath unless /^\.\// =~ xpath
-        el.search(xpath, NS)
+        @el.search(xpath, NS)
       end
 
       def create_visitor(name)

data/lib/scorm2004/manifest/dependency.rb

@@ -13,7 +13,7 @@ module Scorm2004
       end
 
       def referenced_resource
-        el.at("/imscp:manifest/imscp:resources/imscp:resource[@identifier='#{identifierref}']", NS)
+        @el.at("/imscp:manifest/imscp:resources/imscp:resource[@identifier='#{identifierref}']", NS)
       end
     end
   end

data/lib/scorm2004/manifest/href.rb

@@ -8,7 +8,7 @@ module Scorm2004
       private
 
       def relative_href
-        value = el.at('./@href', NS)
+        value = @el.at('./@href', NS)
         return unless value
         uri = URI(value)
         uri.absolute? ? uri : Pathname(uri.path)

data/lib/scorm2004/manifest/item.rb

@@ -28,7 +28,7 @@ module Scorm2004
       end
 
       def resource
-        el.at("/imscp:manifest/imscp:resources/imscp:resource[@identifier='#{identifierref}']", NS)
+        @el.at("/imscp:manifest/imscp:resources/imscp:resource[@identifier='#{identifierref}']", NS)
       end
     end
   end

data/lib/scorm2004/manifest/manifest.rb

@@ -6,6 +6,8 @@ module Scorm2004
       include Attributes
       include XmlBase
       
+      VERSION_SPM = 20
+
       has_one_and_only_one './imscp:metadata/imscp:schema'
       has_one_and_only_one './imscp:metadata/imscp:schemaversion'
       has_one_and_only_one 'imscp:resources'
@@ -13,7 +15,7 @@ module Scorm2004
       has_zero_or_one      'imsss:sequencingCollection'
 
       attribute :id,     'identifier'
-      attribute :string, 'version', spm: 20
+      attribute :string, 'version', spm: VERSION_SPM
     end
   end
 end

data/lib/scorm2004/manifest/min_normalized_measure.rb

@@ -4,13 +4,13 @@ module Scorm2004
       include VisitorPattern
       
       def to_f
-        Float(el.content)
+        Float(@el.content)
       end
 
       private
       
       def do_visit
-        error("#{el} should be between -1 and 1.") unless (-1.0..1.0).include?(to_f)
+        error("#{@el} should be between -1 and 1.") unless (-1.0..1.0).include?(to_f)
       end
     end
   end

data/lib/scorm2004/manifest/organizations.rb

@@ -16,7 +16,7 @@ module Scorm2004
       end
 
       def default_resource
-        el.at("/imscp:manifest/imscp:organizations/imscp:organization[@identifier='#{default}']", NS)
+        @el.at("/imscp:manifest/imscp:organizations/imscp:organization[@identifier='#{default}']", NS)
       end
     end
   end

data/lib/scorm2004/manifest/primary_objective.rb

@@ -14,7 +14,7 @@ module Scorm2004
       private
       
       def do_visit
-        error(<<EOS) if el.at('./imsss:mapInfo', NS) && objective_id.nil?
+        error(<<EOS) if @el.at('./imsss:mapInfo', NS) && objective_id.nil?
 If a <primaryObjective> contains an objective map (<mapInfo>), then the objectiveID attribute is required.
 EOS
       end

data/lib/scorm2004/manifest/rule_action.rb

@@ -13,7 +13,7 @@ module Scorm2004
       private
       
       def do_visit
-        parent_name = el.at('..').name
+        parent_name = @el.at('..').name
         case parent_name
         when 'preConditionRule'
           error("Invalid rule action in <preConditionRule>: #{action}") unless PRE.include?(action)

data/lib/scorm2004/manifest/schema.rb

@@ -6,11 +6,11 @@ module Scorm2004
       private
       
       def do_visit
-        error("Invalid schema: #{el.content}") unless valid?
+        error('Invalid schema') unless valid?
       end
 
       def valid?
-        'ADL SCORM' == el.content
+        'ADL SCORM' == @el.content
       end
     end
   end

data/lib/scorm2004/manifest/schemaversion.rb

@@ -6,11 +6,11 @@ module Scorm2004
       private
       
       def do_visit
-        error("Invalid schemaversion: #{el.content}") unless valid?
+        error('Invalid schemaversion') unless valid?
       end
 
       def valid?
-        '2004 4th Edition' == el.content
+        '2004 4th Edition' == @el.content
       end
     end
   end

data/lib/scorm2004/manifest/text_node.rb

@@ -2,7 +2,7 @@ module Scorm2004
   module Manifest
     module TextNode
       def content
-        el.content
+        @el.content
       end
       alias :to_s :content
       alias :to_str :content

data/lib/scorm2004/manifest/visitor_pattern.rb

@@ -1,8 +1,6 @@
 module Scorm2004
   module Manifest
     module VisitorPattern
-      attr_reader :el
-
       def self.included(base)
         base.class_eval do
           const_set('Error', Class.new(Scorm2004::Manifest::Error))
@@ -21,10 +19,15 @@ module Scorm2004
         self
       end
 
+      # @return [Nokogiri::XML::Node, nil] The <metadata> element or +nil+
+      def metadata
+        @el.at('./imscp:metadata', NS)
+      end
+
       private
 
       def error(message)
-        raise("#{self.class}::Error".constantize, [message, el.try(:to_s)].compact.join("\n"))
+        raise("#{self.class}::Error".constantize, [message, @el.try(:to_s)].compact.join("\n"))
       end
 
       def check_attributes

data/lib/scorm2004/manifest/xml_base.rb

@@ -11,7 +11,7 @@ module Scorm2004
       private
 
       def relative_base
-        value = el.at('./@xml:base', NS)
+        value = @el.at('./@xml:base', NS)
         return unless value
         error("Invalid XML Base value: #{value}") if %r!^/|[^/]$! =~ value
         uri = URI(value)

data/test/scorm2004/manifest/visitor_pattern_test.rb

@@ -3,25 +3,32 @@ require_relative '../../helper'
 module Scorm2004
   module Manifest
     class VisitorPatternTest < ActiveSupport::TestCase
-      class DumbVisitor
+      include PartialManifest
+
+      class Visitor
         include VisitorPattern
       end
-
-      include PartialManifest
       
       context 'Visitor visiting a element' do
         setup do
-          @v = DumbVisitor.new
+          @v = Visitor.new
           el('<dummy />').accept(@v)
         end
 
-        should 'set a Nokogiri node as an attribute named el' do
-          assert_kind_of Nokogiri::XML::Node, @v.el
-        end
-
         should 'return self when visiting a element' do
           assert_equal @v, el('<dummy />').accept(@v)
         end
+
+        should 'not have metadata' do
+          assert_equal nil, @v.metadata
+        end
+      end
+
+      test 'metadata' do
+        visitor = Visitor.new
+        el('<a><metadata /></a>').accept visitor
+        assert_kind_of Nokogiri::XML::Node, visitor.metadata
+        assert_equal 'metadata', visitor.metadata.name
       end
 
       context 'Visitor with do_visit method' do
@@ -47,7 +54,7 @@ module Scorm2004
 
       context 'Visitor with the attributes class method' do
         setup do
-          @v = DumbVisitor.new
+          @v = Visitor.new
           @v.class.stubs(:attributes)
         end
 
@@ -65,7 +72,7 @@ module Scorm2004
 
       context 'Visitor with the children class method' do
         setup do
-          @v = DumbVisitor.new
+          @v = Visitor.new
           @v.class.stubs(:children)
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scorm2004-manifest
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-16 00:00:00.000000000 Z
+date: 2012-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2159029600 !ruby/object:Gem::Requirement
+  requirement: &2159964920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2159029600
+  version_requirements: *2159964920
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2159029120 !ruby/object:Gem::Requirement
+  requirement: &2159963820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2159029120
+  version_requirements: *2159963820
 - !ruby/object:Gem::Dependency
   name: shoulda-context
-  requirement: &2159028520 !ruby/object:Gem::Requirement
+  requirement: &2159963000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *2159028520
+  version_requirements: *2159963000
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2159027940 !ruby/object:Gem::Requirement
+  requirement: &2159985660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.10.4
   type: :development
   prerelease: false
-  version_requirements: *2159027940
+  version_requirements: *2159985660
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2159027460 !ruby/object:Gem::Requirement
+  requirement: &2159985180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *2159027460
+  version_requirements: *2159985180
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2164333080 !ruby/object:Gem::Requirement
+  requirement: &2159984700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *2164333080
+  version_requirements: *2159984700
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2164332600 !ruby/object:Gem::Requirement
+  requirement: &2159984060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,7 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *2164332600
+  version_requirements: *2159984060
 description: ! 'scorm2004-manifest is a Ruby gem that provides a manifest file parser
   for SCORM 2004 4th edition. It parses and validates the manifest file according
   to SCORM 2004 4th Edition Content Aggregation Model (CAM) Version 1.1. After parsing
@@ -242,7 +242,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2466788348493157142
+      hash: 3400129364290875966
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: