active_remote 6.1.2 → 7.1.0

data/lib/active_remote/integration.rb

@@ -9,7 +9,7 @@ module ActiveRemote
       # versioning is off. Accepts any of the symbols in <tt>Time::DATE_FORMATS</tt>.
       #
       # This is +:usec+, by default.
-      class_attribute :cache_timestamp_format, :instance_writer => false, :default => :usec
+      class_attribute :cache_timestamp_format, instance_writer: false, default: :usec
 
       ##
       # :singleton-method:
@@ -17,7 +17,7 @@ module ActiveRemote
       # by a changing version in the #cache_version method.
       #
       # This is +false+, by default until Rails 6.0.
-      class_attribute :cache_versioning, :instance_writer => false, :default => false
+      class_attribute :cache_versioning, instance_writer: false, default: false
     end
 
     # Returns a +String+, which Action Pack uses for constructing a URL to this
@@ -60,11 +60,11 @@ module ActiveRemote
     #   Person.find(5).cache_key  # => "people/5-20071224150000" (updated_at available)
     #
     def cache_key
-      case
-      when new_record? then
+      if new_record?
+
         "#{model_name.cache_key}/new"
-      when ::ActiveRemote.config.default_cache_key_updated_at? && (self.respond_to?(:[]) && timestamp = self["updated_at"]) then
-        timestamp = timestamp.utc.to_s(self.class.cache_timestamp_format)
+      elsif ::ActiveRemote.config.default_cache_key_updated_at? && (respond_to?(:[]) && (timestamp = self["updated_at"]))
+        timestamp = timestamp.utc.to_fs(self.class.cache_timestamp_format)
         "#{model_name.cache_key}/#{send(primary_key)}-#{timestamp}"
       else
         "#{model_name.cache_key}/#{send(primary_key)}"
@@ -88,7 +88,7 @@ module ActiveRemote
     # +false+ (which it is by default until Rails 6.0).
     def cache_version
       if cache_versioning && (timestamp = try(:updated_at))
-        timestamp.utc.to_s(:usec)
+        timestamp.utc.to_fs(:usec)
       end
     end
 
@@ -123,8 +123,8 @@ module ActiveRemote
         else
           define_method :to_param do
             if (default = super()) &&
-               (result = send(method_name).to_s).present? &&
-               (param = result.squish.parameterize.truncate(20, :separator => /-/, :omission => "")).present?
+                (result = send(method_name).to_s).present? &&
+                (param = result.squish.parameterize.truncate(20, separator: /-/, omission: "")).present?
               "#{default}-#{param}"
             else
               default

data/lib/active_remote/persistence.rb

@@ -28,7 +28,7 @@ module ActiveRemote
       # The newly created record is returned if it was successfully saved or not.
       #
       def create(attributes)
-        remote = self.new(attributes)
+        remote = new(attributes)
         remote.save
         remote
       end
@@ -40,7 +40,7 @@ module ActiveRemote
       # an ActiveRemote::RemoteRecordNotSaved exception.
       #
       def create!(attributes)
-        remote = self.new(attributes)
+        remote = new(attributes)
         remote.save!
         remote
       end
@@ -49,8 +49,8 @@ module ActiveRemote
       # when retrieving records that already exist, so @new_record is set to false.
       #
       def instantiate(new_attributes = {}, options = {})
-        attributes = self.build_from_rpc(new_attributes)
-        new_object = self.allocate.init_with(attributes)
+        attributes = build_from_rpc(new_attributes)
+        new_object = allocate.init_with(attributes)
         new_object.readonly! if options[:readonly]
 
         new_object
@@ -220,8 +220,8 @@ module ActiveRemote
       raise ReadOnlyRemoteRecord if readonly?
 
       name = name.to_s
-      send("#{name}=", value)
-      save(:validate => false)
+      send(:"#{name}=", value)
+      save(validate: false)
     end
 
     # Updates the attributes of the remote record from the passed-in hash and
@@ -244,7 +244,7 @@ module ActiveRemote
     end
     alias_method :update!, :update_attributes!
 
-  private
+    private
 
     # Handles creating a remote object and serializing it's attributes and
     # errors from the response.

data/lib/active_remote/query_attributes.rb

@@ -25,14 +25,14 @@ module ActiveRemote
       value = self[attr_name]
 
       case value
-      when true        then true
-      when false, nil  then false
+      when true then true
+      when false, nil then false
       else
         value.present?
       end
     end
 
-  private
+    private
 
     def attribute?(attribute_name)
       query_attribute(attribute_name)

data/lib/active_remote/rpc.rb

@@ -11,13 +11,12 @@ module ActiveRemote
 
     module ClassMethods
       # Builds an attribute hash that be assigned directly
-      # to an object from an rpc response
+      # to an object from an RPC response
       def build_from_rpc(values)
         values = values.stringify_keys
 
-        attribute_names.inject(_default_attributes.deep_dup) do |attributes, name|
+        attribute_names.each_with_object(_default_attributes.deep_dup) do |name, attributes|
           attributes.write_from_database(name, values[name])
-          attributes
         end
       end
 

data/lib/active_remote/rpc_adapters/protobuf_adapter.rb

@@ -8,7 +8,7 @@ module ActiveRemote
       attr_reader :service_class
       attr_accessor :endpoints
 
-      delegate :client, :to => :service_class
+      delegate :client, to: :service_class
 
       ##
       # Constructor!
@@ -41,7 +41,7 @@ module ActiveRemote
         response
       end
 
-    private
+      private
 
       # Return a protobuf request object for the given rpc request.
       #

data/lib/active_remote/search.rb

@@ -25,12 +25,29 @@ module ActiveRemote
       #   Tag.find(Generic::Remote::TagRequest.new(:guid => 'foo'))
       #
       def find(args)
-        remote = self.search(args).first
+        remote = search(args).first
         raise RemoteRecordNotFound, self if remote.nil?
 
         remote
       end
 
+      # Tries to load the first record; if it fails, returns nil.
+      #
+      # ====Examples
+      #
+      #   # A single hash
+      #   Tag.find_by(:guid => 'foo')
+      #
+      #   # Active remote object
+      #   Tag.find_by(Tag.new(:guid => 'foo'))
+      #
+      #   # Protobuf object
+      #   Tag.find_by(Generic::Remote::TagRequest.new(:guid => 'foo'))
+      #
+      def find_by(args)
+        search(args).first
+      end
+
       # Tries to load the first record; if it fails, then create is called
       # with the same arguments.
       #
@@ -43,8 +60,8 @@ module ActiveRemote
       #   Tag.first_or_create(Generic::Remote::TagRequest.new(:name => 'foo'))
       #
       def first_or_create(attributes)
-        remote = self.search(attributes).first
-        remote ||= self.create(attributes)
+        remote = search(attributes).first
+        remote ||= create(attributes)
         remote
       end
 
@@ -52,8 +69,8 @@ module ActiveRemote
       # with the same arguments.
       #
       def first_or_create!(attributes)
-        remote = self.search(attributes).first
-        remote ||= self.create!(attributes)
+        remote = search(attributes).first
+        remote ||= create!(attributes)
         remote
       end
 
@@ -69,8 +86,8 @@ module ActiveRemote
       #   Tag.first_or_initialize(Generic::Remote::TagRequest.new(:name => 'foo'))
       #
       def first_or_initialize(attributes)
-        remote = self.search(attributes).first
-        remote ||= self.new(attributes)
+        remote = search(attributes).first
+        remote ||= new(attributes)
         remote
       end
 
@@ -117,7 +134,7 @@ module ActiveRemote
     #
     def reload
       fresh_object = self.class.find(scope_key_hash)
-      @attributes = fresh_object.instance_variable_get("@attributes")
+      @attributes = fresh_object.instance_variable_get(:@attributes)
       self
     end
   end

data/lib/active_remote/serializers/protobuf.rb

@@ -50,7 +50,7 @@ module ActiveRemote
         # Class methods
         #
         def self.from_attributes(message_class, attributes)
-          fields = self.new(message_class, attributes)
+          fields = new(message_class, attributes)
           fields.from_attributes
         end
 
@@ -58,12 +58,11 @@ module ActiveRemote
         # Instance methods
         #
         def from_attributes
-          attributes.inject({}) do |hash, (key, value)|
+          attributes.each_with_object({}) do |(key, value), hash|
             field = message_class.get_field(key, true) # Check extension fields, too
             value = Field.from_attribute(field, value) if field
 
             hash[key] = value
-            hash
           end
         end
       end
@@ -83,7 +82,7 @@ module ActiveRemote
         # Class methods
         #
         def self.from_attribute(field, value)
-          field = self.new(field, value)
+          field = new(field, value)
           field.from_attribute
         end
 
@@ -91,19 +90,21 @@ module ActiveRemote
         # Instance methods
         #
         def from_attribute
-          case
-          when field.repeated_message? then
+          if field.repeated_message?
+
             repeated_message_value
-          when field.message? then
+          elsif field.message?
+
             message_value
-          when field.repeated? then
+          elsif field.repeated?
+
             repeated_value.map { |value| cast(value) }
           else
             cast_value
           end
         end
 
-      private
+        private
 
         def cast(value)
           type.cast(value)

data/lib/active_remote/validations.rb

@@ -45,13 +45,13 @@ module ActiveRemote
     #
     def valid?(context = nil)
       context ||= (new_record? ? :create : :update)
-      output = super(context)
+      output = super
       errors.empty? && output
     end
 
     alias_method :validate, :valid?
 
-  protected
+    protected
 
     def raise_validation_error
       fail ActiveRemote::RemoteRecordInvalid, self

data/lib/active_remote/version.rb

@@ -1,3 +1,3 @@
 module ActiveRemote
-  VERSION = "6.1.2"
+  VERSION = "7.1.0"
 end

data/spec/lib/active_remote/association_spec.rb

@@ -9,18 +9,18 @@ describe ActiveRemote::Association do
       let(:author_guid) { "AUT-123" }
       let(:user_guid) { "USR-123" }
       let(:default_category_guid) { "CAT-123" }
-      subject { Post.new(:author_guid => author_guid, :user_guid => user_guid) }
+      subject { Post.new(author_guid: author_guid, user_guid: user_guid) }
 
       it { is_expected.to respond_to(:author) }
       it { is_expected.to respond_to(:author=) }
 
       it "searches the associated model for a single record" do
-        expect(Author).to receive(:search).with(:guid => subject.author_guid).and_return(records)
+        expect(Author).to receive(:search).with({guid: subject.author_guid}).and_return(records)
         expect(subject.author).to eq record
       end
 
       it "memoizes the result record" do
-        expect(Author).to receive(:search).once.with(:guid => subject.author_guid).and_return(records)
+        expect(Author).to receive(:search).once.with({guid: subject.author_guid}).and_return(records)
         3.times { expect(subject.author).to eq record }
       end
 
@@ -34,7 +34,7 @@ describe ActiveRemote::Association do
 
       context "when the search is empty" do
         it "returns a nil" do
-          expect(Author).to receive(:search).with(:guid => subject.author_guid).and_return([])
+          expect(Author).to receive(:search).with({guid: subject.author_guid}).and_return([])
           expect(subject.author).to be_nil
         end
       end
@@ -43,7 +43,7 @@ describe ActiveRemote::Association do
         it { is_expected.to respond_to(:user) }
 
         it "searches the associated model for multiple records" do
-          expect(Author).to receive(:search).with(:guid => subject.author_guid, :user_guid => subject.user_guid).and_return(records)
+          expect(Author).to receive(:search).with({guid: subject.author_guid, user_guid: subject.user_guid}).and_return(records)
           expect(subject.user).to eq(record)
         end
 
@@ -68,16 +68,16 @@ describe ActiveRemote::Association do
     context "specific association with class name" do
       let(:author_guid) { "AUT-456" }
 
-      subject { Post.new(:author_guid => author_guid) }
+      subject { Post.new(author_guid: author_guid) }
       it { is_expected.to respond_to(:coauthor) }
 
       it "searches the associated model for a single record" do
-        expect(Author).to receive(:search).with(:guid => subject.author_guid).and_return(records)
+        expect(Author).to receive(:search).with({guid: subject.author_guid}).and_return(records)
         expect(subject.coauthor).to eq record
       end
 
       it "creates a setter method" do
-        author = Author.new(:guid => author_guid)
+        author = Author.new(guid: author_guid)
         subject.coauthor = author
         expect(subject.coauthor).to eq(author)
       end
@@ -86,11 +86,11 @@ describe ActiveRemote::Association do
     context "specific association with class name and foreign_key" do
       let(:author_guid) { "AUT-456" }
 
-      subject { Post.new(:bestseller_guid => author_guid) }
+      subject { Post.new(bestseller_guid: author_guid) }
       it { is_expected.to respond_to(:bestseller) }
 
       it "searches the associated model for a single record" do
-        expect(Author).to receive(:search).with(:guid => subject.bestseller_guid).and_return(records)
+        expect(Author).to receive(:search).with({guid: subject.bestseller_guid}).and_return(records)
         expect(subject.bestseller).to eq record
       end
     end
@@ -101,18 +101,18 @@ describe ActiveRemote::Association do
     let(:guid) { "AUT-123" }
     let(:user_guid) { "USR-123" }
 
-    subject { Author.new(:guid => guid, :user_guid => user_guid) }
+    subject { Author.new(guid: guid, user_guid: user_guid) }
 
     it { is_expected.to respond_to(:posts) }
     it { is_expected.to respond_to(:posts=) }
 
     it "searches the associated model for all associated records" do
-      expect(Post).to receive(:search).with(:author_guid => subject.guid).and_return(records)
+      expect(Post).to receive(:search).with({author_guid: subject.guid}).and_return(records)
       expect(subject.posts).to eq records
     end
 
     it "memoizes the result record" do
-      expect(Post).to receive(:search).once.with(:author_guid => subject.guid).and_return(records)
+      expect(Post).to receive(:search).once.with({author_guid: subject.guid}).and_return(records)
       3.times { expect(subject.posts).to eq records }
     end
 
@@ -126,7 +126,7 @@ describe ActiveRemote::Association do
 
     context "when the search is empty" do
       it "returns the empty set" do
-        expect(Post).to receive(:search).with(:author_guid => subject.guid).and_return([])
+        expect(Post).to receive(:search).with({author_guid: subject.guid}).and_return([])
         expect(subject.posts).to be_empty
       end
     end
@@ -135,7 +135,7 @@ describe ActiveRemote::Association do
       it { is_expected.to respond_to(:flagged_posts) }
 
       it "searches the associated model for a single record" do
-        expect(Post).to receive(:search).with(:author_guid => subject.guid).and_return([])
+        expect(Post).to receive(:search).with({author_guid: subject.guid}).and_return([])
         expect(subject.flagged_posts).to be_empty
       end
     end
@@ -144,7 +144,7 @@ describe ActiveRemote::Association do
       it { is_expected.to respond_to(:bestseller_posts) }
 
       it "searches the associated model for multiple record" do
-        expect(Post).to receive(:search).with(:bestseller_guid => subject.guid).and_return(records)
+        expect(Post).to receive(:search).with({bestseller_guid: subject.guid}).and_return(records)
         expect(subject.bestseller_posts).to eq(records)
       end
     end
@@ -153,7 +153,7 @@ describe ActiveRemote::Association do
       it { is_expected.to respond_to(:user_posts) }
 
       it "searches the associated model for multiple records" do
-        expect(Post).to receive(:search).with(:author_guid => subject.guid, :user_guid => subject.user_guid).and_return(records)
+        expect(Post).to receive(:search).with({author_guid: subject.guid, user_guid: subject.user_guid}).and_return(records)
         expect(subject.user_posts).to eq(records)
       end
 
