radiant-reader-extension 0.9.2 → 1.0.0

data/spec/controllers/admin/messages_controller_spec.rb

@@ -10,29 +10,46 @@ describe Admin::MessagesController do
   it "should handle Messages" do
     controller.class.model_class.should == Message
   end
+
+  describe "on preview" do
+    before do
+      login_as :existing
+    end
+    
+    it "should render a bare message" do
+      get :preview, :id => message_id(:taggy)
+      response.should be_success
+      response.should render_template('preview')
+      response.layout.should == nil
+    end
+
+  end
   
-  describe "on index" do
+  describe "on deliver" do
     before do
       login_as :existing
     end
     
-    it "should redirect to the settings page" do
-      get :index
+    it "should trigger a sending" do
+      message = messages(:taggy)
+      Message.should_receive(:find).at_least(:once).and_return(message)
+      message.should_receive(:deliver).once
+      get :deliver, :id => message_id(:taggy), :delivery => 'all'
       response.should be_redirect
-      response.should redirect_to(admin_reader_settings_url)
+      response.should redirect_to(admin_message_url(messages(:taggy)))
     end
   end
-
-  describe "on update" do
+  
+  describe "on update (and create)" do
     before do
       login_as :existing
     end
     
-    it "should redirect to the settings page" do
+    it "should redirect to show the updated object" do
       put :update, :id => message_id(:normal), :subject => 'testing'
       response.should be_redirect
-      response.should redirect_to(admin_reader_settings_url)
+      response.should redirect_to(admin_message_path(message_id(:normal)))
     end
   end
   
-end
+end

data/spec/controllers/readers_controller_spec.rb

@@ -91,7 +91,7 @@ describe ReadersController do
       it "should not show the edit page for another reader" do 
         get :edit, :id => reader_id(:visible)
         response.should be_success        
-        flash[:error].should =~ /not allowed/
+        flash[:error].should =~ /cannot_edit_others/
       end
 
       it "should not remove this reader" do 

data/spec/models/message_spec.rb

@@ -40,9 +40,8 @@ describe Message do
 
     it "should render a fake sending" do
       @preview.should be_kind_of(TMail::Mail)
-      @preview.from.should == [messages(:taggy).created_by.email]
+      @preview.from.should == ["admin@www.example.com"]
       @preview.subject.should == messages(:taggy).subject
-      @preview.body.should =~ /From #{messages(:taggy).created_by.name}/
     end
   end
   

data/spec/models/reader_notifier_spec.rb

@@ -14,7 +14,7 @@ describe ReaderNotifier do
   it "should render a supplied message" do
     message = ReaderNotifier.create_message(readers(:normal), messages(:normal))
     message.to.should == [readers(:normal).email]
-    message.from.should == [users(:existing).email]
+    message.from.should == ["admin@www.example.com"]
     message.body.should =~ /#{messages(:normal).filtered_body}/
     message.content_type.should == 'text/html'
   end
@@ -28,7 +28,6 @@ describe ReaderNotifier do
     message = ReaderNotifier.create_message(readers(:normal), messages(:taggy))
     message.body.should =~ /<title>#{messages(:taggy).subject}<\/title>/
     message.body.should =~ /To #{readers(:normal).name}/
-    message.body.should =~ /From #{users(:existing).name}/
   end
   
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-reader-extension
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 23
   prerelease: false
   segments: 
+  - 1
   - 0
-  - 9
-  - 2
-  version: 0.9.2
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - spanner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-04 00:00:00 +01:00
+date: 2010-10-19 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -104,14 +104,13 @@ files:
 - Rakefile
 - VERSION
 - app/controllers/admin/messages_controller.rb
-- app/controllers/admin/reader_settings_controller.rb
+- app/controllers/admin/reader_configuration_controller.rb
 - app/controllers/admin/readers_controller.rb
 - app/controllers/password_resets_controller.rb
 - app/controllers/reader_action_controller.rb
 - app/controllers/reader_activations_controller.rb
 - app/controllers/reader_sessions_controller.rb
 - app/controllers/readers_controller.rb
-- app/helpers/admin/reader_settings_helper.rb
 - app/models/message.rb
 - app/models/message_function.rb
 - app/models/message_reader.rb
