marks 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e86462ca450799da8d9cc00a1e189703a7e20ed
-  data.tar.gz: 3c4bf861b0d599b2f78e1c590aa3edcab2492bea
+  metadata.gz: 0b15c7e6a7569ff12c6b88ef8b48060946b5af51
+  data.tar.gz: fcb939ebd6d81dbaaa20aa46e4650875933f1fc0
 SHA512:
-  metadata.gz: 2b1604676f45f4152e59d2e38f432eec222eafed0d3cedce2911d57f49f9eb5c967a0b8bce8517efa8ca444bec4e0e9c0dde437648166e32edfe5c5f201b0ca9
-  data.tar.gz: 4755d17d2d6c7537fff745b08b138ccd7377d285918739a18e58ee447f8b22e5b0da8995b299dd53eea4cf4755e2c909fc5444118a5b5cb76dcbb8a8e675ba9d
+  metadata.gz: 18f1e61375f3387e713d4f41bb5a7b3f35289a27bf54a48d73f5f0cc230e93f51f81b9894563b0e8e50154ec1424d67dddfd694cbd48afea9fdfcf3fe4801be1
+  data.tar.gz: df604dee365c1b15c40451626f8314a760a7a55d3851a0dddf7cba7d0d0f567e423f205377c73a1ca277cba95fb13f2a3bda252f872cddf70cc284c001bbb3e5

data/lib/marks.rb

@@ -1,6 +1,7 @@
 require 'marks/engine'
 require 'marks/marker'
 require 'marks/markable'
+require 'marks/relation_extension'
 
 module Marks
 end
@@ -11,3 +12,7 @@ begin
 rescue LoadError
   #do nothing
 end
+
+ActiveSupport.on_load(:active_record) do
+  ActiveRecord::Relation.send(:include, Marks::RelationExtension)
+end

data/lib/marks/markable.rb

@@ -6,6 +6,11 @@ module Marks
       def markable_with(*types)
         has_many :incoming_marks, as: :markable, dependent: :destroy, class_name: 'Marks::Mark'
 
+        types.each do |type|
+          # just for preload_marker's result cache, which is used by marked_by?
+          has_one :"#{type}_marked_flag"
+        end
+
         class_eval do
           define_method :'markers' do |class_name, mark|
             classified_mark = mark.to_s.classify
@@ -18,6 +23,12 @@ module Marks
             classified_mark = mark.to_s.classify
             raise ArgumentError unless types.map { |t| t.to_s.classify }.include?(classified_mark)
             return false unless marker
+
+            # if preload_marker is executed, use its result
+            if self.association(:"#{mark}_marked_flag").loaded?
+              return self.association(:"#{mark}_marked_flag").target
+            end
+
             klass = marker.class.table_name.classify.constantize
             klass.joins(:outgoing_marks).where('marks_marks.mark_type = ? AND markable_type = ? AND markable_id = ?', mark.to_s.classify, self.class.base_class.to_s, self).any?
           end

data/lib/marks/relation_extension.rb

@@ -0,0 +1,39 @@
+module Marks
+  module RelationExtension
+    attr_accessor :marker_value, :mark_type_values
+
+    def self.included(klass)
+      klass.class_eval do
+        alias_method_chain :exec_queries, :marks
+      end
+    end
+
+    def preload_marker(marker, *mark_types)
+      self.marker_value     = marker
+      self.mark_type_values = mark_types
+      self
+    end
+
+    private
+
+    def exec_queries_with_marks
+      records = exec_queries_without_marks
+
+      if marker_value.present? && mark_type_values.present?
+        mark_type_values.each do |mark_type|
+          preload_marker_for(records, marker_value, mark_type)
+        end
+      end
+
+      records
+    end
+
+    def preload_marker_for(records, marker, mark_type)
+      markable_ids = Mark.where(markable: records, marker: marker, mark_type: mark_type.to_s.classify).pluck(:markable_id)
+
+      records.each do |record|
+        record.association(:"#{mark_type}_marked_flag").target = markable_ids.include?(record.id)
+      end
+    end
+  end
+end

data/lib/marks/version.rb

@@ -1,3 +1,3 @@
 module Marks
-  VERSION = '0.0.10'
+  VERSION = '0.0.11'
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: marks
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Masahiro Ihara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-10 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.9
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.9
+        version: 4.0.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: minitest
   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: 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'
 description: An engine that enable you to mark any ActiveRecord model as many as you
@@ -74,17 +74,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
+- README.md
+- Rakefile
 - app/models/marks/mark.rb
 - db/migrate/20121116121923_create_marks_marks.rb
+- lib/marks.rb
 - lib/marks/engine.rb
 - lib/marks/markable.rb
 - lib/marks/marker.rb
+- lib/marks/relation_extension.rb
 - lib/marks/version.rb
-- lib/marks.rb
 - lib/tasks/marks_tasks.rake
-- MIT-LICENSE
-- Rakefile
-- README.md
 homepage: https://github.com/ihara2525/marks
 licenses: []
 metadata: {}
@@ -94,17 +95,17 @@ 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.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: An engine that enable you to mark any ActiveRecord model as many as you like