@@ -180,8 +180,8 @@ describe ActiveRemote::Association do
     let(:user_guid) { "USR-123" }
     let(:category_attributes) {
       {
-        :guid => guid,
-        :user_guid => user_guid
+        guid: guid,
+        user_guid: user_guid
       }
     }
 
@@ -191,12 +191,12 @@ describe ActiveRemote::Association do
     it { is_expected.to respond_to(:author=) }
 
     it "searches the associated model for all associated records" do
-      expect(Author).to receive(:search).with(:category_guid => subject.guid).and_return(records)
+      expect(Author).to receive(:search).with({category_guid: subject.guid}).and_return(records)
       expect(subject.author).to eq record
     end
 
     it "memoizes the result record" do
-      expect(Author).to receive(:search).once.with(:category_guid => subject.guid).and_return(records)
+      expect(Author).to receive(:search).once.with({category_guid: subject.guid}).and_return(records)
       3.times { expect(subject.author).to eq record }
     end
 
@@ -210,7 +210,7 @@ describe ActiveRemote::Association do
 
     context "when the search is empty" do
       it "returns a nil value" do
-        expect(Author).to receive(:search).with(:category_guid => subject.guid).and_return([])
+        expect(Author).to receive(:search).with({category_guid: subject.guid}).and_return([])
         expect(subject.author).to be_nil
       end
     end
@@ -219,7 +219,7 @@ describe ActiveRemote::Association do
       it { is_expected.to respond_to(:senior_author) }
 
       it "searches the associated model for a single record" do
-        expect(Author).to receive(:search).with(:category_guid => subject.guid).and_return(records)
+        expect(Author).to receive(:search).with({category_guid: subject.guid}).and_return(records)
         expect(subject.senior_author).to eq record
       end
 
@@ -232,7 +232,7 @@ describe ActiveRemote::Association do
       it { is_expected.to respond_to(:primary_editor) }
 
       it "searches the associated model for a single record" do
-        expect(Author).to receive(:search).with(:editor_guid => subject.guid).and_return(records)
+        expect(Author).to receive(:search).with({editor_guid: subject.guid}).and_return(records)
         expect(subject.primary_editor).to eq record
       end
     end
@@ -241,7 +241,7 @@ describe ActiveRemote::Association do
       it { is_expected.to respond_to(:chief_editor) }
 
       it "searches the associated model for multiple records" do
-        expect(Author).to receive(:search).with(:chief_editor_guid => subject.guid, :user_guid => subject.user_guid).and_return(records)
+        expect(Author).to receive(:search).with({chief_editor_guid: subject.guid, user_guid: subject.user_guid}).and_return(records)
         expect(subject.chief_editor).to eq(record)
       end
 

data/spec/lib/active_remote/dirty_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe ActiveRemote::Dirty do
   context "when writing attributes through the setter" do
-    subject { Post.new(:name => "foo") }
+    subject { Post.new(name: "foo") }
 
     before do
       subject.changes_applied
@@ -23,7 +23,7 @@ describe ActiveRemote::Dirty do
   end
 
   context "when writing attributes directly" do
-    subject { Post.new(:name => "foo") }
+    subject { Post.new(name: "foo") }
 
     before do
       subject.changes_applied
@@ -44,10 +44,10 @@ describe ActiveRemote::Dirty do
   end
 
   describe "#reload" do
-    subject { Post.new(:name => "foo") }
+    subject { Post.new(name: "foo") }
 
     before do
-      allow(Post).to receive(:find).and_return(Post.new(:name => "foo"))
+      allow(Post).to receive(:find).and_return(Post.new(name: "foo"))
       subject.reload
     end
 
@@ -55,10 +55,10 @@ describe ActiveRemote::Dirty do
   end
 
   describe "#remote" do
-    let(:post) { Post.new(:name => "foo") }
+    let(:post) { Post.new(name: "foo") }
 
     it "clears changes information" do
