samer 1.0.2 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 989bc24051aaf56c2d3d534084d58fd1f25f0fc8
-  data.tar.gz: 09e99955e26f6bf9d827fd91617f358194015163
+  metadata.gz: 6befa005ce3acab7a18f769432d10b623b8e5614
+  data.tar.gz: 8f5de518b91f83d56c0e8910e7099a5fac0580f5
 SHA512:
-  metadata.gz: 9e832a7ae1793dbad7a0eb86d8c071a3ba3de584f525b73ec7006ce8bf42c0e0cd7f3ff508c6e0e61a05195c987e0d0e4053c7c2eca1ad76b6e340799764346d
-  data.tar.gz: 1db7014953182b98c79ba49c77a541ab9dea01a57a1e85d86d376dbbb66e569b9f2229c0cbf44c811bbebf99cd9cc6861b84fe0254d5d770464e705fb4d01b41
+  metadata.gz: daaa6e1226b4cf3d89b01aa0ff0674fd9aa5b6dcd62e074afb6bd783bb94ae86a63996944e9a96b6d59c82c1dcccff320660bf1bcc89c3191fc878877111e2cf
+  data.tar.gz: 0f9a585fae511532461ed0ea3246320190e347cf6c9e369234c74cdbd5c9e7d5f408a4f18e1b9bd5b15681160a4e452ff8db223fcfd0281c481d096c33da851f

data/bin/samer

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
 
 require 'samer'
-puts Samer.find_for ARGV[0]
+puts Samer.find_for ARGV[0]
+

data/lib/data/users.yml

@@ -6,6 +6,7 @@ john:
   'rock': 3
   'pop': 1
   'heavy-metal': 1
+
 # Pop, ballad
 jane:
   'trance': 1
@@ -13,6 +14,7 @@ jane:
   'chillout': 3
   'ballad': 4
   'pop': 5
+
 # Rock
 jake:
   'rock': 5
@@ -20,6 +22,7 @@ jake:
   'pop': 1
   'ballad': 2
   'trance': 1
+
 # Pop, ballad
 jasmine:
   'pop': 5
@@ -28,6 +31,7 @@ jasmine:
   'rock': 2
   'trance': 1
   'ambient': 2
+
 # Chillout, ambient, ballad
 johanna:
   'ambient': 5

data/lib/samer.rb

@@ -1,13 +1,15 @@
 require 'yaml'
-require 'samer/data_provider'
-require 'samer/engine'
+require_relative 'samer/data_provider'
+require_relative 'samer/engine'
 
 module Samer
 
   def self.find_for name
-    DataProvider.new
     @engine ||= Engine.new(DataProvider.new.prepare)
     @engine.find_for name
   end
 
-end
+end
+
+#TODO Учитывать нулевые оценки
+# p Samer.find_for 'jake' # => ['same_user', coefficient]

data/lib/samer/data_provider.rb

@@ -1,4 +1,5 @@
-require 'samer/user'
+# require 'samer/user'
+require_relative 'user'
 
 module Samer
   class DataProvider

data/lib/samer/engine.rb

@@ -1,5 +1,3 @@
-# require 'samer/similar_user'
-
 module Samer
   class Engine
 
@@ -10,16 +8,18 @@ module Samer
     end
 
     def find_for name
-      similar = {}
-      current_user = @users.find{ |user| user.name == name }
+      @name = name
+      @similars = {}
+
       return "User @#{name} is not present in example users list. See it in lib/data/users.yml" unless current_user
 
       @users.each do |user|
         next if user.name == current_user.name
-        similar[user.name] = distance(current_user, user)
+        @similars[user.name] = distance(current_user, user)
       end
 
-      similar.max_by{ |_, score| score }
+      @similars
+      # similar
     end
 
 
@@ -28,13 +28,21 @@ module Samer
     def distance current_user, user
       distances = []
 
-      current_user.music.keys.each do |genre|
-        next unless user.music[genre]
-        distances.push (current_user.music[genre] - user.music[genre]) ** 2
+      current_user.genres.keys.each do |genre|
+        next unless user.genres[genre]
+        distances.push (current_user.genres[genre] - user.genres[genre]) ** 2
       end
 
       1.fdiv 1 + Math.sqrt(distances.inject(0){ |sum, score| sum + score })
     end
 
+    def current_user
+      @current_user ||= @users.find{ |user| user.name == @name }
+    end
+
+    def similar
+      @similars.max_by{ |_, score| score }
+    end
+
   end
-end
+end

data/lib/samer/user.rb

@@ -1,11 +1,11 @@
 module Samer
   class User
 
-    attr_reader :name, :music
+    attr_reader :name, :genres
 
-    def initialize name, music
+    def initialize name, genres
       @name = name
-      @music = music
+      @genres = genres
     end
 
   end

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: samer
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.5
 platform: ruby
 authors:
 - Evgeniy Fateev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies: []
-description: A simple gem that finds similar person to you by comparing music ratings
+description: A simple gem that finds similar person to you by comparing the music
+  ratings
 email: spaceflow@gmail.com
 executables:
 - samer
@@ -22,7 +23,6 @@ files:
 - lib/samer.rb
 - lib/samer/data_provider.rb
 - lib/samer/engine.rb
-- lib/samer/similar_user.rb
 - lib/samer/user.rb
 homepage: http://rubygems.org/gems/samer
 licenses:
@@ -44,7 +44,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Find someone like you!

data/lib/samer/similar_user.rb

@@ -1,9 +0,0 @@
-module Samer
-  class SimilarUser
-
-    def initialize
-      @similar = {}
-    end
-
-  end
-end