rtunesu 0.4.1 → 0.4.2

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/rtunesu/associations.rb

@@ -6,14 +6,27 @@ module RTunesU
       @owner = owner
       @owner.edits[name] = self
       @edits = []
-      self.from_xml(name)
     end
     
   end
   
   class HasAEntityCollectionProxy < SubentityAssociationProxy
     delegate :class, :to => :target
-    attr_reader :target 
+    attr_reader :target
+    
+    def self.new_or_nil(source_xml, owner, name)
+      return nil if source_xml.empty?
+      proxy = self.new(source_xml, owner, name)
+      proxy.from_xml(name)
+      return proxy
+    end
+    
+    def self.new_from_target(target, owner, name)
+      proxy = self.new(nil, owner, name)
+      proxy.instance_variable_set("@target", target)
+      return proxy
+    end
+    
     def from_xml(name)
       if @source_xml
        @target = "RTunesU::#{name}".constantize.new(:source_xml => @source_xml.first, :parent_handle => @owner.handle)
@@ -22,8 +35,8 @@ module RTunesU
       end
     end
     
-    def to_xml(builder)
-      @target.to_xml(builder) if @target.edits.any?
+    def to_xml(xml_builder = Builder::XmlMarkup.new)
+      @target.to_xml(xml_builder) if @target.edits.any?
     end
     
     def method_missing(method_name, *args)
@@ -34,6 +47,11 @@ module RTunesU
   class HasNEntityCollectionProxy < SubentityAssociationProxy
     delegate :[], :at, :first, :last, :size, :clear, :to => :target
     attr_reader :target, :edits
+    
+    def initialize(source_xml, owner, name)
+      super
+      self.from_xml(name)
+    end
 
     def from_xml(name)
       if @source_xml

data/lib/rtunesu/entities/external_feed.rb

@@ -5,6 +5,15 @@ module RTunesU
     validates!  :polling_interval, [:never, :daily]
     validates!  :security_type,  [:none, 'Basic Authentication']
     
+    # an ExternalFeed must serialize in a specific order
+    def to_xml(xml_builder = Builder::XmlMarkup.new)
+      xml_builder.tag!('ExternalFeed') do
+        %w(URL OwnerEmail PollingInterval SecurityType SignatureType BasicAuthUsername BasicAuthPassword).each do |tag_name|
+          xml_builder.tag!(tag_name, self.edits[tag_name]) if self.edits[tag_name]
+        end
+      end
+    end
+    
     # As an entirely nested entity ExternalFeed instances don't have a parent handle. However, something 'truthy' needs
     # to be presnet for proper XML document genration.
     def parent_handle # :nodoc:

data/lib/rtunesu/entities/file.rb

@@ -1,6 +1,6 @@
 module RTunesU
   class File < Entity
-    composed_of :name, :path, :size, :shared
+    composed_of :name, :path, :shared
     composed_of :size, :readonly => true
   end
 end

data/lib/rtunesu/entities/group.rb

@@ -2,10 +2,38 @@ module RTunesU
   # A Group in iTunes U. A Group is expressed as a tab in the iTunes interface.
   
   class Group < Entity
+    ACCESS = {
+      :no_access => "No Access",
+      :steaming  => "Streaming",
+      :download  => "Download",
+      :drop_box  => "Drop Box",
+      :shared    => "Shared",
+      :edit      => "Edit"
+    }
+    TYPES = {
+      :feed => "Feed"
+    }
     composed_of :name, :group_type, :short_name, :allow_subscription, :explicit
     composed_of :aggregate_file_size, :readonly => true
     validates! :group_type, [:simple, :smart, :feed]
     has_a :external_feed
     has_n :permissions, :tracks, :shared_objects
+    
+    # a Group must serialize in a specific order
+    def to_xml(xml_builder = Builder::XmlMarkup.new)
+      xml_builder.tag!('Group') do
+        %w(Name Handle GroupType Explicit).each do |tag_name|
+          xml_builder.tag!(tag_name, self.edits[tag_name]) if self.edits[tag_name]
+        end
+        
+        self.tracks.to_xml(xml_builder)
+        self.permissions.to_xml(xml_builder)
+        
+        %w(AllowSubscription).each do |tag_name|
+          xml_builder.tag!(tag_name, self.edits[tag_name]) if self.edits[tag_name]
+        end
+        self.external_feed.to_xml(xml_builder) if self.external_feed
+      end
+    end
   end
 end

data/lib/rtunesu/entities/template.rb

@@ -1,4 +1,6 @@
 module RTunesU
   class Tempalte < Entity
+    composed_of :name, :handle
+    has_n :permissions
   end
 end

data/lib/rtunesu/entity.rb

@@ -52,7 +52,7 @@ module RTunesU
     end
     
     def self.composed_of(*names)
-      options = names.last.is_a?(Hash) ? names.pop : {}
+      options = names.extract_options!
       self.attributes.merge(names)
       names.each do |name|
         storage_name = options[:as] || name.to_s.camelize
@@ -70,24 +70,26 @@ module RTunesU
     end
     
     def self.has_a(*names)
-      options = names.last.is_a?(Hash) ? names.pop : {}
+      options = names.extract_options!
       self.attributes.merge(names)
       names.each do |name|
         define_method(name) do
           entity_name = options[:as] || name.to_s.camelize
