allowed 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b822571160319a2272cb7fc33251f6b6a2bf67bd
-  data.tar.gz: 7a61b830db5ba5be91f56c8e7436c998245cd2b7
+  metadata.gz: 36c2b249f68b6401263e3a95905cc860612b8c07
+  data.tar.gz: 108521318be58d7dd97d13de445785203079df10
 SHA512:
-  metadata.gz: c55a9d52c1206fb1cb968e1a6f2087fca91fa9fbd637896b58b001cff2a39cc12731d5e5eb7c64d1e4ec6ccfc4503bef57f87f1b47377ed92bf8d29935a967d6
-  data.tar.gz: 532acaef6a0e4745ebc5f7f1fdc7855f2fe18ce9181316d4a9a6da4a5351d589e17061455397406753ec2708618ba4e05eef580e069c809a827b01e484d04474
+  metadata.gz: 624d7d2118f76e3527103a407733f9d9ead41e39ce9097e6c69e6cefdf83579b8b098e74b462dbb0cabe6cdf70dd188f7271b6c33b4af2ad83f27c1cf33f62a1
+  data.tar.gz: aa0bc2b91837b8d703a5cb1b1a03e65c2bfb3d3724b6f938a195d7edbe719c41b9e2c4e52ecd4a7e7b94b9e30e858efb4d50d835cdffada097278cec769d4227

data/spec/lib/allowed/limit_spec.rb

@@ -30,7 +30,17 @@ describe Allowed::Limit, "#allow" do
   it "adds validation callback" do
     subject.allow(limit, options)
 
-    expect(subject).to have_callback(:validate, :validate_throttles, on: :create)
+    expect(subject).to have_callback(:validate, :validate_throttles)
+  end
+
+  it "only calls validation callback on create" do
+    instance = subject.new
+    instance.stubs(:validate_throttles)
+
+    instance.save
+    instance.save
+
+    expect(instance).to have_received(:validate_throttles).once
   end
 
   it "adds after rollback callback" do

data/spec/support/have_callback.rb

@@ -1,10 +1,20 @@
 RSpec::Matchers.define :have_callback do |type, name, options|
   match do |record|
+    options ||= {}
     callbacks = record.__send__(:"_#{type}_callbacks")
     callbacks.any? do |callback|
-      callback.raw_filter == name &&
-        (options[:kind].nil? || callback.kind == options[:kind]) &&
-        (options[:on].nil? || callback.options[:on] == options[:on])
+      return false unless callback.raw_filter == name
+      return false unless options[:kind].nil? || callback.kind == options[:kind]
+      return true  if options[:on].nil?
+
+      if callback.respond_to?(:options)
+        options[:on] == callback.options[:on]
+      else
+        if_options = callback.instance_variable_get("@if")
+        if_options.any? do |if_option|
+          if_option =~ /#{options[:on]}/
+        end
+      end
     end
   end
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: allowed
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Tristan Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-09 00:00:00.000000000 Z
+date: 2014-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.9
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.9
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: bourne
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.9
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.9
 description: Throttling of ActiveRecord model creations.
 email: support@dribbble.com
 executables: []
@@ -130,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: Throttling of ActiveRecord model creations.