bullet 4.14.7 → 4.14.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 383fdf528838afb5b7b3062473c4cee08afde2a6
-  data.tar.gz: 876d2f512122a2efc65966ae0ca79552a942e55b
+  metadata.gz: e402a50f9b2a4c75edafcf12bc2bdb32e3298860
+  data.tar.gz: 73102589e922894098fe54684ac483c8ef6b44b7
 SHA512:
-  metadata.gz: be6b084a5b2a8a969b9c4de0f5d4edf6b45519bab43daac4a28e16bf2d91d4adcb709555b2b1b914187e37cdd4344606df26f2324bd3e578c1d553fd2d8ff079
-  data.tar.gz: cefcd37562b41f889399face565a9335b7ed47a5627c9a837b53c31803dc40c72f5f31adeaf619ad233b4e60927900b4b336877f2966d94ea19e66dffaf88dd5
+  metadata.gz: 03191a02a885f763bbe24986fdad49f5f9e6d19f6f9a4501ff0c5915b1bb3eaf4cebde6b611be5c0a99982eef12ea32e1e3c51ad6a7a8d3029a1d38ea285d7c8
+  data.tar.gz: dffc316bd5cbacaee45d5ef161bfb63f159a24006d09baf7a5572cfed72a21f970a668c55799fceb2e48705625074fa257bdd0d608a5391c54a5e13e1b354577

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Next Release
 
+## 4.14.8
+
+* compatible with `composite_primary_keys` gem
+
 ## 4.14.7
 
 * Fix AR 4.2 SingularAssociation#reader result can be nil

data/README.md

@@ -109,6 +109,22 @@ Bullet.add_whitelist :type => :unused_eager_loading, :class_name => "Post", :ass
 Bullet.add_whitelist :type => :counter_cache, :class_name => "Country", :association => :cities
 ```
 
+If you want to skip bullet in some specific controller actions, you can
+do like
+
+```ruby
+class ApplicationController < ActionController::Base
+  around_action :skip_bullet
+
+  def skip_bullet
+    Bullet.enable = false
+    yield
+  ensure
+    Bullet.enable = true
+  end
+end
+```
+
 ## Log
 
 The Bullet log `log/bullet.log` will look something like this:

data/lib/bullet/ext/object.rb

@@ -4,7 +4,9 @@ class Object
   end
 
   def primary_key_value
-    if self.class.respond_to?(:primary_key) && self.class.primary_key
+    if self.class.respond_to?(:primary_keys) && self.class.primary_keys
+      self.class.primary_keys.map { |primary_key| self.send primary_key }.join(',')
+    elsif self.class.respond_to?(:primary_key) && self.class.primary_key
       self.send self.class.primary_key
     else
       self.id

data/lib/bullet/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Bullet
-  VERSION = "4.14.7"
+  VERSION = "4.14.8"
 end

data/spec/bullet/ext/object_spec.rb

@@ -27,5 +27,11 @@ describe Object do
       expect(post.primary_key_value).to eq(post.name)
       Post.primary_key = 'id'
     end
+
+    it "should return value for multiple primary keys" do
+      post = Post.first
+      allow(Post).to receive(:primary_keys).and_return([:category_id, :writer_id])
+      expect(post.primary_key_value).to eq("#{post.category_id},#{post.writer_id}")
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet
 version: !ruby/object:Gem::Version
-  version: 4.14.7
+  version: 4.14.8
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-09 00:00:00.000000000 Z
+date: 2015-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport