outpost-aggregator 1.1.2 → 1.1.3

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 1.1.3 (2014-03-19)
+### Fixes
+* Fixed a z-index issue between dropzone empty message and alerts.
+
+### Changes
+* Deprecated `dropLimit`. Replacement is `dropMaxLimit`.
+
+### Additions
+* Added `dropMinLimit` to view options to notify the user when the minimum limit isn't satisfied. (Default: 0)
+* Added a `dropRejectOverflow` option to determine whether or not the aggregator should reject upper-limit overflow. (default: true)
+
+
 ## 1.1.2
 ### Fixes
 * Fixed dropLimit

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

@@ -52,8 +52,10 @@ class outpost.Aggregator
         class @Base extends Backbone.View
             template: JST[Aggregator.TemplatePath + 'base']
             defaults:
-                active: "recent"
-                dropLimit: null
+                active              : "recent"
+                dropMaxLimit        : null,
+                dropMinLimit        : 0
+                dropRejectOverflow  : true
 
             #---------------------
 
@@ -89,11 +91,23 @@ class outpost.Aggregator
                 @search        = new outpost.Aggregator.Views.Search(base: @)
                 @url           = new outpost.Aggregator.Views.URL(base: @)
 
+                # Deprecation notice for dropLimit
+                if @options.dropLimit
+                    console.warn(
+                        "[outpost-aggregator] dropLimit is deprecated. " +
+                        "Use dropMaxLimit and dropMinLimit")
+
+                    if !@options.dropMaxLimit
+                        @options.dropMaxLimit = @options.dropLimit
+
+
                 # Build the Drop Zone section
                 @dropZone = new outpost.Aggregator.Views.DropZone
                     collection: @collection # The bootstrapped content
                     base: @,
-                    limit: @options.dropLimit
+                    minLimit        : @options.dropMinLimit,
+                    maxLimit        : @options.dropMaxLimit,
+                    rejectOverflow  : @options.dropRejectOverflow
 
                 @
 
@@ -118,7 +132,7 @@ class outpost.Aggregator
                     new outpost.Notification(el, "warning",
                         "That content is already in the drop zone.")
 
-                limitReached: (el) ->
+                maxLimitReached: (el) ->
                     new outpost.Notification(el, "warning",
                         "The limit has been reached. Remove an article first.")
 
@@ -134,11 +148,16 @@ class outpost.Aggregator
 
             initialize: ->
                 @base   = @options.base
-                @limit  = @options.limit
+
+                @minLimit           = @options.minLimit
+                @maxLimit           = @options.maxLimit
+                @rejectOverflow     = @options.rejectOverflow
 
                 # Is there a limit? Add a notification to the top of the
-                # drop zone to let them know.
-                if @limit
+                # drop zone to let them know. For minLimit, we're taking
+                # advantage of 0 as falsey in Javascript. For maxLimit,
+                # the default is null, which is also falsey.
+                if @maxLimit or @minLimit
                     @limitNotification =
                         new outpost.Notification(@$el, "info", "Limit")
 
@@ -352,11 +371,16 @@ 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.
+                # If the limit has already been reached, and we get here
+                # (i.e. we're trying to add another article), don't let
+                # the user add it. For minimum limits, we'll allow them
+                # to drop below the min limit, but will just warn them
+                # about it.
                 # The updateLimitNotification() function should
                 # warn the user about this.
-                if @limitReached()
-                    @alert("limitReached")
+                if @maxLimit and @rejectOverflow and
+                @collection.length >= @maxLimit
+                    @alert("maxLimitReached")
                     return
 
                 id = el.attr("data-id")
@@ -439,23 +463,41 @@ class outpost.Aggregator
 
 
             # Check if the limit has been reached, only if it exists.
-            limitReached: ->
-                @limit and @collection.length >= @limit
+            minLimitOk: ->
+                return true if !@minLimit
+                @collection.length >= @minLimit
+
+            maxLimitOk: ->
+                return true if !@maxLimit
+                @collection.length <= @maxLimit
+
+            withinRange: ->
+                @minLimitOk() and @maxLimitOk()
 
 
             # Updates the limit notification.
             # Updates the count, and changes the type if necessary.
             updateLimitNotification: ->
                 return if not @limitNotification
+                spacer = "&nbsp;|&nbsp;"
 
                 @limitNotification.message =
-                    "<strong>Limit:</strong> " +
-                    "#{@collection.length} / #{@limit}"
+                    "<strong>Count:</strong> #{@collection.length}"
+
+                if @maxLimit
+                    @limitNotification.message += spacer
+                    @limitNotification.message +=
+                        "<strong>Maximum:</strong> #{@maxLimit}"
+
+                if @minLimit
+                    @limitNotification.message += spacer
+                    @limitNotification.message +=
+                        "<strong>Minimum:</strong> #{@minLimit}"
 
-                if @limitReached()
+                if @withinRange()
                     @limitNotification.type = "success"
                 else
-                    @limitNotification.type = "info"
+                    @limitNotification.type = "error"
 
                 @limitNotification.rerender()
 

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

@@ -18,7 +18,9 @@
   .drop-zone.empty {
     position: relative;
     color: $grayLight;
+
     h1 {
+      z-index: 0;
       position: absolute;
       top: 60px;
       left: 50px;
@@ -28,6 +30,12 @@
   .drop-zone {
     max-height: 500px;
     overflow: auto;
+
+    .alert {
+      // Make alerts show in front of "Empty Message"
+      z-index: 1;
+      position: relative;
+    }
   }
 
   .content-list, .help-content {

data/lib/outpost/aggregator/version.rb

@@ -1,5 +1,5 @@
 module Outpost
   module Aggregator
-    VERSION = "1.1.2"
+    VERSION = "1.1.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: outpost-aggregator
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-07 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70110278587040 !ruby/object:Gem::Requirement
+  requirement: &70299703934960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70110278587040
+  version_requirements: *70299703934960
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70110278585260 !ruby/object:Gem::Requirement
+  requirement: &70299703934380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70110278585260
+  version_requirements: *70299703934380
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70110278582300 !ruby/object:Gem::Requirement
+  requirement: &70299703933340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70110278582300
+  version_requirements: *70299703933340
 - !ruby/object:Gem::Dependency
   name: combustion
-  requirement: &70110274963500 !ruby/object:Gem::Requirement
+  requirement: &70299703932720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70110274963500
+  version_requirements: *70299703932720
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70110274961840 !ruby/object:Gem::Requirement
+  requirement: &70299708901480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70110274961840
+  version_requirements: *70299708901480
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70110274959860 !ruby/object:Gem::Requirement
+  requirement: &70299708900980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70110274959860
+  version_requirements: *70299708900980
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70110274958320 !ruby/object:Gem::Requirement
+  requirement: &70299708900480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,7 @@ dependencies:
         version: '4.2'
   type: :development
   prerelease: false
-  version_requirements: *70110274958320
+  version_requirements: *70299708900480
 description: Content aggregator for Outpost
 email:
 - bricker88@gmail.com