has_many_scored 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6e3ceacfc424710a369f2556276c3593353e762
-  data.tar.gz: d568b6e4ac4122bad8fa8df24d6609101a0e75a4
+  metadata.gz: 6d92b5fc3873544d969133b75f893c3857b88d3f
+  data.tar.gz: 7354b07b590ede6b1d2c3d03be1d0cd93dd821bf
 SHA512:
-  metadata.gz: f7c91444fa1250d1be8845623db6d3190a7e2e2012fa9f1cb80b67f1c78b9f5cef808e98ff85f6d2b81b65469a27fcabc7b018ca1bc76d3d88d22f220b575f51
-  data.tar.gz: 58a2fda5405b98b228f89c0bef26bd6475378a4666481ce5c77bab28164b81e2a2b6fe3a6467a4249edd2db678121634d12f2aaff87d58992e959cbb967a59ff
+  metadata.gz: 195ff0f882e2719f172377723d37829af3e572e3a8a5d3317e27d839503f1b84723e9b7da5ec01cd88a8da29968d151835729eb13d1e073e626204ccee6c840c
+  data.tar.gz: 67038deb618de8d45f511bd9c0b3df08609e8c01c8aab7129ca9a5e3315fc590d3598eae1d552570a76a6e5e9befe23b6164cb9d3ed09fac8c0d79e6d24f2f73

data/ChangeLog.rdoc

@@ -1,3 +1,6 @@
+=== 1.1.0 / 2014-02-18
+* Add ability to append additional extension methods by calling the association builder with a block.
+
 === 1.0.0 / 2014-02-15
 
 * Initial release

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    has_many_scored (0.0.1)
+    has_many_scored (1.0.0)
       activerecord (>= 3.0, <= 4.0.2)
       redis-objects (>= 0.6.1)
 

data/Rakefile

@@ -4,7 +4,15 @@ require "bundler/gem_tasks"
 require 'rake'
 
 begin
-  gem 'rdoc'
+  require 'rubygems/tasks'
+
+  Gem::Tasks.new
+rescue LoadError => e
+  warn e.message
+  warn "Run `gem install rubygems-tasks` to install Gem::Tasks."
+end
+
+begin
   require 'rdoc/task'
 
   RDoc::Task.new do |rdoc|
@@ -17,7 +25,6 @@ end
 task :doc => :rdoc
 
 begin
-  gem 'rspec', '~> 2.4'
   require 'rspec/core/rake_task'
 
   RSpec::Core::RakeTask.new

data/has_many_scored.gemspec

@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# encoding: utf-8
 
 require File.expand_path("../lib/has_many_scored/version", __FILE__)
 

data/lib/has_many_scored/has_many_scored_extension.rb

@@ -1,7 +1,7 @@
 module HasManyScored
   # This module is used to extend the join model and mix in additional logic
   module HasManyScoredExtension
-    def self.bind_extension(options)
+    def self.bind_extension(options, &block)
       return Proc.new do
         include HasManyScored::HasManyScoredExtension
 
@@ -9,6 +9,8 @@ module HasManyScored
         define_method :options do
           return options
         end
+
+        class_eval(&block) if block
       end
     end
 

data/lib/has_many_scored/scored_for_many_extension.rb

@@ -1,7 +1,8 @@
 module HasManyScored
   # This module is used to extend the join model and mix in additional logic
   module ScoredForManyExtension
-    def self.bind_extension(options)
+    def self.bind_extension(options, &block)
+        puts "YIELDING1"
       return Proc.new do
         include HasManyScored::ScoredForManyExtension
 
@@ -9,6 +10,8 @@ module HasManyScored
         define_method :options do
           return options
         end
+
+        class_eval(&block) if block
       end
     end
 

data/lib/has_many_scored/version.rb

@@ -1,3 +1,3 @@
 module HasManyScored
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/lib/has_many_scored.rb

@@ -8,7 +8,7 @@ module HasManyScored
                            :association_foreign_key, :readonly, :validate,
                            :autosave]
 
