feedjira-podcast 0.9.8 → 0.9.9

data/lib/feedjira/podcast/channel/image.rb

@@ -15,14 +15,8 @@ module Feedjira
           Addressable::URI.parse(link)
         end
 
-        element :width do |width|
-          width.to_f
-        end
-
-        element :height do |height|
-          height.to_f
-        end
-
+        element :width, &:to_f
+        element :height, &:to_f
         element :description
       end
     end

data/lib/feedjira/podcast/channel/optional.rb

@@ -2,7 +2,64 @@ 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
@@ -27,53 +84,22 @@ module Feedjira
 
           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

data/lib/feedjira/podcast/channel/required.rb

@@ -3,14 +3,12 @@ module Feedjira
     module Channel
       module Required
         def self.included(base)
-
           base.element :link do |link|
             Addressable::URI.parse(link)
           end
 
           base.element :title
           base.element :description
-
         end
       end
     end

data/lib/feedjira/podcast/channel/skip_days.rb

@@ -5,9 +5,7 @@ module Feedjira
         include SAXMachine
         include FeedUtilities
 
-        elements :day, as: :day do |day|
-          day.to_sym
-        end
+        elements :day, as: :day, &:to_sym
 
         def days
           @days ||= day ? day : []

data/lib/feedjira/podcast/channel/skip_hours.rb

@@ -5,9 +5,7 @@ module Feedjira
         include SAXMachine
         include FeedUtilities
 
-        elements :hour, as: :hour do |hour|
-          hour.to_f
-        end
+        elements :hour, as: :hour, &:to_f
 
         def hours
           @hours ||= hour ? hour : []

data/lib/feedjira/podcast/channel/syndication.rb

@@ -2,8 +2,7 @@ module Feedjira
   module Podcast
     module Channel
       module Syndication
-        def self.included(base)
-
+        def self.included(_base)
         end
       end
     end

data/lib/feedjira/podcast/error.rb

@@ -2,7 +2,6 @@ module Feedjira
   module Podcast
     class Error
       def initialize
-
       end
     end
   end

data/lib/feedjira/podcast/item/apple.rb

@@ -2,38 +2,7 @@ module Feedjira
   module Podcast
     module Item
       module Apple
