Changeset 8c82fb69f188ac11b1eb2c70bf0f70ee71c378f1

Timestamp:

07/27/10 21:23:22 (6 weeks ago)

Author:

Alban Peignier <alban@…>

Parents:

4d873e1c0c111a263ce1177d4c75ac80f32ef027

git-committer:

Alban Peignier <alban@tryphon.eu> / 2010-07-27T21:23:22Z+0200

Message:

Add Server#server_type supporting icecast2/shoutcast. Refs #19

Files:

• app/models/stream.rb (modified) (3 diffs)
• app/views/streams/_form.erb (modified) (1 diff)
• app/views/streams/show.html.erb (modified) (2 diffs)
• config/environment.rb (modified) (2 diffs)
• config/locales/fr/stream.yml (modified) (1 diff)
• spec/models/stream_spec.rb (modified) (3 diffs)
• spec/views/streams/_form.erb_spec.rb (modified) (1 diff)

app/models/stream.rb

@@ -8 +8 @@
   validates_presence_of :name
 
-  attr_accessor :server, :password, :mount_point
+  attr_accessor :server, :server_type, :password, :mount_point
   acts_as_ip_port :port
-  validates_presence_of :server, :port, :mount_point, :password
+  validates_presence_of :server, :server_type, :port, :password
+  validates_presence_of :mount_point, :if => :icecast_server?
+  validates_inclusion_of :server_type, :in => [ :icecast2, :shoutcast ]
 
-  validates_format_of :mount_point, :with => %r{^[^/]}
+  validates_format_of :mount_point, :with => %r{^[^/]}, :allow_blank => true
 
   attr_accessor :format
@@ -27 +29 @@
     self.format ||= :vorbis
     self.quality ||= 4
+    self.server_type ||= :icecast2
     self.enabled = true if self.enabled.nil?
 
@@ -56 +59 @@
   def path
     mount_point and mount_point.start_with?('/') ? mount_point : "/#{mount_point}"
+  end
+
+  def server_type=(server_type)
+    @server_type = server_type ? server_type.to_sym : nil
+  end
+
+  def icecast_server?
+    server_type == :icecast2
   end
 

app/views/streams/_form.erb

@@ -5 +5 @@
 
 <h3><%= t(".server_attributes") %></h3>
+
+<p>
+  <%= form.label :server_type, Stream.human_attribute_name("server_type") %><br/>
+  <%= form.select :server_type, options_for_select([:icecast2, :shoutcast], @stream.server_type) %>
+</p>
 
 <p>

app/views/streams/show.html.erb

@@ -3 +3 @@
 <div class="stream description <%= @stream.presenter.status_class %>">
   <h3><%= t(".server_attributes") %></h3>
+
+  <p>
+    <%= Stream.human_attribute_name("server_type") %> :
+    <%= @stream.server_type %>
+  </p>
+
   <p>
     <%= Stream.human_attribute_name("server") %> :
@@ -13 +19 @@
   </p>
 
-  <p>
-    <%= Stream.human_attribute_name("mount_point") %> :
-    <%= @stream.mount_point %>
-  </p>
+  <% if @stream.icecast_server? %>
+    <p>
+      <%= Stream.human_attribute_name("mount_point") %> :
+      <%= @stream.mount_point %>
+    </p>
+  <% end %>
 
   <p>

config/environment.rb

@@ -2 +2 @@
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.8' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
@@ -35 +35 @@
   # config.gem "aws-s3", :lib => "aws/s3"
 
-  config.gem "inherited_resources", :version => "1.0.3"
+  config.gem "inherited_resources", :version => "1.0.6"
   config.gem 'will_paginate', :version => '~> 2.3.11', :source => 'http://gemcutter.org'
   config.gem 'delayed_job'

config/locales/fr/stream.yml

@@ -8 +8 @@
         related_url: URL associée
         server: Serveur
+        server_type: Type de serveur
         mount_point: Point de montage
         password: Mot de passe

spec/models/stream_spec.rb

@@ -20 +20 @@
   it { should validate_presence_of :server }
   it { should validate_presence_of :port }
-  it { should validate_presence_of :mount_point }
   it { should validate_presence_of :password }
 
@@ -45 +44 @@
   end
 
-  it "should use vorbis format for a new Stream" do
-    Stream.new.format.should == :vorbis
-  end
-
-  it "should use quality 4 for a new Stream" do
-    Stream.new.quality.should == 4
-  end
-
-  it "should enable a new Stream" do
-    Stream.new.should be_enabled
+  describe "for a new Stream" do
+
+    subject { Stream.new }
+
+    its(:format) { should == :vorbis }
+    its(:quality) { should == 4 }
+    it { should be_enabled }
+    its(:server_type) { should == :icecast2 }
+    
+  end
+
+
+  describe "server_type" do
+
+    it { should validate_presence_of :server_type }
+    
+    it "should support :icecast2 and :shoutcast" do
+      @stream.should allow_values_for :server_type, :icecast2, :shoutcast
+      @stream.should_not allow_values_for :server_type, :dummy
+    end
+
+    it "should be symbolized" do
+      @stream.server_type = "dummy"
+      @stream.server_type.should == :dummy
+    end
+
+  end
+
+  describe "mount_point" do
+
+    context "when server is an icecast server" do
+      before(:each) do
+        subject.stub :icecast_server? => true
+      end
+      it { should validate_presence_of :mount_point }
+    end
+
+    context "when server is not an icecast server" do
+      before(:each) do
+        subject.stub :icecast_server? => false
+      end
+      it { should_not validate_presence_of :mount_point }
+    end
+    
   end
 
@@ -63 +96 @@
     it "should support :vorbis, :mp3 and :aac" do
       @stream.should allow_values_for :format, :vorbis, :mp3, :aac
-      @stream.should_not allow_values_for :dummy
+      @stream.should_not allow_values_for :format, :dummy
     end
 

spec/views/streams/_form.erb_spec.rb

@@ -6 +6 @@
     assigns[:stream] = @stream = Stream.new(:id => 1)
 
-    @form_builder = stub :text_field => '<input type="text"/>', :label => '<label/>', :collection_select => "<select/>", :check_box => '<input type="checkbox"/>'
+    @form_builder = stub :text_field => '<input type="text"/>', :label => '<label/>', :collection_select => "<select/>", :check_box => '<input type="checkbox"/>', :select => '<select/>'
 
     template.stub!(:format_radio_buttons)