concerto_simple_rss 0.0.2 → 0.0.3

data/app/models/simple_rss.rb

@@ -2,6 +2,8 @@ class SimpleRss < DynamicContent
 
   DISPLAY_NAME = 'RSS Feed'
 
+  validate :validate_config
+
   def build_content
     require 'rss'
     require 'net/http'
@@ -47,4 +49,13 @@ class SimpleRss < DynamicContent
     attributes = super()
     attributes.concat([:config => [:url, :output_format]])
   end
+
+  def validate_config
+    if self.config['url'].blank?
+      errors.add(:config_url, "can't be blank")
+    end
+    if !['headlines', 'detailed'].include?(self.config['output_format'])
+      errors.add(:config_output_format, "must be Headlines or Articles")
+    end
+  end
 end

data/app/views/contents/simple_rss/_form_top.html

@@ -4,13 +4,13 @@
     <div class="clearfix">
       <%= config.label :url %>
       <div class="input">
-        <%= config.text_field 'url', :placeholder => 'http://feeds.bbci.co.uk/news/rss.xml', :size => 100 %>
+        <%= config.url_field :url, :placeholder => 'http://feeds.bbci.co.uk/news/rss.xml', :class => "input-xxlarge", :value => @content.config['url'] %>
       </div>
     </div>
     <div class="clearfix">
       <%= config.label :output_format, 'Display Format' %>
       <div class="input">
-        <%= config.select :output_format, [["Headlines", "headlines"], ["Articles", "detailed"]] %>
+        <%= config.select :output_format, [["Headlines", "headlines"], ["Articles", "detailed"]], :selected => @content.config['output_format'] %>
       </div>
     </div>
   <% end %>

data/app/views/contents/simple_rss/_render_tile.html

@@ -0,0 +1,3 @@
+<h1><%= content.name %></h1>
+<br />
+<%= content.config['url'] %>

data/lib/concerto_simple_rss/version.rb

@@ -1,3 +1,3 @@
 module ConcertoSimpleRss
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: concerto_simple_rss
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-06 00:00:00.000000000 -08:00
+date: 2013-05-30 00:00:00.000000000 -07:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70226450444580 !ruby/object:Gem::Requirement
+  requirement: &70276077747540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.2.11
   type: :runtime
   prerelease: false
-  version_requirements: *70226450444580
+  version_requirements: *70276077747540
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70226450444040 !ruby/object:Gem::Requirement
+  requirement: &70276077745540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +33,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70226450444040
+  version_requirements: *70276077745540
 description: Simple support to render RSS content in Concerto 2.
 email:
 - bmichalski@gmail.com
@@ -45,6 +45,7 @@ files:
 - app/models/simple_rss.rb
 - app/views/contents/simple_rss/_form_top.html
 - app/views/contents/simple_rss/_render_default.html
+- app/views/contents/simple_rss/_render_tile.html
 - config/routes.rb
 - lib/concerto_simple_rss/engine.rb
 - lib/concerto_simple_rss/version.rb