← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/ruby1.9/intrepid-updates

« back to all changes in this revision

Viewing changes to lib/rss/maker/0.9.rb

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2007-09-04 16:01:17 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20070904160117-i15zckg2nhxe9fyw
Tags: 1.9.0+20070830-2ubuntu1
* Sync from Debian; remaining changes:
  - Add -g to CFLAGS.
* Fixes build failure on ia64.
* Fixes build failure with gcc-4.2 on lpia.
* Robustify check for target_os, fixing build failure on lpia.
* Set Ubuntu maintainer address.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/rss/maker/0.9.rb
22
22
      end
23
23
 
24
24
      class Channel < ChannelBase
25
 
        
26
25
        def to_feed(rss)
27
26
          channel = Rss::Channel.new
28
27
          set = setup_values(channel)
63
62
 
64
63
        def not_set_required_variables
65
64
          vars = super
66
 
          vars << "description" unless description.have_required_values?
67
 
          vars << "title" unless title.have_required_values?
 
65
          vars << "description" unless description {|d| d.have_required_values?}
 
66
          vars << "title" unless title {|t| t.have_required_values?}
68
67
          vars
69
68
        end
70
69
 
259
258
          def to_feed(rss)
260
259
            item = Rss::Channel::Item.new
261
260
            set = setup_values(item)
262
 
            if set or title.have_required_values?
 
261
            if set or title {|t| t.have_required_values?}
263
262
              rss.items << item
264
263
              set_parent(item, rss.channel)
265
264
              setup_other_elements(rss, item)
268
267
            end
269
268
          end
270
269
 
271
 
          def have_required_values?
272
 
            super and title.have_required_values?
273
 
          end
274
 
 
275
270
          private
276
271
          def required_variable_names
277
272
            %w(link)
279
274
 
280
275
          def not_set_required_variables
281
276
            vars = super
282
 
            vars << "title" unless title.have_required_values?
 
277
            vars << "title" unless title {|t| t.have_required_values?}
283
278
            vars
284
279
          end
285
280