has_token_id 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b71462bcbb1b858915c9ad61261c07c7eb1e8cdd
-  data.tar.gz: 34adb9bb64687b03a4c4a2518ebce32f72fce2b9
+  metadata.gz: ee4ece1e713f29cebb06cbf0adcf72442e33b286
+  data.tar.gz: 18919caf99be5cbe289e4db5b9b24a0bbe05dbb6
 SHA512:
-  metadata.gz: 8bc4ff69f5758624be60644bb01efab78c85146a08100a73d3aa6e3520bb806f8d0312dd827f1355c9dd889d917ed5568bc1f44eda8dc6f5466c1676613dbfef
-  data.tar.gz: 6137d842644e1442354a02fde9b781ab8986429af5029b6f9d6018bda7ade0b42358053338ae0b7d48ef3646f4b1c49e090c43cd0946bc6c41a333570577a9b7
+  metadata.gz: 6d6f647494b39d8defdc179f02339c38dd2f85c5672ac547199b7c2c1354b5d13d3423260767cc8b9b0421647df5a94a5b098bbb036c39ba58a1f2e0acfcf923
+  data.tar.gz: 2cdfbe07ee7a237aec3111d115983b3711c7ca05bc95a44d4f7e5bf0c9d40297a72c9b289c57b8c006f5214c35196cccb60fdef45b215f01d1b4ced7b8ba6094

data/.travis.yml

@@ -1,8 +1,11 @@
+before_install: "gem update bundler"
 before_script: "bundle exec dummier"
 
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
+  - 2.0.0
+  - 2.1.3
+  - 2.2.3
+  - 2.3.1
   - rbx
   - ree

data/README.md

@@ -1,4 +1,4 @@
-# has_token_id [![Build Status](https://secure.travis-ci.org/citrus/has_token_id.png)](http://travis-ci.org/citrus/has_token_id)
+# has_token_id [![Build Status](https://travis-ci.org/citrus/has_token_id.svg?branch=master)](https://travis-ci.org/citrus/has_token_id)
 
 Identify your active records with random tokens when you don't want your users to see a sequential ID.
 

data/lib/has_token_id/finder_methods.rb

@@ -3,16 +3,19 @@ module HasTokenId
 
     # Find by token ensuring case sensitivity
     def find_by_case_sensitive_token(token)
+      return if token.nil?
       where("#{token_with_table_name} = ?", token).first
     end
 
     # Find by token regardless of case
     def find_by_case_insensitive_token(token)
+      return if token.nil?
       where("lower(#{token_with_table_name}) = ?", token.downcase).first
     end
 
     # Find by token
     def find_by_token(token)
+      return if token.nil?
       send(has_token_id_options[:case_sensitive] ? :find_by_case_sensitive_token : :find_by_case_insensitive_token, token)
     end
 

data/lib/has_token_id/version.rb

@@ -1,3 +1,3 @@
 module HasTokenId
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/test/unit/concern_test.rb

@@ -70,88 +70,6 @@ class ConcernTest < MiniTest::Should::TestCase
       assert_equal 24, @item.short_token.length
     end
 
-    should "find by token" do
-      assert_equal @item, Item.find(@item.token)
-    end
-
-    should "work with token finder method" do
-      assert Item.find_by_token(@item.token)
-    end
-
-    should "work with !bang token finder method" do
-      assert Item.find_by_token!(@item.token)
-    end
-
-    should "return nil from token finder method when record is not found" do
-      assert_equal nil, Item.find_by_token("invalid")
-    end
-
-    should "raise activerecord not found from !bang token finder method when record is not found" do
-      assert_raises ActiveRecord::RecordNotFound do
-        Item.find_by_token!("invalid")
-      end
-    end
-
-    context "when case sensitivity is disabled" do
-
-      setup do
-        Item.has_token_id_options[:case_sensitive] = false
-      end
-
-      should "find by token" do
-        assert_equal @item, Item.find(@item.token)
-        assert_equal @item, Item.find_by_token(@item.token)
-        assert_equal @item, Item.find_by_token!(@item.token)
-      end
-
-      should "find by token even if it's all uppercase" do
-        assert_equal @item, Item.find(@item.token.upcase)
-        assert_equal @item, Item.find_by_token(@item.token.upcase)
-        assert_equal @item, Item.find_by_token!(@item.token.upcase)
-      end
-
-      should "find by token even if it's all lowercase" do
-        assert_equal @item, Item.find(@item.token.downcase)
-        assert_equal @item, Item.find_by_token(@item.token.downcase)
-        assert_equal @item, Item.find_by_token!(@item.token.downcase)
-      end
-
-    end
-
-    context "when case sensitivity is enabled" do
-
-      setup do
-        Item.has_token_id_options[:case_sensitive] = true
-      end
-
-      should "find by token" do
-        assert_equal @item, Item.find(@item.token)
-        assert_equal @item, Item.find_by_token(@item.token)
-        assert_equal @item, Item.find_by_token!(@item.token)
-      end
-
-      should "not find by token if it's all uppercase" do
-        assert_raises ActiveRecord::RecordNotFound do
-          Item.find(@item.token.upcase)
-        end
-        assert_equal nil, Item.find_by_token(@item.token.upcase)
-        assert_raises ActiveRecord::RecordNotFound do
-          Item.find_by_token!(@item.token.upcase)
-        end
-      end
-
-      should "not find by token if it's all lowercase" do
-        assert_raises ActiveRecord::RecordNotFound do
-          Item.find(@item.token.downcase)
-        end
-        assert_equal nil, Item.find_by_token(@item.token.downcase)
-        assert_raises ActiveRecord::RecordNotFound do
-          assert Item.find_by_token!(@item.token.downcase)
-        end
-      end
-
-    end
-
   end
 
   context "with a long token" do

