protobuf-activerecord 3.6.1 → 5.0.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c25dac0d341a98ef1a2063256abf9d20b2752f58280dfe32bd45a4e273fec2d0
-  data.tar.gz: 77d0019eb2a66d0938beb272b773354f1d4fe55faf0b1390c908a44092dd4937
+  metadata.gz: 2acd9d491e63a0b8b6a1ddc834b90869ba7f1caa1c9f242cb303e89e820a3720
+  data.tar.gz: 490a6ae78996e6396374bfdf49b71a529456b7259b4bceb4b440c33dd36c1960
 SHA512:
-  metadata.gz: 0febfd5d96839e78688ad1b9700a07063f37a1b6f3f9f8e0e8d643a65541192f88d36c6fb8cd28b219539d9c3a02e67cf57f6e5bfc5f7e3846f9c5aff3b79c39
-  data.tar.gz: b534f6c7b313dac85bf4002f425d29e3be14b027ddbba2ea4b8be7b9e0187bfe400b327593d961f7c6b73276e5a6ebd08163473236c1f811a2746881f764a5d8
+  metadata.gz: a2320ac458f103be8732e0b54f1b6b520542fa6804f1a1114a5af5285f1931996af21055afae7a5fa55c182ad4e1ca05572f6369a9b602dd4c7ea761d2acb7d5
+  data.tar.gz: 387cd10d385db8e437c48b6d9adb1a80c92748bfbaab5bd124b38fae30482b8489e0225d7e494282f0752843ce0353ac89e3c6aefc4c9d8c64cc6f753fec2f42

data/lib/protobuf-activerecord.rb

@@ -4,14 +4,6 @@ require "active_support/concern"
 require "heredity"
 require "protobuf"
 
-# To support Rails 4 apps that use Mass-Assignment Security, attempt to
-# load the protected_attributes gem. If it's not present, move along...
-begin
-  require "protected_attributes"
-rescue LoadError # rubocop:disable Lint/HandleExceptions
-  # These aren't the droids you're looking for... move along.
-end
-
 require "protobuf/active_record/config"
 require "protobuf/active_record/middleware/connection_management"
 require "protobuf/active_record/middleware/connection_management_async"

data/lib/protobuf/active_record/model.rb

@@ -1,7 +1,6 @@
 require "protobuf/active_record/attribute_methods"
 require "protobuf/active_record/columns"
 require "protobuf/active_record/errors"
-require "protobuf/active_record/mass_assignment_security"
 require "protobuf/active_record/nested_attributes"
 require "protobuf/active_record/persistence"
 require "protobuf/active_record/scope"
@@ -18,16 +17,11 @@ module Protobuf
         include Protobuf::ActiveRecord::AttributeMethods
         include Protobuf::ActiveRecord::Columns
         include Protobuf::ActiveRecord::NestedAttributes
+        include Protobuf::ActiveRecord::Persistence
         include Protobuf::ActiveRecord::Serialization
         include Protobuf::ActiveRecord::Scope
         include Protobuf::ActiveRecord::Transformation
         include Protobuf::ActiveRecord::Validations
-
-        if defined?(::ActiveModel::MassAssignmentSecurity)
-          include Protobuf::ActiveRecord::MassAssignmentSecurity
-        else
-          include Protobuf::ActiveRecord::Persistence
-        end
       end
     end
   end

data/lib/protobuf/active_record/version.rb

@@ -1,5 +1,5 @@
 module Protobuf
   module ActiveRecord
-    VERSION = "3.6.1"
+    VERSION = "5.0.0.beta"
   end
 end

data/protobuf-activerecord.gemspec

@@ -22,8 +22,8 @@ Gem::Specification.new do |spec|
   ##
   # Dependencies
   #
-  spec.add_dependency "activerecord", "~> 4.2"
-  spec.add_dependency "activesupport", ">= 3.2"
+  spec.add_dependency "activerecord", "~> 5.0.0"
+  spec.add_dependency "activesupport", "~> 5.0.0"
   spec.add_dependency "concurrent-ruby"
   spec.add_dependency "heredity", ">= 0.1.1"
   spec.add_dependency "protobuf", ">= 3.0"

data/spec/support/db/setup.rb

@@ -5,7 +5,7 @@ ActiveRecord::Base.establish_connection(
   :database => "spec/test.db"
 )
 
-ActiveRecord::Base.connection.tables.each do |table|
+ActiveRecord::Base.connection.data_sources.each do |table|
   ActiveRecord::Base.connection.drop_table(table)
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protobuf-activerecord
 version: !ruby/object:Gem::Version
-  version: 3.6.1
+  version: 5.0.0.beta
 platform: ruby
 authors:
 - Adam Hutchison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-24 00:00:00.000000000 Z
+date: 2019-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -227,9 +227,6 @@ files:
 - lib/protobuf/active_record/columns.rb
 - lib/protobuf/active_record/config.rb
 - lib/protobuf/active_record/errors.rb
-- lib/protobuf/active_record/mass_assignment_security.rb
-- lib/protobuf/active_record/mass_assignment_security/persistence.rb
-- lib/protobuf/active_record/mass_assignment_security/transformation.rb
 - lib/protobuf/active_record/middleware/connection_management.rb
 - lib/protobuf/active_record/middleware/connection_management_async.rb
 - lib/protobuf/active_record/middleware/query_cache.rb
@@ -274,9 +271,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.2
 signing_key: 

data/lib/protobuf/active_record/mass_assignment_security.rb

@@ -1,16 +0,0 @@
-require "active_support/concern"
-require "protobuf/active_record/mass_assignment_security/persistence"
-require "protobuf/active_record/mass_assignment_security/transformation"
-
-module Protobuf
-  module ActiveRecord
-    module MassAssignmentSecurity
-      extend ::ActiveSupport::Concern
-
-      included do
-        include Protobuf::ActiveRecord::MassAssignmentSecurity::Persistence
-        include Protobuf::ActiveRecord::MassAssignmentSecurity::Transformation
-      end
-    end
-  end
-end

data/lib/protobuf/active_record/mass_assignment_security/persistence.rb

@@ -1,57 +0,0 @@
-require "active_support/concern"
-
-module Protobuf
-  module ActiveRecord
-    module MassAssignmentSecurity
-      module Persistence
-        extend ::ActiveSupport::Concern
-
-        module ClassMethods
-          # :nodoc:
-          def create(attributes, options = {})
-            attributes = attributes_from_proto(attributes) if attributes.is_a?(::Protobuf::Message)
-
-            super(attributes, options)
-          end
-
-          # :nodoc:
-          def create!(attributes, options = {})
-            attributes = attributes_from_proto(attributes) if attributes.is_a?(::Protobuf::Message)
-
-            super(attributes, options)
-          end
-        end
-
-        # :nodoc:
-        def assign_attributes(attributes, options = {})
-          attributes = attributes_from_proto(attributes) if attributes.is_a?(::Protobuf::Message)
-
-          super(attributes, options)
-        end
-
-        # :nodoc:
-        def update_attributes(attributes, options = {})
-          attributes = attributes_from_proto(attributes) if attributes.is_a?(::Protobuf::Message)
-
-          super(attributes, options)
-        end
-
-        # :nodoc:
-        def update_attributes!(attributes, options = {})
-          attributes = attributes_from_proto(attributes) if attributes.is_a?(::Protobuf::Message)
-
-          super(attributes, options)
-        end
-      end
-
-      # Override Active Record's initialize method so it can accept a protobuf
-      # message as it's attributes.
-      # :noapi:
-      def initialize(*args, &block)
-        args[0] = attributes_from_proto(args.first) if args.first.is_a?(::Protobuf::Message)
-
-        super(*args, &block)
-      end
-    end
-  end
-end

data/lib/protobuf/active_record/mass_assignment_security/transformation.rb

@@ -1,27 +0,0 @@
-require "active_support/concern"
-
-module Protobuf
-  module ActiveRecord
-    module MassAssignmentSecurity
-      module Transformation
-        extend ::ActiveSupport::Concern
-
-        module ClassMethods
-          # Filters protected attributes from the available attributes list. When
-          # set through accessible attributes, returns the accessible attributes.
-          # When set through protected attributes, returns the attributes minus any
-          # protected attributes.
-          #
-          # :nodoc:
-          def _filtered_attributes
-            if accessible_attributes.present?
-              accessible_attributes.to_a
-            else
-              self.attribute_names - protected_attributes.to_a
-            end
-          end
-        end
-      end
-    end
-  end
-end