outpost-aggregator 1.0.0 → 1.1.1

data/CHANGELOG.md

@@ -1,4 +1,22 @@
-### 1.0.0 (2013-06-13)
+## 1.1.1
+### Additions
+* Added a `dropLimit` in the view options, for specifying the number of articles allowed in the DropZone. By default, this is "null", which means "no limit".
+* Added notifications for Limit, and a limit counter
+* Specify that only ".sortable" nodes should be sortable
+* Added support for Singular associations. Your `build_association` method should
+  just set the association via `self.content = content`.
+
+### Changes
+* Removed old Secretary hooks.
+* All Outpost object now have a "simple_json" method, which just returns a
+  hash with the ID. This should be overridden in most cases.
+
+
+## 1.1.0
+Yanked
+
+
+## 1.0.0
 * The method to use is now `accepts_json_input_for`, and requires 
   a single argument: the name of the association.
 * Does not do a `published?` check anymore. That's up to you to check when
@@ -10,7 +28,7 @@
   on the content - `published?`, `persisted?`, etc.
 
 
-### v0.1.1
+## v0.1.1
 * Merge in the passed-in params (such as api token) to the params for 
   "by_url" requests. This allows one to use their internal/private API
   with the by_url requests.

data/lib/assets/javascripts/outpost/aggregator/aggregator.js.coffee

@@ -4,7 +4,7 @@
 # Hooks into ContentAPI to help YOU, our loyal
 # customer, aggregate content for various
 # purposes
-# 
+#
 # Made up of basically two parts:
 # * The "DropZone", where content will be dropped
 #   and sorted and generally managed.
@@ -18,32 +18,32 @@ class outpost.Aggregator
     @TemplatePath = "outpost/aggregator/templates/"
 
     #---------------------
-    
+
     defaults:
         apiType: "public"
         params: {}
         viewOptions: {}
-        
+
     constructor: (el, input, json, options={}) ->
         @options = _.defaults options, @defaults
-        
+
         @el    = $(el)
         @input = $(input)
-        
+
         # Set the type of API we're dealing with
         apiClass = if @options.apiType is "public" then "ContentCollection" else "PrivateContentCollection"
-        
+
         @baseView = new outpost.Aggregator.Views.Base _.extend options.view || {},
-            el: @el
-            collection: new outpost.ContentAPI[apiClass](json)
-            input: @input
-            apiClass: apiClass
-            params: @options.params
-            viewOptions: @options.viewOptions
-            
+            el              : @el
+            collection      : new outpost.ContentAPI[apiClass](json)
+            input           : @input
+            apiClass        : apiClass
+            params          : @options.params
+            viewOptions     : @options.viewOptions
+
         @baseView.render()
-        
-        
+
+
     #----------------------------------
     # Views!
     class @Views
@@ -53,49 +53,50 @@ class outpost.Aggregator
             template: JST[Aggregator.TemplatePath + 'base']
             defaults:
                 active: "recent"
-                    
+                dropLimit: null
+
             #---------------------
-        
+
             initialize: ->
                 @options = _.defaults @options, @defaults
-                
+
                 # @foundCollection is the collection for all the content
                 # in the RIGHT panel.
                 @foundCollection = new outpost.ContentAPI[@options.apiClass]()
-        
+
             #---------------------
             # Import a URL and turn it into content
             # Let the caller handle what happens after the request
             # via callbacks
             importUrl: (url, callbacks={}) ->
                 $.getJSON(
-                    outpost.ContentAPI[@options.apiClass].prototype.url + "/by_url", 
+                    outpost.ContentAPI[@options.apiClass].prototype.url + "/by_url",
                     _.extend @options.params, { url: url })
                 .success((data, textStatus, jqXHR)      -> callbacks.success?(data))
                 .error((jqXHR, textStatus, errorThrown) -> callbacks.error?(jqXHR))
                 .complete((jqXHR, status)               -> callbacks.complete?(jqXHR))
 
                 true
-                
+
             #---------------------
-            
+
             render: ->
                 # Build the skeleton. We'll fill everything in next.
                 @$el.html @template(active: @options.active)
-                            
+
                 # Build each of the tabs
                 @recentContent = new outpost.Aggregator.Views.RecentContent(base: @)
                 @search        = new outpost.Aggregator.Views.Search(base: @)
                 @url           = new outpost.Aggregator.Views.URL(base: @)
-                
+
                 # Build the Drop Zone section
                 @dropZone = new outpost.Aggregator.Views.DropZone
                     collection: @collection # The bootstrapped content
                     base: @
-                    
+
                 @
-                
-                
+
+
         #----------------------------------
         # The drop-zone!
         # Gets filled with ContentFull views
@@ -105,71 +106,87 @@ class outpost.Aggregator
             tagName: 'ul'
             attributes:
                 class: "drop-zone well"
-            
+
             # Define alerts as functions
             @Alerts:
                 success: (el, data) ->
-                    new outpost.Notification(el, "success", 
+                    new outpost.Notification(el, "success",
                         "<strong>Success!</strong> Imported #{data.id}")
 
                 alreadyExists: (el) ->
-                    new outpost.Notification(el, "warning", 
+                    new outpost.Notification(el, "warning",
                         "That content is already in the drop zone.")
 
+                limitReached: (el) ->
+                    new outpost.Notification(el, "warning",
+                        "The limit has been reached. Remove an article first.")
+
                 invalidUrl: (el, url) ->
-                    new outpost.Notification(el, "error", 
+                    new outpost.Notification(el, "error",
                         "<strong>Failure.</strong> Invalid URL (#{url})")
 
-                error: (el) -> 
-                    new outpost.Notification(el, "error", 
+                error: (el) ->
+                    new outpost.Notification(el, "error",
                         "<strong>Error.</strong> Try the Search tab.")
 
             #---------------------
-            
+
             initialize: ->
                 @base = @options.base
-                
+
                 # Setup the container, render the template,
                 # and then add in the el (the list)
                 @container = $(@container)
                 @container.html @template
                 @container.append @$el
                 @helper = $("<h1 />").html("Drop Content Here")
-                
+
+                # Is there a limit? Add a notification to the top of the
+                # drop zone to let them know.
+                @limit = @options.limit
+
+                if @limit
+                    @limitNotification =
+                        new outpost.Notification(@$el, "info", "Limit")
+
                 @render()
-                
+
                 # Register listeners for URL droppage
                 @dragOver = false
                 @$el.on "dragenter", (event)  => @_dragEnter(event)
                 @$el.on "dragleave", (event)  => @_dragLeave(event)
                 @$el.on "dragover", (event)   => @_dragOver(event)
                 @$el.on "drop", (event)       => @importUrl(event)
-                
+
                 # Listeners for @collection events triggered
                 # by Backbone
                 @collection.bind "add remove reorder", =>
                     @checkDropZone()
                     @setPositions()
                     @updateInput()
+                    @updateLimitNotification()
 
                 # DropZone callbacks!!
                 sortIn  = true
                 dropped = false
 
                 @$el.sortable
+                    # Which items are sortable
+                    items: ".sortable",
+
                     # When dragging (sorting) starts
                     start: (event, ui) ->
                         sortIn  = true
                         dropped = false
                         ui.item.addClass("dragging")
-                    
+
                     # Called whenever an item is moved and is over the
                     # DropZone.
                     over: (event, ui) ->
                         sortIn = true
                         ui.item.addClass("adding")
                         ui.item.removeClass("removing")
-                    
+
                     # This one gets called both when the item moves out of
                     # the dropzone, AND when the item is dropped inside of
                     # the dropzone. I don't know why jquery-ui decided to
@@ -182,28 +199,28 @@ class outpost.Aggregator
                         # in the dropzone, then add the "removing" class.
                         # Also stop any animation immediately.
                         #
-                        # If "drop event" is the case but the element came 
+                        # If "drop event" is the case but the element came
                         # from somewhere else, then don't add the "removing"
-                        # class. 
+                        # class.
                         if !dropped && ui.sender[0] == @$el[0]
                             sortIn = false
                             ui.item.stop(false, true)
                             ui.item.addClass("removing")
-                        
+
                         ui.item.removeClass("adding")
-                    
+
                     # When dragging (sorting) stops, only if the item
                     # being dragged belongs to the original list
                     # Before placeholder disappears
                     beforeStop: (event, ui) =>
                         dropped = true
-                        
+
                     # When an item from another list is dropped into this
                     # DropZone
                     # Move it from there to DropZone.
                     receive: (event, ui) =>
                         dropped = true
-                        # If we're able to move it in, Remove the dropped 
+                        # If we're able to move it in, Remove the dropped
                         # element because we're rendering the bigger, better one.
                         # Otherwise, revert the el back to the original element.
                         if @move(ui.item)
@@ -211,7 +228,7 @@ class outpost.Aggregator
                         else
                             $(ui.item).effect 'highlight', color: "#f2dede", 1500
                             $(ui.sender).sortable "cancel"
-                            
+
                     # When dragging (sorting) stops, only for items
                     # in the original list.
                     # Update the position attribute for each
@@ -236,13 +253,13 @@ class outpost.Aggregator
             _stopEvent: (event) ->
                 event.preventDefault()
                 event.stopPropagation()
-                
+
             #---------------------
             # When an element enters the zone
             _dragEnter: (event) ->
                 @_stopEvent event
                 @$el.addClass('dim')
-                
+
             #---------------------
             # dragleave has child element problems
             # When you hover over a child element,
@@ -256,7 +273,7 @@ class outpost.Aggregator
                 , 50
 
                 @_stopEvent event
-                
+
             #---------------------
             # When an element is in the zone and not yet released
             # Get continuously and rapidly fired when hovering with
@@ -265,7 +282,7 @@ class outpost.Aggregator
             _dragOver: (event) ->
                 @dragOver = true
                 @_stopEvent event
-                
+
             #---------------------
             # Proxy to @base.importUrl
             # Grabs the dropped-in URL, passes it on
@@ -276,8 +293,8 @@ class outpost.Aggregator
                 @container.spin(zIndex: 1)
                 url = event.originalEvent.dataTransfer.getData('text/uri-list')
                 alert = {}
-                
-                @base.importUrl url, 
+
+                @base.importUrl url,
                     success: (data) =>
                         if data
                             if @buildFromData(data)
@@ -286,7 +303,7 @@ class outpost.Aggregator
                                 @alert('alreadyExists')
                         else
                             @alert('invalidUrl', url)
-                        
+
                     error: (jqXHR) =>
                         @alert('error')
 
@@ -295,7 +312,7 @@ class outpost.Aggregator
                     complete: (jqXHR) =>
                         @container.spin(false)
                         @$el.removeClass('dim')
-                
+
                 false # prevent default behavior
 
             #---------------------
@@ -326,7 +343,7 @@ class outpost.Aggregator
             alert: (alertKey, args...) ->
                 notification = DropZone.Alerts[alertKey](@$el, args...)
                 notification.prepend()
-                
+
                 setTimeout ->
                     notification.fadeOut -> @remove()
                 , 5000
@@ -335,12 +352,20 @@ class outpost.Aggregator
             # Moves a model from the "found" section into the drop zone.
             # Converts its view into a ContentFull view.
             move: (el) ->
+                # If the limit has already been reached.
+                # The updateLimitNotification() function should
+                # warn the user about this.
+                if @limitReached()
+                    @alert("limitReached")
+                    return
+
                 id = el.attr("data-id")
-                
+
                 # Get the model for this DOM element
                 # and add it to the DropZone
                 # collection
                 model = @base.foundCollection.get id
+
                 # If the model is already in @collection, then
                 # let the user know and do not import it
                 # Otherwise, set the position and add it to the collection
@@ -348,7 +373,7 @@ class outpost.Aggregator
                     @collection.add model
                     view = new outpost.Aggregator.Views.ContentFull _.extend @base.options.viewOptions,
                         model: model
-                        
+
                     el.replaceWith view.render()
                     @highlightSuccess(view.$el)
 
@@ -363,13 +388,13 @@ class outpost.Aggregator
 
             #---------------------
             # Remove this el's model from @collection
-            # This is the only case where we want to 
+            # This is the only case where we want to
             # actually remove a view from @base.childViews
             remove: (el) ->
                 id    = el.attr("data-id")
                 model = @collection.get id
                 @collection.remove model
-            
+
             #---------------------
             # Render or hide the "Empty message" for the DropZone,
             # based on if there is content inside or not
@@ -390,12 +415,12 @@ class outpost.Aggregator
             _disableDropZoneHelper: ->
                 @$el.removeClass('empty')
                 @helper.detach()
-            
+
             #---------------------
             # Go through the li's and find the corresponding model.
             # This is how we're able to save the order based on
             # the positions in the DropZone.
-            # Note that this method uses the actual DOM, and 
+            # Note that this method uses the actual DOM, and
             # therefore requires that the list has already been
             # rendered.
             #
@@ -406,14 +431,37 @@ class outpost.Aggregator
                     id    = el.attr("data-id")
                     model = @collection.get id
                     model.set "position", el.index()
-            
+
             #---------------------
             # Update the JSON input with current collection
             updateInput: ->
                 @base.options.input.val(JSON.stringify(@collection.simpleJSON()))
 
+
+            # Check if the limit has been reached, only if it exists.
+            limitReached: ->
+                @limit and @collection.length >= @limit
+
+
+            # Updates the limit notification.
+            # Updates the count, and changes the type if necessary.
+            updateLimitNotification: ->
+                return if not @limitNotification
+
+                @limitNotification.message =
+                    "<strong>Limit:</strong> " +
+                    "#{@collection.length} / #{@limit}"
+
+                if @limitReached()
+                    @limitNotification.type = "success"
+                else
+                    @limitNotification.type = "info"
+
+                @limitNotification.rerender()
+
+
             #---------------------
-            
+
             render: ->
                 @$el.empty()
                 @checkDropZone()
@@ -421,11 +469,16 @@ class outpost.Aggregator
                 # For each model, create a new model view and append it
                 # to the el
                 @collection.each (model) =>
-                    view = new outpost.Aggregator.Views.ContentFull _.extend @base.options.viewOptions,
-                        model: model
-                        
+                    view = new outpost.Aggregator.Views.ContentFull(
+                        _.extend @base.options.viewOptions, model: model)
+
                     @$el.append view.render()
 
+                # Prepend & Update the limit notification
+                if @limitNotification
+                    @limitNotification.prepend()
+                    @updateLimitNotification()
+
                 # Set positions.
                 # setPositions depends on the DOM, so it has to be called
                 # after the list has been rendered for it to work.
@@ -443,33 +496,33 @@ class outpost.Aggregator
         class @ContentList extends Backbone.View
             paginationTemplate: JST[Aggregator.TemplatePath + "_pagination"]
             errorTemplate: JST[Aggregator.TemplatePath + "error"]
-            events: 
+            events:
                 "click .pagination a": "changePage"
-            
+
             #---------------------
 
             initialize: ->
                 @base     = @options.base
                 @page     = 1
                 @per_page = @base.options.params.limit || 10
-                
+
                 # Grab Recent Content using ContentAPI
                 # Render the list
                 @collection = new outpost.ContentAPI[@base.options.apiClass]()
-                
+
                 # Add just the added model to @base.foundCollection
                 @collection.bind "add", (model, collection, options) =>
                     @base.foundCollection.add model
-                
+
                 # Add the reset collection to @base.foundCollection
                 @collection.bind "reset", (collection, options) =>
                     @base.foundCollection.add collection.models
-                
+
                 @container  = $(@container)
                 @container.html @$el
-                
+
                 @render()
-                
+
             #---------------------
             # Get the page from the DOM
             # Proxy to #request to setup params
@@ -490,11 +543,11 @@ class outpost.Aggregator
             # Also handles transitions
             _fetch: (params) ->
                 @transitionStart()
-                
+
                 @collection.fetch
                     data: _.defaults params, @base.options.params
                     success: (collection, response, options) =>
-                        # If the collection length is > 0, then 
+                        # If the collection length is > 0, then
                         # call @renderCollection().
                         # Otherwise render a notice that no results
                         # were found.
@@ -502,14 +555,14 @@ class outpost.Aggregator
                             @renderCollection()
                         else
                             @alertNoResults()
-                        
+
                         # Set the page and re-render the pagination
                         @renderPagination(params, collection)
-                        
+
                     error: (collection, xhr, options) =>
                         @alertError(xhr: xhr)
                 .always => @transitionEnd()
-                
+
                 # Return the collection
                 @collection
 
@@ -528,7 +581,7 @@ class outpost.Aggregator
                 @$el.spin(false)
 
             #---------------------
-            
+
             _stopEvent: (event) ->
                 event.preventDefault()
                 event.stopPropagation()
@@ -543,16 +596,16 @@ class outpost.Aggregator
             # Render a notice if the server returned an error
             alertError: (options={}) ->
                 xhr = options.xhr
-                
+
                 _.defaults options,
                     el: @resultsEl
                     type: "error"
                     message: @errorTemplate(xhr: xhr)
                     method: "replace"
-                    
-                alert = new outpost.Notification(options.el, 
+
+                alert = new outpost.Notification(options.el,
                     options.type, options.message)
-                    
+
                 alert[options.method]()
 
             #---------------------
@@ -563,35 +616,35 @@ class outpost.Aggregator
                     type: "notice"
                     message: "No results"
                     method: "replace"
-                    
-                alert = new outpost.Notification(options.el, 
+
+                alert = new outpost.Notification(options.el,
                     options.type, options.message)
-                    
+
                 alert[options.method]()
-            
+
             #---------------------
             # Fill in the @resultsEl with the model views
             renderCollection: ->
                 @resultsEl.empty()
-                
+
                 @collection.each (model) =>
                     view = new outpost.Aggregator.Views.ContentMinimal
                         model: model
-                        
+
                     @resultsEl.append view.render()
-                
+
                 @$el
 
             #---------------------
             # Re-render the pagination with new page values,
             # and set @page.
             #
-            # If the passed-in length is less than the requested 
-            # limit, then assume that we reached the end of the 
+            # If the passed-in length is less than the requested
+            # limit, then assume that we reached the end of the
             # results and disable the "Next" link
             renderPagination: (params, collection) ->
                 @page = params.page
-                
+
                 # Add in the pagination
                 # Prefer blank classes over "0" for consistency
                 # parseInt(null) and parseInt("") both return null
@@ -603,7 +656,7 @@ class outpost.Aggregator
                 )
 
                 @$el
-                
+
             #---------------------
             # Render the whole section.
             # This should only be called once per page load.
@@ -629,13 +682,13 @@ class outpost.Aggregator
             container: "#aggregator-recent-content"
             resultsId: "#aggregator-recent-content-results"
             template: JST[Aggregator.TemplatePath + 'recent_content']
-            
+
             #---------------------
             # Need to populate right away for Recent Content
             initialize: ->
                 super
                 @request()
-                
+
             #---------------------
             # Sets up default parameters, and then proxies to #_fetch
             request: (params={}) ->
@@ -643,17 +696,17 @@ class outpost.Aggregator
                     limit: @per_page
                     page: 1
                     query: ""
-                
+
                 @_fetch(params)
                 false # To keep consistent with Search#request
 
-                
+
         #----------------------------------
         # SEARCH?!?!
-        # This view is the entire Search section. It it made up of 
+        # This view is the entire Search section. It it made up of
         # smaller "ContentMinimal" views
         #
-        # Note that because of the Input field and pagination, 
+        # Note that because of the Input field and pagination,
         # the list of content is actually stored in @resultsEl, not @el
         #
         # @render() is for rendering the full section.
@@ -689,10 +742,10 @@ class outpost.Aggregator
                     limit: @per_page
                     page: 1
                     query: $("#aggregator-search-input", @$el).val()
-                
+
                 @_fetch(params)
                 false # to keep the Rails form from submitting
-                
+
 
         #----------------------------------
         # The URL Import view
@@ -731,11 +784,11 @@ class outpost.Aggregator
             # This overrides the default ContentList#_fetch
             _fetch: (params={}) ->
                 @transitionStart()
-                
+
                 input = $("#aggregator-url-input", @$el)
                 url   = input.val()
-                
-                @base.importUrl url, 
+
+                @base.importUrl url,
                     success: (data) =>
                         # Returns null if no record is found
                         # If no data, alert the person
@@ -745,33 +798,34 @@ class outpost.Aggregator
                             @collection.add data
                             @append @collection.get(data.id)
                             input.val("") # Empty the URL input
-                        else 
+                        else
                             @alertNoResults
                                 method: "render"
                                 message: "Invalid URL"
-                    
+
                     error: (jqXHR)    => @alertError(xhr: jqXHR)
                     complete: (jqHXR) => @transitionEnd()
-                        
+
                 false # Prevent the Rails form from submitting
 
-                
+
         #----------------------------------
         #----------------------------------
         # An abstract class from which the different
         # representations of a model should inherit
         class @ContentView extends Backbone.View
             tagName: 'li'
-            
+            className: 'sortable'
+
             #---------------------
-            
+
             initialize: ->
                 # Add the model ID to the DOM
                 # We have to do this so that we can share content
                 # between the lists.
                 @$el.attr("data-id", @model.id)
                 @options = _.defaults @options, { template: @template }
-                
+
             #---------------------
 
             render: ->
@@ -781,16 +835,14 @@ class outpost.Aggregator
         # A single piece of content in the drop zone!
         # Full with lots of information
         class @ContentFull extends @ContentView
-            attributes:
-                class: "content-full"
+            className: "sortable content-full"
             template: 'content_full'
-            
+
         #----------------------------------
         # A single piece of recent content!
         # Just the basic info
         class @ContentMinimal extends @ContentView
-            attributes:
-                class: "content-minimal"
+            className: "sortable content-minimal"
             template: 'content_small'
 
         #---------------------

data/lib/assets/javascripts/outpost/aggregator/templates/base.jst.eco

@@ -8,15 +8,15 @@
       <li class="<%= 'active' if @active is 'recent' %>">
         <a href="#aggregator-recent-content" data-toggle="tab">Recent</a>
       </li>
-  
+
       <li class="<%= 'active' if @active is 'search' %>">
         <a href="#aggregator-search" data-toggle="tab">Search</a>
       </li>
-      
+
       <li class"<%= 'active' if @active is 'url' %>">
         <a href="#aggregator-url" data-toggle="tab">URL</a>
       </li>
-      
+
       <li class="<%= 'active' if @active is 'help' %>">
         <a href="#aggregator-help" data-toggle="tab">Help</a>
       </li>
@@ -27,7 +27,7 @@
       <div class="tab-pane<%= ' active' if @active is 'recent' %>" id="aggregator-recent-content">
         Loading Recent Content...
       </div>
-  
+
       <!-- Search Tab -->
       <div class="tab-pane<%= ' active' if @active is 'search' %>" id="aggregator-search">
         Loading Search...
@@ -37,7 +37,7 @@
       <div class="tab-pane<%= ' active' if @active is 'url' %>" id="aggregator-url">
         Loading URL Import...
       </div>
-      
+
       <!-- Help Tab -->
       <div class="tab-pane<%= ' active' if @active is 'help' %>" id="aggregator-help">
         <ul class="help-content">
@@ -64,7 +64,7 @@
             </ul>
           </li>
           <hr />
-          
+
           <h4>Importing content</h4>
           <li><strong>Recent Tab</strong>: Drag content from the "Recent" tab into the Drop Zone</strong</li>
           <li>

data/lib/assets/javascripts/outpost/aggregator/templates/content_full.jst.eco

@@ -9,8 +9,8 @@
     <% else: %>
       <span class="text-error"><strong>UNPUBLISHED</strong></span>
     <% end %><br />
-    
-    <% if !_.isEmpty(@content.teaser)?: %> 
+
+    <% if !_.isEmpty(@content.teaser)?: %>
       <%= @content.teaser %> (<strong><%= @content.teaser?.length %></strong>)<br />
     <% end %>
 

data/lib/assets/javascripts/outpost/aggregator/templates/content_small.jst.eco

@@ -9,7 +9,7 @@
     <% else: %>
       <span class="text-error"><strong>UNPUBLISHED</strong></span>
     <% end %>
-  
+
     (<a href="<%=@content.edit_url%>" target="_blank"><%= @content.id %></a>)
   </div>
 </div>

data/lib/assets/stylesheets/outpost/aggregator.css.scss

@@ -4,13 +4,13 @@
     @include opacity(30);
     @include transition(opacity 0.1s linear)
   }
-  
+
   // Override the Twitter pagination
   // To reduce the padding
   .pagination {
     margin: 0 0 10px 0;
   }
-  
+
   input {
     max-width: 250px;
   }
@@ -18,13 +18,13 @@
   .drop-zone.empty {
     position: relative;
     color: $grayLight;
-    h1 { 
+    h1 {
       position: absolute;
       top: 60px;
       left: 50px;
     }
   }
-  
+
   .drop-zone {
     max-height: 500px;
     overflow: auto;
@@ -35,6 +35,12 @@
     overflow: auto;
   }
 
+  &.short {
+    .content-list, .help-content {
+      max-height: 200px;
+    }
+  }
+
   .help-content {
     padding-right: 10px;
   }
@@ -42,36 +48,36 @@
   .drop-zone, .content-list {
     min-height: 200px;
     @extend .unstyled;
-    
+
     li {
       @extend .clearfix;
-      
+
       background: #fff;
       border: 1px solid $grayLight;
       margin: 5px 0;
       padding: 5px;
       cursor: move;
-      
+
       @include box-shadow(2px 2px 6px #ccc);
       @include border-radius(3px);
-      
+
       // Dragging any content
       &.dragging {
         @include box-shadow(2px 2px 10px #ccc);
       }
-      
+
       // Adding content from the right panel
       &.adding {
         border-color: #0f0;
       }
-      
+
       // Removing content from drop zone
       &.removing {
         background-color: #f2dede;
         border-color: #f00;
         &>div { @include opacity(30); }
       }
-      
+
       img {
         float: left;
         margin-right: 5px;
@@ -84,7 +90,7 @@
       max-width: 120px;
     }
   }
-  
+
   .content-minimal {
     img {
       max-width: 60px;

data/lib/outpost/aggregator/json_input.rb

@@ -3,6 +3,15 @@ module Outpost
     module JsonInput
       extend ActiveSupport::Concern
 
+      # The default simple JSON for all objects.
+      # This catches one-to-one and many-to-one associations.
+      # It should be overridden for many-to-many associations.
+      def simple_json
+        @simple_json ||= {
+          "id" => self.respond_to?(:obj_key) ? self.obj_key : self.id
+        }
+      end
+
       module ClassMethods
         def accepts_json_input_for(name)
           include InstanceMethodsOnActivation
@@ -33,31 +42,39 @@ module Outpost
         def process_json_input_for(name, json)
           return if json.empty?
           name = name.to_s
-          
+          reflection = self.class.reflect_on_association(name.to_sym)
+
           json = Array(JSON.parse(json)).sort_by { |c| c["position"].to_i }
-          loaded = []
-          
-          json.each do |object_hash|
-            if object = Outpost.obj_by_key(object_hash["id"])
-              new_object = build_association_for(name, object_hash, object)
-              loaded.push(new_object) if new_object
-            end
-          end
 
-          loaded_json  = Aggregator.array_to_simple_json(loaded)
-          current_json = current_json_for(name)
-          
-          if current_json != loaded_json
-            # Outpost::Version hook
-            if self.respond_to?(:custom_changes)
-              self.custom_changes[name] = [current_json, loaded_json]
+
+          if reflection.collection?
+            loaded = []
+
+            json.each do |object_hash|
+              if object = Outpost.obj_by_key(object_hash["id"])
+                new_object = build_association_for(name, object_hash, object)
+                loaded.push(new_object) if new_object
+              end
             end
 
-            self.changed_attributes[name] = current_json
+            loaded_json  = Aggregator.array_to_simple_json(loaded)
+            current_json = current_json_for(name)
 
-            # This actually opens a DB transaction and saves stuff.
-            # This is Rails behavior.
-            self.send("#{name}=", loaded)
+            if current_json != loaded_json
+              # This actually opens a DB transaction and saves stuff.
+              # This is Rails behavior.
+              self.send("#{name}=", loaded)
+            end
+          else
+            object_hash = json.first
+
+            if object_hash.present?
+              if object = Outpost.obj_by_key(object_hash["id"])
+                build_association_for(name, object_hash, object)
+              end
+            else
+              self.send("#{name}=", nil)
+            end
           end
 
           self.send(name)

data/lib/outpost/aggregator/version.rb

@@ -1,5 +1,5 @@
 module Outpost
   module Aggregator
-    VERSION = "1.0.0"
+    VERSION = "1.1.1"
   end
 end

data/outpost-aggregator.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
-  
+
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec-rails"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: outpost-aggregator
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-12 00:00:00.000000000 Z
+date: 2013-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70360918168500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,15 +21,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
+  version_requirements: *70360918168500
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70360918165380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70360918165380
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70360918155860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,15 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70360918155860
 - !ruby/object:Gem::Dependency
   name: combustion
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70360918154960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,15 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70360918154960
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70360918152920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -85,15 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70360918152920
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70360918151420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -101,15 +76,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
+  version_requirements: *70360918151420
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70360918149680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -117,12 +87,7 @@ dependencies:
         version: '4.2'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.2'
+  version_requirements: *70360918149680
 description: Content aggregator for Outpost
 email:
 - bricker88@gmail.com
@@ -157,7 +122,6 @@ files:
 - spec/factories.rb
 - spec/internal/config/database.yml
 - spec/internal/config/routes.rb
-- spec/internal/db/combustion_test.sqlite
 - spec/internal/db/schema.rb
 - spec/internal/log/.gitignore
 - spec/internal/public/favicon.ico
@@ -185,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A simple UI and server-side integration to help aggregate content using an
@@ -194,11 +158,9 @@ test_files:
 - spec/factories.rb
 - spec/internal/config/database.yml
 - spec/internal/config/routes.rb
-- spec/internal/db/combustion_test.sqlite
 - spec/internal/db/schema.rb
 - spec/internal/log/.gitignore
 - spec/internal/public/favicon.ico
 - spec/lib/outpost/aggregator/json_input_spec.rb
 - spec/lib/outpost/aggregator/simple_json_spec.rb
 - spec/spec_helper.rb
-has_rdoc: