outpost-aggregator 1.1.3 → 1.2.0

Sign up to get free protection for your applications and to get access to all the features.
@@ -0,0 +1,7 @@
1
+ ---
2
+ SHA1:
3
+ metadata.gz: bde62e0aa7da73bd276edac7f781c98d7e085840
4
+ data.tar.gz: c78fbe3a32800350a5d171a5fab535105e7d713c
5
+ SHA512:
6
+ metadata.gz: c9402d338b4a7b61f70b68d01941e2b353594fe5f46eb5dd2708a1a90b7dbb8519758e64a48f52ee9eac6e40352124ee84e06d774c50a9ad9ed1ed312ef2b58c
7
+ data.tar.gz: d85d48196c82d210eabdaeb759c78e5193812335c064daaf977565361df305a4aa98d190027ddddee8d4bfc19e32feb2a4ce6af848cf3f72608c03650d0559ce
@@ -1,3 +1,8 @@
1
+ ## 1.2.0
2
+ ### Fixes
3
+ * Now you can have multiple aggregators on a single page.
4
+
5
+
1
6
  ## 1.1.3 (2014-03-19)
2
7
  ### Fixes
3
8
  * Fixed a z-index issue between dropzone empty message and alerts.
@@ -84,7 +84,11 @@ class outpost.Aggregator
84
84
 
85
85
  render: ->
86
86
  # Build the skeleton. We'll fill everything in next.
87
- @$el.html @template(active: @options.active)
87
+ # The prefix is for the tab IDs
88
+ @$el.html @template(
89
+ active: @options.active
90
+ prefix: @options.el.attr('id')
91
+ )
88
92
 
89
93
  # Build each of the tabs
90
94
  @recentContent = new outpost.Aggregator.Views.RecentContent(base: @)
@@ -117,7 +121,7 @@ class outpost.Aggregator
117
121
  # Gets filled with ContentFull views
118
122
  class @DropZone extends Backbone.View
119
123
  template: JST[Aggregator.TemplatePath + 'drop_zone']
120
- container: "#aggregator-dropzone"
124
+ container: ".aggregator-dropzone"
121
125
  tagName: 'ul'
122
126
  attributes:
123
127
  class: "drop-zone well"
@@ -163,7 +167,7 @@ class outpost.Aggregator
163
167
 
164
168
  # Setup the container, render the template,
165
169
  # and then add in the el (the list)
166
- @container = $(@container)
170
+ @container = $(@container, @base.$el)
167
171
  @container.html @template
168
172
  @container.append @$el
169
173
  @helper = $("<h1 />").html("Drop Content Here")
@@ -345,8 +349,8 @@ class outpost.Aggregator
345
349
  # render it, highlight it
346
350
  # If it does already exist, then just return false
347
351
  if not @collection.get model.id
348
- view = new outpost.Aggregator.Views.ContentFull _.extend @base.options.viewOptions,
349
- model: model
352
+ view = new outpost.Aggregator.Views.ContentFull(
353
+ _.extend @base.options.viewOptions, model: model)
350
354
 
351
355
  @$el.append view.render()
352
356
  @highlightSuccess(view.$el)
@@ -560,7 +564,7 @@ class outpost.Aggregator
560
564
  @collection.bind "reset", (collection, options) =>
561
565
  @base.foundCollection.add collection.models
562
566
 
563
- @container = $(@container)
567
+ @container = $(@container, @base.$el)
564
568
  @container.html @$el
565
569
 
566
570
  @render()
@@ -710,7 +714,7 @@ class outpost.Aggregator
710
714
 
711
715
  # Make the Results div Sortable
712
716
  @resultsEl.sortable
713
- connectWith: "#aggregator-dropzone .drop-zone"
717
+ connectWith: ".aggregator-dropzone .drop-zone"
714
718
 
715
719
  @
716
720
 
@@ -721,8 +725,8 @@ class outpost.Aggregator
721
725
  # Note that because of Pagination, the list of content is
722
726
  # stored in @resultsEl, not @el
723
727
  class @RecentContent extends @ContentList
724
- container: "#aggregator-recent-content"
725
- resultsId: "#aggregator-recent-content-results"
728
+ container: ".aggregator-recent-content"
729
+ resultsId: ".aggregator-recent-content-results"
726
730
  template: JST[Aggregator.TemplatePath + 'recent_content']
727
731
 
728
732
  #---------------------
@@ -754,8 +758,8 @@ class outpost.Aggregator
754
758
  # @render() is for rendering the full section.
755
759
  # Use @renderCollection for rendering just the search results.
756
760
  class @Search extends @ContentList
