encrypted_id 1.0.0 → 1.1.0

data/.rspec

@@ -1 +1 @@
---color
+--color --format d

data/README.md

@@ -1,4 +1,4 @@
-# encrypted_id
+# encrypted_id [![Build Status](https://secure.travis-ci.org/pencil/encrypted_id.png)](http://travis-ci.org/pencil/encrypted_id)
 
 Sometimes you don't want your users to see the actual ID of your databases entries. This gem allows you to hide the ID.
 

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/encrypted_id.gemspec

@@ -0,0 +1,66 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "encrypted_id"
+  s.version = "1.1.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Nils Caspar"]
+  s.date = "2012-10-15"
+  s.description = "Sometimes you don't want your users to see the actual ID of your databases entries. This gem allows you to hide the ID."
+  s.email = "ncaspar@me.com"
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.md"
+  ]
+  s.files = [
+    ".document",
+    ".rspec",
+    ".rvmrc",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "encrypted_id.gemspec",
+    "lib/encrypted_id.rb",
+    "spec/encrypted_id_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/support/models/animal.rb",
+    "spec/support/models/user.rb"
+  ]
+  s.homepage = "http://github.com/pencil/encrypted_id"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.24"
+  s.summary = "Allows you to encrypt the ID of your ActiveRecord model."
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activerecord>, [">= 3.0.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.2.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_development_dependency(%q<sqlite3>, [">= 0"])
+    else
+      s.add_dependency(%q<activerecord>, [">= 3.0.0"])
+      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.2.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_dependency(%q<sqlite3>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<activerecord>, [">= 3.0.0"])
+    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.2.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    s.add_dependency(%q<sqlite3>, [">= 0"])
+  end
+end
+

data/lib/encrypted_id.rb

@@ -11,6 +11,7 @@ module EncryptedId
     include InstanceMethods
     cattr_accessor :encrypted_id_key
     self.encrypted_id_key = Digest::SHA256.digest(options[:key] || encrypted_id_default_key)
+    self.define_singleton_method(:find_single, lambda { puts "foo" })
   end
 
   def self.decrypt(key, id)
@@ -29,14 +30,17 @@ module EncryptedId
 
   module ClassMethods
     def find(*args)
-      if has_encrypted_id?
+      scope = args.slice!(0)
+      options = args.slice!(0) || {}
+      if !(scope.is_a? Symbol) && has_encrypted_id? && !options[:no_encrypted_id]
         begin
-          args[0] = EncryptedId.decrypt(encrypted_id_key, "#{args[0]}")
+          scope = EncryptedId.decrypt(encrypted_id_key, "#{scope}")
         rescue OpenSSL::Cipher::CipherError
           raise ActiveRecord::RecordNotFound.new("Could not decrypt ID #{args[0]}")
         end
       end
-      super(*args)
+      options.delete(:no_encrypted_id)
+      super(scope, options)
     end
 
     def has_encrypted_id?
@@ -52,6 +56,11 @@ module EncryptedId
     def to_param
       EncryptedId.encrypt(self.class.encrypted_id_key, self.id)
     end
+
+    def reload(options = nil)
+      options = (options || {}).merge(:no_encrypted_id => true)
+      super(options)
+    end
   end
 end
 

data/spec/encrypted_id_spec.rb

@@ -1,49 +1,51 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe 'EncryptedId' do
-  describe 'in the User model' do
-    before(:each) do
-      @user = User.new
-    end
-
-    it 'should give us the encrypted ID via to_param' do
-      @user.id = 15
-      @user.to_param.should == '1e8644f924812bec506b116ff14368c8'
-    end
-
-    it 'should be possible to find an entry by the encrypred id' do
-      @user.id = 8
-      @user.save!
-      User.find('da9f98cd7c3eb2b0f0e88cc8daeb222c').id.should == 8
-    end
-
-    it 'should throw an exception if we try to find an entry by the real ID' do
-      @user.id = 1
-      @user.save!
-      expect { User.find 1 }.to raise_error(ActiveRecord::RecordNotFound)
-    end
-  end
-
-  describe 'in the Animal model' do
-    before(:each) do
-      @animal = Animal.new
-    end
-
-    it 'should give us the encrypted ID via to_param' do
-      @animal.id = 15
-      @animal.to_param.should == '2f71ba22a8e6975db0f13b7e3db6d9cd'
-    end
-
-    it 'should be possible to find an entry by the encrypred id' do
-      @animal.id = 8
-      @animal.save!
-      Animal.find('6916a1adba452d3fffde6e444ae1ad3a').id.should == 8
-    end
-
-    it 'should throw an exception if we try to find an entry by the real ID' do
-      @animal.id = 1
-      @animal.save!
-      expect { Animal.find 1 }.to raise_error(ActiveRecord::RecordNotFound)
+  ModelDescription = Struct.new(:model, :test_ids)
+
+  [
+    ModelDescription.new(User,
+      { 15 => '1e8644f924812bec506b116ff14368c8', 8 => 'da9f98cd7c3eb2b0f0e88cc8daeb222c' }
+    ),
+    ModelDescription.new(Animal,
+      { 15 => '2f71ba22a8e6975db0f13b7e3db6d9cd', 8 => '6916a1adba452d3fffde6e444ae1ad3a' }
+    )
+  ].each do |description|
+    describe "in the #{description.model} model" do
+      before(:each) do
+        @model = description.model
+        @test_ids = description.test_ids
+        @entity = @model.new
+      end
+
+      it 'should give us the encrypted ID via to_param' do
+        @entity.id = 15
+        @entity.to_param.should == @test_ids[15]
+      end
+
+      it 'should be possible to find an entry by the encrypted id' do
+        @entity.id = 8
+        @entity.save!
+        @model.find(@test_ids[8]).id.should == 8
+      end
+
+      it 'should throw an exception if we try to find an entry by the real ID' do
+        @entity.id = 1
+        @entity.save!
+        expect { @model.find 1 }.to raise_error(ActiveRecord::RecordNotFound)
+      end
+
+      it 'should allow us to reload an entity' do
+        @entity.id = 7
+        @entity.save!
+        @entity.reload.should == @entity
+      end
+
+      it 'should allow us to use find with :all' do
+        @entity.id = 99
+        @entity.save!
+        @model.find(:all).should include(@entity)
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -8,6 +8,7 @@ require 'encrypted_id'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
+  config.order = 'random'
   c = ActiveRecord::Base.establish_connection(
     :adapter => 'sqlite3',
     :database => 'spec/test.sqlite3'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: encrypted_id
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-14 00:00:00.000000000 Z
+date: 2012-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -109,6 +109,7 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- encrypted_id.gemspec
 - lib/encrypted_id.rb
 - spec/encrypted_id_spec.rb
 - spec/spec_helper.rb
@@ -129,7 +130,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4444389274485543368
+      hash: 4307408867672767625
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: