protobuf-activerecord 3.3.4 → 3.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c8be2c5b47651fa584955f0d8f0908081ccb2e7
-  data.tar.gz: 2a3c984be5bc80d87fa84b51468899c05635378c
+  metadata.gz: 6eb619048fc322fd28447c597d45c2b640f9de25
+  data.tar.gz: 2c964967c403700a0fc10050c2d366be88a1767e
 SHA512:
-  metadata.gz: 3786b4d41fb7b8ffbca764be0a0fbc107f6e702ea000cf8d8435b7a0df981bc29ed70c94894f2cfdae3d6ba11e0d643c702ff07a60c5d3afeb9539d1a7166831
-  data.tar.gz: 7c3ae969053e01513a6cca6e68d48a92c20fbaaf78a55029c55c4a71d4a862e8be10d497e7f124b0d02fa37556d6e98524ecde6c7a65043240332a2515cd3870
+  metadata.gz: d50153357f7874cbff551c4f80a1ce37cc05b2fbfc484a13bae35b0c46ce950f2d6718d9a5c09d21647216cf10295d1a9a62b37f10c8cb0e4a0c16f98d236645
+  data.tar.gz: e864f028ee4a138ae78f2e0930a4fe32a999147c7ef5b4cb00f8871600646ff98b99a3b7ce3063212e9e9844e23df57e1a310837e1ef0acf8d1b18f97b1c84fd

data/lib/protobuf/active_record/middleware/query_cache.rb

@@ -1,27 +1,31 @@
+require "thread"
+
 module Protobuf
   module ActiveRecord
     module Middleware
       class QueryCache
+        CURRENT_CONNECTION = "_protobuf_active_record_current_connection".freeze
+
         def initialize(app)
           @app = app
         end
 
         def call(env)
-          enabled = ::ActiveRecord::Base.connection.query_cache_enabled
-          connection_id = ::ActiveRecord::Base.connection_id
-          ::ActiveRecord::Base.connection.enable_query_cache!
+          connection = ::Thread.current[CURRENT_CONNECTION] = ::ActiveRecord::Base.connection
+          enabled = connection.query_cache_enabled
+          connection.enable_query_cache!
 
           @app.call(env)
         ensure
-          restore_query_cache_settings(connection_id, enabled)
+          restore_query_cache_settings(enabled)
         end
 
       private
 
-        def restore_query_cache_settings(connection_id, enabled)
-          ::ActiveRecord::Base.connection_id = connection_id
-          ::ActiveRecord::Base.connection.clear_query_cache
-          ::ActiveRecord::Base.connection.disable_query_cache! unless enabled
+        def restore_query_cache_settings(enabled)
+          ::Thread.current[CURRENT_CONNECTION].clear_query_cache
+          ::Thread.current[CURRENT_CONNECTION].disable_query_cache! unless enabled
+          ::Thread.current[CURRENT_CONNECTION] = nil
         end
       end
     end

data/lib/protobuf/active_record/scope.rb

@@ -95,10 +95,6 @@ module Protobuf
           searchable_fields.each do |field, scope_name|
             next unless proto.respond_to_and_has_and_present?(field)
 
-            unless self.respond_to?(scope_name)
-              raise SearchScopeError, "Undefined scope :#{scope_name}."
-            end
-
             search_values = parse_search_values(proto, field)
             search_relation = search_relation.__send__(scope_name, *search_values)
           end

data/lib/protobuf/active_record/serialization.rb

@@ -42,10 +42,6 @@ module Protobuf
           @_protobuf_field_transformers ||= {}
         end
 
-        def _protobuf_instance_respond_to_from_cache?(key)
-          _protobuf_respond_to_cache.include?(key)
-        end
-
         def _protobuf_message_deprecated_fields
           @_protobuf_message_deprecated_fields ||= begin
             self.protobuf_message.all_fields.map do |field|
@@ -68,10 +64,6 @@ module Protobuf
           end
         end
 
-        def _protobuf_respond_to_cache
-          @_protobuf_respond_to_cache ||= ::Set.new
-        end
-
         # Define a field transformation from a record. Accepts a Symbol,
         # callable, or block that is called with the record being serialized.
         #
@@ -156,6 +148,73 @@ module Protobuf
 
           @protobuf_message
         end
+
+        def _protobuf_write_convert_to_fields_method(field)
+          is_datetime_time_or_timestamp_column = _protobuf_date_datetime_time_or_timestamp_column?(field)
+          is_date_column = _protobuf_date_column?(field)
+
+          if is_datetime_time_or_timestamp_column
+            if is_date_column
+              self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+                def _protobuf_active_record_serialize_#{field}
+                  value = #{field}
+                  return nil if value.nil?
+
+                  value.to_time(:utc).to_i
+                end
+              RUBY
+            else
+              self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+                def _protobuf_active_record_serialize_#{field}
+                  value = #{field}
+                  return nil if value.nil?
+
+                  value.to_i
+                end
+              RUBY
+            end
+          else
+            self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+              def _protobuf_active_record_serialize_#{field}
+                #{field}
+              end
+            RUBY
+          end
+        end
+
+        def _protobuf_write_field_transformer_method(field)
+          self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+            def _protobuf_active_record_serialize_#{field}
+              self.class._protobuf_field_transformers[:#{field}].call(self)
+            end
+          RUBY
+        end
+
+        def _protobuf_write_nil_method(field)
+          self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+            def _protobuf_active_record_serialize_#{field}
+              nil
+            end
+          RUBY
+        end
+
+        def _protobuf_write_symbol_transformer_method(field)
+          transformer_method = _protobuf_field_symbol_transformers[field]
+
+          if self.methods.include?(transformer_method)
+            self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+              def _protobuf_active_record_serialize_#{field}
+                self.class.#{transformer_method}(self)
+              end
+            RUBY
+          else
+            self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+              def _protobuf_active_record_serialize_#{field}
+                #{transformer_method}
+              end
+            RUBY
+          end
+        end
       end
 
       # :nodoc:
@@ -220,19 +279,25 @@ module Protobuf
         # in terms of optimization (`while` is slightly faster as no block carried through)
         while attribute_number < limit
           field = field_attributes[attribute_number]
-          hash[field] = case
-                        when _protobuf_field_symbol_transformers.has_key?(field) then
-                          self.class.__send__(_protobuf_field_symbol_transformers[field], self)
-                        when _protobuf_field_transformers.has_key?(field) then
-                          _protobuf_field_transformers[field].call(self)
-                        when self.class._protobuf_instance_respond_to_from_cache?(field) then
-                          _protobuf_convert_attributes_to_fields(field, __send__(field))
-                        when respond_to?(field) then
-                          self.class._protobuf_respond_to_cache << field
-                          _protobuf_convert_attributes_to_fields(field, __send__(field))
-                        else
-                          nil
-                        end
+
+          begin
+            hash[field] = __send__("_protobuf_active_record_serialize_#{field}")
+          rescue NoMethodError => error
+            raise unless error.message =~ /_protobuf_active_record_serialize/i
+
+            case
+            when _protobuf_field_symbol_transformers.has_key?(field) then
+              self.class._protobuf_write_symbol_transformer_method(field)
+            when _protobuf_field_transformers.has_key?(field) then
+              self.class._protobuf_write_field_transformer_method(field)
+            when respond_to?(field) then
+              self.class._protobuf_write_convert_to_fields_method(field)
+            else
+              self.class._protobuf_write_nil_method(field)
+            end
+
+            hash[field] = __send__("_protobuf_active_record_serialize_#{field}")
+          end
 
           attribute_number += 1
         end

data/lib/protobuf/active_record/version.rb

@@ -1,5 +1,5 @@
 module Protobuf
   module ActiveRecord
-    VERSION = "3.3.4"
+    VERSION = "3.3.5"
   end
 end

data/protobuf-activerecord.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   ##
   # Dependencies
   #
-  spec.add_dependency "activerecord", ">= 3.2"
+  spec.add_dependency "activerecord", "~> 4.2"
   spec.add_dependency "activesupport", ">= 3.2"
   spec.add_dependency "heredity", ">= 0.1.1"
   spec.add_dependency "protobuf", ">= 3.0"

data/spec/protobuf/active_record/scope_spec.rb

@@ -42,7 +42,7 @@ describe Protobuf::ActiveRecord::Scope do
 
       it "raises an exception" do
         allow(User).to receive(:searchable_fields).and_return({ :email =>  :by_hullabaloo })
-        expect { User.search_scope(request) }.to raise_exception(/Undefined scope :by_hullabaloo/)
+        expect { User.search_scope(request) }.to raise_exception(/undefined method .*by_hullabaloo/i)
       end
     end
   end

data/spec/protobuf/active_record/serialization_spec.rb

@@ -222,11 +222,6 @@ describe Protobuf::ActiveRecord::Serialization do
 
       context "when a transformer is defined for the field" do
         let(:fields_from_record) { { :guid => user.guid, :name => user.name, :email => user.email, :email_domain => 'test.co', :password => nil, :nullify => nil } }
-        let(:transformer) { { :email_domain => lambda { |record| record.email.split('@').last } } }
-
-        before {
-          allow(User).to receive(:_protobuf_field_transformers).and_return(transformer)
-        }
 
         it "gets the field from the transformer" do
           expect(user.fields_from_record).to eq fields_from_record
@@ -236,14 +231,13 @@ describe Protobuf::ActiveRecord::Serialization do
       context "when a transformer is not defined for the field" do
         let(:fields_from_record) { { :guid => user.guid, :name => user.name, :email => user.email, :email_domain => nil, :password => nil, :nullify => nil } }
 
+        before {
+          allow(user).to receive(:_protobuf_active_record_serialize_email_domain).and_return(nil)
+        }
+
         it "returns a hash of protobuf fields that this object has getters for" do
           expect(user.fields_from_record).to eq fields_from_record
         end
-
-        it "converts attributes values for protobuf messages" do
-          expect(user).to receive(:_protobuf_convert_attributes_to_fields).at_least(:once)
-          user.fields_from_record
-        end
       end
 
       context "given options with :include" do

data/spec/support/models/user.rb

@@ -10,6 +10,8 @@ class User < ActiveRecord::Base
   attribute_from_proto :last_name, :extract_last_name
   attribute_from_proto :password, lambda { |proto| proto.password! }
 
+  field_from_record :email_domain, lambda { |record| record.email.split('@').last }
+
   def self.extract_first_name(proto)
     if proto.field?(:name)
       names = proto.name.split(" ")

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: protobuf-activerecord
 version: !ruby/object:Gem::Version
-  version: 3.3.4
+  version: 3.3.5
 platform: ruby
 authors:
 - Adam Hutchison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-01 00:00:00.000000000 Z
+date: 2017-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -234,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Google Protocol Buffers integration for Active Record