protobuf-activerecord 3.3.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83d490440de55e5f819bad525efef1571449f9f0
-  data.tar.gz: 7f1048b2c82821f5646c61c0332797c2dc4d6cb5
+  metadata.gz: 1dd165bad09c99c5b394865faaaa00efaffcb3fb
+  data.tar.gz: 88c7bb55c4408f66397ffb8ca5f4fda21c0e4a64
 SHA512:
-  metadata.gz: 0dcd9ec4c112cff39b1eb6996d2509ae1a3b07ec10d4b3ed0ffaf67921bd02b699e715053013e37687f7823e0fcfca2e57a762e816103d09c7ce3cdf63ba1afc
-  data.tar.gz: 62848e072057f8f64c875529f50927381d4917d3c034e248caa509f3a037ee13b4742d5fc3962a52ba8a38a339986704245469dd8bd96629bde525b2c2920646
+  metadata.gz: 5b89216c06f6a28dc2f0af37bacf0e5cad14b104305a545241a867086458d7f6b60610566e22dbd2010c0e91468647bcc2b437cfd63c0fc99229518d5f61826a
+  data.tar.gz: 5cbdf81b2078d11c22d05d9924dc819ad7bbaf4739efad1dd60a37298544aab140474d2a00aea2e91cfa9af61f63c47b18674f587839f75b49a47439898a1781

data/lib/protobuf/active_record/columns.rb

@@ -1,16 +1,21 @@
 require 'set'
 require 'active_support/concern'
+require 'thread'
 
 module Protobuf
   module ActiveRecord
     module Columns
       extend ::ActiveSupport::Concern
 
+      COLUMN_TYPE_MAP_MUTEX = ::Mutex.new
+      DATE_OR_TIME_TYPES = ::Set.new([:date, :datetime, :time, :timestamp])
+
       included do
         include ::Heredity
 
         inheritable_attributes :_protobuf_columns,
                                :_protobuf_column_types,
+                               :_protobuf_date_datetime_time_or_timestamp_column,
                                :_protobuf_mapped_columns
       end
 
@@ -27,20 +32,31 @@ module Protobuf
           @_protobuf_column_types
         end
 
+        def _protobuf_date_datetime_time_or_timestamp_column
+          _protobuf_map_columns unless _protobuf_mapped_columns?
+
+          @_protobuf_date_datetime_time_or_timestamp_column
+        end
+
         # :nodoc:
         def _protobuf_date_column?(key)
-          _protobuf_column_types.fetch(:date, false) && _protobuf_column_types[:date].include?(key)
+          _protobuf_column_types[:date].include?(key)
+        end
+
+        # :nodoc:
+        def _protobuf_date_datetime_time_or_timestamp_column?(key)
+          _protobuf_date_datetime_time_or_timestamp_column.include?(key)
         end
 
         # :nodoc:
         def _protobuf_datetime_column?(key)
-          _protobuf_column_types.fetch(:datetime, false) && _protobuf_column_types[:datetime].include?(key)
+          _protobuf_column_types[:datetime].include?(key)
         end
 
         # Map out the columns for future reference on type conversion
         # :nodoc:
         def _protobuf_map_columns(force = false)
-          ::Thread.exclusive do
+          COLUMN_TYPE_MAP_MUTEX.synchronize do
             @_protobuf_mapped_columns = false if force
 
             return unless table_exists?
@@ -48,10 +64,17 @@ module Protobuf
 
             @_protobuf_columns = {}
             @_protobuf_column_types = ::Hash.new { |h,k| h[k] = ::Set.new }
+            @_protobuf_date_datetime_time_or_timestamp_column = ::Set.new
 
             columns.map do |column|
-              @_protobuf_columns[column.name.to_sym] = column
-              @_protobuf_column_types[column.type.to_sym] << column.name.to_sym
+              column_name_symbol = column.name.to_sym
+              column_type_symbol = column.type.to_sym
+              @_protobuf_columns[column_name_symbol] = column
+              @_protobuf_column_types[column_type_symbol] << column_name_symbol
+
+              if DATE_OR_TIME_TYPES.include?(column_type_symbol)
+                @_protobuf_date_datetime_time_or_timestamp_column << column_name_symbol
+              end
             end
 
             @_protobuf_mapped_columns = true
@@ -64,12 +87,12 @@ module Protobuf
 
         # :nodoc:
         def _protobuf_time_column?(key)
-          _protobuf_column_types.fetch(:time, false) && _protobuf_column_types[:time].include?(key)
+          _protobuf_column_types[:time].include?(key)
         end
 
         # :nodoc:
         def _protobuf_timestamp_column?(key)
-          _protobuf_column_types.fetch(:timestamp, false) && _protobuf_column_types[:timestamp].include?(key)
+          _protobuf_column_types[:timestamp].include?(key)
         end
       end
     end

data/lib/protobuf/active_record/serialization.rb

@@ -8,12 +8,14 @@ module Protobuf
 
       included do
         class << self
-          attr_writer :_protobuf_field_transformers,
+          attr_writer :_protobuf_field_symbol_transformers,
+                      :_protobuf_field_transformers,
                       :_protobuf_field_options,
                       :protobuf_message
         end
 
         private :_protobuf_convert_attributes_to_fields
+        private :_protobuf_field_symbol_transformers
         private :_protobuf_field_transformers
         private :_protobuf_message
       end
@@ -21,26 +23,20 @@ module Protobuf
       module ClassMethods
         # :nodoc:
         def _protobuf_convert_attributes_to_fields(key, value)
-          case
-          when value.nil? then
-            value
-          when _protobuf_date_column?(key) then
-            value.to_time(:utc).to_i
-          when _protobuf_datetime_column?(key) then
-            value.to_i
-          when _protobuf_time_column?(key) then
-            value.to_i
-          when _protobuf_timestamp_column?(key) then
-            value.to_i
-          else
-            value
-          end
+          return value unless _protobuf_date_datetime_time_or_timestamp_column?(key)
+          return value.to_i unless _protobuf_date_column?(key)
+
+          value.to_time(:utc).to_i
         end
 
         def _protobuf_field_options
           @_protobuf_field_options ||= {}
         end
 
+        def _protobuf_field_symbol_transformers
+          @_protobuf_field_symbol_transformers ||= {}
+        end
+
         def _protobuf_field_transformers
           @_protobuf_field_transformers ||= {}
         end
@@ -93,14 +89,13 @@ module Protobuf
         #   end
         #
         def field_from_record(field, transformer = nil, &block)
-          transformer ||= block
-
           if transformer.is_a?(Symbol)
-            callable = lambda { |value| self.__send__(transformer, value) }
-          else
-            callable = transformer
+            _protobuf_field_symbol_transformers[field] = transformer
+            return
           end
 
+          transformer ||= block
+          callable = transformer
           unless callable.respond_to?(:call)
             raise FieldTransformerError
           end
@@ -225,6 +220,8 @@ module Protobuf
         while attribute_number < limit
           field = field_attributes[attribute_number]
           hash[field] = case
+                        when _protobuf_field_symbol_transformers.has_key?(field) then
+                          self.__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
@@ -247,6 +244,11 @@ module Protobuf
         self.class._protobuf_convert_attributes_to_fields(field, value)
       end
 
+      # :nodoc:
+      def _protobuf_field_symbol_transformers
+        self.class._protobuf_field_symbol_transformers
+      end
+
       # :nodoc:
       def _protobuf_field_transformers
         self.class._protobuf_field_transformers

data/lib/protobuf/active_record/transformation.rb

@@ -62,6 +62,8 @@ module Protobuf
           return value if value.nil?
 
           value = case
+                  when !_protobuf_date_datetime_time_or_timestamp_column?(key) then
+                    value
                   when _protobuf_date_column?(key) then
                     convert_int64_to_date(value)
                   when _protobuf_datetime_column?(key) then

data/lib/protobuf/active_record/version.rb

@@ -1,5 +1,5 @@
 module Protobuf
   module ActiveRecord
-    VERSION = "3.3.1"
+    VERSION = "3.3.2"
   end
 end

data/spec/protobuf/active_record/columns_spec.rb

@@ -23,7 +23,9 @@ describe Protobuf::ActiveRecord::Columns do
       end
 
       it "maps column names by column type" do
-        expect(User._protobuf_column_types).to eq expected_column_types
+        expected_column_types.each do |expected_column_type, value|
+          expect(User._protobuf_column_types).to include expected_column_type => value
+        end
       end
     end
   end

data/spec/protobuf/active_record/serialization_spec.rb

@@ -13,7 +13,10 @@ describe Protobuf::ActiveRecord::Serialization do
       let(:date) { Date.new(2015, 10, 1) }
       let(:integer) { 1_443_657_600 }
 
-      before { allow(User).to receive(:_protobuf_date_column?).and_return(true) }
+      before {
+        allow(User).to receive(:_protobuf_date_datetime_time_or_timestamp_column?).and_return(true)
+        allow(User).to receive(:_protobuf_date_column?).and_return(true)
+      }
 
       it "converts the given value to an integer" do
         expect(User._protobuf_convert_attributes_to_fields(:foo_date, date)).to eq integer
@@ -24,7 +27,10 @@ describe Protobuf::ActiveRecord::Serialization do
       let(:datetime) { DateTime.current }
       let(:integer) { datetime.to_time.to_i }
 
-      before { allow(User).to receive(:_protobuf_datetime_column?).and_return(true) }
+      before {
+        allow(User).to receive(:_protobuf_date_datetime_time_or_timestamp_column?).and_return(true)
+        allow(User).to receive(:_protobuf_datetime_column?).and_return(true)
+      }
 
       it "converts the given value to an integer" do
         expect(User._protobuf_convert_attributes_to_fields(:foo_datetime, datetime)).to eq integer
@@ -35,7 +41,10 @@ describe Protobuf::ActiveRecord::Serialization do
       let(:time) { Time.current }
       let(:integer) { time.to_time.to_i }
 
-      before { allow(User).to receive(:_protobuf_time_column?).and_return(true) }
+      before {
+        allow(User).to receive(:_protobuf_date_datetime_time_or_timestamp_column?).and_return(true)
+        allow(User).to receive(:_protobuf_time_column?).and_return(true)
+      }
 
       it "converts the given value to an integer" do
         expect(User._protobuf_convert_attributes_to_fields(:foo_time, time)).to eq integer
@@ -46,7 +55,10 @@ describe Protobuf::ActiveRecord::Serialization do
       let(:timestamp) { Time.current }
       let(:integer) { timestamp.to_time.to_i }
 
-      before { allow(User).to receive(:_protobuf_timestamp_column?).and_return(true) }
+      before {
+        allow(User).to receive(:_protobuf_date_datetime_time_or_timestamp_column?).and_return(true)
+        allow(User).to receive(:_protobuf_timestamp_column?).and_return(true)
+      }
 
       it "converts the given value to an integer" do
         expect(User._protobuf_convert_attributes_to_fields(:foo_timestamp, timestamp)).to eq integer
@@ -64,13 +76,10 @@ describe Protobuf::ActiveRecord::Serialization do
 
   describe ".field_from_record" do
     context "when the given converter is a symbol" do
-      let(:callable) { lambda { |value| User.__send__(:extract_first_name) } }
-
       before { User.field_from_record :first_name, :extract_first_name }
 
-      it "creates a callable method object from the converter" do
-        expect(User).to receive(:extract_first_name)
-        User._protobuf_field_transformers[:first_name].call(1)
+      it "creates a symbol transformer from the converter" do
+        expect(User._protobuf_field_symbol_transformers[:first_name]).to eq :extract_first_name
       end
     end
 

data/spec/protobuf/active_record/transformation_spec.rb

@@ -34,7 +34,10 @@ describe Protobuf::ActiveRecord::Transformation do
       let(:date) { Date.current }
       let(:value) { date.to_time.to_i }
 
-      before { allow(User).to receive(:_protobuf_date_column?).and_return(true) }
+      before {
+        allow(User).to receive(:_protobuf_date_datetime_time_or_timestamp_column?).and_return(true)
+        allow(User).to receive(:_protobuf_date_column?).and_return(true)
+      }
 
       it "converts the given value to a Date object" do
         expect(User._protobuf_convert_fields_to_attributes(:foo_date, value)).to eq date
@@ -45,7 +48,10 @@ describe Protobuf::ActiveRecord::Transformation do
       let(:datetime) { DateTime.current }
       let(:value) { datetime.to_i }
 
-      before { allow(User).to receive(:_protobuf_datetime_column?).and_return(true) }
+      before {
+        allow(User).to receive(:_protobuf_date_datetime_time_or_timestamp_column?).and_return(true)
+        allow(User).to receive(:_protobuf_datetime_column?).and_return(true)
+      }
 
       it "converts the given value to a DateTime object" do
         expect(User._protobuf_convert_fields_to_attributes(:foo_datetime, value)).to be_a(DateTime)
@@ -60,7 +66,10 @@ describe Protobuf::ActiveRecord::Transformation do
       let(:time) { Time.current }
       let(:value) { time.to_i }
 
-      before { allow(User).to receive(:_protobuf_time_column?).and_return(true) }
+      before {
+        allow(User).to receive(:_protobuf_date_datetime_time_or_timestamp_column?).and_return(true)
+        allow(User).to receive(:_protobuf_time_column?).and_return(true)
+      }
 
       it "converts the given value to a Time object" do
         expect(User._protobuf_convert_fields_to_attributes(:foo_time, value)).to be_a(Time)
@@ -75,7 +84,10 @@ describe Protobuf::ActiveRecord::Transformation do
       let(:time) { Time.current }
       let(:value) { time.to_i }
 
-      before { allow(User).to receive(:_protobuf_timestamp_column?).and_return(true) }
+      before {
+        allow(User).to receive(:_protobuf_date_datetime_time_or_timestamp_column?).and_return(true)
+        allow(User).to receive(:_protobuf_timestamp_column?).and_return(true)
+      }
 
       it "converts the given value to a Time object" do
         expect(User._protobuf_convert_fields_to_attributes(:foo_time, value)).to be_a(Time)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protobuf-activerecord
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
 platform: ruby
 authors:
 - Adam Hutchison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-15 00:00:00.000000000 Z
+date: 2016-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -234,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Google Protocol Buffers integration for Active Record