merge master

Gemfile

@@ -44,6 +44,7 @@ gem 'oj_mimic_json'
 
 ## Messaging
 gem 'shoryuken'
+gem 'announce'
 
 ## Deployment
 # configuration

Gemfile.lock

@@ -41,6 +41,7 @@ GEM
       tzinfo (~> 1.1)
     acts_as_list (0.7.0)
       activerecord (>= 3.0)
+    announce (0.2.2)
     ansi (1.5.0)
     arel (6.0.0)
     aws-sdk-core (2.0.41)
@@ -393,6 +394,7 @@ PLATFORMS
 DEPENDENCIES
   actionpack-action_caching
   acts_as_list
+  announce
   better_errors
   binding_of_caller
   capistrano (~> 3.2)

app/controllers/api/base_controller.rb

@@ -8,6 +8,7 @@ class Api::BaseController < ApplicationController
 
   include ApiVersioning
   include HalActions
+  include AnnounceActions
   include Roar::Rails::ControllerAdditions
 
   # respond to hal or json, but always returns application/hal+json
@@ -17,7 +18,6 @@ class Api::BaseController < ApplicationController
   allow_params :index, [:page, :per, :zoom]
 
   cache_api_action :show
-
   cache_api_action :index
 
   caches_action :entrypoint, cache_path: ->(_c) { { _c: Api.version(api_version).cache_key } }

app/controllers/api/stories_controller.rb

@@ -6,6 +6,32 @@ class Api::StoriesController < Api::BaseController
 
   filter_resources_by :series_id, :account_id
 
+  announce_actions :create, :update, :delete, :publish, :unpublish
+
+  def publish
+    publish_resource.tap do |res|
+      authorize res
+      res.publish!
+      respond_with root_resource(res), show_options
+    end
+  end
+
+  def publish_resource
+    @story ||= Story.unpublished.where(id: params[:id]).first
+  end
+
+  def unpublish
+    unpublish_resource.tap do |res|
+      authorize res
+      res.unpublish!
+      respond_with root_resource(res), show_options
+    end
+  end
+
+  def unpublish_resource
+    @story ||= Story.published.where(id: params[:id]).first
+  end
+
   def random
     @story = Story.published.limit(1).order('RAND()').first
     show

app/controllers/concerns/announce_actions.rb

@@ -0,0 +1,48 @@
+# encoding: utf-8
+
+require 'active_support/concern'
+require 'announce_actions/announce_filter'
+
+# expects underlying model to have filename, class, and id attributes
+module AnnounceActions
+  extend ActiveSupport::Concern
+
+  module ClassMethods
+    attr_accessor :announced_actions
+
+    def announce_actions(*args)
+      self.announced_actions ||= []
+
+      options = args.extract_options!
+
+      actions = args.map(&:to_s).uniq
+      actions = [:create, :update, :destroy] if actions.empty?
+
+      actions.each do |action|
+        next if announced_actions.include?(action)
+
+        add_announce_filter(action, options)
+
+        # remember this action already announcing, prevent dupes
+        self.announced_actions << action
+      end
+    end
+
+    def add_announce_filter(action, options)
+      # when it is a destroy action, default action name to 'delete'
+      announce_filter = new_announce_filter(action, options)
+
+      # default callback options for only this action, and only on success
+      default_options = { only: [action], if: ->() { response.successful? } }
+      callback_options = options.slice(:only, :except, :if, :unless)
+
+      after_action announce_filter, default_options.merge(callback_options)
+    end
+
+    def new_announce_filter(action, options)
+      filter_options = options.slice(:action, :decorator)
+      filter_options[:action] ||= 'delete' if action.to_s == 'destroy'
+      AnnounceActions::AnnounceFilter.new(action, filter_options)
+    end
+  end
+end

app/controllers/concerns/announce_actions/announce_filter.rb

@@ -0,0 +1,46 @@
+# encoding: utf-8
+
+require 'announce'
+
+# expects underlying model to have filename, class, and id attributes
+module AnnounceActions
+
+  class AnnounceFilter
+    include Announce::Publisher
+
+    attr_accessor :action, :options
+
+    def initialize(action, options = {})
+      @action = action
+      @options = options
+    end
+
+    def after(controller)
+      subject = controller.controller_name.singularize
+      announce(subject, resource_action, decorated_resource(controller))
+    end
+
+    def resource_action
+      (options[:action] || action).to_s
+    end
+
+    def decorated_resource(controller)
+      decorator = decorator_class(controller)
+      raise "No decorator specified: #{controller.inspect}" unless decorator
+      res = announce_resource(action, controller)
+      decorator.new(res).to_json
+    end
+
+    def announce_resource(action, controller)
+      pre = "#{action}_" if controller.respond_to?("#{action}_resource", true)
+      controller.send("#{pre}resource")
+    end
+
+    def decorator_class(controller)
+      return options[:decorator] if options[:decorator]
+      resource_class = controller.controller_name.singularize.camelize
+      "Api::Min::#{resource_class}Representer".safe_constantize ||
+        "Api::#{resource_class}Representer".safe_constantize
+    end
+  end
+end

app/controllers/concerns/api_versioning.rb

@@ -26,7 +26,5 @@ def api_versions(*versions)
       self.understood_api_versions = versions.map(&:to_s)
       before_filter :check_api_version
     end
-
   end
-
 end

app/controllers/public_assets_controller.rb

@@ -11,5 +11,4 @@ def show
       head 401
     end
   end
-
 end

app/models/concerns/public_asset.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 require 'active_support/concern'
-require 'digest/md5'
+require 'openssl'
 
 # expects underlying model to have filename, class, and id attributes
 module PublicAsset
@@ -26,7 +26,7 @@ def public_url_token(options={})
 
     str = [t,e,u,c,i,v,n,x].join("|")
 
-    Digest::MD5.hexdigest(str)
+    OpenSSL::Digest::MD5.hexdigest(str)
   end
 
   # assumes a route like the following
@@ -91,5 +91,4 @@ def filename_extension
   def token_secret
     ENV['PUBLIC_ASSET_SECRET']
   end
-
 end

app/models/paged_collection.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'forwardable'
+require 'openssl'
 
 class PagedCollection
   extend ActiveModel::Naming
@@ -29,14 +30,12 @@ def initialize(items, request=nil, options=nil)
   end
 
   def cache_key
-    key_components = ["c"]
-    key_components << item_class.model_name.cache_key
-    key_components << items.inject([0, 0]) do |keys, i|
-      keys[0] = keys[0] + i.try(:id).to_i.modulo(100)
-      keys[1] = [keys[1], i.try(:updated_at).try(:utc).to_i].max
-      keys
-    end.flatten.join("-")
-
+    item_keys = items.inject([]) do |keys, i|
+      keys << i.try(:id)
+      keys << i.try(:updated_at).try(:utc).to_i
+    end
+    key_components = ['c', item_class.model_name.cache_key]
+    key_components << OpenSSL::Digest::MD5.hexdigest(item_keys.join)
     ActiveSupport::Cache.expand_cache_key(key_components)
   end
 
@@ -76,5 +75,4 @@ def parent
   def count
     items.length
   end
-
 end

app/models/story.rb

@@ -58,6 +58,8 @@ def self.paranoia_scope
 
   scope :published, -> { where('`published_at` IS NOT NULL AND `network_only_at` IS NULL') }
 
+  scope :unpublished, -> { where('`published_at` IS NULL') }
+
   scope :purchased, -> {
     joins(:purchases).
     select('`pieces`.*', 'COUNT(`purchases`.`id`) AS `purchase_count`').group('`pieces`.`id`')
@@ -118,7 +120,7 @@ def tags=(ts)
   end
 
   def self.policy_class
-    AccountablePolicy
+    StoryPolicy
   end
 
   def episode_date
@@ -131,6 +133,24 @@ def subscription_episode?
     series && series.subscribable?
   end
 
+  # raising exceptions here to prevent sending publish messages
+  #  when not actually a change to be published
+  def publish!
+    if published?
+      raise "Story #{id} is already published."
+    else
+      update_attributes!(published_at: Time.now)
+    end
+  end
+
+  def unpublish!
+    if !published?
+      raise "Story #{id} is not published."
+    else
+      update_attributes!(published_at: nil)
+    end
+  end
+
   def destroy
     if v4?
       really_destroy!

app/policies/account_policy.rb

@@ -1,10 +1,5 @@
 class AccountPolicy < ApplicationPolicy
-  attr_reader :user, :account
-
-  def initialize(user, account)
-    @user = user
-    @account = account
-  end
+  alias_method :account, :record
 
   def create?
     user.present?

app/policies/accountable_policy.rb

@@ -1,11 +1,4 @@
-class AccountablePolicy
-  attr_reader :user, :record
-
-  def initialize(user, record)
-    @user = user
-    @record = record
-  end
-
+class AccountablePolicy < ApplicationPolicy
   def create?
     update?
   end

app/policies/image_policy.rb

@@ -1,10 +1,5 @@
-class ImagePolicy
-  attr_reader :user, :image
-
-  def initialize(user, image)
-    @user = user
-    @image = image
-  end
+class ImagePolicy < ApplicationPolicy
+  alias_method :image, :record
 
   def create?
     update?

app/policies/membership_policy.rb

@@ -1,10 +1,5 @@
 class MembershipPolicy < ApplicationPolicy
-  attr_reader :user, :membership
-
-  def initialize(user, membership)
-    @user = user
-    @membership = membership
-  end
+  alias_method :membership, :record
 
   def create?
     update? || (user == membership.user && !membership.approved?)

app/policies/producer_policy.rb

@@ -1,10 +1,5 @@
 class ProducerPolicy < ApplicationPolicy
-  attr_reader :user, :producer
-
-  def initialize(user, producer)
-    @user = user
-    @producer = producer
-  end
+  alias_method :producer, :record
 
   def create?
     update?

app/policies/story_attribute_policy.rb

@@ -1,11 +1,4 @@
-class StoryAttributePolicy
-  attr_reader :user, :record
-
-  def initialize(user, record)
-    @user = user
-    @record = record
-  end
-
+class StoryAttributePolicy < ApplicationPolicy
   def create?
     update?
   end

app/policies/story_policy.rb

@@ -0,0 +1,9 @@
+class StoryPolicy < AccountablePolicy
+  def publish?
+    update?
+  end
+
+  def unpublish?
+    update?
+  end
+end

app/policies/user_policy.rb

@@ -1,10 +1,5 @@
 class UserPolicy < ApplicationPolicy
-  attr_reader :user, :other_user
-
-  def initialize(user, other_user)
-    @user = user
-    @other_user = other_user
-  end
+  alias_method :other_user, :record
 
   def create?
     true

app/representers/api/account_representer.rb

@@ -2,7 +2,7 @@
 
 class Api::AccountRepresenter < Api::BaseRepresenter
 
-  property :id
+  property :id, writeable: false
   property :type
   property :name
   property :path

app/representers/api/address_representer.rb

@@ -2,7 +2,7 @@
 
 class Api::AddressRepresenter < Api::BaseRepresenter
 
-  property :id
+  property :id, writeable: false
   property :street_1
   property :street_2
   property :street_3