outpost-aggregator 1.1.3 → 1.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: bde62e0aa7da73bd276edac7f781c98d7e085840
+  data.tar.gz: c78fbe3a32800350a5d171a5fab535105e7d713c
+SHA512:
+  metadata.gz: c9402d338b4a7b61f70b68d01941e2b353594fe5f46eb5dd2708a1a90b7dbb8519758e64a48f52ee9eac6e40352124ee84e06d774c50a9ad9ed1ed312ef2b58c
+  data.tar.gz: d85d48196c82d210eabdaeb759c78e5193812335c064daaf977565361df305a4aa98d190027ddddee8d4bfc19e32feb2a4ce6af848cf3f72608c03650d0559ce

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.2.0
+### Fixes
+* Now you can have multiple aggregators on a single page.
+
+
 ## 1.1.3 (2014-03-19)
 ### Fixes
 * Fixed a z-index issue between dropzone empty message and alerts.

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

@@ -84,7 +84,11 @@ class outpost.Aggregator
 
             render: ->
                 # Build the skeleton. We'll fill everything in next.
-                @$el.html @template(active: @options.active)
+                # The prefix is for the tab IDs
+                @$el.html @template(
+                    active: @options.active
+                    prefix: @options.el.attr('id')
+                )
 
                 # Build each of the tabs
                 @recentContent = new outpost.Aggregator.Views.RecentContent(base: @)
@@ -117,7 +121,7 @@ class outpost.Aggregator
         # Gets filled with ContentFull views
         class @DropZone extends Backbone.View
             template: JST[Aggregator.TemplatePath + 'drop_zone']
-            container: "#aggregator-dropzone"
+            container: ".aggregator-dropzone"
             tagName: 'ul'
             attributes:
                 class: "drop-zone well"
@@ -163,7 +167,7 @@ class outpost.Aggregator
 
                 # Setup the container, render the template,
                 # and then add in the el (the list)
-                @container = $(@container)
+                @container = $(@container, @base.$el)
                 @container.html @template
                 @container.append @$el
                 @helper = $("<h1 />").html("Drop Content Here")
@@ -345,8 +349,8 @@ class outpost.Aggregator
                 # render it, highlight it
                 # If it does already exist, then just return false
                 if not @collection.get model.id
-                    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()
                     @highlightSuccess(view.$el)
@@ -560,7 +564,7 @@ class outpost.Aggregator
                 @collection.bind "reset", (collection, options) =>
                     @base.foundCollection.add collection.models
 
-                @container  = $(@container)
+                @container  = $(@container, @base.$el)
                 @container.html @$el
 
                 @render()
@@ -710,7 +714,7 @@ class outpost.Aggregator
 
                 # Make the Results div Sortable
                 @resultsEl.sortable
-                    connectWith: "#aggregator-dropzone .drop-zone"
+                    connectWith: ".aggregator-dropzone .drop-zone"
 
                 @
 
@@ -721,8 +725,8 @@ class outpost.Aggregator
         # Note that because of Pagination, the list of content is
         # stored in @resultsEl, not @el
         class @RecentContent extends @ContentList
-            container: "#aggregator-recent-content"
-            resultsId: "#aggregator-recent-content-results"
+            container: ".aggregator-recent-content"
+            resultsId: ".aggregator-recent-content-results"
             template: JST[Aggregator.TemplatePath + 'recent_content']
 
             #---------------------
@@ -754,8 +758,8 @@ class outpost.Aggregator
         # @render() is for rendering the full section.
         # Use @renderCollection for rendering just the search results.
         class @Search extends @ContentList
-            container: "#aggregator-search"
-            resultsId: "#aggregator-search-results"
+            container: ".aggregator-search"
+            resultsId: ".aggregator-search-results"
             template: JST[Aggregator.TemplatePath + "search"]
             events:
                 "click .pagination a" : "changePage"
@@ -783,7 +787,7 @@ class outpost.Aggregator
                 _.defaults params,
                     limit: @per_page
                     page: 1
-                    query: $("#aggregator-search-input", @$el).val()
+                    query: $(".aggregator-search-input", @$el).val()
 
                 @_fetch(params)
                 false # to keep the Rails form from submitting
@@ -794,8 +798,8 @@ class outpost.Aggregator
         # Inherits from @ContentList but doesn't actually
         # need all of its goodies. That's okay.
         class @URL extends @ContentList
-            container: "#aggregator-url"
-            resultsId: "#aggregator-url-results"
+            container: ".aggregator-url"
+            resultsId: ".aggregator-url-results"
             template: JST[Aggregator.TemplatePath + "url"]
             events:
                 "click a.btn" : "importUrl"
@@ -827,7 +831,7 @@ class outpost.Aggregator
             _fetch: (params={}) ->
                 @transitionStart()
 
-                input = $("#aggregator-url-input", @$el)
+                input = $(".aggregator-url-input", @$el)
                 url   = input.val()
 
                 @base.importUrl url,

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

@@ -1,45 +1,45 @@
 <div class="row">
-  <div id="aggregator-dropzone" class="content-bucket span5">
+  <div class="aggregator-dropzone content-bucket span5">
     Loading content...
   </div>
 
   <div class="span4">
     <ul class="nav nav-tabs">
       <li class="<%= 'active' if @active is 'recent' %>">
-        <a href="#aggregator-recent-content" data-toggle="tab">Recent</a>
+        <a href="#<%=@prefix%>-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>
+        <a href="#<%=@prefix%>-aggregator-search" data-toggle="tab">Search</a>
       </li>
 
       <li class"<%= 'active' if @active is 'url' %>">
-        <a href="#aggregator-url" data-toggle="tab">URL</a>
+        <a href="#<%=@prefix%>-aggregator-url" data-toggle="tab">URL</a>
       </li>
 
       <li class="<%= 'active' if @active is 'help' %>">
-        <a href="#aggregator-help" data-toggle="tab">Help</a>
+        <a href="#<%=@prefix%>-aggregator-help" data-toggle="tab">Help</a>
       </li>
     </ul>
 
     <div class="tab-content">
       <!-- Recent Content Tab -->
-      <div class="tab-pane<%= ' active' if @active is 'recent' %>" id="aggregator-recent-content">
+      <div class="aggregator-recent-content tab-pane<%= ' active' if @active is 'recent' %>" id="<%=@prefix%>-aggregator-recent-content">
         Loading Recent Content...
       </div>
 
       <!-- Search Tab -->
-      <div class="tab-pane<%= ' active' if @active is 'search' %>" id="aggregator-search">
+      <div class="aggregator-search tab-pane<%= ' active' if @active is 'search' %>" id="<%=@prefix%>-aggregator-search">
         Loading Search...
       </div>
 
       <!-- URL Import Tab -->
-      <div class="tab-pane<%= ' active' if @active is 'url' %>" id="aggregator-url">
+      <div class="aggregator-url tab-pane<%= ' active' if @active is 'url' %>" id="<%=@prefix%>-aggregator-url">
         Loading URL Import...
       </div>
 
       <!-- Help Tab -->
-      <div class="tab-pane<%= ' active' if @active is 'help' %>" id="aggregator-help">
+      <div class="aggregator-help tab-pane<%= ' active' if @active is 'help' %>" id="<%=@prefix%>-aggregator-help">
         <ul class="help-content">
           <li>The gray area on the left is referred to as the "<strong>Drop Zone</strong>".</li>
           <hr />
@@ -58,7 +58,7 @@
               <li>"Back" shows the previous page of stories if available</li>
               <li>"Next" shows the next page stories if available</li>
               <li>
-                The "Refresh" icon (<i class="icon-refresh"></i>) refreshes the current page. 
+                The "Refresh" icon (<i class="icon-refresh"></i>) refreshes the current page.
                 This is is useful if you have been moving content out of the list and want to get it all back.
               </li>
             </ul>
@@ -68,13 +68,13 @@
           <h4>Importing content</h4>
           <li><strong>Recent Tab</strong>: Drag content from the "Recent" tab into the Drop Zone</strong</li>
           <li>
-            <strong>Search Tab</strong>: 
-            Use the "Search" tab to find older content. 
+            <strong>Search Tab</strong>:
+            Use the "Search" tab to find older content.
             Dragging from the Search panel works the same as from the Recent panel.
           </li>
           <li>
-            <strong>Via URL</strong>: 
-            Drag any Content URL into the Drop Zone. 
+            <strong>Via URL</strong>:
+            Drag any Content URL into the Drop Zone.
             Alternatively, you can paste a URL into the form in the "URL" tab and click "Import".<br />
           </li>
           <hr />

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

@@ -1,2 +1,2 @@
 <div class="aggregator-pagination"></div>
-<ul id="aggregator-recent-content-results" class="content-list"></ul>
+<ul  class="aggregator-recent-content-results content-list"></ul>

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

@@ -1,6 +1,6 @@
-<input type="text" id="aggregator-search-input" placeholder="Search Query" />
+<input type="text" class="aggregator-search-input" placeholder="Search Query" />
 <a class="btn">Go</a>
 <hr />
 
 <div class="aggregator-pagination"></div>
-<ul id="aggregator-search-results" class="content-list"></ul>
+<ul class="aggregator-search-results content-list"></ul>

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

@@ -1,5 +1,5 @@
-<input type="text" id="aggregator-url-input" placeholder="URL" />
+<input type="text" class="aggregator-url-input" placeholder="URL" />
 <a class="btn">Import</a>
 <hr />
 
-<ul id="aggregator-url-results" class="content-list"></ul>
+<ul class="aggregator-url-results content-list"></ul>

data/lib/outpost/aggregator/version.rb

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

metadata

@@ -1,93 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: outpost-aggregator
 version: !ruby/object:Gem::Version
-  version: 1.1.3
-  prerelease: 
+  version: 1.2.0
 platform: ruby
 authors:
 - Bryan Ricker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-20 00:00:00.000000000 Z
+date: 2014-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70299703934960 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70299703934960
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70299703934380 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70299703934380
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70299703933340 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70299703933340
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: combustion
-  requirement: &70299703932720 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70299703932720
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70299708901480 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70299708901480
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70299708900980 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70299708900980
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70299708900480 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
   type: :development
   prerelease: false
-  version_requirements: *70299708900480
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
 description: Content aggregator for Outpost
 email:
 - bricker88@gmail.com
@@ -95,7 +115,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
@@ -131,27 +151,26 @@ files:
 homepage: https://github.com/SCPR/outpost-aggregator
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A simple UI and server-side integration to help aggregate content using an
   API.
 test_files: