active_remote 3.3.3 → 5.0.0.pre

data/lib/active_remote/dsl.rb

@@ -1,11 +1,10 @@
-require 'active_support/inflector'
+require "active_support/inflector"
 
 module ActiveRemote
   module DSL
     extend ActiveSupport::Concern
 
     module ClassMethods
-
       # Whitelist enable attributes for serialization purposes.
       #
       # ====Examples
@@ -121,10 +120,10 @@ module ActiveRemote
       # the class constant.
       #
       def _determine_service_class
-        class_name = [ namespace, service_name ].join("/")
+        class_name = [namespace, service_name].join("/")
         const_name = class_name.camelize
 
-        return const_name.present? ? const_name.constantize : const_name
+        const_name.present? ? const_name.constantize : const_name
       end
 
       def _determine_service_name

data/lib/active_remote/errors.rb

@@ -18,7 +18,7 @@ module ActiveRemote
 
     def initialize(record)
       @record = record
-      errors = @record.errors.full_messages.join(', ')
+      errors = @record.errors.full_messages.join(", ")
       super(errors)
     end
   end
@@ -43,16 +43,6 @@ module ActiveRemote
   # Raised by ActiveRemove::Base.save! and ActiveRemote::Base.create! methods
   # when remote record cannot be saved because it is invalid.
   class RemoteRecordNotSaved < ActiveRemoteError
-    attr_reader :record
-
-    def initialize(message_or_record = nil)
-      message = message_or_record
-      if message_or_record.is_a?(::ActiveRemote::Base)
-        @record = message_or_record
-        message = @record.errors.full_messages.join(", ")
-      end
-      super(message)
-    end
   end
 
   class UnknownAttributeError < ActiveRemoteError

data/lib/active_remote/persistence.rb

@@ -1,4 +1,4 @@
-require 'active_remote/rpc'
+require "active_remote/rpc"
 
 module ActiveRemote
   module Persistence
@@ -20,7 +20,6 @@ module ActiveRemote
     end
 
     module ClassMethods
-
       # Creates a remote record through the service.
       #
       # The service will run any validations and if any of them fail, will return
@@ -81,7 +80,7 @@ module ActiveRemote
 
       add_errors(response.errors) if response.respond_to?(:errors)
 
-      return success? ? freeze : false
+      success? ? freeze : false
     end
 
     # Deletes the record from the service (the service determines if the
@@ -92,7 +91,7 @@ module ActiveRemote
     #
     def delete!
       delete
-      raise ActiveRemoteError.new(errors.to_s) if has_errors?
+      raise ActiveRemoteError, errors.to_s if has_errors?
     end
 
     # Destroys (hard deletes) the record from the service and freezes this
@@ -106,7 +105,7 @@ module ActiveRemote
 
       add_errors(response.errors) if response.respond_to?(:errors)
 
-      return success? ? freeze : false
+      success? ? freeze : false
     end
 
     # Destroys (hard deletes) the record from the service and freezes this
@@ -116,13 +115,13 @@ module ActiveRemote
     #
     def destroy!
       destroy
-      raise ActiveRemoteError.new(errors.to_s) if has_errors?
+      raise ActiveRemoteError, errors.to_s if has_errors?
     end
 
     # Returns true if the record has errors; otherwise, returns false.
     #
     def has_errors?
-      return respond_to?(:errors) && errors.present?
+      respond_to?(:errors) && errors.present?
     end
 
     # Instantiate a record with the given remote attributes. Generally used
@@ -143,7 +142,7 @@ module ActiveRemote
     # Returns true if the remote record has been saved; otherwise, returns false.
     #
     def persisted?
-      return ! new_record?
+      !new_record?
     end
 
     # Sets the instance to be a readonly object
@@ -184,13 +183,13 @@ module ActiveRemote
     # Also runs any before/after save callbacks that are defined.
     #
     def save!(*args)
-      save(*args) || fail(RemoteRecordNotSaved, self)
+      save(*args) || raise(RemoteRecordNotSaved)
     end
 
     # Returns true if the record doesn't have errors; otherwise, returns false.
     #
     def success?
-      return ! has_errors?
+      !has_errors?
     end
 
     # Updates a single attribute and saves the record.
@@ -241,7 +240,7 @@ module ActiveRemote
 
         response = remote_call(:create, new_attributes)
 
-        assign_attributes(response.to_hash)
+        instantiate(response.to_hash)
         add_errors(response.errors) if response.respond_to?(:errors)
 
         @new_record = has_errors?
