active_remote 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 504eab37f9a56c2656caa7504f24641a66eae495
-  data.tar.gz: b12c095d6bbb8cbb01f61b0ceb8acfdbb4dd7f3f
+  metadata.gz: 75e05a76039dc8d851f60fce3e0ccf7f0a0b9640
+  data.tar.gz: 39a54ee4bfc9f1fc2b5ed191c3a40b6dfa2e910b
 SHA512:
-  metadata.gz: 9939ebba06ba1b48b023ba1e82ee0123973990e200a38e2849454fba50deb50ac5c71d85e70352dc2f3cd6b5c8bc4a66904207ab9169a55caa8fe362c177a4f7
-  data.tar.gz: dbe5bb87bb059095f306183c9c5d65366d6ca9c19c107b5674a523bea61512edc495019029059d337b5f143ed67ac670404094938ad13fa7d7f07072dd200574
+  metadata.gz: 861f57dbc0304deb5534596447c517169529c8738d128d2c29f6d170b43f23abbb101975979f019eb6df836706a9d0d6c5e9c2bca840eb60c5dd15f73603393b
+  data.tar.gz: d57cde44a3b9a2cff12db7c0ce34aa4aa78a75f17b6eaeb1ed54de3ee99d8e75a0219e3f885cbc2a191b247855fc5171cd6a063c0f6849a4334eff50471574d2

data/lib/active_remote/serializers/protobuf.rb

@@ -3,6 +3,24 @@ module ActiveRemote
     module Protobuf
       extend ActiveSupport::Concern
 
+      TYPECASTER_MAP = {
+        ::Protobuf::Field::BoolField     => ActiveAttr::Typecasting::BooleanTypecaster,
+        ::Protobuf::Field::BytesField    => ActiveAttr::Typecasting::StringTypecaster,
+        ::Protobuf::Field::DoubleField   => ActiveAttr::Typecasting::FloatTypecaster,
+        ::Protobuf::Field::Fixed32Field  => ActiveAttr::Typecasting::IntegerTypecaster,
+        ::Protobuf::Field::Fixed64Field  => ActiveAttr::Typecasting::IntegerTypecaster,
+        ::Protobuf::Field::FloatField    => ActiveAttr::Typecasting::FloatTypecaster,
+        ::Protobuf::Field::Int32Field    => ActiveAttr::Typecasting::IntegerTypecaster,
+        ::Protobuf::Field::Int64Field    => ActiveAttr::Typecasting::IntegerTypecaster,
+        ::Protobuf::Field::Sfixed32Field => ActiveAttr::Typecasting::IntegerTypecaster,
+        ::Protobuf::Field::Sfixed64Field => ActiveAttr::Typecasting::IntegerTypecaster,
+        ::Protobuf::Field::Sint32Field   => ActiveAttr::Typecasting::IntegerTypecaster,
+        ::Protobuf::Field::Sint64Field   => ActiveAttr::Typecasting::IntegerTypecaster,
+        ::Protobuf::Field::StringField   => ActiveAttr::Typecasting::StringTypecaster,
+        ::Protobuf::Field::Uint32Field   => ActiveAttr::Typecasting::IntegerTypecaster,
+        ::Protobuf::Field::Uint64Field   => ActiveAttr::Typecasting::IntegerTypecaster
+      }
+
       module ClassMethods
         def fields_from_attributes(message_class, attributes)
           Fields.from_attributes(message_class, attributes)
@@ -75,9 +93,9 @@ module ActiveRemote
           when field.message? then
             message_value
           when field.repeated? then
-            repeated_value
+            repeated_value.map { |value| typecast(value) }
           else
-            value
+            typecasted_value
           end
         end
 
@@ -97,6 +115,27 @@ module ActiveRemote
         def repeated_value
           value.is_a?(Array) ? value : [ value ]
         end
+
+        def typecast(value)
+          return value if value.nil?
+
+          typecaster? ? typecaster.call(value) : value
+        end
+
+        def typecasted_value
+          typecast(value)
+        end
+
+        def typecaster
+          @typecaster ||= begin
+            typecaster = TYPECASTER_MAP[field.type_class]
+            typecaster.new if typecaster
+          end
+        end
+
+        def typecaster?
+          typecaster.present?
+        end
       end
     end
   end

data/lib/active_remote/version.rb

@@ -1,3 +1,3 @@
 module ActiveRemote
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/spec/lib/active_remote/serializers/protobuf_spec.rb

@@ -51,5 +51,38 @@ describe ActiveRemote::Serializers::Protobuf::Field do
         end
       end
     end
+
+    # TODO: Find a better way to write this. It works for now, but it's not
+    # very clear and is hard to track down since failures don't include a
+    # description.
+    #
+    # TODO: Consider adding specific specs for typecasting dates to integers
+    # or strings since that's what prompted the re-introduction of the
+    # typecasting.
+    #
+    context "when typecasting fields" do
+      let(:string_value) { double(:string, :to_s => '') }
+
+      def typecasts(field, conversion)
+        field = Serializer.get_field(field, true)
+        described_class.from_attribute(field, conversion.first[0]).should eq conversion.first[1]
+      end
+
+      it { typecasts(:bool_field, '0' => false) }
+      it { typecasts(:bytes_field, string_value => '') }
+      it { typecasts(:double_field, 0 => 0.0) }
+      it { typecasts(:fixed32_field, '0' => 0) }
+      it { typecasts(:fixed64_field, '0' => 0) }
+      it { typecasts(:float_field, 0 => 0.0) }
+      it { typecasts(:int32_field, '0' => 0) }
+      it { typecasts(:int64_field, '0' => 0) }
+      it { typecasts(:sfixed32_field, '0' => 0) }
+      it { typecasts(:sfixed64_field, '0' => 0) }
+      it { typecasts(:sint32_field, '0' => 0) }
+      it { typecasts(:sint64_field, '0' => 0) }
+      it { typecasts(:string_field, string_value => '') }
+      it { typecasts(:uint32_field, '0' => 0) }
+      it { typecasts(:uint64_field, '0' => 0) }
+    end
   end
 end

data/spec/support/definitions/serializer.proto

@@ -0,0 +1,17 @@
+message Serializer {
+  optional bool bool_field         = 1;
+  optional bytes bytes_field       = 2;
+  optional double double_field     = 3;
+  optional fixed32 fixed32_field   = 4;
+  optional fixed64 fixed64_field   = 5;
+  optional float float_field       = 6;
+  optional int32 int32_field       = 7;
+  optional int64 int64_field       = 8;
+  optional sfixed32 sfixed32_field = 9;
+  optional sfixed64 sfixed64_field = 10;
+  optional sint32 sint32_field     = 11;
+  optional sint64 sint64_field     = 12;
+  optional string string_field     = 13;
+  optional uint32 uint32_field     = 14;
+  optional uint64 uint64_field     = 15;
+}

data/spec/support/protobuf.rb

@@ -1,4 +1,5 @@
 require 'support/protobuf/author.pb'
 require 'support/protobuf/category.pb'
 require 'support/protobuf/post.pb'
+require 'support/protobuf/serializer.pb'
 require 'support/protobuf/tag.pb'

data/spec/support/protobuf/serializer.pb.rb

@@ -0,0 +1,33 @@
+##
+# This file is auto-generated. DO NOT EDIT!
+#
+require 'protobuf/message'
+
+
+##
+# Message Classes
+#
+class Serializer < ::Protobuf::Message; end
+
+
+##
+# Message Fields
+#
+class Serializer
+  optional :bool, :bool_field, 1
+  optional :bytes, :bytes_field, 2
+  optional :double, :double_field, 3
+  optional :fixed32, :fixed32_field, 4
+  optional :fixed64, :fixed64_field, 5
+  optional :float, :float_field, 6
+  optional :int32, :int32_field, 7
+  optional :int64, :int64_field, 8
+  optional :sfixed32, :sfixed32_field, 9
+  optional :sfixed64, :sfixed64_field, 10
+  optional :sint32, :sint32_field, 11
+  optional :sint64, :sint64_field, 12
+  optional :string, :string_field, 13
+  optional :uint32, :uint32_field, 14
+  optional :uint64, :uint64_field, 15
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_remote
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Adam Hutchison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr
@@ -208,6 +208,7 @@ files:
 - spec/support/definitions/category.proto
 - spec/support/definitions/error.proto
 - spec/support/definitions/post.proto
+- spec/support/definitions/serializer.proto
 - spec/support/definitions/tag.proto
 - spec/support/helpers.rb
 - spec/support/models.rb
@@ -221,6 +222,7 @@ files:
 - spec/support/protobuf/category.pb.rb
 - spec/support/protobuf/error.pb.rb
 - spec/support/protobuf/post.pb.rb
+- spec/support/protobuf/serializer.pb.rb
 - spec/support/protobuf/tag.pb.rb
 homepage: https://github.com/liveh2o/active_remote
 licenses: []
@@ -265,6 +267,7 @@ test_files:
 - spec/support/definitions/category.proto
 - spec/support/definitions/error.proto
 - spec/support/definitions/post.proto
+- spec/support/definitions/serializer.proto
 - spec/support/definitions/tag.proto
 - spec/support/helpers.rb
 - spec/support/models.rb
@@ -278,4 +281,5 @@ test_files:
 - spec/support/protobuf/category.pb.rb
 - spec/support/protobuf/error.pb.rb
 - spec/support/protobuf/post.pb.rb
+- spec/support/protobuf/serializer.pb.rb
 - spec/support/protobuf/tag.pb.rb