similar_models 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a937276a3ad548a1941029abfdedbb6696c14e39
-  data.tar.gz: 90d95999b118943e34ae960fce17be495918b30b
+  metadata.gz: ad504d7a2e4aff75dc1c3ff6d48162110aaedcad
+  data.tar.gz: 38cbf0ecea5b020f118845b893d59ab7bdb508c9
 SHA512:
-  metadata.gz: 5d0cd374a49fbc5f1ee85433d38463eabdbdad9990ad81bb94efd142caea0a922f5fb8e7d12bf7622f96718976264be6d47fd13fa6f369a7e036fdec63a59095
-  data.tar.gz: c6df39065597cbf583c8311564b15854ddee418eb5fdcee5337aa52685523f2fd12df8d5aab6079842742d1c91e97feb0f5e4bbd2485917587bb9aeb97215e39
+  metadata.gz: aebcd2acdddd464feedfc604300daf67add8022fa18920305f2849a31489f1dc8534ffe6eb21e02061be09ac89984194347f2997e496cd031a997b6988388864
+  data.tar.gz: aacfe230c5415df95ef1f4253cb837b53d559b5e770ceafaea9794611f3733fdb9219886c3ce6ae4053a70cc40f1531babd464483d22f69dd870340183f2e2ba

data/README.md

@@ -2,7 +2,7 @@
 
 Adds a `similar_{model name plural}` method to an active record model, but can be set to any name using `as: {method name}`. It returns the most similar models of the same class based on associated models in common.
 
-The association(s) have to be many to many, so either habtm or 'has_many though'.
+The association(s) have to be many to many, so either [habtm](http://guides.rubyonrails.org/association_basics.html#the-has-and-belongs-to-many-association) or [has_many :through](http://guides.rubyonrails.org/association_basics.html#the-has-many-through-association).
 
 ## Installation
 
@@ -28,8 +28,8 @@ Post example
       has_and_belongs_to_many :tags
 
       has_similar_models :authors
-      has_similar_models :tags, as: :similar_posts_by_tags
-      has_similar_models :authors, :tags, as: :similar_posts_by_author_or_tag
+      has_similar_models :tags, as: :similar_posts_by_tag
+      has_similar_models :authors, :tags, as: :similar_posts_by_author_and_tag
     end
 
     class Tag < ActiveRecord::Base

data/lib/similar_models/version.rb

@@ -1,3 +1,3 @@
 module SimilarModels
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/lib/similar_models.rb

@@ -8,31 +8,30 @@ module SimilarModels
     # defaults to 'def similar_{model name}'
     define_method as do
       table_name = self.class.table_name
+      primary_key = self.class.primary_key
+      primary_key_ref = "#{table_name}.#{primary_key}"
       association_scopes = []
 
       many_to_many_associations.each do |many_to_many_association|
         assocation = self.class.reflect_on_association(many_to_many_association)
         join_table, foreign_key, association_foreign_key = self.class.join_table_values(assocation)
 
-        association_scopes << self.class.where("#{join_table}.#{association_foreign_key} IN " +
-          "(select #{join_table}.#{association_foreign_key} from #{join_table} " +
-          "where #{join_table}.#{foreign_key} = :foreign_key)", foreign_key: self.id).
-          joins("INNER JOIN #{join_table} ON #{join_table}.#{foreign_key} = #{table_name}.id")
+        association_scopes << self.class.where(
+          "#{join_table}.#{association_foreign_key} IN \
+          (select #{join_table}.#{association_foreign_key} from #{join_table} \
+          where #{join_table}.#{foreign_key} = :foreign_key)", foreign_key: self.id
+        ).joins("INNER JOIN #{join_table} ON #{join_table}.#{foreign_key} = #{primary_key_ref}")
       end
 
-      scope = self.class.select("#{table_name}.*, count(#{table_name}.id) AS #{as}_model_count").
-        where.not(id: self.id).order("#{as}_model_count DESC")
-      group_by_clause = 'id'
+      scope = self.class.select("#{table_name}.*, count(#{primary_key_ref}) AS #{as}_model_count").
+        where.not(primary_key => self.id).order("#{as}_model_count DESC")
+      group_by_clause = primary_key
 
       # if there is only one many-to-many association no need to use UNION sql syntax
       if association_scopes.one?
         scope.merge(association_scopes.first).group(group_by_clause)
       else
-        # with postgres the group by clause has to be different
-        # http://dba.stackexchange.com/questions/88988/postgres-error-column-must-appear-in-the-group-by-clause-or-be-used-in-an-aggre
-        if ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
-          group_by_clause = self.class.column_names.join(', ')
-        end
+        group_by_clause = self.class.column_names.join(', ')
 
         # see http://blog.ubersense.com/2013/09/27/tech-talk-unioning-scoped-queries-in-rails/
         scope.from("((#{association_scopes.map(&:to_sql).join(') UNION ALL (')})) AS #{table_name}").group(group_by_clause)

data/similar_models.gemspec

@@ -19,12 +19,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.required_ruby_version     = '>= 2.1'
-  spec.add_runtime_dependency     'activerecord', '~> 4.2'
-  spec.add_development_dependency 'bundler', '~> 1.13'
+  spec.add_runtime_dependency     'activerecord', '>= 4.2'
+  spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'rspec', '~> 3.5'
   spec.add_development_dependency 'database_cleaner', '~>1.5'
   spec.add_development_dependency 'sqlite3', '~>1.3'
-  spec.add_development_dependency 'mysql2', '~>0.4'
-  spec.add_development_dependency 'pg', '~>0.19'
+  spec.add_development_dependency 'mysql2', '~>0.5'
+  spec.add_development_dependency 'pg', '~>1.0'
   spec.add_development_dependency 'byebug', '~>9.0'
 end

data/spec/spec_helper.rb

@@ -8,7 +8,7 @@
 require 'active_record'
 
 ActiveRecord::Base.establish_connection adapter: 'postgresql', database: 'similar_models'
-# ActiveRecord::Base.establish_connection adapter: 'mysql2', database: 'similar_models'
+# ActiveRecord::Base.establish_connection adapter: 'mysql2', database: 'similar_models', username: 'test'
 # ActiveRecord::Base.establish_connection adapter: 'sqlite3', database: ':memory:'
 load 'support/schema.rb'
 
@@ -24,6 +24,16 @@ RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
+  end
+
   # Run specs in random order to surface order dependencies. If you find an
   # order dependency and want to debug it, you can fix the order by providing
   # the seed, which is printed after each run.

data/spec/support/schema.rb

@@ -11,7 +11,7 @@ ActiveRecord::Schema.define do
     t.timestamps null: false
   end
 
-  create_table :posts, force: true do |t|
+  create_table :posts, primary_key: :alt_id, force: true do |t|
     t.timestamps null: false
   end
 

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: similar_models
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jolyon Pawlyn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-15 00:00:00.000000000 Z
+date: 2018-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -86,28 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -131,7 +131,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".rspec"
 - ".ruby-version"
 - Gemfile
 - LICENSE.txt

data/.rspec

@@ -1,2 +0,0 @@
---color
---format progress