secret_id 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61c578a2b69ba786972b304322645baa80d05c0b
-  data.tar.gz: 4af527cca46d9391652b84f560e31fe849380e5f
+  metadata.gz: 22426a2a8d1ef1c2ed9c35ff962eace9b592542b
+  data.tar.gz: 82119fac8f3d6d44f65fe454c19d85fbb0f71cfa
 SHA512:
-  metadata.gz: 81c5f65a20f1ca7c4c526d49360f500d63d9cdb89932a79c304ee77ce5c4129673ab82897e9912c6c55be8defba54aaada0f60073b4b41bb8465987d6ac81cdb
-  data.tar.gz: 65370b73b1fb87dc6e8d21a2c10424d5dcb85568ff885f2a617684d2c63d59914af016ea886fe0acf5c36fc222649b6232fe8bdf627d9ac27d58e0440a6e6f0a
+  metadata.gz: f26076e4beb8babc92d7463f2e275f22f0adee2bdb2537ff0f3946348925f8fad073d64c6b48645c330ca28bc87faebf226b9636b8c7e1102cd38fcb10a7b281
+  data.tar.gz: dc7aefb65671c6c340f3a43781d2ea33b658ba58485035cc518dccc25b0156cd5b1d5b76a03c23d1f19ab5252504c20645904ff084e53a484b6a67c104dee9db

data/lib/secret_id/active_record.rb

@@ -1,44 +1,84 @@
 module SecretId
   module ActiveRecord
-    extend ActiveSupport::Concern
+    module FinderMethods
+      extend ActiveSupport::Concern
 
-    included do
-      # Override ActiveRecord::FinderMethods#find_with_ids decoding ids
-      def find_with_ids(*ids)
-        return super(*ids) unless @klass.is_a?(SecretId)
+      included do
+        # Override ActiveRecord::FinderMethods#find_with_ids decoding ids
+        def find_with_ids(*ids)
+          return super unless @klass.is_a?(SecretId)
 
-        raise UnknownPrimaryKey.new(@klass) if primary_key.nil?
+          unless ids.length == 1
+            options = ids.slice!(ids.size - 1) if ids.last.kind_of?(Hash)
+            options ||= {}
+
+            return super if options[:secret_id] === false
+          end
+
+          raise UnknownPrimaryKey.new(@klass) if primary_key.nil?
+
+          expects_array = ids.first.kind_of?(Array)
+          return ids.first if expects_array && ids.first.empty?
+
+          ids = ids.flatten.compact.uniq
+
+          case ids.size
+          when 0
+            raise ::ActiveRecord::RecordNotFound, "Couldn't find #{@klass.name} without an ID"
+          when 1
+            begin
+              id = decode_id(ids.first)
+            rescue
+              raise ::ActiveRecord::RecordNotFound, "Couldn't find #{@klass.name} with secret id=#{ids.first}"
+            end
+
+            result = find_one(id)
+            expects_array ? [ result ] : result
+          else
+            ids.map! do |id|
+              begin
+                decode_id(id)
+              rescue
+                raise ::ActiveRecord::RecordNotFound, "Couldn't find #{@klass.name} with secret id=#{id}"
+              end
+            end
+
+            find_some(ids)
+          end
+        rescue RangeError
+          raise ::ActiveRecord::RecordNotFound, "Couldn't find #{@klass.name} with an out of range ID"
+        end
+      end
+    end
+
+    module Core
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        # Override ActiveRecord::Core#find decoding ids, if is necessary
+        def find(*ids)
 
-        expects_array = ids.first.kind_of?(Array)
-        return ids.first if expects_array && ids.first.empty?
 
-        ids = ids.flatten.compact.uniq
+          if ids.length == 1
+            return super if ids.first.kind_of?(Array)
+          else
+            options = ids.slice!(ids.size - 1) if ids.last.kind_of?(Hash)
+            options ||= {}
 
-        case ids.size
-        when 0
-          raise ::ActiveRecord::RecordNotFound, "Couldn't find #{@klass.name} without an ID"
-        when 1
-          begin
-            id = decode_id(ids.first)
-          rescue
-            raise ::ActiveRecord::RecordNotFound, "Couldn't find #{@klass.name} with secret id=#{ids.first}"
+            return super ids, secret_id: false if options[:secret_id] === false
+            return super if ids.first.kind_of?(Array)
           end
 
-          result = find_one(id)
-          expects_array ? [ result ] : result
-        else
           ids.map! do |id|
             begin
               decode_id(id)
             rescue
-              raise ::ActiveRecord::RecordNotFound, "Couldn't find #{@klass.name} with secret id=#{id}"
+              raise ::ActiveRecord::RecordNotFound, "Couldn't find #{self.name} with secret id=#{id}"
             end
           end
 
-          find_some(ids)
+          return super ids, secret_id: false
         end
-      rescue RangeError
-        raise ::ActiveRecord::RecordNotFound, "Couldn't find #{@klass.name} with an out of range ID"
       end
     end
   end

data/lib/secret_id/version.rb

@@ -1,3 +1,3 @@
 module SecretId
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/secret_id.rb

@@ -9,7 +9,8 @@ module SecretId
     base.include SecretId::Base
 
     if defined?(::ActiveRecord::Base)
-      ::ActiveRecord::Relation.include SecretId::ActiveRecord
+      base.include SecretId::ActiveRecord::Core
+      ::ActiveRecord::Relation.include SecretId::ActiveRecord::FinderMethods
     end
 
     super

data/test/dummy/log/test.log

@@ -0,0 +1,5 @@
+   (0.2ms)  begin transaction
+------------------------
+SecretIdTest: test_truth
+------------------------
+   (0.1ms)  rollback transaction

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: secret_id
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Sebastián Orellana
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,7 +52,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Flexible masking identifiers solution for Rails with Hashids.
+description: SecretId is a flexible solution for masking the identifiers of ActiveRecord.
 email:
 - limcross@gmail.com
 executables: []
@@ -95,6 +95,8 @@ files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
+- test/dummy/db/test.sqlite3
+- test/dummy/log/test.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
@@ -124,7 +126,7 @@ rubyforge_project:
 rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
-summary: Flexible masking identifiers solution for Rails with Hashids.
+summary: SecretId is a flexible solution for masking the identifiers of ActiveRecord.
 test_files:
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
@@ -154,6 +156,8 @@ test_files:
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
 - test/dummy/config.ru
+- test/dummy/db/test.sqlite3
+- test/dummy/log/test.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html