-          instance_variable_get("@#{name}") || instance_variable_set("@#{name}", RTunesU::HasAEntityCollectionProxy.new(self.source_xml./(entity_name), self, entity_name))
+          edits[entity_name] || RTunesU::HasAEntityCollectionProxy.new_or_nil(self.source_xml./(entity_name), self, entity_name)
         end
         
         unless options[:readonly]
           define_method(:"#{name}=") do |arg|
-            edits[options[:as] || name.to_s.camelize] = arg
+            entity_name = options[:as] || name.to_s.camelize
+            RTunesU::HasAEntityCollectionProxy.new_from_target(arg, self, entity_name)
+            #edits[options[:as] || name.to_s.camelize] = arg
           end
         end
       end
     end
     
     def self.has_n(*names)
-      options = names.last.is_a?(Hash) ? names.pop : {}
+      options = names.extract_options!
       self.attributes.merge(names)
       names.each do |name|
         define_method(name) do
@@ -180,11 +182,11 @@ module RTunesU
     # Converts the entities changed attributes and subentities to XML.  Called by Document when building
     # documents to transfer to iTunes U.
     def to_xml(xml_builder = Builder::XmlMarkup.new)
-      xml_builder.tag!(self.class_name) {
+      xml_builder.tag!(self.class_name) do
         self.edits.each do |attribute,edit|
           edit.is_a?(SubentityAssociationProxy) ? edit.to_xml(xml_builder) : xml_builder.tag!(attribute, edit)
         end
-      }
+      end
     end
     
     def inspect

data/spec/entities/file_spec.rb

@@ -0,0 +1,18 @@
+require File.dirname(__FILE__) + '/../spec_helper.rb'
+require File.dirname(__FILE__) + '/../entity_spec.rb'
+
+include RTunesU
+
+describe RTunesU::File do  
+  before(:each) do
+    @klass = RTunesU::File
+    @entity = RTunesU::File.new
+    @file = @entity
+    @attributes = {:name => 'foo.png'}
+  end
+  
+  it_should_behave_like "an Entity with attribute assignment"
+  
+  it_should_be_composed_of :name, :path, :shared
+  it_should_be_composed_of :size, :readonly => true
+end

data/spec/entities/group_spec.rb

@@ -16,4 +16,40 @@ describe Group do
   it_should_be_composed_of :aggregate_file_size, :readonly => true
   it_should_have_many :permissions, :tracks, :shared_objects
   it_should_have_a    :external_feed
+  
+  describe "external feed" do
+    it "should return nil if unset" do
+      @entity.external_feed.should be_nil
+    end
+    
+    it "should return feed from XML if present" do
+      id = 2628591672
+      mock_connect!
+      FakeWeb.register_uri(:get,
+                           "https://deimos.apple.com/WebObjects/Core.woa/API/GetUploadURL/example.edu.#{id}?credentials=Administrator%40urn%3Amace%3Aitunesu.com%3Asites%3Aexample.edu&identity=%22Admin%22+%3Cadmin%40example.edu%3E+%28admin%29+%5B0%5D&time=1214619134&signature=121a6cf76c9c5ecda41450d87e3394b9d02c570a5f76b2bd16287f860f068302&type=XMLControlFile",
+                           :body => mock_upload_url_for_handle(id))
+      FakeWeb.register_uri(:post, mock_upload_url_for_handle(id), :body => response_for(@klass, 'show', true))
+      @entity = Group.find(id)
+      @entity.external_feed.should_not be_nil
+      FakeWeb.clean_registry
+    end
+    
+    it "should return a feed if set" do
+      @entity.external_feed = ExternalFeed.new
+      @entity.external_feed.should_not be_nil
+    end
+  end
+  
+  describe "access rights" do
+    it "should have the correct access rights as constant" do
+      Group::ACCESS.should ==  {
+          :no_access => "No Access",
+          :steaming  => "Streaming",
+          :download  => "Download",
+          :drop_box  => "Drop Box",
+          :shared    => "Shared",
+          :edit      => "Edit"
+        }
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -48,7 +48,7 @@ def it_should_have_a(*associations)
   associations.each do |association|
     it "should have a #{association}" do
       @entity.should respond_to(association)
-      @entity.send(association).should be_kind_of(HasAEntityCollectionProxy)
+      # @entity.send(association).should be_kind_of(HasAEntityCollectionProxy)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rtunesu
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Trek Glowacki
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-30 00:00:00 -04:00
+date: 2009-11-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -88,6 +88,7 @@ files:
 - spec/entities/course_spec.rb
 - spec/entities/division_spec.rb
 - spec/entities/external_feed_spec.rb
+- spec/entities/file_spec.rb
 - spec/entities/group_spec.rb
 - spec/entities/permission_spec.rb
 - spec/entities/section_spec.rb
@@ -183,6 +184,7 @@ test_files:
 - spec/entities/course_spec.rb
 - spec/entities/division_spec.rb
 - spec/entities/external_feed_spec.rb
+- spec/entities/file_spec.rb
 - spec/entities/group_spec.rb
 - spec/entities/permission_spec.rb
 - spec/entities/section_spec.rb