-    def has_many_scored(name, opts=nil)
+    def has_many_scored(name, opts=nil, &extension)
       opts = opts.try(:dup) || {}
 
       habtm_opts = opts.select { |k, v| VALID_HABTM_OPTIONS.include?(k) }
@@ -29,10 +29,10 @@ module HasManyScored
       has_and_belongs_to_many(
         name,
         lambda { |owner| order("#{owner.association(name).join_table.name}.#{opts[:score_column]} DESC") },
-        habtm_opts, &HasManyScored::HasManyScoredExtension.bind_extension(opts))
+        habtm_opts, &HasManyScored::HasManyScoredExtension.bind_extension(opts, &extension))
     end
 
-    def scored_for_many(name, opts=nil)
+    def scored_for_many(name, opts=nil, &extension)
       opts = opts.try(:dup) || {}
 
       habtm_opts = opts.select { |k, v| VALID_HABTM_OPTIONS.include?(k) }
@@ -53,7 +53,7 @@ module HasManyScored
       has_and_belongs_to_many(
         name,
         lambda { |owner| order("#{owner.association(name).join_table.name}.#{opts[:score_column]} DESC") },
-        habtm_opts, &HasManyScored::HasManyScoredExtension.bind_extension(opts))
+        habtm_opts, &HasManyScored::ScoredForManyExtension.bind_extension(opts, &extension))
     end
   end
 

data/spec/customized_model_spec.rb

@@ -0,0 +1,142 @@
+require 'spec_helper'
+require 'has_many_scored'
+
+class Topic2 < ActiveRecord::Base
+  include HasManyScored
+  scored_for_many :tags, class_name: "Tag2", score_column: :hotness, score_field: :compute_hotness do
+    def custom_method
+      return true
+    end
+  end
+
+  def compute_hotness
+    create_ts
+  end
+end
+class Tag2 < ActiveRecord::Base
+  include HasManyScored
+  has_many_scored :topics, class_name: "Topic2", score_column: :hotness, score_field: :compute_hotness do
+    def custom_other_method
+      return true
+    end
+  end
+end
+
+def setup_schema2!
+  setup_db do
+    create_table :topic2s do |t|
+      t.column :name, :string
+      t.column :create_ts, :integer
+    end
+    create_table :tag2s do |t|
+      t.column :name, :string
+    end
+    create_table :tag2s_topic2s do |t|
+      t.column :topic2_id, :integer
+      t.column :tag2_id, :integer
+      t.column :hotness, :integer
+    end
+  end
+end
+
+BASE_TIME = Time.now.to_i
+describe Tag2 do
+  before(:each) do
+    setup_schema2!
+  end
+  after(:each) do
+    teardown_db
+  end
+  context "with dummy data" do
+    before do
+      @t1 = Topic2.create(:name => "Topic 1", :create_ts => BASE_TIME + 2)
+      @t2 = Topic2.create(:name => "Topic 2", :create_ts => BASE_TIME + 1)
+      @t3 = Topic2.create(:name => "Topic 3", :create_ts => BASE_TIME + 3)
+      @tag = Tag2.create(:name => "Tag 1")
+      @tag.topics << @t1 << @t2 << @t3
+    end
+
+    it "computes size" do
+      expect(@tag.topics.size).to eq(3)
+      @tag.topics = []
+      expect(@tag.topics.size).to eq(0)
+    end
+
+    it "computes score when setting by ID" do
+      @tag.topic_ids = [@t1.id, @t2.id]
+      expect(@tag.topics(true).map(&:name)).to eq(["Topic 1", "Topic 2"])
+
+      @tag.topic_ids = [@t3.id]
+      expect(@tag.topics(true).map(&:name)).to eq(["Topic 3"])
+
+      @tag.topic_ids = [@t3.id, @t2.id, @t1.id]
+      expect(@tag.topics(true).map { |t| t.name }).to eq(["Topic 3", "Topic 1", "Topic 2"])
+    end
+
+    it "computes scores" do
+      expect(@tag.topics.compute_score(@t2)).to eq(BASE_TIME + 1)
+    end
+
+    it "reads in scored order" do
+      # Sadly we have to call reload.
+      @tag.topics.reload
+
+      expect(@tag.topics.map { |t| t.name }).to eq(["Topic 3", "Topic 1", "Topic 2"])
+      expect(@tag.topics.first(2).map { |t| t.name }).to eq(["Topic 3", "Topic 1"])
+    end
+
+    it "handles delete" do
+      @tag.topics.delete(@t1)
+
+      expect(@tag.topics.map { |t| t.name }).to eq(["Topic 3", "Topic 2"])
+    end
+
+    it "handles update_score" do
+      @t2.create_ts = BASE_TIME + 4
+      @t2.save
+      @tag.topics.update_score(@t2)
+
+      expect(Tag2.first.topics.map { |t| t.name }).to eq(["Topic 2", "Topic 3", "Topic 1"])
+    end
+  end
+end
+
+describe Topic2 do
+  before(:each) do
+    setup_schema2!
+  end
+  after(:each) do
+    teardown_db
+  end
+
+  context "with dummy data" do
+    before do
+      @t1 = Topic2.create(:name => "Topic 1", :create_ts => BASE_TIME + 2)
+      @t2 = Topic2.create(:name => "Topic 2", :create_ts => BASE_TIME + 1)
+      @t3 = Topic2.create(:name => "Topic 3", :create_ts => BASE_TIME + 3)
+      @tag1 = Tag2.create(:name => "Tag 1")
+      @tag2 = Tag2.create(:name => "Tag 2")
+      @tag2 = Tag2.create(:name => "Tag 3")
+      @tag1.topics << @t2 << @t3
+      @t1.tags << @tag1 << @tag2
+    end
+
+    it "computes size" do
+      expect(@t1.tags.size).to eq(2)
+      @t1.tags = []
+      expect(@t1.tags.size).to eq(0)
+    end
+
+    it "reads in scored order" do
+      # Sadly we have to call reload.
+      @tag1.topics.reload
+
+      expect(@tag1.topics.map { |t| t.name }).to eq(["Topic 3", "Topic 1", "Topic 2"])
+      expect(@tag2.topics.map { |t| t.name }).to eq(["Topic 1"])
+    end
+
+    it "accepts block extensions" do
+      expect(@t1.tags).to respond_to(:custom_method)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,4 +1,3 @@
-gem "rspec", "~> 2.4"
 require "rspec"
 require "has_many_scored/version"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_many_scored
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Hsiu-Fan Wang
@@ -14,118 +14,118 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - "<="
+    - - <=
       - !ruby/object:Gem::Version
         version: 4.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - "<="
+    - - <=
       - !ruby/object:Gem::Version
         version: 4.0.2
 - !ruby/object:Gem::Dependency
   name: redis-objects
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeredis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.4'
 - !ruby/object:Gem::Dependency
   name: rubygems-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.2'
 description: An ActiveRecord plugin that combines an ordered habtm-like association
@@ -135,8 +135,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
+- .gitignore
+- .rspec
 - ChangeLog.rdoc
 - Gemfile
 - Gemfile.lock
@@ -148,6 +148,7 @@ files:
 - lib/has_many_scored/has_many_scored_extension.rb
 - lib/has_many_scored/scored_for_many_extension.rb
 - lib/has_many_scored/version.rb
+- spec/customized_model_spec.rb
 - spec/has_many_scored_spec.rb
 - spec/simple_model_spec.rb
 - spec/spec_helper.rb
@@ -161,22 +162,23 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: An ActiveRecord plugin that combines an ordered habtm-like association with
   optional redis caching
 test_files:
+- spec/customized_model_spec.rb
 - spec/has_many_scored_spec.rb
 - spec/simple_model_spec.rb
 - spec/spec_helper.rb