757
- container: "#aggregator-search"
758
- resultsId: "#aggregator-search-results"
761
+ container: ".aggregator-search"
762
+ resultsId: ".aggregator-search-results"
759
763
  template: JST[Aggregator.TemplatePath + "search"]
760
764
  events:
761
765
  "click .pagination a" : "changePage"
@@ -783,7 +787,7 @@ class outpost.Aggregator
783
787
  _.defaults params,
784
788
  limit: @per_page
785
789
  page: 1
786
- query: $("#aggregator-search-input", @$el).val()
790
+ query: $(".aggregator-search-input", @$el).val()
787
791
 
788
792
  @_fetch(params)
789
793
  false # to keep the Rails form from submitting
@@ -794,8 +798,8 @@ class outpost.Aggregator
794
798
  # Inherits from @ContentList but doesn't actually
795
799
  # need all of its goodies. That's okay.
796
800
  class @URL extends @ContentList
797
- container: "#aggregator-url"
798
- resultsId: "#aggregator-url-results"
801
+ container: ".aggregator-url"
802
+ resultsId: ".aggregator-url-results"
799
803
  template: JST[Aggregator.TemplatePath + "url"]
800
804
  events:
801
805
  "click a.btn" : "importUrl"
@@ -827,7 +831,7 @@ class outpost.Aggregator
827
831
  _fetch: (params={}) ->
828
832
  @transitionStart()
829
833
 
830
- input = $("#aggregator-url-input", @$el)
834
+ input = $(".aggregator-url-input", @$el)
831
835
  url = input.val()
832
836
 
833
837
  @base.importUrl url,
@@ -1,45 +1,45 @@
1
1
  <div class="row">
2
- <div id="aggregator-dropzone" class="content-bucket span5">
2
+ <div class="aggregator-dropzone content-bucket span5">
3
3
  Loading content...
4
4
  </div>
5
5
 
6
6
  <div class="span4">
7
7
  <ul class="nav nav-tabs">
8
8
  <li class="<%= 'active' if @active is 'recent' %>">
9
- <a href="#aggregator-recent-content" data-toggle="tab">Recent</a>
9
+ <a href="#<%=@prefix%>-aggregator-recent-content" data-toggle="tab">Recent</a>
10
10
  </li>
11
11
 
12
12
  <li class="<%= 'active' if @active is 'search' %>">
13
- <a href="#aggregator-search" data-toggle="tab">Search</a>
13
+ <a href="#<%=@prefix%>-aggregator-search" data-toggle="tab">Search</a>
14
14
  </li>
15
15
 
16
16
  <li class"<%= 'active' if @active is 'url' %>">
17
- <a href="#aggregator-url" data-toggle="tab">URL</a>
17
+ <a href="#<%=@prefix%>-aggregator-url" data-toggle="tab">URL</a>
18
18
  </li>
19
19
 
20
20
  <li class="<%= 'active' if @active is 'help' %>">
21
- <a href="#aggregator-help" data-toggle="tab">Help</a>
21
+ <a href="#<%=@prefix%>-aggregator-help" data-toggle="tab">Help</a>
22
22
  </li>
23
23
  </ul>
24
24
 
25
25
  <div class="tab-content">
26
26
  <!-- Recent Content Tab -->
27
- <div class="tab-pane<%= ' active' if @active is 'recent' %>" id="aggregator-recent-content">
27
+ <div class="aggregator-recent-content tab-pane<%= ' active' if @active is 'recent' %>" id="<%=@prefix%>-aggregator-recent-content">
28
28
  Loading Recent Content...
29
29
  </div>
30
30
 
31
31
  <!-- Search Tab -->
32
- <div class="tab-pane<%= ' active' if @active is 'search' %>" id="aggregator-search">
32
+ <div class="aggregator-search tab-pane<%= ' active' if @active is 'search' %>" id="<%=@prefix%>-aggregator-search">
33
33
  Loading Search...
34
34
  </div>
35
35
 
36
36
  <!-- URL Import Tab -->
37
- <div class="tab-pane<%= ' active' if @active is 'url' %>" id="aggregator-url">
37
+ <div class="aggregator-url tab-pane<%= ' active' if @active is 'url' %>" id="<%=@prefix%>-aggregator-url">
38
38
  Loading URL Import...
39
39
  </div>
40
40
 
41
41
  <!-- Help Tab -->
42
- <div class="tab-pane<%= ' active' if @active is 'help' %>" id="aggregator-help">
42
+ <div class="aggregator-help tab-pane<%= ' active' if @active is 'help' %>" id="<%=@prefix%>-aggregator-help">
43
43
  <ul class="help-content">
44
44
  <li>The gray area on the left is referred to as the "<strong>Drop Zone</strong>".</li>
45
45
  <hr />
@@ -58,7 +58,7 @@
58
58
  <li>"Back" shows the previous page of stories if available</li>
59
59
  <li>"Next" shows the next page stories if available</li>
60
60
  <li>
61
- The "Refresh" icon (<i class="icon-refresh"></i>) refreshes the current page.
61
+ The "Refresh" icon (<i class="icon-refresh"></i>) refreshes the current page.
62
62
  This is is useful if you have been moving content out of the list and want to get it all back.
63
63
  </li>
64
64
  </ul>
@@ -68,13 +68,13 @@
68
68
  <h4>Importing content</h4>
69
69
  <li><strong>Recent Tab</strong>: Drag content from the "Recent" tab into the Drop Zone</strong</li>
70
70
  <li>
71
- <strong>Search Tab</strong>:
72
- Use the "Search" tab to find older content.
71
+ <strong>Search Tab</strong>:
72
+ Use the "Search" tab to find older content.
73
73
  Dragging from the Search panel works the same as from the Recent panel.
74
74
  </li>
75
75
  <li>
76
- <strong>Via URL</strong>:
77
- Drag any Content URL into the Drop Zone.
76
+ <strong>Via URL</strong>:
77
+ Drag any Content URL into the Drop Zone.
78
78
  Alternatively, you can paste a URL into the form in the "URL" tab and click "Import".<br />
79
79
  </li>
80
80
  <hr />
@@ -1,2 +1,2 @@
1
1
  <div class="aggregator-pagination"></div>
2
- <ul id="aggregator-recent-content-results" class="content-list"></ul>
2
+ <ul class="aggregator-recent-content-results content-list"></ul>
@@ -1,6 +1,6 @@
1
- <input type="text" id="aggregator-search-input" placeholder="Search Query" />
1
+ <input type="text" class="aggregator-search-input" placeholder="Search Query" />
2
2
  <a class="btn">Go</a>
3
3
  <hr />
4
4
 
5
5
  <div class="aggregator-pagination"></div>
6
- <ul id="aggregator-search-results" class="content-list"></ul>
6
+ <ul class="aggregator-search-results content-list"></ul>
@@ -1,5 +1,5 @@
1
- <input type="text" id="aggregator-url-input" placeholder="URL" />
1
+ <input type="text" class="aggregator-url-input" placeholder="URL" />
2
2
  <a class="btn">Import</a>
3
3
  <hr />
4
4
 
5
- <ul id="aggregator-url-results" class="content-list"></ul>
5
+ <ul class="aggregator-url-results content-list"></ul>
@@ -1,5 +1,5 @@
1
1
  module Outpost
2
2
  module Aggregator
3
- VERSION = "1.1.3"
3
+ VERSION = "1.2.0"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,93 +1,113 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: outpost-aggregator
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.3
5
- prerelease:
4
+ version: 1.2.0
6
5
  platform: ruby
7
6
  authors:
8
7
  - Bryan Ricker
9
8
  autorequire:
10
9
  bindir: bin
11
10
  cert_chain: []
12
- date: 2014-03-20 00:00:00.000000000 Z
11
+ date: 2014-05-30 00:00:00.000000000 Z
13
12
  dependencies:
14
13
  - !ruby/object:Gem::Dependency
15
14
  name: bundler
16
- requirement: &70299703934960 !ruby/object:Gem::Requirement
17
- none: false
15
+ requirement: !ruby/object:Gem::Requirement
18
16
  requirements:
19
- - - ~>
17
+ - - "~>"
20
18
  - !ruby/object:Gem::Version
21
19
  version: '1.3'
22
20
  type: :development
23
21
  prerelease: false
24
- version_requirements: *70299703934960
22
+ version_requirements: !ruby/object:Gem::Requirement
23
+ requirements:
24
+ - - "~>"
25
+ - !ruby/object:Gem::Version
26
+ version: '1.3'
25
27
  - !ruby/object:Gem::Dependency
26
28
  name: rake
27
- requirement: &70299703934380 !ruby/object:Gem::Requirement
28
- none: false
29
+ requirement: !ruby/object:Gem::Requirement
29
30
  requirements:
30
- - - ! '>='
31
+ - - ">="
31
32
  - !ruby/object:Gem::Version
32
33
  version: '0'
33
34
  type: :development
34
35
  prerelease: false
35
- version_requirements: *70299703934380
36
+ version_requirements: !ruby/object:Gem::Requirement
37
+ requirements:
38
+ - - ">="
39
+ - !ruby/object:Gem::Version
40
+ version: '0'
36
41
  - !ruby/object:Gem::Dependency
37
42
  name: rspec-rails
38
- requirement: &70299703933340 !ruby/object:Gem::Requirement
39
- none: false
43
+ requirement: !ruby/object:Gem::Requirement
40
44
  requirements:
41
- - - ! '>='
45
+ - - ">="
42
46
  - !ruby/object:Gem::Version
43
47
  version: '0'
44
48
  type: :development
45
49
  prerelease: false
46
- version_requirements: *70299703933340
50
+ version_requirements: !ruby/object:Gem::Requirement
51
+ requirements:
52
+ - - ">="
53
+ - !ruby/object:Gem::Version
54
+ version: '0'
47
55
  - !ruby/object:Gem::Dependency
48
56
  name: combustion
49
- requirement: &70299703932720 !ruby/object:Gem::Requirement
50
- none: false
57
+ requirement: !ruby/object:Gem::Requirement
51
58
  requirements:
52
- - - ! '>='
59
+ - - ">="
53
60
  - !ruby/object:Gem::Version
54
61
  version: '0'
55
62
  type: :development
56
63
  prerelease: false
57
- version_requirements: *70299703932720
64
+ version_requirements: !ruby/object:Gem::Requirement
65
+ requirements:
66
+ - - ">="
67
+ - !ruby/object:Gem::Version
68
+ version: '0'
58
69
  - !ruby/object:Gem::Dependency
59
70
  name: activerecord
60
- requirement: &70299708901480 !ruby/object:Gem::Requirement
61
- none: false
71
+ requirement: !ruby/object:Gem::Requirement
62
72
  requirements:
63
- - - ! '>='
73
+ - - ">="
64
74
  - !ruby/object:Gem::Version
65
75
  version: '0'
66
76
  type: :development
67
77
  prerelease: false
68
- version_requirements: *70299708901480
78
+ version_requirements: !ruby/object:Gem::Requirement
79
+ requirements:
80
+ - - ">="
81
+ - !ruby/object:Gem::Version
82
+ version: '0'
69
83
  - !ruby/object:Gem::Dependency
70
84
  name: sqlite3
71
- requirement: &70299708900980 !ruby/object:Gem::Requirement
72
- none: false
85
+ requirement: !ruby/object:Gem::Requirement
73
86
  requirements:
74
- - - ~>
87
+ - - "~>"
75
88
  - !ruby/object:Gem::Version
76
89
  version: '1.3'
77
90
  type: :development
78
91
  prerelease: false
79
- version_requirements: *70299708900980
92
+ version_requirements: !ruby/object:Gem::Requirement
93
+ requirements:
94
+ - - "~>"
95
+ - !ruby/object:Gem::Version
96
+ version: '1.3'
80
97
  - !ruby/object:Gem::Dependency
81
98
  name: factory_girl
82
- requirement: &70299708900480 !ruby/object:Gem::Requirement
83
- none: false
99
+ requirement: !ruby/object:Gem::Requirement
84
100
  requirements:
85
- - - ~>
101
+ - - "~>"
86
102
  - !ruby/object:Gem::Version
87
103
  version: '4.2'
88
104
  type: :development
89
105
  prerelease: false
90
- version_requirements: *70299708900480
106
+ version_requirements: !ruby/object:Gem::Requirement
107
+ requirements:
108
+ - - "~>"
109
+ - !ruby/object:Gem::Version
110
+ version: '4.2'
91
111
  description: Content aggregator for Outpost
92
112
  email:
93
113
  - bricker88@gmail.com
@@ -95,7 +115,7 @@ executables: []
95
115
  extensions: []
96
116
  extra_rdoc_files: []
97
117
  files:
98
- - .gitignore
118
+ - ".gitignore"
99
119
  - CHANGELOG.md
100
120
  - Gemfile
101
121
  - MIT-LICENSE
@@ -131,27 +151,26 @@ files:
131
151
  homepage: https://github.com/SCPR/outpost-aggregator
132
152
  licenses:
133
153
  - MIT
154
+ metadata: {}
134
155
  post_install_message:
135
156
  rdoc_options: []
136
157
  require_paths:
137
158
  - lib
138
159
  required_ruby_version: !ruby/object:Gem::Requirement
139
- none: false
140
160
  requirements:
141
- - - ! '>='
161
+ - - ">="
142
162
  - !ruby/object:Gem::Version
143
163
  version: '0'
144
164
  required_rubygems_version: !ruby/object:Gem::Requirement
145
- none: false
146
165
  requirements:
147
- - - ! '>='
166
+ - - ">="
148
167
  - !ruby/object:Gem::Version
149
168
  version: '0'
150
169
  requirements: []
151
170
  rubyforge_project:
152
- rubygems_version: 1.8.11
171
+ rubygems_version: 2.2.2
153
172
  signing_key:
154
- specification_version: 3
173
+ specification_version: 4
155
174
  summary: A simple UI and server-side integration to help aggregate content using an
156
175
  API.
157
176
  test_files: