voltron-encrypt 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fa0e956bb62d9eedaa51594c9f35b0bb66c9fa8
-  data.tar.gz: 28c0cebba4890bd456fc9e8a6f60e1fd8192d5e0
+  metadata.gz: 3bec1a7a6c6807648a8bb6e1debc10e4d098bc45
+  data.tar.gz: a1b95933e6526a729d390bff947d0b43bf3ffb39
 SHA512:
-  metadata.gz: b2c03a252f4d9b9ee081879d6bb3330c21a1a20c3b49908358560c311ed58ea97636739dbdb100c646294df0b15f6d4f0ed7675ff7bcf92085ba69801aa516a6
-  data.tar.gz: 01f2f3b14b42deaf7f25592ca91f36f74ff9aba78ff504e61ee453d8925698d4929a24ed0363359448cfa8df1a7665f6a9a35a5776f9303961b4af7e2bb053e8
+  metadata.gz: a5b2737a2169939aa466511a8753918a8cf65adde2cabe0cbd9099895d8ac46fd2aa0b03cef14300e5d0661fc8e07c9016b71f92965392902aa43609d9c0baf3
+  data.tar.gz: ac229008eb3831e1fabb5f92244c33d5602339f6fee7f636405a84bc3ca65ac9abe3881bd1ebf0652501aeb90fd39a9ab91177e606f7f70c5edaa5c886c3b215

data/.gitignore

@@ -9,4 +9,5 @@
 tmp/
 log/
 voltron-*.gem
-*.bak
+*.bak
+*.sqlite3

data/lib/voltron/encrypt/active_record/collection_association.rb

@@ -0,0 +1,37 @@
+module Voltron
+  class Encrypt
+    module ActiveRecord
+      module CollectionAssociation
+
+        def ids_writer(ids)
+          if klass.has_encrypted_id?
+            ids.reject!(&:blank?)
+            replace(klass.find(ids))
+          else
+            super ids
+          end
+        end
+
+        def ids_reader
+          if loaded?
+            load_target.map do |record|
+              if klass.has_encrypted_id?
+                record.to_param
+              else
+                record.send(reflection.association_primary_key)
+              end
+            end
+          else
+            if klass.has_encrypted_id?
+              scope.map(&:to_param)
+            else
+              column  = "#{reflection.quoted_table_name}.#{reflection.association_primary_key}"
+              scope.pluck(column)
+            end
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/voltron/encrypt/engine.rb

@@ -6,6 +6,7 @@ module Voltron
 
       initializer "voltron.encrypt.initialize" do
         ::ActiveRecord::Base.send :extend, ::Voltron::Encryptable
+        ::ActiveRecord::Associations::CollectionAssociation.send :prepend, ::Voltron::Encrypt::ActiveRecord::CollectionAssociation
 
         # Corrects sidekiq resource lookup by forcing it to find_by_id rather than find with the model id
         # We either want it to find with to_param value, or find_by_id with the actual id, this is the latter

data/lib/voltron/encrypt/version.rb

@@ -1,5 +1,5 @@
 module Voltron
   class Encrypt
-    VERSION = "0.1.3".freeze
+    VERSION = "0.1.4".freeze
   end
 end

data/lib/voltron/encrypt.rb

@@ -2,6 +2,7 @@ require "voltron"
 require "voltron/encrypt/version"
 require "voltron/config/encrypt"
 require "voltron/encryptable"
+require "voltron/encrypt/active_record/collection_association"
 
 module Voltron
   class Encrypt
@@ -49,15 +50,15 @@ module Voltron
       !blacklist(encoded.length).match(regex).nil?
     end
 
-    private
-
-      def blacklist(len = 6)
-        if File.exist?(Voltron.config.encrypt.blacklist.to_s)
-          File.readlines(Voltron.config.encrypt.blacklist).map(&:strip).reject { |line| line.length > len }.join(" ")
-        else
-          ""
-        end
+    def blacklist(len = 6)
+      if File.exist?(Voltron.config.encrypt.blacklist.to_s)
+        File.readlines(Voltron.config.encrypt.blacklist).map(&:strip).reject { |line| line.length > len }.join(" ")
+      else
+        ""
       end
+    end
+
+    private
 
       def translations
         {

data/lib/voltron/encryptable.rb

@@ -1,6 +1,10 @@
 module Voltron
   module Encryptable
 
+    def has_encrypted_id?
+      false
+    end
+
     def encrypted_id
       extend ClassMethods
       include InstanceMethods
@@ -13,6 +17,10 @@ module Voltron
     end
 
     module ClassMethods
+      def has_encrypted_id?
+        true
+      end
+
       def find(*args)
         scope = args.slice!(0)
         options = args.slice!(0) || {}
@@ -20,7 +28,7 @@ module Voltron
         if !options[:bypass] && ![:first, :last, :all].include?(scope.try(:to_sym))
           scope = decoded_ids(scope)
         end
-        
+
         super(scope)
       end
 

data/voltron-encrypt.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "rails", ">= 4.2"
   spec.add_dependency "voltron", ">= 0.1.0"
 
+  spec.add_development_dependency "byebug"
   spec.add_development_dependency "bundler", ">= 1.12"
   spec.add_development_dependency "rake", ">= 10.0"
   spec.add_development_dependency "rspec", ">= 3.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: voltron-encrypt
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Eric Hainer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-28 00:00:00.000000000 Z
+date: 2016-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -145,6 +159,7 @@ files:
 - lib/generators/voltron/encrypt/install_generator.rb
 - lib/voltron/config/encrypt.rb
 - lib/voltron/encrypt.rb
+- lib/voltron/encrypt/active_record/collection_association.rb
 - lib/voltron/encrypt/engine.rb
 - lib/voltron/encrypt/version.rb
 - lib/voltron/encryptable.rb
@@ -169,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Enables base 64 encoded ids on rails models