@@ -271,7 +270,7 @@ module ActiveRemote
 
         response = remote_call(:update, updated_attributes)
 
-        assign_attributes(response.to_hash)
+        instantiate(response.to_hash)
         add_errors(response.errors) if response.respond_to?(:errors)
 
         success?

data/lib/active_remote/primary_key.rb

@@ -3,7 +3,6 @@ module ActiveRemote
     extend ActiveSupport::Concern
 
     module ClassMethods
-
       ##
       # The default_primary_key is used to define what attribute is used
       # as a primary key for your global code base. If you use a primary

data/lib/active_remote/query_attributes.rb

@@ -21,25 +21,25 @@ module ActiveRemote
       attribute_method_suffix "?"
     end
 
-    # Test the presence of an attribute
-    #
-    # See {Typecasting::BooleanTypecaster.call} for more details.
-    #
-    # @example Query an attribute
-    #   person.query_attribute(:name)
-    #
-    def query_attribute(name)
-      if respond_to?("#{name}?")
-        send("#{name}?")
+    def query_attribute(attr_name)
+      value = self[attr_name]
+
+      case value
+      when true        then true
+      when false, nil  then false
       else
-        raise ::ActiveRemote::UnknownAttributeError, "unknown attribute: #{name}"
+        if value.respond_to?(:zero?)
+          !value.zero?
+        else
+          value.present?
+        end
       end
     end
 
   private
 
-    def attribute?(name)
-      ::ActiveRemote::Typecasting::BooleanTypecaster.call(read_attribute(name))
+    def attribute?(attribute_name)
+      query_attribute(attribute_name)
     end
   end
 end

data/lib/active_remote/rpc.rb

@@ -1,5 +1,5 @@
-require 'active_remote/rpc_adapters/protobuf_adapter'
-require 'active_remote/serializers/protobuf'
+require "active_remote/rpc_adapters/protobuf_adapter"
+require "active_remote/serializers/protobuf"
 
 module ActiveRemote
   module RPC
@@ -12,19 +12,13 @@ module ActiveRemote
     module ClassMethods
       # Builds an attribute hash that be assigned directly
       # to an object from an rpc response
-      def build_from_rpc(new_attributes)
-        new_attributes = new_attributes.stringify_keys
-        constructed_attributes = {}
-        attributes.each do |name, definition|
-          if new_attributes[name].nil?
-            constructed_attributes[name] = nil
-          elsif definition[:typecaster]
-            constructed_attributes[name] = definition[:typecaster].call(new_attributes[name])
-          else
-            constructed_attributes[name] = new_attributes[name]
-          end
+      def build_from_rpc(values)
+        values = values.stringify_keys
+
+        attributes.inject({}) do |attributes, (name, definition)|
+          attributes[name] = definition.from_rpc(values[name])
+          attributes
         end
-        constructed_attributes
       end
 
       # Execute an RPC call to the remote service and return the raw response.

data/lib/active_remote/rpc_adapters/protobuf_adapter.rb

@@ -1,11 +1,11 @@
-require 'active_remote/serializers/protobuf'
+require "active_remote/serializers/protobuf"
 
 module ActiveRemote
   module RPCAdapters
     class ProtobufAdapter
       include Serializers::Protobuf
 
-      attr_reader :last_request, :last_response, :service_class
+      attr_reader :service_class
       attr_accessor :endpoints
 
       delegate :client, :to => :service_class
@@ -22,9 +22,10 @@ module ActiveRemote
       #
       def execute(endpoint, request_args)
         rpc_method = endpoints.fetch(endpoint) { endpoint }
-        @last_request = request(rpc_method, request_args)
+        request = build_request(rpc_method, request_args)
+        response = nil
 
-        client.__send__(rpc_method, @last_request) do |c|
+        client.send(rpc_method, request) do |c|
           # In the event of service failure, raise the error.
           c.on_failure do |error|
             protobuf_error = protobuf_error_class(error)
@@ -32,16 +33,26 @@ module ActiveRemote
           end
 
           # In the event of service success, assign the response.
-          c.on_success do |response|
-            @last_response = response
+          c.on_success do |rpc_response|
+            response = rpc_response
           end
         end
 
-        @last_response
+        response
       end
 
     private
 
+      # Return a protobuf request object for the given rpc request.
+      #
+      def build_request(rpc_method, request_args)
+        return request_args unless request_args.is_a?(Hash)
+
+        message_class = request_type(rpc_method)
+        fields = fields_from_attributes(message_class, request_args)
+        message_class.new(fields)
+      end
+
       def protobuf_error_class(error)
         return ::ActiveRemote::ActiveRemoteError unless error.respond_to?(:error_type)
 
@@ -71,16 +82,6 @@ module ActiveRemote
         end
       end
 
-      # Return a protobuf request object for the given rpc request.
-      #
-      def request(rpc_method, request_args)
-        return request_args unless request_args.is_a?(Hash)
-
-        message_class = request_type(rpc_method)
-        fields = fields_from_attributes(message_class, request_args)
-        message_class.new(fields)
-      end
-
       # Return the class applicable to the request for the given rpc method.
       #
       def request_type(rpc_method)

data/lib/active_remote/scope_keys.rb

@@ -10,7 +10,6 @@ module ActiveRemote
     end
 
     module ClassMethods
-
       ##
       # Allows you to define, at a class level, what keys should be
       # used as identifiers when making remote calls. For instance,
@@ -31,7 +30,7 @@ module ActiveRemote
       # persistence or refresh calls.
       #
       def scope_keys
-        [ primary_key.to_s ] + _scope_keys
+        [primary_key.to_s] + _scope_keys
       end
     end
 

data/lib/active_remote/search.rb

@@ -1,5 +1,5 @@
-require 'active_remote/persistence'
-require 'active_remote/rpc'
+require "active_remote/persistence"
+require "active_remote/rpc"
 
 module ActiveRemote
   module Search
@@ -26,9 +26,9 @@ module ActiveRemote
       #
       def find(args)
         remote = self.search(args).first
-        raise RemoteRecordNotFound.new(self) if remote.nil?
+        raise RemoteRecordNotFound, self if remote.nil?
 
-        return remote
+        remote
       end
 
       # Tries to load the first record; if it fails, then create is called
@@ -91,7 +91,9 @@ module ActiveRemote
         response = remote_call(:search, args)
 
         if response.respond_to?(:records)
-          records = serialize_records(response.records)
+          serialize_records(response.records)
+        else
+          response
         end
       end
 
@@ -115,7 +117,7 @@ module ActiveRemote
     #
     def reload
       fresh_object = self.class.find(scope_key_hash)
-      @attributes.update(fresh_object.instance_variable_get('@attributes'))
+      @attributes.update(fresh_object.instance_variable_get("@attributes"))
     end
   end
 end

data/lib/active_remote/serializers/protobuf.rb

@@ -1,5 +1,3 @@
-require "active_remote/type"
-
 module ActiveRemote
   module Serializers
     module Protobuf
@@ -99,14 +97,22 @@ module ActiveRemote
           when field.message? then
             message_value
           when field.repeated? then
-            repeated_value.map { |value| typecast(value) }
+            repeated_value.map { |value| cast(value) }
           else
-            typecasted_value
+            cast_value
           end
         end
 
       private
 
+        def cast(value)
+          type.cast(value)
+        end
+
+        def cast_value
+          cast(value)
+        end
+
         def message_value(attributes = nil)
           attributes ||= value
           attributes.is_a?(Hash) ? Fields.from_attributes(field.type_class, attributes) : attributes
@@ -119,31 +125,15 @@ module ActiveRemote
         end
 
         def repeated_value
-          value.is_a?(Array) ? value : [ value ]
+          value.is_a?(Array) ? value : [value]
         end
 
-        def type_name
-          Serializers::Protobuf.type_name_for_field(field)
+        def type
+          @type ||= ::ActiveModel::Type.lookup(type_name)
         end
 
-        def typecast(value)
-          return value if value.nil?
-
-          typecaster? ? typecaster.call(value) : value
-        end
-
-        def typecasted_value
-          typecast(value)
-        end
-
-        def typecaster
-          return nil if type_name.nil?
-
-          @typecaster ||= Type.lookup(type_name)
-        end
-
-        def typecaster?
-          typecaster.present?
+        def type_name
+          Serializers::Protobuf.type_name_for_field(field) || :value
         end
       end
     end

data/lib/active_remote/validations.rb

@@ -54,7 +54,7 @@ module ActiveRemote
   protected
 
     def raise_validation_error
-      fail(::ActiveRemote::RemoteRecordInvalid.new(self))
+      fail ActiveRemote::RemoteRecordInvalid, self
     end
 
     def perform_validations(options = {})

data/lib/active_remote/version.rb

@@ -1,3 +1,3 @@
 module ActiveRemote
-  VERSION = "3.3.3"
+  VERSION = "5.0.0.pre"
 end

data/spec/lib/active_remote/association_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe ActiveRemote::Association do
   let(:record) { double(:record) }