-        def self.included(base)
-
-          base.element :"itunes:author", as: :itunes_author
-          base.element :"itunes:block", as: :_itunes_block
-
-          base.element :"itunes:image", as: :itunes_image_href, value: :href do |href|
-            Addressable::URI.parse(href)
-          end
-
-          base.element :"itunes:duration", as: :itunes_duration do |d|
-            ["0:0:0:#{d}".split(":")[-3, 3].map(&:to_i)].inject(0) do |m, i|
-              (i[0] * 3600) + (i[1] * 60) + i[2]
-            end
-          end
-
-          base.element :"itunes:explicit", as: :_itunes_explicit
-
-          base.element :"itunes:isClosedCaptioned", as: :_itunes_is_closed_captioned
-          
-          base.element :"itunes:order", as: :itunes_order do |order|
-            order.to_f
-          end
-
-          base.element :"itunes:subtitle", as: :itunes_subtitle
-          base.element :"itunes:summary", as: :itunes_summary
-
-          # Legacy support
-
-          base.element :"itunes:keywords", as: :itunes_keywords do |keywords|
-            keywords.split(',').map(&:strip).select { |k| !k.empty? }
-          end
-
+        module InstanceMethods
           def itunes
             @itunes ||= Struct.new(
               :author,
@@ -69,21 +38,52 @@ module Feedjira
           end
 
           def itunes_block
-            @itunes_block ||= (_itunes_block == 'yes')
+            @itunes_block ||= (_itunes_block == "yes")
           end
 
           def itunes_is_closed_captioned
-            @itunes_is_closed_captioned ||= (_itunes_is_closed_captioned == 'yes')
+            @itunes_is_closed_captioned ||= (_itunes_is_closed_captioned == "yes")
           end
 
           def itunes_explicit
-            @itunes_explicit ||= (_itunes_explicit == 'yes')
+            @itunes_explicit ||= (_itunes_explicit == "yes")
           end
 
           def itunes_clean
-            @itunes_clean ||=  (_itunes_explicit == 'clean')
+            @itunes_clean ||= (_itunes_explicit == "clean")
+          end
+        end
+
+        def self.included(base)
+          base.include(InstanceMethods)
+
+          base.element :"itunes:author", as: :itunes_author
+          base.element :"itunes:block", as: :_itunes_block
+
+          base.element :"itunes:image", as: :itunes_image_href, value: :href do |href|
+            Addressable::URI.parse(href)
           end
 
+          base.element :"itunes:duration", as: :itunes_duration do |d|
+            ["0:0:0:#{d}".split(":")[-3, 3].map(&:to_i)].inject(0) do |_m, i|
+              (i[0] * 3600) + (i[1] * 60) + i[2]
+            end
+          end
+
+          base.element :"itunes:explicit", as: :_itunes_explicit
+
+          base.element :"itunes:isClosedCaptioned", as: :_itunes_is_closed_captioned
+
+          base.element :"itunes:order", as: :itunes_order, &:to_f
+
+          base.element :"itunes:subtitle", as: :itunes_subtitle
+          base.element :"itunes:summary", as: :itunes_summary
+
+          # Legacy support
+
+          base.element :"itunes:keywords", as: :itunes_keywords do |keywords|
+            keywords.split(",").map(&:strip).select { |k| !k.empty? }
+          end
         end
       end
     end

data/lib/feedjira/podcast/item/content.rb

@@ -2,14 +2,16 @@ module Feedjira
   module Podcast
     module Item
       module Content
-        def self.included(base)
-
-          base.element :"content:encoded", as: :content_encoded
-
+        module InstanceMethods
           def content
             @content ||= Struct.new(:encoded).new(content_encoded)
           end
+        end
+
+        def self.included(base)
+          base.include(InstanceMethods)
 
+          base.element :"content:encoded", as: :content_encoded
         end
       end
     end

data/lib/feedjira/podcast/item/dublin.rb

@@ -2,16 +2,18 @@ module Feedjira
   module Podcast
     module Item
       module Dublin
-        def self.included(base)
-
-          base.element :"dc:creator", as: :dc_creator
-
+        module InstanceMethods
           def dc
             @dc ||= Struct.new(:creator).new(
               dc_creator,
             )
           end
+        end
+
+        def self.included(base)
+          base.include(InstanceMethods)
 
+          base.element :"dc:creator", as: :dc_creator
         end
       end
     end

data/lib/feedjira/podcast/item/guid.rb

@@ -8,13 +8,12 @@ module Feedjira
         value :guid do |guid|
           perma_link? ? Addressable::URI.parse(guid) : guid
         end
-        
+
         attribute :isPermaLink, as: :is_perma_link
 
         def perma_link?
-          is_perma_link == 'false' ? false : true
+          is_perma_link == "false" ? false : true
         end
-
       end
     end
   end

data/lib/feedjira/podcast/item/optional.rb

@@ -2,7 +2,22 @@ module Feedjira
   module Podcast
     module Item
       module Optional
+        module InstanceMethods
+          def categories
+            category.map(&:strip).uniq
+          end
+
+          def enclosure
+            @enclosure ||= Struct.new(:url, :length, :type).new(
+              enclosure_url,
+              enclosure_length,
+              enclosure_type,
+            )
+          end
+        end
+
         def self.included(base)
+          base.include(InstanceMethods)
 
           base.element :link do |link|
             Addressable::URI.parse(link)
@@ -16,28 +31,14 @@ module Feedjira
             Addressable::URI.parse(comments)
           end
 
-          def categories
-            category.map{|c|c.strip}.uniq
-          end
-
           base.element :enclosure, as: :enclosure_url, value: :url do |url|
             Addressable::URI.parse(url)
           end
 
-          base.element :enclosure, as: :enclosure_length, value: :length do |length|
-            length.to_f
-          end
+          base.element :enclosure, as: :enclosure_length, value: :length, &:to_f
 
           base.element :enclosure, as: :enclosure_type, value: :type
 
-          def enclosure
-            @enclosure ||= Struct.new(:url, :length, :type).new(
-              enclosure_url,
-              enclosure_length,
-              enclosure_type,
-            )
-          end
-
           base.element :guid, as: :guid, class: GUID, default: Struct.new(:guid, :perma_link?).new
 
           base.element :pubDate, as: :pub_date do |date|
@@ -49,7 +50,6 @@ module Feedjira
           end
 
           base.element :source, class: Source, default: Struct.new(:name, :url).new
-
         end
       end
     end

data/lib/feedjira/podcast/item/required.rb

@@ -3,10 +3,8 @@ module Feedjira
     module Item
       module Required
         def self.included(base)
-
           base.element :title
           base.element :description
-
         end
       end
     end

data/lib/feedjira/podcast/item/source.rb

@@ -10,7 +10,6 @@ module Feedjira
         attribute :url do |url|
           Addressable::URI.parse(url)
         end
-
       end
     end
   end

data/lib/feedjira/podcast/version.rb

@@ -1,5 +1,5 @@
 module Feedjira
   module Podcast
-    VERSION = "0.9.8"
+    VERSION = "0.9.9"
   end
 end

data/lib/feedjira/podcast/warning.rb

@@ -2,7 +2,6 @@ module Feedjira
   module Podcast
     class Warning
       def initialize
-
       end
     end
   end