lib/feedjira/podcast/channel/optional.rb in feedjira-podcast-0.9.8 vs lib/feedjira/podcast/channel/optional.rb in feedjira-podcast-0.9.9

@@ -1,10 +1,67 @@
 module Feedjira
   module Podcast
     module Channel
       module Optional
+        module InstanceMethods
+          def categories
+            category.map(&:strip).uniq
+          end
+
+          def cloud
+            @cloud ||= cloud_struct.new(*cloud_params)
+          end
+
+          def image
+            @image ||= image_struct.new(*image_params)
+          end
+
+          def skip
+            @skip ||= Struct.new(:hours, :days).new(
+              skip_hours.hours,
+              skip_days.days
+            )
+          end
+
+          private
+
+          def cloud_struct
+            Struct.new(:domain, :port, :path, :registerProcedure, :protocol)
+          end
+
+          def cloud_params
+            return [] unless _cloud
+
+            [
+              _cloud.domain,
+              _cloud.port,
+              _cloud.path,
+              _cloud.registerProcedure,
+              _cloud.protocol
+            ]
+          end
+
+          def image_struct
+            Struct.new(:url, :title, :link, :width, :height, :description)
+          end
+
+          def image_params
+            return [] unless _image
+
+            [
+              _image.url,
+              _image.title,
+              _image.link,
+              _image.width,
+              _image.height,
+              _image.description
+            ]
+          end
+        end
+
         def self.included(base)
+          base.include(InstanceMethods)
 
           base.element :language
           base.element :copyright
           base.element :managingEditor, as: :managing_editor
           base.element :webMaster, as: :web_master
@@ -25,56 +82,25 @@
             end
           end
 
           base.elements :category
 
-          def categories
-            category.map{|c|c.strip}.uniq
-          end
-
           base.element :generator
 
           base.element :docs do |docs|
             Addressable::URI.parse(docs)
           end
 
-          # base.element :cloud
-          # A has five required attributes: domain is the domain name or IP
-          # address of the cloud, port is the TCP port that the cloud is running
-          # on, path is the location of its responder, registerProcedure is the
-          # name of the procedure to call to request notification, and protocol
-          # is xml-rpc, soap or http-post (case-sensitive), indicating which
-          # protocol is to be used.
+          base.element :cloud, as: :_cloud, class: Cloud
 
-          base.element :ttl do |ttl|
-            ttl.to_f
-          end
+          base.element :ttl, &:to_f
 
           base.element :image, as: :_image, class: Image
 
-          def image
-            @image ||= Struct.new(:url, :title, :link, :width, :height, :description).new(
-              _image && _image.url,
-              _image && _image.title,
-              _image && _image.link,
-              _image && _image.width,
-              _image && _image.height,
-              _image && _image.description,
-            )
-          end
-
           # base.element :rating
           base.element :textInput, as: :text_input, class: TextInput, default: Struct.new(:title, :description, :name, :link).new
           base.element :skipHours, as: :skip_hours, class: SkipHours
           base.element :skipDays, as: :skip_days, class: SkipDays
-
-          def skip
-            @skip ||= Struct.new(:hours, :days).new(
-              skip_hours.hours,
-              skip_days.days
-            )
-          end
-
         end
       end
     end
   end
 end