ess 0.9.1 → 0.9.3

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+script: bundle exec rspec spec
+#
+

data/Gemfile

@@ -3,4 +3,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in ess.gemspec
 gemspec
 
-gem 'rspec', '~> 2.13.0'
+group :test do
+  gem 'rake'
+  gem 'rspec', '~> 2.13.0'
+end

data/README.md

@@ -1,9 +1,7 @@
-ruby-ess
-========
+ruby-ess [![ESS Feed Standard](http://essfeed.org/images/8/87/ESS_logo_32x32.png)](http://essfeed.org/)
+=======================================================================================================
 
-#### https://github.com/essfeed/rails-ess 
-                                                                                    
-[![ESS Feed Standard](http://essfeed.org/images/8/87/ESS_logo_32x32.png)](http://essfeed.org/)
+[![Build Status](https://travis-ci.org/essfeed/ruby-ess.png)](https://travis-ci.org/essfeed/ruby-ess)
 
 Generate ESS XML feeds with Ruby
 
@@ -11,7 +9,7 @@ Generate ESS XML feeds with Ruby
 
 Add this line to your application's Gemfile:
 
-    gem 'ess', '~> 0.9.1'
+    gem 'ess', '~> 0.9.3'
 
 And then execute:
 
@@ -19,7 +17,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install ess -v 0.9.1
+    $ gem install ess -v 0.9.3
 
 ## Usage
 
@@ -30,7 +28,7 @@ it's done, with most of the available tags available in ESS:
 
 require 'ess'
 
-ess = Maker.make do |ess|
+ess = ESS::Maker.make do |ess|
   ess.channel do |channel|
     channel.title "National Stadium Football events"
     channel.link "http://sample.com/feeds/sample.ess"
@@ -231,7 +229,7 @@ add an option to the 'make' class method:
 
 ```ruby
 
-ess = Maker.make(:push => true) do |ess|
+ess = ESS::Maker.make(:push => true) do |ess|
 
   ...
 
@@ -250,7 +248,7 @@ provide the aggregator with more useful data:
 
 ```ruby
 
-ess = Maker.make(:request => request) do |ess|
+ess = ESS::Maker.make(:request => request) do |ess|
 
   ...
 
@@ -263,7 +261,7 @@ can be done with the aggregators option:
 
 ```ruby
 
-ess = Maker.make(:aggregators => ['http://aggregator.example.com/api.json', ...]) do |ess|
+ess = ESS::Maker.make(:aggregators => ['http://aggregator.example.com/api.json', ...]) do |ess|
 
   ...
 
@@ -272,7 +270,7 @@ end
 ```
 
 Another option is to set a new default list of aggregator services
-using the Pusher class:
+using the ESS::Pusher class:
 
 ```ruby
 
@@ -282,7 +280,7 @@ ESS::Pusher.aggregators = ['http://aggregator.example.com/api.json', ...]
 
 ### Validation
 
-When using the Maker class, the resulting feed is
+When using the ESS::Maker class, the resulting feed is
 validated automatically at the end of the block. That means that
 before the block ends, the feed has to have all the mandatory
 tags, with valid values. There is however an option to turn that
@@ -290,7 +288,7 @@ behavior off, but there should be a good reason to do that.
 
 ```ruby
 
-ess = Maker.make(:validate => false) do |ess|
+ess = ESS::Maker.make(:validate => false) do |ess|
 
   ...
 
@@ -308,7 +306,7 @@ A tag with text can be specified like this:
 
 ```ruby
 
-ess = Maker.make do |ess|
+ess = ESS::Maker.make do |ess|
   ess.channel do |channel|
 
     channel.title "National Stadium Football events"
@@ -333,7 +331,7 @@ same name, the following construct can be used:
 
 ```ruby
 
-ess = Maker.make do |ess|
+ess = ESS::Maker.make do |ess|
   ess.channel do |channel|
 
     channel.add_feed do |feed|
@@ -361,7 +359,7 @@ Attributes have also their own methods for setting them, for example:
 
 ```ruby
 
-ess = Maker.make do |ess|
+ess = ESS::Maker.make do |ess|
   ess.lang_attr "zu"
 
   ...
@@ -375,7 +373,7 @@ also a 'text!' method, which can be used to set a tags text:
 
 ```ruby
 
-ess = Maker.make do |ess|
+ess = ESS::Maker.make do |ess|
   ess.channel do |channel|
 
     channel.title do |title|

data/Rakefile

@@ -3,3 +3,6 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new
 
+task :test => [:spec]
+task :default => [:test]
+

data/lib/ess/dtd.rb

@@ -106,11 +106,7 @@ module ESS
                        :interval => { :mandatory => false,
                                       :max_occurs => 1 },
                        :selected_day => { :mandatory => false,
-                                          :max_occurs => :inf,
-                                          :valid_values => [
-                                            'number','monday','tuesday',
-                                            'wednesday','thursday','friday',
-                                            'saturday','sunday'] },
+                                          :max_occurs => :inf },
                        :selected_week => { :mandatory => false,
                                            :max_occurs => :inf,
                                            :valid_values => [
@@ -127,7 +123,8 @@ module ESS
                  :duration => { :dtd => BASIC_ELEMENT,
                                 :mandatory => false,
                                 :max_occurs => 1 } },
-      :validation => [ UnitMandatoryIfRecurrent.new ]
+      :validation => [ UnitMandatoryIfRecurrent.new,
+                       SelectedDayCheck.new ]
     }
 
     DATES = {
@@ -216,11 +213,7 @@ module ESS
                        :interval => { :mandatory => false,
                                       :max_occurs => 1 },
                        :selected_day => { :mandatory => false,
-                                          :max_occurs => :inf,
-                                          :valid_values => [
-                                            'number','monday','tuesday',
-                                            'wednesday','thursday','friday',
-                                            'saturday','sunday'] },
+                                          :max_occurs => :inf },
                        :selected_week => { :mandatory => false,
                                            :max_occurs => :inf,
                                            :valid_values => [
@@ -247,7 +240,8 @@ module ESS
                            :mandatory => false,
                            :max_occurs => 1 } },
       :validation => [ CurrMandatoryIfValueGT0.new,
-                       UnitMandatoryIfRecurrent.new ]
+                       UnitMandatoryIfRecurrent.new,
+                       SelectedDayCheck.new ]
     }
 
     PRICES = {

data/lib/ess/element.rb

@@ -131,7 +131,7 @@ module ESS
         if args.length > 0 && args[0].class != Hash
           if @dtd[:tags][m].include? :valid_values
             unless @dtd[:tags][m][:valid_values].include?(args[0])
-              raise InvalidValueError, "\"#{args[0]}\" is not a valid value for the #{m} tag"
+              raise DTD::InvalidValueError, "\"#{args[0]}\" is not a valid value for the #{m} tag"
             end
           end
           tag_list[0].text!(args[0])

data/lib/ess/validation.rb

@@ -10,7 +10,7 @@ module ESS
     class TextIsNotNull
       def validate tag
         if tag.text!.strip == ''
-          raise InvalidValueError, "the <#{tag.tag_name}> element cannot be empty"
+          raise ValidationError, "the <#{tag.tag_name}> element cannot be empty"
         end
       end
     end
@@ -25,7 +25,7 @@ module ESS
       def validate_url text
         unless text =~ /^(http|https|ftp):\/\/([A-Z0-9][A-Z0-9_-]*(?:\.[A-Z0-9][A-Z0-9_-]*)+):?(\d+)?\/?/i || text.length > 10
           unless isValidIP text
-            raise InvalidValueError, "invalid URL: #{text}"
+            raise ValidationError, "invalid URL: #{text}"
           end
         end
       end
@@ -54,7 +54,7 @@ module ESS
     class TextIsValidLatitude
       def validate tag
         unless tag.text! =~ /^-?([0-8]?[0-9]|90)\.[0-9]{1,6}$/
-          raise InvalidValueError, "invalid latitude: #{tag.text!}"
+          raise ValidationError, "invalid latitude: #{tag.text!}"
         end
       end
     end
@@ -62,7 +62,7 @@ module ESS
     class TextIsValidLongitude
       def validate tag
         unless tag.text! =~ /^-?((1?[0-7]?|[0-9]?)[0-9]|180)\.[0-9]{1,6}$/
-          raise InvalidValueError, "invalid longitude: #{tag.text!}"
+          raise ValidationError, "invalid longitude: #{tag.text!}"
         end
       end
     end
@@ -321,7 +321,7 @@ module ESS
 
       def validate tag
         unless COUNTRY_CODES.keys.include? tag.text!.strip.upcase
-          raise InvalidValueError, "invalid country code: #{tag.text!}"
+          raise ValidationError, "invalid country code: #{tag.text!}"
         end
       end
     end
@@ -572,7 +572,7 @@ module ESS
 
       def validate tag
         unless CURRENCIES.values.include? tag.text!.strip.upcase
-          raise InvalidValueError, "invalid currency: #{tag.text!}"
+          raise ValidationError, "invalid currency: #{tag.text!}"
         end
       end
     end
@@ -581,7 +581,7 @@ module ESS
       def validate price_tag
         if price_tag.value.text!.to_i != 0
           if price_tag.currency.text! == ""
-            raise InvalidValueError, "the <currency> element of a price item cannot be empty if <value> is not 0"
+            raise ValidationError, "the <currency> element of a price item cannot be empty if <value> is not 0"
           end
         end
       end
@@ -777,7 +777,7 @@ module ESS
 
       def validate ess_tag
         unless LANGUAGES.has_key?(ess_tag.lang_attr) || ess_tag.lang_attr == ""
-          raise InvalidValueError, "the \"lang\" attribute value is invalid: #{ess_tag.lang_attr}"
+          raise ValidationError, "the \"lang\" attribute value is invalid: #{ess_tag.lang_attr}"
         end
       end
     end
@@ -786,7 +786,22 @@ module ESS
       def validate item_tag
         if item_tag.type_attr == "recurrent"
           unless item_tag.unit_attr != ""
-            raise InvalidValueError, "the \"unit\" attribute is mandatory in a date item if type is recurrent"
+            raise ValidationError, "the \"unit\" attribute is mandatory in a date item if type is recurrent"
+          end
+        end
+      end
+    end
+
+    DAYS_OF_WEEK = [ 'monday', 'tuesday', 'wednesday', 'thursday', 'friday',
+                     'saturday', 'sunday']
+    class SelectedDayCheck
+      def validate date_item_tag
+        sday = date_item_tag.selected_day_attr
+        if !sday.empty?
+          values = sday.split(",")
+          bad_values = values.delete_if { |day| DAYS_OF_WEEK.include?(day) || day.to_i.to_s == day }
+          if bad_values.any?
+            raise ValidationError, "the values \"#{bad_values}\" are not allowed in the \"selected_day\" attribute of date items"
           end
         end
       end

data/lib/ess/version.rb

@@ -1,3 +1,3 @@
 module ESS
-  VERSION = "0.9.1"
+  VERSION = "0.9.3"
 end

data/spec/ess/element_spec.rb

@@ -7,8 +7,8 @@ module ESS
 
     describe '#new' do
       it 'should require a name and a DTD argument' do
-        expect { Element.new }.to raise_error
-        expect { Element.new :tag_name }.to raise_error
+        expect { Element.new }.to raise_error(ArgumentError)
+        expect { Element.new :tag_name }.to raise_error(ArgumentError)
       end
 
       it 'should accept a hash with both :attributes and :tags keys' do
@@ -68,9 +68,9 @@ module ESS
       let(:element) { Element.new(:tags, DTD::TAGS) }
 
       it 'should return an error when trying to set an invalid tag' do
-        expect { element.bad "Example text" }.to raise_error
-        expect { element.bad }.to raise_error
-        expect { element.add_bad "Example text" }.to raise_error
+        expect { element.bad "Example text" }.to raise_error(NoMethodError)
+        expect { element.bad }.to raise_error(NoMethodError)
+        expect { element.add_bad "Example text" }.to raise_error(NoMethodError)
       end
 
       describe '#tag' do
@@ -250,19 +250,7 @@ module ESS
       end
 
       it 'should raise error if an invalid value was used for an attribute' do
-        expect { element.type_attr "bad_value" }.to raise_error
-      end
-
-      it 'should allow multiple comma separated valid values' do
-        lambda {
-          element.selected_day_attr "friday,saturday"
-        }.should_not raise_error
-      end
-
-      it 'should raise error if one value is valid and the other is not' do
-        expect {
-          element.selected_day_attr "friday,bad"
-        }.to raise_error
+        expect { element.type_attr "bad_value" }.to raise_error(DTD::InvalidValueError)
       end
     end
 
@@ -355,7 +343,7 @@ module ESS
         end
 
         it 'should not allow other values' do
-          expect { element.access "bad" }.to raise_error
+          expect { element.access "bad" }.to raise_error(DTD::InvalidValueError)
         end
       end
     end
@@ -650,7 +638,7 @@ module ESS
           it 'should raise an error' do
             lambda {
               element.validate
-            }.should raise_error
+            }.should raise_error(Validation::ValidationError)
           end
         end
       end
@@ -756,6 +744,42 @@ module ESS
         end
       end
 
+      context "a date item with selected_day attribute" do
+        let(:item) do
+          element = Element.new :item, DTD::DATE_ITEM
+          element.type_attr "recurrent"
+          element.unit_attr "month"
+          element.name "A date"
+          element.start Time.now
+          element
+        end
+
+        it 'should be invalid if the attribute has a random value' do
+          item.selected_day_attr "randomvalue"
+          item.should_not be_valid
+        end
+
+        it 'should be valid if the value is a day of the week' do
+          item.selected_day_attr "tuesday"
+          item.should be_valid
+        end
+
+        it 'should be valid if the value is a number' do
+          item.selected_day_attr "1"
+          item.should be_valid
+        end
+
+        it 'should be valid if the value is a comma-separated array of names of days of the week' do
+          item.selected_day_attr "monday,tuesday,sunday"
+          item.should be_valid
+        end
+
+        it 'should be valid if the value is a comma-separated array of numbers' do
+          item.selected_day_attr "1,30,31"
+          item.should be_valid
+        end
+      end
+
       context "a price item" do
         let(:element) do
           element = Element.new(:item, DTD::PRICE_ITEM)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ess
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-20 00:00:00.000000000 Z
+date: 2013-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -37,6 +37,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md