-  let(:records) { [ record ] }
+  let(:records) { [record] }
 
   describe ".belongs_to" do
     context "simple association" do
@@ -39,7 +39,7 @@ describe ActiveRemote::Association do
         end
       end
 
-      context 'scoped field' do
+      context "scoped field" do
         it { is_expected.to respond_to(:user) }
 
         it "searches the associated model for multiple records" do
@@ -47,19 +47,19 @@ describe ActiveRemote::Association do
           expect(subject.user).to eq(record)
         end
 
-        context 'when user_guid doesnt exist on model 'do
+        context "when user_guid doesnt exist on model " do
           before { allow(subject.class).to receive_message_chain(:public_instance_methods, :include?).with(:user_guid).and_return(false) }
 
-          it 'raises an error' do
-            expect {subject.user}.to raise_error(::RuntimeError, /Could not find attribute/)
+          it "raises an error" do
+            expect { subject.user }.to raise_error(::RuntimeError, /Could not find attribute/)
           end
         end
 
-        context 'when user_guid doesnt exist on associated model 'do
+        context "when user_guid doesnt exist on associated model " do
           before { allow(Author).to receive_message_chain(:public_instance_methods, :include?).with(:user_guid).and_return(false) }
 
-          it 'raises an error' do
-            expect {subject.user}.to raise_error(::RuntimeError, /Could not find attribute/)
+          it "raises an error" do
+            expect { subject.user }.to raise_error(::RuntimeError, /Could not find attribute/)
           end
         end
       end
@@ -95,7 +95,7 @@ describe ActiveRemote::Association do
   end
 
   describe ".has_many" do
-    let(:records) { [ record, record, record ] }
+    let(:records) { [record, record, record] }
     let(:guid) { "AUT-123" }
     let(:user_guid) { "USR-123" }
 
@@ -147,7 +147,7 @@ describe ActiveRemote::Association do
       end
     end
 
-    context 'scoped field' do
+    context "scoped field" do
       it { is_expected.to respond_to(:user_posts) }
 
       it "searches the associated model for multiple records" do
@@ -155,19 +155,19 @@ describe ActiveRemote::Association do
         expect(subject.user_posts).to eq(records)
       end
 
-      context 'when user_guid doesnt exist on model 'do
+      context "when user_guid doesnt exist on model " do
         before { allow(subject).to receive(:respond_to?).with("user_guid").and_return(false) }
 
-        it 'raises an error' do
-          expect {subject.user_posts}.to raise_error(::ActiveRemote::UnknownAttributeError)
+        it "raises an error" do
+          expect { subject.user_posts }.to raise_error(::ActiveRemote::UnknownAttributeError)
         end
       end
 
-      context 'when user_guid doesnt exist on associated model 'do
+      context "when user_guid doesnt exist on associated model " do
         before { allow(Post).to receive_message_chain(:public_instance_methods, :include?).with(:user_guid).and_return(false) }
 
-        it 'raises an error' do
-          expect {subject.user_posts}.to raise_error(::RuntimeError, /Could not find attribute/)
+        it "raises an error" do
+          expect { subject.user_posts }.to raise_error(::RuntimeError, /Could not find attribute/)
         end
       end
     end
@@ -243,7 +243,7 @@ describe ActiveRemote::Association do
       end
     end
 
-    context 'scoped field' do
+    context "scoped field" do
       it { is_expected.to respond_to(:chief_editor) }
 
       it "searches the associated model for multiple records" do
@@ -251,19 +251,19 @@ describe ActiveRemote::Association do
         expect(subject.chief_editor).to eq(record)
       end
 
-      context 'when user_guid doesnt exist on model 'do
+      context "when user_guid doesnt exist on model " do
         before { allow(subject).to receive(:respond_to?).with("user_guid").and_return(false) }
 
-        it 'raises an error' do
-          expect {subject.chief_editor}.to raise_error(::ActiveRemote::UnknownAttributeError)
+        it "raises an error" do
+          expect { subject.chief_editor }.to raise_error(::ActiveRemote::UnknownAttributeError)
         end
       end
 
-      context 'when user_guid doesnt exist on associated model 'do
+      context "when user_guid doesnt exist on associated model " do
         before { allow(Author).to receive_message_chain(:public_instance_methods, :include?).with(:user_guid).and_return(false) }
 
-        it 'raises an error' do
-          expect {subject.chief_editor}.to raise_error(::RuntimeError, /Could not find attribute/)
+        it "raises an error" do
+          expect { subject.chief_editor }.to raise_error(::RuntimeError, /Could not find attribute/)
         end
       end
     end