voluntary 0.5.0 → 0.5.1

data/app/assets/stylesheets/voluntary/bootstrap_and_overrides.css.sass

@@ -14,4 +14,4 @@
   overflow-y: auto
   
 #bootstrap_modal
-  width: 800px !important
+  width: 900px !important

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

@@ -0,0 +1,18 @@
+module Voluntary
+  module Api
+    module V1
+      class 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.truncate(50) }}
+          ), root: false
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,76 @@
+module Voluntary
+  module Api
+    module V1
+      class ArgumentsController < ActionController::Base
+        include Voluntary::V1::BaseController
+       
+        respond_to :json
+        
+        def index
+          options = {}
+        
+          arguments = Argument
+          arguments = Argument.where(
+            argumentable_type: params[:argumentable_type], argumentable_id: params[:argumentable_id]
+          ) if params[:argumentable_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(current_user.id, params[:argument]) }
+          end
+        end
+        
+        def update
+          resource = current_user.arguments.where('arguments.id = ?', params[:id]).first
+          errors = {}
+          
+          if resource.nil?
+            errors[:base] = I18n.t('activerecord.errors.models.general.attributes.base.user_resource_not_found')
+          else
+            topic = ArgumentTopic.find_or_create_by_name params[:argument][:topic_name]
+            params[:argument][:topic_id] = topic.id
+            resource.update_attributes params[:argument]
+            resource.valid?
+            errors = resource.errors.to_hash
+          end
+          
+          respond_to do |format|
+            format.json do
+              render json: errors.empty? ? resource : { errors: errors }
+            end
+          end
+        end
+        
+        def destroy
+          resource = current_user.arguments.find params[:id]
+          resource.destroy
+          
+          respond_to do |format|
+            format.json do
+              render json: if resource.persisted?
+                { error: I18n.t('activerecord.errors.models.argument.attributes.base.deletion_failed') }
+              else
+                {}
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,48 @@
+module Voluntary
+  module Api
+    module V1
+      module Things
+        class ArgumentsController < ActionController::Base
+          include Voluntary::V1::BaseController
+         
+          respond_to :json
+          
+          def comparison
+            options = {}
+          
+            arguments = Argument.compare_two_argumentables(params[:argumentable_type], 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
+      end
+    end
+  end
+end

data/app/controllers/voluntary/api/v1/users_controller.rb

@@ -0,0 +1,9 @@
+class Voluntary::Api::V1::UsersController < ActionController::Base
+  include Voluntary::V1::BaseController
+
+  respond_to :json
+ 
+  def show
+    respond_with User.friendly.find(params[:id])
+  end
+end

data/app/models/argument.rb

@@ -0,0 +1,58 @@
+class Argument < ActiveRecord::Base
+  include Likeable
+   
+  belongs_to :user
+  belongs_to :topic, class_name: 'ArgumentTopic'
+  belongs_to :argumentable, polymorphic: true
+  
+  scope :compare_two_argumentables, ->(argumentable_type, side, left_argumentable_name, right_argumentable_name) do
+    left_argumentable_name, right_argumentable_name = right_argumentable_name, left_argumentable_name if side == 'right'
+      
+    left_argumentable = argumentable_type.constantize.where('LOWER(name) = ?', left_argumentable_name.downcase).first
+    right_argumentable = argumentable_type.constantize.where('LOWER(name) = ?', right_argumentable_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.argumentable_type = #{sanitize(argumentable_type)} AND " +
+      "arguments2.argumentable_id = #{sanitize(right_argumentable.id)} AND arguments2.topic_id = arguments.topic_id"
+    )
+    scope = scope.where('arguments2.id IS NULL') unless side == 'both'
+    scope.where('arguments.argumentable_type = ? AND arguments.argumentable_id = ?', argumentable_type, left_argumentable.id)
+  end
+  
+  validates :topic_id, presence: true
+  validates :argumentable_type, presence: true
+  validates :argumentable_id, presence: true, uniqueness: { scope: [:topic_id, :argumentable_type] }
+ 
+  attr_accessible :topic_id, :argumentable_type, :argumentable_id, :vote, :value
+  
+  attr_accessor :positive
+  
+  def self.create_with_topic(user_id, attributes)
+    topic = ArgumentTopic.find_or_create_by_name attributes[:topic_name]
+    
+    if topic.valid?
+      argumentable_id = if attributes[:argumentable_name].present?
+        attributes[:argumentable_type].constantize.where('LOWER(name) = ?', attributes[:argumentable_name].downcase).first.id
+      else
+        attributes[:argumentable_type].constantize.where(id: attributes[:argumentable_id]).first.try(:id)
+      end
+      
+      argument = Argument.new(
+        topic_id: topic.id, argumentable_type: attributes[:argumentable_type], argumentable_id: argumentable_id, 
+        value: attributes[:value], vote: attributes[:vote]
+      )
+      argument.user_id = user_id
+      argument.save
+      
+      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

@@ -0,0 +1,17 @@
+class ArgumentTopic < ActiveRecord::Base
+  has_many :arguments
+  
+  validates :name, presence: true, uniqueness: { case_sensitive: false }
+  
+  attr_accessible :name, :text
+  
+  def self.find_or_create_by_name(name)
+    resource = where('LOWER(name) = ?', name.to_s.strip.downcase).first
+    
+    if resource
+      resource
+    else
+      resource = create(name: name.to_s.strip)
+    end
+  end
+end

data/app/models/user.rb

@@ -10,6 +10,7 @@ class User < ActiveRecord::Base
   has_and_belongs_to_many :areas
   has_and_belongs_to_many :projects
   
+  has_many :arguments, dependent: :nullify
   has_many :organizations, dependent: :destroy
   def stories; Story.where(offeror_id: id); end
   

data/app/serializers/application_serializer.rb

@@ -0,0 +1,2 @@
+class ApplicationSerializer < ActiveModel::Serializer
+end

data/app/serializers/argument_serializer.rb

@@ -0,0 +1,19 @@
+class ArgumentSerializer < ActiveModel::Serializer
+  attributes :id, :vote, :topic_id, :topic_name, :argumentable_type, :argumentable_id, :argumentable_name, :value, :user_id, :user_name, :user_slug, :positive, :likes_count, :dislikes_count
+
+  def argumentable_name
+    object.argumentable.try(:name)
+  end
+  
+  def topic_name
+    object.topic.try(:name)
+  end
+  
+  def user_name
+    object.user.try(:name)
+  end
+  
+  def user_slug
+    object.user.try(:slug)
+  end
+end

data/app/serializers/basic_user_serializer.rb

@@ -0,0 +1,3 @@
+class BasicUserSerializer < ApplicationSerializer
+  attributes :id, :slug, :name, :email
+end

data/app/serializers/current_user_serializer.rb

@@ -0,0 +1,3 @@
+class CurrentUserSerializer < BasicUserSerializer
+  #attributes :admin?
+end

data/app/serializers/user_serializer.rb

@@ -0,0 +1,2 @@
+class UserSerializer < BasicUserSerializer
+end

data/app/views/layouts/application.html.erb

@@ -9,7 +9,7 @@
   <link href="//netdna.bootstrapcdn.com/font-awesome/3.1.1/css/font-awesome.css" rel="stylesheet"/>
 </head>
 <body>
-  <div id="bootstrap_modal" class="modal hide fade"></div>
+  <div id="bootstrap_modal" class="modal fade"></div>
   
   <section id="dialog">
     <img alt="Ajax-loader-small" class="hide " id="dialog_body_spinner" src="<%=image_path('voluntary/spinner.gif')%>"/>

data/app/views/shared/layouts/twitter_bootstrap/_control_group.html.erb

@@ -1,4 +1,4 @@
-<% id ||= field.match(/id="([^"]*)"/)[1] %>
+<% id ||= field.match(/id="([^"]*)"/)[1] if field.match(/id="([^"]*)"/) %>
 <% required ||= false %>
 <% required_class = required ? 'required' : 'optional' %>
 <div class="form-group string <%= required_class %> <%= id %>">

data/app/views/shared/layouts/twitter_bootstrap/_modal.html.erb

@@ -1,12 +1,16 @@
 <% body ||= nil %>
 <% footer ||= nil %>
-<div class="modal-header">
-  <button type="button" id="close_bootstrap_modal_button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-  <h3><%= title %></h3>
+<div class="modal-dialog">
+  <div class="modal-content">
+    <div class="modal-header">
+      <button type="button" id="close_bootstrap_modal_button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+      <h3><%= title %></h3>
+    </div>
+    <div class="modal-body" style="overflow-y:none;">
+      <%= body || yield(:modal_body) %>
+    </div>
+    <div class="modal-footer">
+      <%= footer || yield(:modal_footer) %>
+    </div>
+  </div>
 </div>
-<div class="modal-body" style="overflow-y:none;">
-  <%= body || yield(:modal_body) %>
-</div>
-<div class="modal-footer">
-  <%= footer || yield(:modal_footer) %>
-</div>

data/config/initializers/active_model_serializer.rb

@@ -0,0 +1,4 @@
+ActiveModel::Serializer.setup do |config|
+  config.embed = :ids
+  config.embed_in_root = true
+end

data/config/locales/general/en.yml

@@ -1,5 +1,17 @@
 en:  
   general:
+    account: Account
+    anonymous: Anonymous
+    authentication: Authentication
+    author: Author
+    cancel: Cancel
+    contra: contra
+    issues: Issues
+    neutral: neutral
+    pro: pro
+    sign_out: Sign out
+    vote: Vote
+    
     index:
       title: Home
     search: Search
@@ -34,7 +46,7 @@ en:
       activate: Activate
     exceptions:
       wrong_recaptcha: The captcha code which you typed in is wrong.
-      access_denied: Access denied
+      access_denied: Access denied!
       not_found: Resource not found.
     notifications:
       event_successful: "%{event} successful."
@@ -82,5 +94,7 @@ en:
       models:
         general:
           attributes:
+            base:
+              user_resource_not_found: Resource not found for your account!
             name:
               reserved_word_included: is a reserved word

data/config/locales/resources/argument/en.yml

@@ -0,0 +1,28 @@
+en:
+  arguments:
+    index:
+      title: Arguments
+    new:
+      title: New Argument
+    save:
+      failed: Something went wrong at saving argument
+      successful: Successfully saved argument.
+    create:
+      title: Create Argument
+    update:
+      title: Update Argument
+    destroy:
+      failed: Removing argument failed!
+      successful: Successfully removed argument.
+    model:
+      publish_create_to_brainstorming: A new argument has been added  
+      publish_update_to_brainstorming: An argument has been updated
+      publish_destroy_to_brainstorming: An argument has been removed     
+      
+  activerecord:
+    errors:
+      models:
+        argument:
+          attributes:
+            base: 
+              deletion_failed: Brainstorming idea argument could not be deleted!

data/config/locales/resources/argument_topic/en.yml

@@ -0,0 +1,9 @@
+en:
+  activerecord:
+    models:
+      argument_topic: Argument Topic
+      argument_topic_short: Topic
+      
+    attributes:
+      argument_topic:
+        value: Value

data/config/locales/resources/like/en.yml

@@ -1,5 +1,11 @@
 en:
   likes:
+    create:
+      like_failed: Liking failed!
+      dislike_failed: Disliking failed!
+    destroy:
+      unlike_failed: Undoing like failed!
+      undo_dislike_failed: Undoing dislike failed!  
     actions:
       like: Like
       dislike: Dislike

data/config/routes/api.rb

@@ -3,5 +3,17 @@ namespace :voluntary, path: 'api', module: 'voluntary/api', defaults: {format: '
     resources :stories, only: [] do
       resources :tasks, only: [:index, :create]
     end
+    
+    resources :argument_topics, only: [] do
+      collection do
+        get :autocomplete
+      end  
+    end
+    
+    resources :arguments
+    
+    get '/things/:left_thing_name/vs/:right_thing_name/arguments', to: 'things/arguments#comparison'
+    
+    resources :users
   end
 end

data/db/migrate/20121006162913_add_public_attribute_to_roles.rb

@@ -1,3 +1,6 @@
+class Role < ActiveRecord::Base
+end
+
 class AddPublicAttributeToRoles < ActiveRecord::Migration
   def up
     add_column :roles, :public, :boolean, default: false

data/db/migrate/20150818151512_create_or_alter_arguments.rb

@@ -0,0 +1,49 @@
+class CreateOrAlterArguments < ActiveRecord::Migration
+  def up
+    if (Product::Ranking rescue nil)
+      add_column :arguments, :argumentable_type, :string
+      add_column :arguments, :argumentable_id, :integer
+      
+      Argument.update_all 'argumentable_type = "Thing", argumentable_id = thing_id'
+      
+      remove_column :arguments, :thing_id
+      add_index :arguments, [:topic_id, :argumentable_id, :argumentable_type], name: 'arguments_index_on_argumentable_topic', unique: true
+      add_index :arguments, [:argumentable_id, :argumentable_type], name: 'arguments_index_on_argumentable'
+    else
+      create_table :argument_topics do |t|
+        t.string :name
+        t.text :text
+        t.timestamps
+      end
+      
+      add_index :argument_topics, :name, unique: true
+      
+      create_table :arguments do |t|
+        t.string :argumentable_type
+        t.integer :argumentable_id
+        t.integer :topic_id
+        t.string :value
+        t.timestamps
+      end
+      
+      add_index :arguments, [:topic_id, :argumentable_id, :argumentable_type], name: 'arguments_index_on_argumentable_topic', unique: true
+      add_index :arguments, [:argumentable_id, :argumentable_type], name: 'arguments_index_on_argumentable'
+    end
+  end
+  
+  def down
+    if (Product::Ranking rescue nil)
+      add_column :arguments, :thing_id, :integer
+      
+      Argument.where(argumentable_type: 'Thing').update_all 'thing_id = argumentable_id'
+      
+      remove_column :arguments, :argumentable_type
+      remove_column :arguments, :argumentable_id
+      
+      add_index :arguments, [:topic_id, :thing_id], unique: true
+    else
+      remove_table :argument_topics
+      remove_table :arguments
+    end
+  end
+end

data/db/migrate/20150821102558_add_vote_column_to_arguments.rb

@@ -0,0 +1,6 @@
+class AddVoteColumnToArguments < ActiveRecord::Migration
+  def change
+    add_column :arguments, :user_id, :integer
+    add_column :arguments, :vote, :boolean
+  end
+end

data/db/migrate/20150823174056_add_likes_count_to_arguments.rb

@@ -0,0 +1,6 @@
+class AddLikesCountToArguments < ActiveRecord::Migration
+  def change
+    add_column :arguments, :likes_count, :integer, default: 0
+    add_column :arguments, :dislikes_count, :integer, default: 0
+  end
+end

data/lib/generators/voluntary/product_dummy/templates/features/step_definitions/session_steps.rb

@@ -8,6 +8,7 @@ When /^I (?:sign|log) in as "([^"]*)"$/ do |name|
   @me = User.find_by_name(name)
   @me.password = 'password'
   automatic_login
+  step %(I should see "Signed in successfully.")
 end
 
 When /^I fill out change password section with my password and "([^"]*)" and "([^"]*)"$/ do |new_pass, confirm_pass|

data/lib/generators/voluntary/product_dummy/templates/features/step_definitions/web_steps.rb

@@ -269,3 +269,7 @@ end
 Then /^show me the page$/ do
   save_and_open_page
 end
+
+Then /^wait (\d+) second(?:s)?$/ do |seconds|
+  sleep(seconds.to_i)
+end

data/lib/generators/voluntary/product_dummy/templates/features/support/env.rb

@@ -22,6 +22,10 @@ require File.join(File.dirname(__FILE__), "integration_sessions_controller")
 # steps to use the XPath syntax.
 Capybara.default_selector = :css
 
+Capybara.register_driver :chrome do |app|
+  Capybara::Selenium::Driver.new(app, browser: :chrome)
+end
+
 Capybara.javascript_driver = ENV['JAVASCRIPT_DRIVER'] ? ENV['JAVASCRIPT_DRIVER'].to_sym : :webkit
 
 Capybara.add_selector(:row) do

data/lib/voluntary/engine.rb

@@ -1,5 +1,6 @@
 module Voluntary
   class Engine < ::Rails::Engine
+    config.autoload_paths << File.expand_path("../../../app/serializers", __FILE__)
     config.autoload_paths << File.expand_path("../../../app/models/concerns", __FILE__)
     config.autoload_paths << File.expand_path("../../../app/controllers/concerns", __FILE__)
     config.autoload_paths << File.expand_path("../..", __FILE__)

data/lib/voluntary/test/rspec_helpers/factories.rb

@@ -4,6 +4,10 @@ module Voluntary
       class Factories
         def self.code
           Proc.new do |factory_girl|
+            factory_girl.factory :argument_topic do
+              sequence(:name) { |n| "topic #{n}#{r_str}" } 
+            end
+            
             factory_girl.factory :user do
               sequence(:name) { |n| "user#{n}#{r_str}" }
               sequence(:email) { |n| "user#{n}#{r_str}@volontari.at" }

data/lib/voluntary/version.rb

@@ -1,3 +1,3 @@
 module Voluntary
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

data/lib/voluntary.rb

@@ -44,7 +44,6 @@ require 'bootstrap-sass-rails'
 require 'bootstrap-datetimepicker-rails'
 require 'jquery-ui-bootstrap-rails-asset'
 require 'auto_html'
-#require 'twitter-bootstrap-rails'
 require 'simple-navigation-bootstrap'
 require 'faraday'
 require 'faraday_middleware'
@@ -60,6 +59,7 @@ require 'selectize-rails'
 require 'bitmask_attributes'
 require 'csv'
 require 'httparty'
+require 'active_model/serializer'
 
 require 'voluntary/navigation'