-      allow(post).to receive(:remote_call).and_return(::Generic::Remote::Post.new(:name => "foo"))
+      allow(post).to receive(:remote_call).and_return(::Generic::Remote::Post.new(name: "foo"))
       expect { post.remote(:reload) }.to change { post.changed? }.to(false)
     end
   end
@@ -66,7 +66,7 @@ describe ActiveRemote::Dirty do
   describe "#save" do
     let!(:changes) { subject.changes }
 
-    subject { Post.new(:name => "foo") }
+    subject { Post.new(name: "foo") }
 
     before do
       allow(subject).to receive(:create_or_update).and_return(true)
@@ -80,7 +80,7 @@ describe ActiveRemote::Dirty do
   describe "#save!" do
     let!(:changes) { subject.changes }
 
-    subject { Post.new(:name => "foo") }
+    subject { Post.new(name: "foo") }
 
     before do
       allow(subject).to receive(:save).and_return(true)

data/spec/lib/active_remote/dsl_spec.rb

@@ -24,19 +24,19 @@ describe ActiveRemote::DSL do
   describe ".endpoints" do
     it "has default values" do
       expect(Tag.endpoints).to eq(
-        :create => :create,
-        :delete => :delete,
-        :destroy => :destroy,
-        :search => :search,
-        :update => :update
+        create: :create,
+        delete: :delete,
+        destroy: :destroy,
+        search: :search,
+        update: :update
       )
     end
 
     context "given a new value for an endpoint" do
-      after { Tag.endpoints(:create => :create) }
+      after { Tag.endpoints(create: :create) }
 
       it "overwrites default values" do
-        Tag.endpoints(:create => :register)
+        Tag.endpoints(create: :register)
         expect(Tag.endpoints[:create]).to eq(:register)
       end
     end

data/spec/lib/active_remote/errors_spec.rb

@@ -4,8 +4,8 @@ describe ::ActiveRemote::RemoteRecordNotSaved do
   let(:record) { ::Tag.new }
 
   before do
-    record.errors.add(:base, :invalid, :message => "Some error one!")
-    record.errors.add(:base, :invalid, :message => "Some error two!")
+    record.errors.add(:base, :invalid, message: "Some error one!")
+    record.errors.add(:base, :invalid, message: "Some error two!")
   end
 
   context "when an active remote record is used" do

data/spec/lib/active_remote/integration_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe ::ActiveRemote::Integration do
   let(:guid) { "GUID-derp" }
-  let(:tag) { ::Tag.new(:guid => guid) }
+  let(:tag) { ::Tag.new(guid: guid) }
 
   subject { tag }
 
@@ -35,7 +35,7 @@ describe ::ActiveRemote::Integration do
       ::ActiveRemote.config.default_cache_key_updated_at = true
       twenty_o_one_one = tag.updated_at = DateTime.new(2001, 0o1, 0o1)
       expect(tag).to receive(:new_record?).and_return(false)
-      expect(tag.cache_key).to eq("tags/#{guid}-#{twenty_o_one_one.to_s(:usec)}")
+      expect(tag.cache_key).to eq("tags/#{guid}-#{twenty_o_one_one.to_fs(:usec)}")
       tag.updated_at = nil
       ::ActiveRemote.config.default_cache_key_updated_at = false
     end
@@ -46,7 +46,7 @@ describe ::ActiveRemote::Integration do
   end
 
   describe "#cache_key_with_version" do
-    let(:tag) { ::Tag.new(:guid => guid, :updated_at => ::DateTime.current) }
+    let(:tag) { ::Tag.new(guid: guid, updated_at: ::DateTime.current) }
 
     specify { expect(subject).to respond_to(:cache_key_with_version) }
 
@@ -91,7 +91,7 @@ describe ::ActiveRemote::Integration do
 
       it "returns a cache version" do
         tag.updated_at = DateTime.new(2001, 0o1, 0o1)
-        expect(tag.cache_version).to eq(tag.updated_at.utc.to_s(:usec))
+        expect(tag.cache_version).to eq(tag.updated_at.utc.to_fs(:usec))
       end
     end