voluntary_ranking 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d80fd9aec98a0b73c549d41c107d7100ad624e39
-  data.tar.gz: a83b2e05f8141fc6f10580edf245dada93bf5050
+  metadata.gz: 76f45df67cb3f035e730281227f3862b7de1088a
+  data.tar.gz: 119fa32bedaa5329a994e8b2402161c74e4cfd02
 SHA512:
-  metadata.gz: f3009b243c9933459f5d0edf5db082040269f71c279cefac15f15a94aa060152d71eda5492e0982b1065492b3a3af38b9904734b250fd6eda1e5727c43119342
-  data.tar.gz: dd9f56bb4e2e6d460e620796d79fa1db2d8b056dbca6e0b8888399fad41d38014f0e06761dfb38c4095236cbf6a49118d1286eff3db297dcd5791399fc64aa2d
+  metadata.gz: 4345d300c059616625ad2c63065511e8776ea2f17e36a7e75b0eb2b452e49a2de2ecf2a0322639a8370f43631220cac3ae84304412728afc61275531b6965aeb
+  data.tar.gz: 31301321664b6edb916d5c452ac8ab721888f8858474069847eb1f6716fa726593a0f7b5244a0d7d7ec02b3ab8d55293adfc1a007b253c820a47719a00c5551b

data/app/assets/javascripts/voluntary_ranking/app.js

@@ -1,11 +1,9 @@
+//= require_tree ./components
 //= require_tree ./mixins
 //= require_tree ./models
 //= require_tree ./controllers
-//= require_tree ./components
-//= require_tree ./views
 //= require_tree ./helpers
 //= require_tree ./templates
 //= require ./router.js.coffee
 //= require_tree ./routes
-//= require_self
-//= require ./base.js.coffee
+//= require_self

data/app/assets/javascripts/voluntary_ranking/{views/arguments/new_view.js.coffee → components/new_argument_component.js.coffee}

@@ -1,4 +1,4 @@
-Volontariat.ArgumentsNewView = Ember.View.extend
+Volontariat.NewArgumentComponent = Ember.Component.extend
   didInsertElement: ->
     $('input[data-append-autocomplete]').each (k, v) ->
       $(v).autocomplete
@@ -6,4 +6,4 @@ Volontariat.ArgumentsNewView = Ember.View.extend
         appendTo: '#topic_suggestions'
         select: (event, ui) ->
           $(this).val(ui.item.value)
-          false
+          false

data/app/assets/javascripts/voluntary_ranking/{views/ranking_items/colllection_view.js.coffee → components/ranking_items_collection_component.js.coffee}

@@ -1,11 +1,9 @@
-Volontariat.RankingItemsCollectionView = Ember.View.extend
-  templateName: 'ranking_items/_collection'
-  
+Volontariat.RankingItemsCollectionComponent = Ember.Component.extend
   didInsertElement: ->
     first_position = $('#ranking li:first').data('position')
     last_position = $('#ranking li:last').data('position')
-
-    @$( '#ranking' ).sortable
+   
+    $( '#ranking' ).sortable
       handle: '.ranking_item_sortable'
       start: (event, ui) =>
         first_position = $('#ranking li:first').data('position')
@@ -22,4 +20,4 @@ Volontariat.RankingItemsCollectionView = Ember.View.extend
           if $(element).data('id') == $(source_item).data('id')
             $.post '/api/v1/user_ranking_items/' + $(element).data('id') + '/move', { _method: 'put', position: Volontariat.current_position }
           
-          Volontariat.current_position += 1
+          Volontariat.current_position += 1    

data/app/assets/javascripts/voluntary_ranking/controllers/arguments/new_controller.js.coffee

@@ -5,9 +5,16 @@ Volontariat.ArgumentsNewController = Ember.Controller.extend
     
     create: ->
       # TODO: replace manual ajax logic by createRecord usage if the thingId can be passed
-      #argument = @store.createRecord('argument', topicName: @get('topicName'), thingId: $('#thing_id').val(), value: @get('value'))
+      #argument = @store.createRecord('argument', topicName: @get('topicName'), argumentableType: 'Thing', argumentableId: $('#thing_id').val(), value: @get('value'))
       #argument.save()
-      $.post('/api/v1/arguments', { argument: { topic_name: @get('topicName'), thing_name: $('#thing_name').val(), value: @get('value') } }).success =>
+      $.post(
+        '/api/v1/arguments', { 
+          argument: { 
+            topic_name: @get('topicName'), argumentable_type: 'Thing', argumentable_name: $('#thing_name').val(), 
+            value: @get('value') 
+          } 
+        }
+      ).success =>
         @send "closeModal"
         @transitionToRoute('no_data')
         @transitionToRoute('arguments.index', $('#thing_name').val(), 1)

data/app/assets/javascripts/voluntary_ranking/controllers/thing_controller.js.coffee

@@ -6,5 +6,34 @@ Volontariat.ThingController = Ember.Controller.extend
     compare: ->
       @transitionToRoute('compare_things', @get('name'), @get('otherThingName'))
     
+    addToComparisonList: ->
+      list = []
+      
+      unless Cookies.get('thingComparisonList') == undefined
+        list = Cookies.getJSON 'thingComparisonList'
+        
+        if list.length == 4
+          alert Volontariat.t('things.show.limit_of_comparison_list')
+          
+          return false
+          
+      list.push @get('thingId')
+
+      Cookies.set 'thingComparisonList', list, expires: 7
+      @controllerFor('thing').set 'thingComparisonListCount', list.length
+      @set 'onComparisonList', true
+        
+    removeFromComparisonList: ->
+      list = jQuery.grep(Cookies.getJSON('thingComparisonList'), (id) =>
+        id != @get('thingId')
+      )
+      
+      Cookies.set 'thingComparisonList', list, expires: 7
+      @controllerFor('thing').set 'thingComparisonListCount', list.length
+      @set 'onComparisonList', false
+      
+    goToComparisonList: ->
+      @transitionToRoute 'things_comparison_matrix'  
+      
     close: ->
       @send "closeModal"

data/app/assets/javascripts/voluntary_ranking/helpers/stars_html_helper.js.coffee

@@ -1,4 +1,5 @@
-Ember.Handlebars.helper 'stars-html', (value, options) ->
+Volontariat.StarsHtmlHelper = Ember.Helper.helper((params) ->
+  value = params[0]
   text = ''
   
   if value == 5
@@ -26,4 +27,5 @@ Ember.Handlebars.helper 'stars-html', (value, options) ->
   else
     text += '<span></span>'   
     
-  new (Ember.Handlebars.SafeString)(text)
+  new (Ember.Handlebars.SafeString)(text)
+)

data/app/assets/javascripts/voluntary_ranking/mixins/pagination_controller.js.coffee

@@ -11,7 +11,12 @@ Volontariat.PaginationController = Em.Mixin.create
   _goToPage: (page) ->
     page = parseInt(page)
     @set('page', page)
-    @set('totalPages', (@get('metadata') || @store.metadataFor(@get('paginationResource'))).pagination.total_pages)
+    
+    if @get('metadata')
+      @set 'totalPages', @get('metadata').pagination.total_pages
+    else
+      @set 'totalPages', 1
+
     pages = []; i = page - 4
     
     while i <= page

data/app/assets/javascripts/voluntary_ranking/models/ranking_item.js.coffee

@@ -1,6 +1,6 @@
 Volontariat.RankingItem = DS.Model.extend
   ranking: DS.belongsTo('ranking')
-  thing: DS.belongsTo('thing', { polymorphic: true })
+  thing: DS.belongsTo('thing')
   thingId: DS.attr('number')
   thingName: DS.attr('string')
   position: DS.attr('number')

data/app/assets/javascripts/voluntary_ranking/router.js.coffee

@@ -24,7 +24,6 @@ Volontariat.Router.map ->
   @resource 'compare_things', path: '/things/:left_thing_name/vs/:right_thing_name', ->
     @route 'arguments', path: ':side/arguments/page/:page'
   
-  @resource 'ranking_item', path: '/things/:thing_name/is_one_of_the/:adjective/:topic/:scope/page/:page'
-        
-  # This route will be used to reload the current route by going to this route and then back to the current route
-  @route 'no_data'
+  @route 'things_comparison_matrix'
+  
+  @resource 'ranking_item', path: '/things/:thing_name/is_one_of_the/:adjective/:topic/:scope/page/:page'

data/app/assets/javascripts/voluntary_ranking/routes/arguments/index_route.js.coffee

@@ -1,9 +1,13 @@
 Volontariat.ArgumentsIndexRoute = Ember.Route.extend
   model: (params) ->
     @controllerFor('arguments.index').set 'page', parseInt(params.page)
-    @controllerFor('arguments.index').set 'thingName', @modelFor('thing')._internalModel._data.name
+    #@controllerFor('arguments.index').set 'thingName', @modelFor('thing')._internalModel._data.name
+    #@controllerFor('arguments.index').set 'thingName', @modelFor('thing').name
+    @controllerFor('arguments.index').set 'thingName', window.location.hash.split('/')[2]
     
-    @store.query 'argument', thing_id: @modelFor('thing').id, page: params.page
+    @store.query('argument', argumentable_type: 'Thing', argumentable_id: @modelFor('thing').id, page: params.page).then (result) =>
+      @controllerFor('arguments.index').set 'metadata', result.get('meta')
+      result
   
   setupController: (controller, model) ->
     controller.send('goToPageWithoutRedirect', controller.get('page'))

data/app/assets/javascripts/voluntary_ranking/routes/compare_things/arguments_route.js.coffee

@@ -4,7 +4,7 @@ Volontariat.CompareThingsArgumentsRoute = Ember.Route.extend
     @controllerFor('compare_things.arguments').set 'rightThingName', @modelFor('compare_things').rightThingName
     @controllerFor('compare_things.arguments').set 'page', parseInt(params.page)
     
-    Ember.$.getJSON("/api/v1/things/#{@modelFor('compare_things').leftThingName}/vs/#{@modelFor('compare_things').rightThingName}/arguments.json?page=#{params.page}&side=#{params.side}").then (json) =>
+    Ember.$.getJSON("/api/v1/things/#{@modelFor('compare_things').leftThingName}/vs/#{@modelFor('compare_things').rightThingName}/arguments.json?argumentable_type=Thing&page=#{params.page}&side=#{params.side}").then (json) =>
       @controllerFor('compare_things.arguments').set('metadata', json.meta)  
       json.arguments
       

data/app/assets/javascripts/voluntary_ranking/routes/profile/rankings_route.js.coffee

@@ -17,7 +17,9 @@ Volontariat.ProfileRankingsRoute = Ember.Route.extend
         user_id: Volontariat.User.current().id, adjective: params.adjective, 
         negative_adjective: params.negative_adjective, topic: params.topic, 
         scope: params.scope, page: params.page
-      )
+      ).then (result) =>
+        @controllerFor('profile.rankings').set 'metadata', result.get('meta')
+        result
     
   setupController: (controller, model) ->
     unless Volontariat.User.current() == undefined

data/app/assets/javascripts/voluntary_ranking/routes/rankings/index_route.js.coffee

@@ -3,7 +3,9 @@ Volontariat.RankingsIndexRoute = Ember.Route.extend
     @controllerFor('rankings.index').set 'page', parseInt(params.page)
     @controllerFor('rankings.index').set 'thingName', @modelFor('thing').get('name')
     
-    @store.query 'ranking', thing_id: @modelFor('thing').id, page: params.page
+    @store.query('ranking', thing_id: @modelFor('thing').id, page: params.page).then (result) =>
+      @controllerFor('rankings.index').set 'metadata', result.get('meta')
+      result
     
   setupController: (controller, model) ->
     controller.send('goToPageWithoutRedirect', controller.get('page'))

data/app/assets/javascripts/voluntary_ranking/routes/rankings/show_route.js.coffee

@@ -12,7 +12,9 @@ Volontariat.RankingsShowRoute = Ember.Route.extend
       'ranking_item',
       adjective: params.adjective, negative_adjective: params.negative_adjective, topic: params.topic, 
       scope: params.scope, page: params.page
-    )
+    ).then (result) =>
+      @controllerFor('rankings.show').set 'metadata', result.get('meta')
+      result
     
   setupController: (controller, model) ->
     controller.send('goToPageWithoutRedirect', controller.get('page'))

data/app/assets/javascripts/voluntary_ranking/routes/thing_route.js.coffee

@@ -4,4 +4,16 @@ Volontariat.ThingRoute = Ember.Route.extend
       @transitionTo('rankings.index', params.name, 1)
     
     @controllerFor('thing').set 'name', params.name
-    @store.find('thing', params.name)
+    
+    thingIds = []
+    
+    if Cookies.get('thingComparisonList') == undefined
+      @controllerFor('thing').set 'thingComparisonListCount', 0
+    else
+      thingIds = Cookies.getJSON('thingComparisonList')
+      @controllerFor('thing').set 'thingComparisonListCount', thingIds.length
+      
+    @store.find('thing', params.name).then (thing) =>
+      @controllerFor('thing').set 'thingId', thing.id
+      @controllerFor('thing').set 'onComparisonList', jQuery.inArray(thing.id, thingIds) > -1
+      thing

data/app/assets/javascripts/voluntary_ranking/routes/things_comparison_matrix_route.js.coffee

@@ -0,0 +1,11 @@
+Volontariat.ThingsComparisonMatrixRoute = Ember.Route.extend
+  model: (params) ->
+    if Cookies.get('thingComparisonList') == undefined
+      []
+    else
+      argumentables = []
+      
+      $.each Cookies.getJSON('thingComparisonList'), (index, value) ->
+        argumentables.push { type: 'Thing', id: value } 
+      
+      Ember.$.getJSON("/api/v1/arguments/matrix", argumentables: argumentables)

data/app/assets/javascripts/voluntary_ranking/templates/arguments/new.js.handlebars

@@ -1,3 +1,4 @@
+{{#new-argument}}{{/new-argument}}
 {{#modal-dialog action="close"}}
   <form class="form-inline" id="new_argument_form">
 	  <div class="modal-header">
@@ -14,4 +15,4 @@
 	    <button class="save_argument_button" {{action 'create'}}>Submit</button>
 		</div>
   </form>
-{{/modal-dialog}}
+{{/modal-dialog}}

data/app/assets/javascripts/voluntary_ranking/templates/ranking_items/_collection.js.handlebars

@@ -2,18 +2,18 @@
 <table class="table" style="margin-bottom: 0px">
   <thead>
     <tr>
-  {{#if controller.yourRanking}}
+  {{#if yourRanking}}
       <th width="2%"></th>
   {{/if}}
       <th width="5%" style="vertical-align:top;">Position</th>  
-  {{#if controller.yourRanking}}           
+  {{#if yourRanking}}           
       <th width="5%" style="vertical-align:top; text-align:center;">Move</th>
       <th width="70%" style="vertical-align:top;">Name</th>
   {{else}}
       <th width="80%" style="vertical-align:top;">Name</th>
   {{/if}}
       <th width="15%" style="vertical-align:top; text-align:center;">Stars</th>
-  {{#if controller.yourRanking}}  
+  {{#if yourRanking}}  
       <th width="5%"></th>
   {{/if}}
     </tr>
@@ -26,7 +26,7 @@
     <li class="ranking_item_{{unbound rankingItem.id}}" data-id="{{unbound rankingItem.id}}" data-position="{{unbound rankingItem.position}}">
       <table class="table">
         <tr>
-    {{#if controller.yourRanking}}
+    {{#if yourRanking}}
           <td width="2%" style="text-align:center">
             <span class="ranking_item_sortable glyphicon glyphicon-move"></span>
           </td>
@@ -36,7 +36,7 @@
               {{rankingItem.position}}
             {{/link-to}}
           </td>        
-    {{#if controller.yourRanking}} 
+    {{#if yourRanking}} 
           <td class="list-element-striped" width="5%" style="text-align:center">
             <a {{action 'moveToPreviousPage' rankingItem.id}} title="move to previous page"><span class="glyphicon glyphicon-chevron-left"></span></a> 
             <a {{action 'moveToNextPage' rankingItem.id}} title="move to next page"><span class="glyphicon glyphicon-chevron-right"></span></a>
@@ -51,7 +51,7 @@
     {{/if}}
           <td class="list-element-striped" width="15%" style="text-align:center;">
             <div class="stars" style="white-space:nowrap;">
-    {{#if controller.yourRanking}}         
+    {{#if yourRanking}}         
               <span class="5stars {{if rankingItem.is5StarClass 'active'}}" {{action 'updateStars' rankingItem.id rankingItem.stars 5}}></span>
               <span class="4stars {{if rankingItem.is4StarClass 'active'}}" {{action 'updateStars' rankingItem.id rankingItem.stars 4}}></span>
               <span class="3stars {{if rankingItem.is3StarClass 'active'}}" {{action 'updateStars' rankingItem.id rankingItem.stars 3}}></span>
@@ -66,7 +66,7 @@
     {{/if}}        
             </div>
           </td>
-    {{#if controller.yourRanking}}       
+    {{#if yourRanking}}       
           <td width="3%" style="text-align:center;">
             <span class="glyphicon glyphicon-remove" {{action 'destroy' rankingItem.id}}></span> 
           </td>

data/app/assets/javascripts/voluntary_ranking/templates/shared/_pagination.js.handlebars

@@ -1,23 +1,23 @@
 <nav>
   <ul class="pagination">
-  {{#if controller.showFirstPageLink}}
+  {{#if showFirstPageLink}}
 	  <li class="first"><a {{action 'goToPage' 1}}>&laquo; First</a></li>
 	{{/if}}
 	
-	{{#if controller.showPreviousPageLink}}
-  	<li class="prev"><a {{action 'goToPage' controller.previousPage}}>&laquo; Previous</a></li>
+	{{#if showPreviousPageLink}}
+  	<li class="prev"><a {{action 'goToPage' previousPage}}>&laquo; Previous</a></li>
 	{{/if}}
 	
-	{{#each controller.pages as |currentPage|}}
+	{{#each pages as |currentPage|}}
 	  <li class="{{if currentPage.isCurrent 'active'}}"><a href="#" {{action 'goToPage' currentPage.number}}>{{currentPage.number}}</a></li>
 	{{/each}}
 	
-	{{#if controller.showNextPageLink}}
-  	<li class="next_page"><a {{action 'goToPage' controller.nextPage}}>Next &raquo;</a></li>
+	{{#if showNextPageLink}}
+  	<li class="next_page"><a {{action 'goToPage' nextPage}}>Next &raquo;</a></li>
 	{{/if}}
 	
-	{{#if controller.showLastPageLink}}
-  	<li class="last next"><a {{action 'goToPage' controller.totalPages}}>Last &raquo;</a></li>
+	{{#if showLastPageLink}}
+  	<li class="last next"><a {{action 'goToPage' totalPages}}>Last &raquo;</a></li>
 	{{/if}}
 	</ul>
 </nav>

data/app/assets/javascripts/voluntary_ranking/templates/thing.js.handlebars

@@ -1,8 +1,16 @@
 <h1>
-{{name}} 
+{{model.name}} 
 vs. 
 {{input type="text" value=otherThingName placeholder="Other thing" data-autocomplete="/api/v1/things/autocomplete"}}
-<button class="compare_button" {{action 'compare'}}>Compare</button>
+<button class="btn btn-default compare_button" {{action 'compare'}}>Compare</button>
+{{#if onComparisonList}}
+<button class="btn btn-default" {{action 'removeFromComparisonList' model.name}}>{{t 'things.show.remove_from_comparison_list'}}</button>
+{{else}}
+<button class="btn btn-default" {{action 'addToComparisonList' model.name}}>{{t 'things.show.add_to_comparison_list'}}</button>
+{{/if}}
+<a {{action 'goToComparisonList'}} style="font-size:14px;">
+  {{t 'things.show.comparison_list'}} ({{thingComparisonListCount}})
+</a>
 </h1>
 
 <ul class="nav nav-pills">

data/app/assets/javascripts/voluntary_ranking/templates/things_comparison_matrix.js.handlebars

@@ -0,0 +1,22 @@
+<h1>{{t 'arguments.matrix.title' }}</h1>
+
+<table class="table table-striped">
+  <thead>
+    <tr>
+      <th></th>
+{{#each model.argumentables as |argumentable|}}      
+      <th>{{#link-to 'thing' argumentable.name}}{{argumentable.name}}{{/link-to}}</th>
+{{/each}}
+    </tr>
+  </thead>
+  <tbody>
+{{#each model.matrix as |argument|}}  
+    <tr>
+      <td>{{argument.topic_name}}</td>
+  {{#each argument.values as |value|}}
+      <td>{{value}}</td>
+  {{/each}}  
+    </tr>
+{{/each}}
+  </tbody>
+</table>

data/app/assets/javascripts/voluntary_ranking/templates/user/rankings/details.js.handlebars

@@ -4,4 +4,8 @@
   {{partial 'ranking_items/form'}}
 {{/if}}
 
-{{view 'ranking_items_collection'}}
+{{partial 'ranking_items/collection'}}
+
+{{#if yourRanking}}
+  {{#ranking-items-collection}}{{/ranking-items-collection}}
+{{/if}}

data/app/controllers/api/v1/rankings_controller.rb

@@ -9,7 +9,7 @@ class Api::V1::RankingsController < ActionController::Base
     rankings = Ranking
     rankings = Ranking.for_user(params[:user_name]) if params[:user_name].present?
     rankings = Ranking.for_thing(params[:thing_id]) if params[:thing_id].present?
-    options[:json] = rankings.paginate page: params[:page], per_page: 1, count: { group: 'rankings.id' }
+    options[:json] = rankings.paginate page: params[:page], per_page: 10, count: { group: 'rankings.id' }
     
     options[:meta] = { 
       pagination: {

data/app/controllers/api/v1/things_controller.rb

@@ -15,7 +15,7 @@ class Api::V1::ThingsController < ActionController::Base
   
   def autocomplete
     render json: (
-      Thing.order(:name).where("name LIKE ?", "%#{params[:term]}%").
+      Thing.order(:name).where("LOWER(name) LIKE ?", "%#{params[:term].downcase}%").
       map{|t| { id: t.id, value: t.name }}
     ), root: false
   end

data/app/models/ranking.rb

@@ -65,7 +65,7 @@ class Ranking < ActiveRecord::Base
     end
     
     Ranking.select("DISTINCT(#{attribute})").order(attribute).limit(10).
-    where("#{attribute} LIKE ?", "%#{term.strip}%").map(&attribute.to_sym).map{|v| { value: v }}
+    where("LOWER(#{attribute}) LIKE ?", "%#{term.strip.downcase}%").map(&attribute.to_sym).map{|v| { value: v }}
   end
   
   private

data/app/models/user_ranking_item.rb

@@ -25,7 +25,11 @@ class UserRankingItem < ActiveRecord::Base
     ranking_items = ranking_items.where('id <> ?', user_ranking_item_id) if user_ranking_item_id.present?
     
     if stars.to_i >= 3
-      ranking_items.order('stars ASC, position DESC').where('stars >= ?', stars).first.try(:position).to_i + 1 || 1
+      position = ranking_items.order('stars ASC, position DESC').where('stars >= ?', stars).first.try(:position).to_i + 1 || 1
+      
+      position -= 1 if user_ranking_item_id.present? && position > ranking_items_count
+      
+      position
     else
       item = ranking_items.order('stars DESC, position ASC').where('stars <= ?', stars).first
       

data/config/routes.rb

@@ -3,15 +3,6 @@ Rails.application.routes.draw do
   
   namespace :api, defaults: {format: 'json'} do
     scope module: :v1, path: 'v1' do
-      # TODO: remove manual routing when get rid of this resource using root UsersController
-      resources :argument_topics, only: [] do
-        collection do
-          get :autocomplete
-        end  
-      end
-      
-      resources :arguments
-      
       resources :rankings
       
       get '/rankings/attributes/:attribute/autocomplete', to: 'rankings#autocomplete_attribute'
@@ -25,7 +16,6 @@ Rails.application.routes.draw do
         end  
       end
       
-      get '/things/:left_thing_name/vs/:right_thing_name/arguments', to: 'things/arguments#comparison'
       get '/things/:thing_name/is_one_of_the/:adjective/:topic/:scope', to: 'ranking_items#show'
       
       resources :user_ranking_items do
@@ -34,8 +24,6 @@ Rails.application.routes.draw do
           put :move
         end
       end
-      
-      resources :users
     end
   end
 end

data/lib/voluntary_ranking/version.rb

@@ -1,3 +1,3 @@
 module VoluntaryRanking
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,43 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: voluntary_ranking
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Mathias Gawlista
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-17 00:00:00.000000000 Z
+date: 2015-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: voluntary
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.2
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.2
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: voluntary-ember_js
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: letter_opener
   requirement: !ruby/object:Gem::Requirement
@@ -290,7 +302,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.9
-description: 'Ranking plugin for #crowdsourcing gem voluntary: http://bit.ly/vr-0-0-1'
+description: 'Ranking plugin for #crowdsourcing gem voluntary: http://bit.ly/vr-0-1-0'
 email:
 - gawlista@gmail.com
 executables: []
@@ -302,8 +314,8 @@ files:
 - Rakefile
 - app/assets/javascripts/voluntary_ranking/app.js
 - app/assets/javascripts/voluntary_ranking/application.js
-- app/assets/javascripts/voluntary_ranking/base.js.coffee
-- app/assets/javascripts/voluntary_ranking/components/modal_dialog_component.js.coffee
+- app/assets/javascripts/voluntary_ranking/components/new_argument_component.js.coffee
+- app/assets/javascripts/voluntary_ranking/components/ranking_items_collection_component.js.coffee
 - app/assets/javascripts/voluntary_ranking/controllers/arguments/index_controller.js.coffee
 - app/assets/javascripts/voluntary_ranking/controllers/arguments/new_controller.js.coffee
 - app/assets/javascripts/voluntary_ranking/controllers/compare_things/arguments_controller.js.coffee
@@ -318,13 +330,9 @@ files:
 - app/assets/javascripts/voluntary_ranking/controllers/user/rankings/show_controller.js.coffee
 - app/assets/javascripts/voluntary_ranking/controllers/user_controller.js.coffee
 - app/assets/javascripts/voluntary_ranking/controllers/user_ranking_controller.js.coffee
-- app/assets/javascripts/voluntary_ranking/helpers/name_with_apostrophe_helper.js.coffee
 - app/assets/javascripts/voluntary_ranking/helpers/stars_html_helper.js.coffee
-- app/assets/javascripts/voluntary_ranking/mixins/has_current_user.js.coffee
 - app/assets/javascripts/voluntary_ranking/mixins/pagination_controller.js.coffee
 - app/assets/javascripts/voluntary_ranking/mixins/ranking_controller.js.coffee
-- app/assets/javascripts/voluntary_ranking/mixins/singleton.js.coffee
-- app/assets/javascripts/voluntary_ranking/models/argument.js.coffee
 - app/assets/javascripts/voluntary_ranking/models/movie.js.coffee
 - app/assets/javascripts/voluntary_ranking/models/ranking.js.coffee
 - app/assets/javascripts/voluntary_ranking/models/ranking_item.js.coffee
@@ -340,6 +348,7 @@ files:
 - app/assets/javascripts/voluntary_ranking/routes/rankings/index_route.js.coffee
 - app/assets/javascripts/voluntary_ranking/routes/rankings/show_route.js.coffee
 - app/assets/javascripts/voluntary_ranking/routes/thing_route.js.coffee
+- app/assets/javascripts/voluntary_ranking/routes/things_comparison_matrix_route.js.coffee
 - app/assets/javascripts/voluntary_ranking/routes/user_ranking_route.js.coffee
 - app/assets/javascripts/voluntary_ranking/routes/user_route.js.coffee
 - app/assets/javascripts/voluntary_ranking/templates/application.handlebars.erb
@@ -348,7 +357,6 @@ files:
 - app/assets/javascripts/voluntary_ranking/templates/arguments/new.js.handlebars
 - app/assets/javascripts/voluntary_ranking/templates/compare_things.js.handlebars
 - app/assets/javascripts/voluntary_ranking/templates/compare_things/arguments.js.handlebars
-- app/assets/javascripts/voluntary_ranking/templates/components/modal-dialog.js.handlebars
 - app/assets/javascripts/voluntary_ranking/templates/components/rankings-component.handlebars
 - app/assets/javascripts/voluntary_ranking/templates/index.js.handlebars
 - app/assets/javascripts/voluntary_ranking/templates/navigation.js.handlebars
@@ -364,34 +372,24 @@ files:
 - app/assets/javascripts/voluntary_ranking/templates/thing/index.js.handlebars
 - app/assets/javascripts/voluntary_ranking/templates/things/show.arguments.js.handlebars
 - app/assets/javascripts/voluntary_ranking/templates/things/show.js.handlebars
+- app/assets/javascripts/voluntary_ranking/templates/things_comparison_matrix.js.handlebars
 - app/assets/javascripts/voluntary_ranking/templates/user.js.handlebars
 - app/assets/javascripts/voluntary_ranking/templates/user/rankings/details.js.handlebars
-- app/assets/javascripts/voluntary_ranking/views/application/index_view.js.coffee
-- app/assets/javascripts/voluntary_ranking/views/arguments/new_view.js.coffee
-- app/assets/javascripts/voluntary_ranking/views/index_view.js.coffee
-- app/assets/javascripts/voluntary_ranking/views/ranking_items/colllection_view.js.coffee
-- app/assets/javascripts/voluntary_ranking/views/shared/pagination.js
 - app/assets/stylesheets/voluntary_ranking/application.css
 - app/assets/stylesheets/voluntary_ranking/base.css.sass
 - app/assets/stylesheets/voluntary_ranking/bootstrap_and_overrides.css.sass
 - app/assets/stylesheets/voluntary_ranking/stars.css.sass
 - app/assets/stylesheets/voluntary_ranking/twitter-typeahead.css.sass
-- app/controllers/api/v1/argument_topics_controller.rb
-- app/controllers/api/v1/arguments_controller.rb
 - app/controllers/api/v1/ranking_items_controller.rb
 - app/controllers/api/v1/rankings_controller.rb
-- app/controllers/api/v1/things/arguments_controller.rb
 - app/controllers/api/v1/things_controller.rb
 - app/controllers/api/v1/user_ranking_items_controller.rb
 - app/controllers/api/v1/users_controller.rb
 - app/controllers/product/ranking_controller.rb
-- app/models/argument.rb
-- app/models/argument_topic.rb
 - app/models/product/ranking.rb
 - app/models/ranking.rb
 - app/models/ranking_item.rb
 - app/models/user_ranking_item.rb
-- app/serializers/argument_serializer.rb
 - app/serializers/base_ranking_item_serializer.rb
 - app/serializers/ranking_item_serializer.rb
 - app/serializers/user_ranking_item_serializer.rb

data/app/assets/javascripts/voluntary_ranking/base.js.coffee

@@ -1,3 +0,0 @@
-Ember.TextField.reopen attributeBindings: [
-  'data-autocomplete', 'data-append-autocomplete', 'data-append-to'
-]

data/app/assets/javascripts/voluntary_ranking/components/modal_dialog_component.js.coffee

@@ -1,6 +0,0 @@
-Volontariat.ModalDialogComponent = Ember.Component.extend(
-  actions:
-    
-    close: ->
-      @sendAction()
-)

data/app/assets/javascripts/voluntary_ranking/helpers/name_with_apostrophe_helper.js.coffee

@@ -1,5 +0,0 @@
-Ember.Handlebars.helper 'name-with-apostrophe', (name, options) ->
-  if name[name.length - 1].toLowerCase() == 's'
-    "#{name}'"
-  else
-    "#{name}'s"

data/app/assets/javascripts/voluntary_ranking/mixins/has_current_user.js.coffee

@@ -1,4 +0,0 @@
-Volontariat.HasCurrentUser = Em.Mixin.create
-  currentUser: (->
-    Volontariat.User.current()
-  ).property().volatile()

data/app/assets/javascripts/voluntary_ranking/mixins/singleton.js.coffee

@@ -1,17 +0,0 @@
-Volontariat.Singleton = Em.Mixin.create(
-  current: ->
-    @_current = @createCurrent()  unless @_current
-    @_current
-
-  createCurrent: ->
-    @create {}
-
-  currentProp: (property, value) ->
-    instance = @current()
-    return  unless instance
-    if typeof (value) isnt "undefined"
-      instance.set property, value
-      value
-    else
-      instance.get property
-)

data/app/assets/javascripts/voluntary_ranking/models/argument.js.coffee

@@ -1,7 +0,0 @@
-Volontariat.Argument = DS.Model.extend
-  #topic: DS.belongsTo('topic')
-  topicId: DS.attr('number')
-  topicName: DS.attr('string')
-  thing: DS.belongsTo('thing')
-  thingId: DS.attr('number')
-  value: DS.attr('string')

data/app/assets/javascripts/voluntary_ranking/templates/components/modal-dialog.js.handlebars

@@ -1,9 +0,0 @@
-<div id="modal" class="modal hide fade">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-body">
-        {{yield}}
-      </div>
-    </div>
-  </div>
-</div>

data/app/assets/javascripts/voluntary_ranking/views/application/index_view.js.coffee

@@ -1 +0,0 @@
-Volontariat.ApplicationIndexView = Ember.View.extend()

data/app/assets/javascripts/voluntary_ranking/views/index_view.js.coffee

@@ -1 +0,0 @@
-Volontariat.IndexView = Ember.View.extend()

data/app/assets/javascripts/voluntary_ranking/views/shared/pagination.js

@@ -1,4 +0,0 @@
-Volontariat.SharedPaginationView = Ember.View.extend({
-  templateName: 'voluntary_ranking/templates/shared/pagination',
-  pages: ['1']
-});

data/app/controllers/api/v1/argument_topics_controller.rb

@@ -1,12 +0,0 @@
-class Api::V1::ArgumentTopicsController < ActionController::Base
-  include Voluntary::V1::BaseController
- 
-  respond_to :json
-  
-  def autocomplete
-    render json: (
-      ArgumentTopic.order(:name).where("name LIKE ?", "%#{params[:term]}%").
-      map{|t| { id: t.id, value: t.name }}
-    ), root: false
-  end
-end

data/app/controllers/api/v1/arguments_controller.rb

@@ -1,32 +0,0 @@
-class Api::V1::ArgumentsController < ActionController::Base
-  include Voluntary::V1::BaseController
- 
-  respond_to :json
-  
-  def index
-    options = {}
-  
-    arguments = Argument
-    arguments = Argument.where(thing_id: params[:thing_id]) if params[:thing_id].present?
-    options[:json] = arguments.paginate(page: params[:page], per_page: 10)
-    
-    options[:meta] = { 
-      pagination: {
-        total_pages: options[:json].total_pages, current_page: options[:json].current_page,
-        previous_page: options[:json].previous_page, next_page: options[:json].next_page
-      }
-    }
-    
-    respond_with do |format|
-      format.json { render options }
-    end
-  end
-  
-  def create
-    raise CanCan::AccessDenied if current_user.blank?
-    
-    respond_to do |format|
-      format.json { render json: Argument.create_with_topic(params[:argument]) }
-    end
-  end
-end

data/app/controllers/api/v1/things/arguments_controller.rb

@@ -1,40 +0,0 @@
-class Api::V1::Things::ArgumentsController < ActionController::Base
-  include Voluntary::V1::BaseController
- 
-  respond_to :json
-  
-  def comparison
-    options = {}
-  
-    arguments = Argument.compare_two_things(params[:side], params[:left_thing_name], params[:right_thing_name]).
-                paginate(page: params[:page], per_page: 10)
-    
-    options[:json] = arguments.map do |argument_comparison|
-      hash = { 
-        left: { id: argument_comparison.id, value: argument_comparison.value },
-        right: { id: argument_comparison.right_id, value: argument_comparison.right_value },
-        topic: { id: argument_comparison.topic_id, name: argument_comparison.topic_name }
-      }
-      
-      if params[:side] == 'right'
-        left = hash[:left].clone
-        right = hash[:right].clone
-        hash[:left] = right
-        hash[:right] = left
-      end
-      
-      hash
-    end
-    
-    options[:meta] = { 
-      pagination: {
-        total_pages: arguments.total_pages, current_page: arguments.current_page,
-        previous_page: arguments.previous_page, next_page: arguments.next_page
-      }
-    }
-    
-    respond_with do |format|
-      format.json { render options }
-    end
-  end
-end

data/app/models/argument.rb

@@ -1,48 +0,0 @@
-class Argument < ActiveRecord::Base
-  belongs_to :topic, class_name: 'ArgumentTopic'
-  belongs_to :thing
-  
-  scope :compare_two_things, ->(side, left_thing_name, right_thing_name) do
-    left_thing_name, right_thing_name = right_thing_name, left_thing_name if side == 'right'
-      
-    left_thing = Thing.where('LOWER(name) = ?', left_thing_name.downcase).first
-    right_thing = Thing.where('LOWER(name) = ?', right_thing_name.downcase).first
-    
-    scope = joins(:topic).select('arguments.id, arguments.value, arguments.topic_id, argument_topics.name AS topic_name, arguments2.id AS right_id, arguments2.value AS right_value').
-    joins("#{side == 'both' ? 'INNER' : 'LEFT'} JOIN arguments arguments2 ON arguments2.thing_id = #{sanitize(right_thing.id)} AND arguments2.topic_id = arguments.topic_id")
-    scope = scope.where('arguments2.id IS NULL') unless side == 'both'
-    scope.where('arguments.thing_id = ?', left_thing.id)
-  end
-  
-  validates :topic_id, presence: true
-  validates :thing_id, presence: true, uniqueness: { scope: :topic_id }
-  validates :value, presence: true
-  
-  attr_accessible :topic_id, :thing_id, :value
-  
-  def self.create_with_topic(attributes)
-    topic = ArgumentTopic.where('LOWER(name) = ?', attributes[:topic_name].to_s.strip.downcase).first
-    
-    unless topic
-      topic = ArgumentTopic.create(name: attributes[:topic_name].to_s.strip)
-    end
-    
-    if topic.valid?
-      thing_id = if attributes[:thing_name].present?
-        Thing.where('LOWER(name) = ?', attributes[:thing_name].downcase).first.id
-      else
-        Thing.where(id: attributes[:thing_id]).first.try(:id)
-      end
-      
-      argument = Argument.create(topic_id: topic.id, thing_id: thing_id, value: attributes[:value])
-      
-      if argument.valid?
-        argument
-      else
-        { errors: argument.errors.to_hash }
-      end
-    else
-      { errors: { topic: topic.errors.to_hash } }
-    end
-  end
-end

data/app/models/argument_topic.rb

@@ -1,7 +0,0 @@
-class ArgumentTopic < ActiveRecord::Base
-  has_many :arguments
-  
-  validates :name, presence: true, uniqueness: { case_sensitive: false }
-  
-  attr_accessible :name, :text
-end

data/app/serializers/argument_serializer.rb

@@ -1,11 +0,0 @@
-class ArgumentSerializer < ActiveModel::Serializer
-  attributes :id, :topic_id, :topic_name, :thing_id, :thing_name, :value
-
-  def thing_name
-    object.thing.try(:name)
-  end
-  
-  def topic_name
-    object.topic.try(:name)
-  end
-end