active_remote 2.3.2 → 2.3.3.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b08e44ec12d74b9ccbcad49d83a11410e113ad89
-  data.tar.gz: 548d83e5dfa32d9d1509438facddf3004f7d34d9
+  metadata.gz: fde256631d072c0dbb9b64da285670f35907c207
+  data.tar.gz: f087ed474857994084ce213cd65334e171fce348
 SHA512:
-  metadata.gz: 813cfdb4e920fa42af09933086d24c9bbcf119ec7727b385b5484f942cb74af791b5e0b64a4e501f9ff36b368feaaad9f925f20b3026d3fe93019e9e0a7a7e6f
-  data.tar.gz: 1b232f29d892e3a9e09b269b12d0a8b60e180f90b290456bed7dca082c0a85dadedecdba341b7816e6e82c821036a2f8fb34531776edfddfba830949d4393002
+  metadata.gz: 8984da90d6fea1eb43c79d7ba7df6aaf4d08d9bd1967056a0d0b89861220fc82e60d699d1c509d7c698f25c70f668ad994d76672161731021431d176cd5075cc
+  data.tar.gz: c42d0d74c59126c346503556e9c39ac068de220ae27e6d0ef4a885c2b05ae8b90dceb58a725c2b188eb4ddf6099f56d1e0997f3b20e77b90f92957f7cd560197

data/lib/active_remote/attributes.rb

@@ -1,5 +1,13 @@
 module ActiveRemote
   module Attributes
+    def attributes
+      @attributes ||= begin
+        attribute_names = self.class.attribute_names
+        Hash[attribute_names.map { |key| [key, send(key)] }]
+      end
+      @attributes.dup
+    end
+
     # Read attribute from the attributes hash
     #
     def read_attribute(name)

data/lib/active_remote/base.rb

@@ -15,13 +15,20 @@ require 'active_remote/rpc'
 require 'active_remote/scope_keys'
 require 'active_remote/search'
 require 'active_remote/serialization'
+require 'active_remote/typecasting'
 require 'active_remote/validations'
 
 module ActiveRemote
   class Base
     extend ActiveModel::Callbacks
 
-    include ActiveAttr::Model
+    include ActiveAttr::BasicModel
+    include ActiveAttr::BlockInitialization
+    include ActiveAttr::Logger
+    include ActiveAttr::MassAssignment
+    include ActiveAttr::AttributeDefaults
+    include ActiveAttr::QueryAttributes
+    include ActiveAttr::Serialization
 
     include Association
     include Attributes
@@ -35,6 +42,7 @@ module ActiveRemote
     include ScopeKeys
     include Search
     include Serialization
+    include Typecasting
 
     # Overrides some methods, providing support for dirty tracking,
     # so it needs to be included last.
@@ -49,7 +57,11 @@ module ActiveRemote
     define_model_callbacks :initialize, :only => :after
 
     def initialize(*)
-      @attributes ||= {}
+      @attributes ||= begin
+        attribute_names = self.class.attribute_names
+        Hash[attribute_names.map { |key| [key, send(key)] }]
+      end
+
       @new_record = true
 
       skip_dirty_tracking do

data/lib/active_remote/serializers/protobuf.rb

@@ -1,24 +1,26 @@
+require "active_remote/typecasting"
+
 module ActiveRemote
   module Serializers
     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
+        ::Protobuf::Field::BoolField     => ActiveRemote::Typecasting::BooleanTypecaster,
+        ::Protobuf::Field::BytesField    => ActiveRemote::Typecasting::StringTypecaster,
+        ::Protobuf::Field::DoubleField   => ActiveRemote::Typecasting::FloatTypecaster,
+        ::Protobuf::Field::Fixed32Field  => ActiveRemote::Typecasting::IntegerTypecaster,
+        ::Protobuf::Field::Fixed64Field  => ActiveRemote::Typecasting::IntegerTypecaster,
+        ::Protobuf::Field::FloatField    => ActiveRemote::Typecasting::FloatTypecaster,
+        ::Protobuf::Field::Int32Field    => ActiveRemote::Typecasting::IntegerTypecaster,
+        ::Protobuf::Field::Int64Field    => ActiveRemote::Typecasting::IntegerTypecaster,
+        ::Protobuf::Field::Sfixed32Field => ActiveRemote::Typecasting::IntegerTypecaster,
+        ::Protobuf::Field::Sfixed64Field => ActiveRemote::Typecasting::IntegerTypecaster,
+        ::Protobuf::Field::Sint32Field   => ActiveRemote::Typecasting::IntegerTypecaster,
+        ::Protobuf::Field::Sint64Field   => ActiveRemote::Typecasting::IntegerTypecaster,
+        ::Protobuf::Field::StringField   => ActiveRemote::Typecasting::StringTypecaster,
+        ::Protobuf::Field::Uint32Field   => ActiveRemote::Typecasting::IntegerTypecaster,
+        ::Protobuf::Field::Uint64Field   => ActiveRemote::Typecasting::IntegerTypecaster
       }
 
       module ClassMethods
@@ -127,10 +129,7 @@ module ActiveRemote
         end
 
         def typecaster
-          @typecaster ||= begin
-            typecaster = TYPECASTER_MAP[field.type_class]
-            typecaster.new if typecaster
-          end
+          @typecaster ||= TYPECASTER_MAP[field.type_class]
         end
 
         def typecaster?

data/lib/active_remote/typecasting.rb

@@ -0,0 +1,60 @@
+require "active_remote/typecasting/big_decimal_typecaster"
+require "active_remote/typecasting/boolean"
+require "active_remote/typecasting/boolean_typecaster"
+require "active_remote/typecasting/date_time_typecaster"
+require "active_remote/typecasting/date_typecaster"
+require "active_remote/typecasting/float_typecaster"
+require "active_remote/typecasting/integer_typecaster"
+require "active_remote/typecasting/object_typecaster"
+require "active_remote/typecasting/string_typecaster"
+
+module ActiveRemote
+  module Typecasting
+    extend ActiveSupport::Concern
+
+    TYPECASTER_MAP = {
+      BigDecimal => ::ActiveRemote::Typecasting::BigDecimalTypecaster,
+      Boolean => ::ActiveRemote::Typecasting::BooleanTypecaster,
+      Date => ::ActiveRemote::Typecasting::DateTypecaster,
+      DateTime => ::ActiveRemote::Typecasting::DateTimeTypecaster,
+      Float => ::ActiveRemote::Typecasting::FloatTypecaster,
+      Integer => ::ActiveRemote::Typecasting::IntegerTypecaster,
+      Object => ::ActiveRemote::Typecasting::ObjectTypecaster,
+      String => ::ActiveRemote::Typecasting::StringTypecaster
+    }.freeze
+
+    private
+
+    def attribute=(name, value)
+      return super if value.nil?
+
+      typecaster = _attribute_typecaster(name)
+      return super unless typecaster
+
+      super(name, typecaster.call(value))
+    end
+
+    def _attribute_typecaster(attribute_name)
+      self.class.attributes[attribute_name][:typecaster] || _typecaster_for(attribute_name)
+    end
+
+    def _typecaster_for(attribute_name)
+      type = self.class.attributes[attribute_name][:type]
+      return nil unless type
+
+      TYPECASTER_MAP[type]
+    end
+
+    module ClassMethods
+      def inspect
+        inspected_attributes = attribute_names.sort.map { |name| "#{name}: #{_attribute_type(name)}" }
+        attributes_list = "(#{inspected_attributes.join(", ")})" unless inspected_attributes.empty?
+        "#{name}#{attributes_list}"
+      end
+
+      def _attribute_type(attribute_name)
+        attributes[attribute_name][:type] || Object
+      end
+    end
+  end
+end

data/lib/active_remote/typecasting/big_decimal_typecaster.rb

@@ -0,0 +1,21 @@
+require "bigdecimal"
+require "bigdecimal/util"
+require "active_support/core_ext/big_decimal/conversions"
+
+module ActiveRemote
+  module Typecasting
+    class BigDecimalTypecaster
+      def self.call(value)
+        if value.is_a?(BigDecimal)
+          value
+        elsif value.is_a?(Rational)
+          value.to_f.to_d
+        elsif value.respond_to?(:to_d)
+          value.to_d
+        else
+          BigDecimal.new(value.to_s)
+        end
+      end
+    end
+  end
+end

data/lib/active_remote/typecasting/boolean.rb

@@ -0,0 +1,7 @@
+module ActiveRemote
+  module Typecasting
+    # For use in :type dsl option
+    class Boolean
+    end
+  end
+end

data/lib/active_remote/typecasting/boolean_typecaster.rb

@@ -0,0 +1,15 @@
+module ActiveRemote
+  module Typecasting
+    class BooleanTypecaster
+       FALSE_VALUES = ["n", "N", "no", "No", "NO", "false", "False", "FALSE", "off", "Off", "OFF", "f", "F"]
+
+      def self.call(value)
+        case value
+        when *FALSE_VALUES then false
+        when Numeric, /^\-?[0-9]/ then !value.to_f.zero?
+        else value.present?
+        end
+      end
+    end
+  end
+end

data/lib/active_remote/typecasting/date_time_typecaster.rb

@@ -0,0 +1,9 @@
+module ActiveRemote
+  module Typecasting
+    class DateTimeTypecaster
+      def self.call(value)
+        value.to_datetime if value.respond_to?(:to_datetime)
+      end
+    end
+  end
+end

data/lib/active_remote/typecasting/date_typecaster.rb

@@ -0,0 +1,10 @@
+module ActiveRemote
+  module Typecasting
+    class DateTypecaster
+      def self.call(value)
+        value.to_date if value.respond_to?(:to_date)
+      rescue NoMethodError, ArgumentError
+      end
+    end
+  end
+end

data/lib/active_remote/typecasting/float_typecaster.rb

@@ -0,0 +1,9 @@
+module ActiveRemote
+  module Typecasting
+    class FloatTypecaster
+      def self.call(value)
+        value.to_f if value.respond_to?(:to_f)
+      end
+    end
+  end
+end

data/lib/active_remote/typecasting/integer_typecaster.rb

@@ -0,0 +1,10 @@
+module ActiveRemote
+  module Typecasting
+    class IntegerTypecaster
+      def self.call(value)
+        value.to_i if value.respond_to?(:to_i)
+      rescue FloatDomainError
+      end
+    end
+  end
+end

data/lib/active_remote/typecasting/object_typecaster.rb

@@ -0,0 +1,9 @@
+module ActiveRemote
+  module Typecasting
+    class ObjectTypecaster
+      def self.call(value)
+        value
+      end
+    end
+  end
+end

data/lib/active_remote/typecasting/string_typecaster.rb

@@ -0,0 +1,9 @@
+module ActiveRemote
+  module Typecasting
+    class StringTypecaster
+      def self.call(value)
+        value.to_s if value.respond_to?(:to_s)
+      end
+    end
+  end
+end

data/lib/active_remote/version.rb

@@ -1,3 +1,3 @@
 module ActiveRemote
-  VERSION = "2.3.2"
+  VERSION = "2.3.3.pre"
 end

data/spec/lib/active_remote/typecasting_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+describe ::ActiveRemote::Typecasting do
+  let(:test_class) { ::TypecastedAuthor }
+
+  describe "boolean" do
+    it "casts to boolean" do
+      record = test_class.new(:writes_fiction => "no")
+      expect(record.writes_fiction).to eq(false)
+    end
+  end
+
+  describe "datetime" do
+    it "casts to datetime" do
+      record = test_class.new(:birthday => "2016-01-01")
+      expect(record.birthday).to eq(DateTime.parse("2016-01-01"))
+    end
+  end
+
+  describe "float" do
+    it "casts to float" do
+      record = test_class.new(:net_sales => "2000.20")
+      expect(record.net_sales).to eq(2000.2)
+    end
+  end
+
+  describe "integer" do
+    it "casts to integer" do
+      record = test_class.new(:age => "40")
+      expect(record.age).to eq(40)
+    end
+  end
+
+  describe "string" do
+    it "casts to string" do
+      record = test_class.new(:guid => 1000)
+      expect(record.guid).to eq("1000")
+    end
+  end
+end

data/spec/support/models.rb

@@ -3,3 +3,4 @@ require 'support/models/author'
 require 'support/models/category'
 require 'support/models/post'
 require 'support/models/tag'
+require 'support/models/typecasted_author'

data/spec/support/models/typecasted_author.rb

@@ -0,0 +1,8 @@
+class TypecastedAuthor < ::ActiveRemote::Base
+  attribute :guid, :type => String
+  attribute :name, :typecaster => StringTypecaster
+  attribute :age, :type => Integer
+  attribute :birthday, :type => DateTime
+  attribute :writes_fiction, :type => Boolean
+  attribute :net_sales, :type => Float
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_remote
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.3.pre
 platform: ruby
 authors:
 - Adam Hutchison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-13 00:00:00.000000000 Z
+date: 2016-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr
@@ -191,6 +191,16 @@ files:
 - lib/active_remote/serialization.rb
 - lib/active_remote/serializers/json.rb
 - lib/active_remote/serializers/protobuf.rb
+- lib/active_remote/typecasting.rb
+- lib/active_remote/typecasting/big_decimal_typecaster.rb
+- lib/active_remote/typecasting/boolean.rb
+- lib/active_remote/typecasting/boolean_typecaster.rb
+- lib/active_remote/typecasting/date_time_typecaster.rb
+- lib/active_remote/typecasting/date_typecaster.rb
+- lib/active_remote/typecasting/float_typecaster.rb
+- lib/active_remote/typecasting/integer_typecaster.rb
+- lib/active_remote/typecasting/object_typecaster.rb
+- lib/active_remote/typecasting/string_typecaster.rb
 - lib/active_remote/validations.rb
 - lib/active_remote/version.rb
 - spec/core_ext/date_time_spec.rb
@@ -209,6 +219,7 @@ files:
 - spec/lib/active_remote/serialization_spec.rb
 - spec/lib/active_remote/serializers/json_spec.rb
 - spec/lib/active_remote/serializers/protobuf_spec.rb
+- spec/lib/active_remote/typecasting_spec.rb
 - spec/lib/active_remote/validations_spec.rb
 - spec/spec_helper.rb
 - spec/support/definitions/author.proto
@@ -224,6 +235,7 @@ files:
 - spec/support/models/message_with_options.rb
 - spec/support/models/post.rb
 - spec/support/models/tag.rb
+- spec/support/models/typecasted_author.rb
 - spec/support/protobuf.rb
 - spec/support/protobuf/author.pb.rb
 - spec/support/protobuf/category.pb.rb
@@ -245,9 +257,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: []
 rubyforge_project: 
 rubygems_version: 2.5.1
@@ -271,6 +283,7 @@ test_files:
 - spec/lib/active_remote/serialization_spec.rb
 - spec/lib/active_remote/serializers/json_spec.rb
 - spec/lib/active_remote/serializers/protobuf_spec.rb
+- spec/lib/active_remote/typecasting_spec.rb
 - spec/lib/active_remote/validations_spec.rb
 - spec/spec_helper.rb
 - spec/support/definitions/author.proto
@@ -286,6 +299,7 @@ test_files:
 - spec/support/models/message_with_options.rb
 - spec/support/models/post.rb
 - spec/support/models/tag.rb
+- spec/support/models/typecasted_author.rb
 - spec/support/protobuf.rb
 - spec/support/protobuf/author.pb.rb
 - spec/support/protobuf/category.pb.rb