db/migrate/002_create_pages.rb @@ -1,4 +1,3 @@ - Document migrations that generate sample pages and page parts - Split out subscription tags into separate form fields -- Move Spreedly config to Radiant config table - Run through action, but render a Radiant page (see comments extension for @page.render) \ No newline at end of file TODO @@ -1,12 +1,14 @@ class Admin::SpreedlyController < ApplicationController - def index - @spreedly_config = SpreedlyConfig.first - end - def edit - @spreedly_config = SpreedlyConfig.first || SpreedlyConfig.new(params[:spreedly_config]) if request.post? - @spreedly_config.new_record? ? @spreedly_config.save! : @spreedly_config.update_attributes!(params[:spreedly_config]) + Radiant::Config['spreedly.api_token'] = params[:api_token] + Radiant::Config['spreedly.login_name'] = params[:login_name] + + plan = SubscriptionPlan.find_by_id(params[:plan_id]) + Radiant::Config['spreedly.plan_id'] = plan.id + Radiant::Config['spreedly.plan_name'] = plan.name + + Radiant::Config['spreedly.mode'] = params[:mode] redirect_to spreedly_index_url end end app/controllers/admin/spreedly_controller.rb @@ -42,12 +42,11 @@ module SpreedlyTags s = tag.locals.subscriber if s.active? "You are all paid up!" - elsif SpreedlyConfig.first + elsif s.spreedly_configured? "No active subscription. #{link_to 'Subscribe', s.spreedly_url}" else - content_tag(:span, :style => "font-weight:bold; color:red") do - "Spreedly is not configured properly. Please contact an admin." - end + content_tag(:span, "Spreedly is not configured properly. " << + "Please contact an admin.", :style => "font-weight:bold; color:red") end end app/models/spreedly_tags.rb @@ -9,12 +9,22 @@ class Subscriber < ActiveRecord::Base before_save :encrypt_password def spreedly_url - if sc = SpreedlyConfig.first - test = sc.mode == "Testing" ? "-test" : "" - "https://spreedly.com/#{sc.login_name}#{test}/subscribers/#{id}/subscribe/#{sc.plan_id}/#{email}-#{id}" + if spreedly_configured? + test = Radiant::Config['spreedly.mode'] == "Testing" ? "-test" : "" + login_name = Radiant::Config['spreedly.login_name'] + plan_id = Radiant::Config['spreedly.plan_id'] + "https://spreedly.com/#{login_name}#{test}/subscribers/#{id}/subscribe/#{plan_id}/#{email}-#{id}" end end + def spreedly_configured? + # TODO this is yucky + !Radiant::Config['spreedly.api_token'].blank? && + !Radiant::Config['spreedly.login_name'].blank? && + !Radiant::Config['spreedly.plan_id'].blank? && + !Radiant::Config['spreedly.mode'].blank? + end + def refresh_from_spreedly update_attributes!(:active => SubscriberResource.find(id).active) end app/models/subscriber.rb @@ -4,4 +4,8 @@ class SubscriptionPlan < ActiveResource::Base def self.to_dropdown find(:all).collect { |e| [e.name, e.id] } end + + def self.find_by_id(id) + find(:all).detect { |e| e.id == id.to_i } + end end \ No newline at end of file app/models/subscription_plan.rb @@ -1,11 +1,9 @@ <h2>Edit Spreedly Configuration</h2> -<%= error_messages_for :spreedly_config %> - -<% form_for :spreedly_config do |f| -%> - API Token: <%= f.text_field :api_token, :size => 50 %><br/> - Login Name: <%= f.text_field :login_name, :size => 20 %><br/> - Plan: <%= f.select :plan_id, SubscriptionPlan.to_dropdown %><br/> - Mode: <%= f.select :mode, %w(Testing Production) %><br/> - <%= f.submit "Save" %> or <%= link_to "cancel", spreedly_index_url %> +<% form_tag do -%> + API Token: <%= text_field_tag :api_token, Radiant::Config['spreedly.api_token'],:size => 50 %><br/> + Login Name: <%= text_field_tag :login_name, Radiant::Config['spreedly.login_name'], :size => 20 %><br/> + Plan: <%= select_tag :plan_id, options_for_select(SubscriptionPlan.to_dropdown, Radiant::Config['spreedly.plan_id'].to_i) %><br/> + Mode: <%= select_tag :mode, options_for_select(%w(Testing Production), Radiant::Config['spreedly.mode']) %><br/> + <%= submit_tag "Save" %> or <%= link_to "cancel", spreedly_index_url %> <% end -%> \ No newline at end of file app/views/admin/spreedly/edit.html.erb @@ -1,15 +1,12 @@ <h1>Spreedly</h1> -<% if @spreedly_config -%> - <p>You can adjust your Spreedly configuration here.</p> - <p> - <b>Account Name:</b> <%= @spreedly_config.login_name %><br/> - <b>Plan ID:</b> <%= @spreedly_config.plan_id %><br/> - <b>Mode:</b> <%= @spreedly_config.mode %><br/> - </p> -<% else -%> - <p><span style="font-weight:bold; color:red">Please set up your Spreedly - account by clicking "edit" below.</b></p> -<% end -%> +<p>You can adjust your Spreedly configuration here.</p> + +<p> + <b>API Token:</b> <%= Radiant::Config['spreedly.api_token'] %><br/> + <b>Login Name:</b> <%= Radiant::Config['spreedly.login_name'] %><br/> + <b>Plan:</b> <%= Radiant::Config['spreedly.plan_name'] %><br/> + <b>Mode:</b> <%= Radiant::Config['spreedly.mode'] %><br/> +</p> <p><%= link_to "edit", spreedly_edit_url %></p> \ No newline at end of file app/views/admin/spreedly/index.html.erb app/models/spreedly_config.rb db/migrate/002_create_spreedly_configs.rb db/migrate/003_create_pages.rb 7d072257c81b9c3b83d2b17c33ac7d1c06499ece Matthew Bass matt@68-243-116-122.pools.spcsdns.net http://github.com/pelargir/radiant-spreedly-extension/commit/2ceecaffd08ee14649e7fba6d778eec0d5464999 2ceecaffd08ee14649e7fba6d778eec0d5464999 2008-11-13T12:03:11-08:00 2008-11-13T12:03:11-08:00 switched from SpreedlyConfig to Radiant::Config 368f48a4aa22720ffee51bac759ff2ef7c06a065 Matthew Bass matt@68-243-116-122.pools.spcsdns.net