data/test/unit/finder_methods_test.rb

@@ -0,0 +1,100 @@
+require "test_helper"
+
+# We'll test the test/dummy/app/item.rb model
+
+class FinderMethodsTest < MiniTest::Should::TestCase
+
+  setup do
+    # remove all items
+    Item.destroy_all
+    # reset to defaults
+    Item.has_token_id_options.merge!(Item.default_token_options)
+    @item = Item.create(:name => "Blue Cheese Burger")
+  end
+
+  should "find by using default find method" do
+    assert_equal @item, Item.find(@item.token)
+  end
+
+  should "work with token finder method" do
+    assert Item.find_by_token(@item.token)
+  end
+
+  should "return nil when token is nil" do
+    assert_nil Item.find_by_token(nil)
+  end
+
+  should "work with !bang token finder method" do
+    assert Item.find_by_token!(@item.token)
+  end
+
+  should "return nil from token finder method when record is not found" do
+    assert_equal nil, Item.find_by_token("invalid")
+  end
+
+  should "raise activerecord not found from !bang token finder method when record is not found" do
+    assert_raises ActiveRecord::RecordNotFound do
+      Item.find_by_token!("invalid")
+    end
+  end
+
+  context "when case sensitivity is disabled" do
+
+    setup do
+      Item.has_token_id_options[:case_sensitive] = false
+    end
+
+    should "find by token" do
+      assert_equal @item, Item.find(@item.token)
+      assert_equal @item, Item.find_by_token(@item.token)
+      assert_equal @item, Item.find_by_token!(@item.token)
+    end
+
+    should "find by token even if it's all uppercase" do
+      assert_equal @item, Item.find(@item.token.upcase)
+      assert_equal @item, Item.find_by_token(@item.token.upcase)
+      assert_equal @item, Item.find_by_token!(@item.token.upcase)
+    end
+
+    should "find by token even if it's all lowercase" do
+      assert_equal @item, Item.find(@item.token.downcase)
+      assert_equal @item, Item.find_by_token(@item.token.downcase)
+      assert_equal @item, Item.find_by_token!(@item.token.downcase)
+    end
+
+  end
+
+  context "when case sensitivity is enabled" do
+
+    setup do
+      Item.has_token_id_options[:case_sensitive] = true
+    end
+
+    should "find by token" do
+      assert_equal @item, Item.find(@item.token)
+      assert_equal @item, Item.find_by_token(@item.token)
+      assert_equal @item, Item.find_by_token!(@item.token)
+    end
+
+    should "not find by token if it's all uppercase" do
+      assert_raises ActiveRecord::RecordNotFound do
+        Item.find(@item.token.upcase)
+      end
+      assert_equal nil, Item.find_by_token(@item.token.upcase)
+      assert_raises ActiveRecord::RecordNotFound do
+        Item.find_by_token!(@item.token.upcase)
+      end
+    end
+
+    should "not find by token if it's all lowercase" do
+      assert_raises ActiveRecord::RecordNotFound do
+        Item.find(@item.token.downcase)
+      end
+      assert_equal nil, Item.find_by_token(@item.token.downcase)
+      assert_raises ActiveRecord::RecordNotFound do
+        assert Item.find_by_token!(@item.token.downcase)
+      end
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_token_id
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Spencer Steffen
@@ -133,6 +133,7 @@ files:
 - test/support/test_case.rb
 - test/test_helper.rb
 - test/unit/concern_test.rb
+- test/unit/finder_methods_test.rb
 - test/unit/has_token_id_test.rb
 - test/unit/table_definition_test.rb
 homepage: https://github.com/citrus/has_token_id
@@ -165,5 +166,6 @@ test_files:
 - test/support/test_case.rb
 - test/test_helper.rb
 - test/unit/concern_test.rb
+- test/unit/finder_methods_test.rb
 - test/unit/has_token_id_test.rb
 - test/unit/table_definition_test.rb