ratable 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b37b427f57776006d941b8f962e0ac53c332972
-  data.tar.gz: 4784df61824db2de0351693663283bd173713e82
+  metadata.gz: 0b73a6b2a07a0e7148f91bdfa503d6d849e0621e
+  data.tar.gz: 1f5ee31f7d742e84326135d5c4042be6cfe0fc5c
 SHA512:
-  metadata.gz: 0bc3c2714db3e79fba8b448776172340c0717b17fc7bcf59ea5942fab553456f4f5458cc4b16c16eaad6d9cef22de8de09b38c93f3651b6a72ea46dcf5c2fa37
-  data.tar.gz: bc620147f939dbc11733389ea429f6b5f3c9c0276fce72d54a64d991ca3caaf0780caf12ab800df9610092d37eb82dd17a812d037151ab6b6a4cb1d9a1668f2f
+  metadata.gz: 35e0271f3f1855f1fb22a53e546f97554c9ca98367d25390b478fa11119c96887d629cb5befc955ba39a3261ba8a8b8bf4b2ee1fc62f494432568819f2bfff62
+  data.tar.gz: 5e4383b223bf6cf7ae9a988abb0d7226b9f96ddf0a8de514a3a0f00d5b5bf76a4e1f170b001ab3ff78e8fa9a72a464a8f205fc0300e4e0665a1bb1a775dd33e8

data/app/assets/javascripts/ratable.js.erb

@@ -1,5 +1,4 @@
-//= require jquery
-//= require_tree ../../../vendor/assets/javascripts
+//= require jquery.raty.js
 (function($){
   $.fn.raty.defaults.starHalf = '<%= image_path('star-half.png') %>';
   $.fn.raty.defaults.starOn = '<%= image_path('star-on.png') %>';

data/app/assets/stylesheets/ratable.scss

@@ -0,0 +1,16 @@
+/*
+ * This is a manifest file that'll be compiled into ratable.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the bottom of the
+ * compiled file so the styles you add here take precedence over styles defined in any styles
+ * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
+ * file per style scope.
+ *
+ *= require jquery.raty.css
+ *= require_tree .
+ *= require_self
+ */

data/lib/ratable/models/ratee.rb

@@ -2,66 +2,41 @@ module Ratable
   module Models
     module Ratee
       extend ActiveSupport::Concern
-      extend Ratable::ActiveRecordExtension
 
       attr_reader :has_one
 
       module ActiveRecordExtension
         def acts_as_ratee(options={has_one: false})
-          throw "To make a model the rater and the ratee use `acts_as_ratee_and_rater`" if acts_like_rater?
+          raise "To make a model the rater and the ratee use `acts_as_ratee_and_rater`" if acts_like_rater?
           @has_one = options[:has_one]
           include Ratee
         end
       end
 
       included do
-        unless acts_like_rater?
-          if @has_one
-            has_one :rating, class_name: 'Ratable::Rating', dependent: :destroy, as: :ratee
-          else
-            has_many :ratings, class_name: 'Ratable::Rating', dependent: :destroy, as: :ratee
-          end
+        if @has_one
+          has_one :rating, class_name: 'Ratable::Rating', dependent: :destroy, as: :ratee
         else
-          if @has_one
-            has_one :ratee_rating, class_name: 'Ratable::Rating', dependent: :destroy, as: :ratee
-          else
-            has_many :ratee_ratings, class_name: 'Ratable::Rating', dependent: :destroy, as: :ratee
-          end
+          has_many :ratings, class_name: 'Ratable::Rating', dependent: :destroy, as: :ratee
         end
       end
 
       def raters
-        unless acts_like_rater?
-          if @has_one
-            rating.rater
-          else
-            ratings.includes(:rater).collect { |rating| rating.rater }
-          end
+        if @has_one
+          rating.rater
         else
-          if @has_one
-            ratee_rating.rater
-          else
-            ratee_ratings.includes(:rater).collect { |rating| rating.rater }
-          end
+          ratings.includes(:rater).collect { |rating| rating.rater }
         end
       end
 
-      # def rate(options={})
-      #   options.reject! { |k| k == :ratee }
-      #   unless acts_like_rater?
-      #     if @has_one
-      #       self.rating.create(options)
-      #     else
-      #       self.ratings.create(options)
-      #     end
-      #   else
-      #     if @has_one
-      #       self.ratee_rating.create(options)
-      #     else
-      #       self.ratee_ratings.create(options)
-      #     end
-      #   end
-      # end
+      def rate(options={})
+        options.reject! { |k| k == :ratee }
+        if @has_one
+          self.rating.create(options)
+        else
+          self.ratings.create(options)
+        end
+      end
 
     end
   end

data/lib/ratable/models/ratee_rater.rb

@@ -2,7 +2,6 @@ module Ratable
   module Models
     module RateeRater
       extend ActiveSupport::Concern
-      extend Ratable::ActiveRecordExtension
 
       attr_reader :has_one_ratee, :has_one_rater
 

data/lib/ratable/models/rater.rb

@@ -7,7 +7,7 @@ module Ratable
 
       module ActiveRecordExtension
         def acts_as_rater(options={has_one: false})
-          throw "To make a model the rater and the ratee use `acts_as_ratee_and_rater`" if acts_like_ratee?
+          raise "To make a model the rater and the ratee use `acts_as_ratee_and_rater`" if acts_like_ratee?
           @has_one = options[:has_one]
           include Rater
         end

data/lib/ratable/version.rb

@@ -1,3 +1,3 @@
 module Ratable
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/spec/dummy/app/models/user.rb

@@ -4,5 +4,6 @@ class User < ActiveRecord::Base
   devise :database_authenticatable, :registerable,
          :recoverable, :rememberable, :trackable, :validatable
 
-  acts_as_ratee_and_rater
+  acts_as_ratee
+  acts_as_rater
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ratable
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - François Bélanger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-25 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -120,7 +120,7 @@ files:
 - README.rdoc
 - Rakefile
 - app/assets/javascripts/ratable.js.erb
-- app/assets/javascripts/ratings.js
+- app/assets/stylesheets/ratable.scss
 - app/models/ratable/rating.rb
 - app/views/ratable/ratings/_rating.html.erb
 - db/migrate/20160418175804_create_ratable_ratings.rb

data/app/assets/javascripts/ratings.js

@@ -1,10 +0,0 @@
-$(function() {
-  $('.rating').each(function() {
-    $this = $(this);
-    $this.raty({
-      score: $this.data('rating'),
-      scoreName: 'star',
-      space: true
-    });
-  });
-});