secret_id 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95cd1a2112c47d113f3e34908082828922c9a4dd
-  data.tar.gz: 125e924ad21440ab4b35bb6903e5699db73141e8
+  metadata.gz: 61c578a2b69ba786972b304322645baa80d05c0b
+  data.tar.gz: 4af527cca46d9391652b84f560e31fe849380e5f
 SHA512:
-  metadata.gz: f429e03eafc6bf35e87a97bc7bb0e4328a3d996a1f32ce261788296504fc5d9157bc1915b2b2d481acfa65fe8d825bbe4f38dfaa3044e30b783f4a2f03f65c94
-  data.tar.gz: 476e8cf09f5930fe156c46d5a6b454b71e6042ead75a4346f9e553b466d9f06139521c4c26ac53c9d5662bbbf8d589fa4b5df53568d8e3112ee4c21aacec3d3a
+  metadata.gz: 81c5f65a20f1ca7c4c526d49360f500d63d9cdb89932a79c304ee77ce5c4129673ab82897e9912c6c55be8defba54aaada0f60073b4b41bb8465987d6ac81cdb
+  data.tar.gz: 65370b73b1fb87dc6e8d21a2c10424d5dcb85568ff885f2a617684d2c63d59914af016ea886fe0acf5c36fc222649b6232fe8bdf627d9ac27d58e0440a6e6f0a

data/lib/secret_id/active_record.rb

@@ -5,6 +5,8 @@ module SecretId
     included do
       # Override ActiveRecord::FinderMethods#find_with_ids decoding ids
       def find_with_ids(*ids)
+        return super(*ids) unless @klass.is_a?(SecretId)
+
         raise UnknownPrimaryKey.new(@klass) if primary_key.nil?
 
         expects_array = ids.first.kind_of?(Array)
@@ -14,15 +16,29 @@ module SecretId
 
         case ids.size
         when 0
-          raise RecordNotFound, "Couldn't find #{@klass.name} without an ID"
+          raise ::ActiveRecord::RecordNotFound, "Couldn't find #{@klass.name} without an ID"
         when 1
-          result = find_one(decode_id(ids.first))
+          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
-          find_some(ids.map {|id| decode_id(id)})
+          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 RecordNotFound, "Couldn't find #{@klass.name} with an out of range ID"
+        raise ::ActiveRecord::RecordNotFound, "Couldn't find #{@klass.name} with an out of range ID"
       end
     end
   end

data/lib/secret_id/base.rb

@@ -5,12 +5,12 @@ module SecretId
     included do
       class_attribute :hashids
 
-      def id
-        self.class.encode_id(read_attribute(:id)) if read_attribute(:id)
+      def to_param
+        secret_id
       end
 
       def secret_id
-        read_attribute(:id)
+        self.class.encode_id(id) unless id.nil?
       end
     end
 

data/lib/secret_id/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: secret_id
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Sebastián Orellana