@@ -120,17 +119,17 @@ files:
 - app/models/reader_session.rb
 - app/views/admin/messages/_form.html.haml
 - app/views/admin/messages/_help.html.haml
+- app/views/admin/messages/_list_function.haml
 - app/views/admin/messages/_message_description.html.haml
 - app/views/admin/messages/edit.html.haml
+- app/views/admin/messages/index.haml
 - app/views/admin/messages/new.html.haml
-- app/views/admin/reader_settings/_setting.html.haml
-- app/views/admin/reader_settings/edit.html.haml
-- app/views/admin/reader_settings/index.html.haml
-- app/views/admin/reader_settings/show.html.haml
+- app/views/admin/messages/preview.html.haml
+- app/views/admin/messages/show.html.haml
+- app/views/admin/reader_configuration/edit.html.haml
+- app/views/admin/reader_configuration/show.html.haml
 - app/views/admin/readers/_avatar.html.haml
 - app/views/admin/readers/_form.html.haml
-- app/views/admin/readers/_list_head.html.haml
-- app/views/admin/readers/_listed.html.haml
 - app/views/admin/readers/_password_fields.html.haml
 - app/views/admin/readers/edit.html.haml
 - app/views/admin/readers/index.html.haml
@@ -140,8 +139,6 @@ files:
 - app/views/password_resets/create.html.haml
 - app/views/password_resets/edit.html.haml
 - app/views/password_resets/new.html.haml
-- app/views/reader_activations/_activation_required.html.haml
-- app/views/reader_activations/_on_activation.html.haml
 - app/views/reader_activations/show.html.haml
 - app/views/reader_notifier/message.html.haml
 - app/views/reader_sessions/_login_form.html.haml
@@ -151,16 +148,15 @@ files:
 - app/views/readers/_extra_controls.html.haml
 - app/views/readers/_flasher.html.haml
 - app/views/readers/_form.html.haml
-- app/views/readers/create.html.haml
 - app/views/readers/edit.html.haml
 - app/views/readers/index.html.haml
 - app/views/readers/login.html.haml
 - app/views/readers/new.html.haml
 - app/views/readers/permission_denied.html.haml
 - app/views/readers/show.html.haml
-- app/views/wrappers/_field_errors.html.haml
+- config/initializers/radiant_config.rb
+- config/locales/en.yml
 - config/routes.rb
-- config/settings.rb
 - db/migrate/001_create_readers.rb
 - db/migrate/002_extend_sites.rb
 - db/migrate/003_reader_honorifics.rb
@@ -180,6 +176,7 @@ files:
 - db/migrate/20100922152338_lock_versions.rb
 - db/migrate/20100927095703_default_settings.rb
 - db/migrate/20101004074945_unlock_version.rb
+- db/migrate/20101019094714_message_sent_date.rb
 - lib/config_extensions.rb
 - lib/controller_extensions.rb
 - lib/reader_admin_ui.rb
@@ -188,12 +185,9 @@ files:
 - lib/reader_tags.rb
 - lib/rfc822.rb
 - lib/tasks/reader_extension_tasks.rake
-- pkg/radiant-reader-extension-0.9.0.gem
 - public/images/admin/chk_off.png
 - public/images/admin/chk_on.png
-- public/images/admin/new-message.png
-- public/images/admin/new-reader.png
-- public/javascripts/admin/messages.js
+- public/images/admin/delta.png
 - public/stylesheets/sass/admin/reader.sass
 - radiant-reader-extension.gemspec
 - reader_extension.rb

data/app/controllers/admin/reader_settings_controller.rb

@@ -1,92 +0,0 @@
-class Admin::ReaderSettingsController < ApplicationController
-  only_allow_access_to :show, :edit, :update,
-    :when => [:admin],
-    :denied_url => { :controller => 'admin/reader_settings', :action => 'index' },
-    :denied_message => 'You must have admin privileges to edit reader settings.'
-  
-  before_filter :default_settings
-  before_filter :get_setting, :only => [:show, :edit, :update]
-  
-  cattr_accessor :settable
-  # this will need to be extensible
-  @@settable = {
-    'reader.allow_registration?' => true,
-    'reader.require_confirmation?' => true,
-    'reader.layout' => 'unset',
-    'site.title' => 'Site Title',
-    'site.url' => 'Site URL', 
-    'reader.mail_from_name' => 'Sender', 
-    'reader.mail_from_address' => 'sender@example.com'
-  }
-
-  def self.make_settable(settings)
-    @@settable.merge! settings
-  end
-
-  def index
-    
-  end
-  
-  def show
-    respond_to do |format|
-      format.html { }
-      format.js { render :layout => false }
-    end
-  end
-  
-  def edit
-    respond_to do |format|
-      format.html { }
-      format.js { render :layout => false }
-    end
-  end
-  
-  def update
-    Rails.logger.warn "<<  #{@setting.key} is #{@setting.value.inspect}"
-    
-    value = params[:value] || params[:radiant_config][:value]
-    
-    if @setting.boolean?
-      @setting.value = (value == 'false' ? false : true)
-    else
-      @setting.value = value
-    end
-    
-    Rails.logger.warn ">>  and now #{@setting.key} is #{@setting.value.inspect}"
-    
-    @setting.save!
-    respond_to do |format|
-      format.html { render :action => 'show' }
-      format.js { render :layout => false, :action => 'show' }
-    end
-  end
-
-private
-
-  def settable?(key)
-    self.class.settable.keys.include?(key)
-  end
-
-  # temporarily while I do this properly in radiant
-  
-  def default_settings
-    self.class.settable.each do |k, v|
-      Radiant::Config[k] = v if Radiant::Config[k].nil?
-    end
-  end
-
-  def get_setting
-    @setting = Radiant::Config.find(params[:id])
-    unless settable?(@setting.key)
-      respond_to do |format|
-        format.html { 
-          flash['error'] = "Not settable"
-          redirect_to :action => 'index'
-        }
-        format.js { render :status => 403, :text => 'Not settable' }
-      end
-      return false
-    end
-  end
-  
-end

data/app/helpers/admin/reader_settings_helper.rb

@@ -1,36 +0,0 @@
-module Admin::ReaderSettingsHelper
-
-  def editable_setting(setting)
-    setting = Radiant::Config.find_by_key(setting) unless setting.is_a? Radiant::Config
-    domkey = setting.key.gsub('?', '_')
-    containerid = "set_#{domkey}"
-    link = link_to_remote setting.value, 
-      :url => edit_admin_reader_setting_url(setting.id), 
-      :method => 'get', 
-      :update => containerid,
-      :loading => "$('#{containerid}').addClassName('waiting');", 
-      :loaded => "$('#{containerid}').removeClassName('waiting');"
-    %{
-  #{link}
-    }
-  end
-
-  def checkbox_for_setting(setting, label)
-    setting = Radiant::Config.find_by_key(setting) unless setting.is_a? Radiant::Config
-    domkey = setting.key.gsub('?', '_')
-    containerid = "set_#{domkey}"
-    checkbox = check_box_tag setting.key.to_sym, 1, setting.value, :class => 'fancy', :id => domkey, :onchange => remote_function(
-      :url => admin_reader_setting_path(setting.id),
-      :with => %{'value=' + (this.checked ? 'true' : 'false')},
-      :method => 'put',
-      :loading => "$('#{containerid}').addClassName('waiting');",
-      :success => "$('#{containerid}').removeClassName('waiting').toggleClassName('true').toggleClassName('false');"
-    )
-    %{
-  #{checkbox}
-  <label for="#{domkey}">#{label}</label>
-    }
-    
-  end
-
-end

data/app/views/admin/reader_settings/_setting.html.haml

@@ -1,24 +0,0 @@
-- if setting || key
-  - setting ||= Radiant::Config.find_by_key(key)
-  - if setting
-    - label ||= setting.key
-    - notes ||= nil
-    - domkey = setting.key.gsub('?', '_')
-    - containerid = "set_#{domkey}"
-
-    - if setting.key.ends_with?("?")
-      %p.ruled
-        %span{:id => containerid, :class => "checkbox #{setting.value.to_s}"}
-          = checkbox_for_setting(setting, label)
-
-    - else 
-      %p.ruled
-        %label= label
-        %span.inplace{:id => containerid}
-          = editable_setting(setting)
-    
-  - else
-    %p.haserror
-      %strong
-        = key
-      is not defined.

data/app/views/admin/reader_settings/edit.html.haml

@@ -1,10 +0,0 @@
-- domkey = @setting.key.gsub('?', '_')
-- domid = "set_#{domkey}"
-
-- remote_form_for @setting, :url => admin_reader_setting_path(@setting), :update => domid, :loading => "$('#{domid}').addClassName('waiting');", :loaded => "$('#{domid}').removeClassName('waiting');", :html => { :method => :put } do |f|
-  - if @setting.key =~ /\.layout$/
-    = f.select :value, Layout.all.collect {|l| [ l.name, l.name ] }
-  - else
-    = f.text_field :value
-  = f.submit 'save'
-  = link_to_remote 'cancel', {:url => admin_reader_setting_url(@setting.id), :method => 'get', :update => domid, :loading => "$('#{domid}').addClassName('waiting');", :loaded => "$('#{domid}').removeClassName('waiting');"}, {:class => 'cancel'}

data/app/views/admin/reader_settings/index.html.haml

@@ -1,35 +0,0 @@
-- body_classes << "reversed"
-- include_stylesheet('admin/reader')
-
-#reader_settings.box
-  %h3 Reader administration
-  
-  - render_region :settings do |settings|
-    - settings.registration do
-      = render :partial => 'setting', :locals => {:key => 'reader.allow_registration?', :label => 'Allow visitors to register'}
-      = render :partial => 'setting', :locals => {:key => 'reader.require_confirmation?', :label => 'Require email confirmation'}
-      = render :partial => 'setting', :locals => {:key => 'reader.layout', :label => "Admin layout", :notes => "The radiant layout used to present reader-administration pages"}
-
-    - settings.site do
-      = render :partial => 'setting', :locals => {:key => 'site.title', :label => "Site title", :notes => "This is the name by which forms and emails refer to your site"}
-      = render :partial => 'setting', :locals => {:key => 'site.url', :label => "Site url", :notes => "This is the address we use to build links in emails"}
-
-    - settings.sender do
-      = render :partial => 'setting', :locals => {:key => 'reader.mail_from_name', :label => "Email sender", :notes => "This is the name that automatic emails seem to come from"}
-      = render :partial => 'setting', :locals => {:key => 'reader.mail_from_address', :label => "Email address", :notes => "This is the address that automatic emails seem to come from"}
-
-#message_settings.box
-  %h3 Administrative messages
-  
-  - render_region :messages do |messages|
-    - messages.administration do
-      - MessageFunction.find_all.each do |func|
-        - message = Message.for_function(func).shift
-        %p.ruled
-          %label= func.description
-          - if message
-            = link_to message.subject, edit_admin_message_url(message)
-          - else
-            = link_to image('plus') + " create message", new_admin_message_url(:function => func), :class => 'create'
-
-

data/app/views/admin/reader_settings/show.html.haml

@@ -1 +0,0 @@
-= editable_setting(@setting)

data/app/views/admin/readers/_list_head.html.haml

@@ -1,9 +0,0 @@
-%thead
-  %tr
-    - render_region :thead do |thead|
-      - thead.title_header do
-        %th.reader Name / Login
-      - thead.description_header do
-        %th.reader_description Self-description
-      - thead.modify_header do
-        %th.modify Modify

data/app/views/admin/readers/_listed.html.haml

@@ -1,22 +0,0 @@
-%tr.node.level-1
-  - render_region :tbody do |tbody|
-    - tbody.title_cell do
-      %td{:class => reader.activated? ? 'name activated' : 'name inactive'}
-        = link_to image_tag(gravatar_url(reader.email, :size=>"32px"), :class=>"avatar avatar_32x32", :width=>32, :height=>32, :alt=>""), edit_admin_reader_url(reader)
-        = link_to reader.name, edit_admin_reader_url(reader), :class => reader.trusted? ? '' : 'untrusted'
-        %span.info
-          = "(#{reader.login})"
-        - unless reader.notes.blank?
-          %p.admin_notes
-            %strong
-              note:
-            = reader.notes
-
-    - tbody.description_cell do
-      %td.reader_description
-        = truncate_and_textilize(reader.description, 24)
-      
-    - tbody.modify_cell do
-      %td.remove
-        - if admin?
-          = link_to(image('remove', :alt => 'Remove Reader'), admin_reader_url(reader), :method => :delete, :confirm => "really delete reader #{reader.name}?")