active_remote 5.1.1 → 5.2.0.alpha

data/lib/active_remote/persistence.rb

@@ -48,7 +48,7 @@ module ActiveRemote
       # Instantiate a record with the given remote attributes. Generally used
       # when retrieving records that already exist, so @new_record is set to false.
       #
-      def instantiate(new_attributes, options = {})
+      def instantiate(new_attributes = {}, options = {})
         attributes = self.build_from_rpc(new_attributes)
         new_object = self.allocate.init_with(attributes)
         new_object.readonly! if options[:readonly]

data/lib/active_remote/primary_key.rb

@@ -32,5 +32,23 @@ module ActiveRemote
     def primary_key
       self.class.primary_key
     end
+
+    # Returns an Array of all key attributes if any of the attributes is set, whether or not
+    # the object is persisted. Returns +nil+ if there are no key attributes.
+    #
+    #   class Person
+    #     include ActiveModel::Conversion
+    #     attr_accessor :id
+    #
+    #     def initialize(id)
+    #       @id = id
+    #     end
+    #   end
+    #
+    #   person = Person.new(1)
+    #   person.to_key # => [1]
+    def to_key
+      send(primary_key) ? [send(primary_key)] : nil
+    end
   end
 end

data/lib/active_remote/rpc.rb

@@ -15,8 +15,8 @@ module ActiveRemote
       def build_from_rpc(values)
         values = values.stringify_keys
 
-        attributes.inject({}) do |attributes, (name, definition)|
-          attributes[name] = definition.from_rpc(values[name])
+        attribute_names.inject(_default_attributes.deep_dup) do |attributes, name|
+          attributes.write_from_database(name, values[name])
           attributes
         end
       end
@@ -53,8 +53,7 @@ module ActiveRemote
     end
 
     def assign_attributes_from_rpc(response)
-      new_attributes = self.class.build_from_rpc(response.to_hash)
-      @attributes.update(new_attributes)
+      @attributes = self.class.build_from_rpc(response.to_hash)
       add_errors(response.errors) if response.respond_to?(:errors)
     end
 

data/lib/active_remote/search.rb

@@ -117,7 +117,8 @@ module ActiveRemote
     #
     def reload
       fresh_object = self.class.find(scope_key_hash)
-      @attributes.update(fresh_object.instance_variable_get("@attributes"))
+      @attributes = fresh_object.instance_variable_get("@attributes")
+      self
     end
   end
 end

data/lib/active_remote/version.rb

@@ -1,3 +1,3 @@
 module ActiveRemote
-  VERSION = "5.1.1"
+  VERSION = "5.2.0.alpha"
 end

data/spec/lib/active_remote/association_spec.rb

@@ -155,14 +155,6 @@ describe ActiveRemote::Association do
         expect(subject.user_posts).to eq(records)
       end
 
-      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)
-        end
-      end
-
       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) }
 
@@ -251,14 +243,6 @@ describe ActiveRemote::Association do
         expect(subject.chief_editor).to eq(record)
       end
 
-      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)
-        end
-      end
-
       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) }
 

data/spec/lib/active_remote/dirty_spec.rb

@@ -4,10 +4,10 @@ describe ActiveRemote::Dirty do
   context "when writing attributes through the setter" do
     subject { Post.new(:name => "foo") }
 
-    before {
-      subject.previous_changes.try(:clear)
-      subject.changed_attributes.try(:clear)
-    }
+    before do
+      subject.changes_applied
+      subject.clear_changes_information
+    end
 
     context "when the value changes" do
       before { subject.name = "bar" }
@@ -25,10 +25,10 @@ describe ActiveRemote::Dirty do
   context "when writing attributes directly" do
     subject { Post.new(:name => "foo") }
 
-    before {
-      subject.previous_changes.try(:clear)
-      subject.changed_attributes.try(:clear)
-    }
+    before do
+      subject.changes_applied
+      subject.clear_changes_information
+    end
 
     context "when the value changes" do
       before { subject[:name] = "bar" }
@@ -46,10 +46,10 @@ describe ActiveRemote::Dirty do
   describe "#reload" do
     subject { Post.new(:name => "foo") }
 
-    before {
+    before do
       allow(Post).to receive(:find).and_return(Post.new(:name => "foo"))
       subject.reload
-    }
+    end
 
     its(:changes) { should be_empty }
   end
@@ -68,10 +68,10 @@ describe ActiveRemote::Dirty do
 
     subject { Post.new(:name => "foo") }
 
-    before {
+    before do
       allow(subject).to receive(:create_or_update).and_return(true)
       subject.save
-    }
+    end
 
     its(:previous_changes) { should eq changes }
     its(:changes) { should be_empty }
@@ -82,27 +82,12 @@ describe ActiveRemote::Dirty do
 
     subject { Post.new(:name => "foo") }
 
-    before {
+    before do
       allow(subject).to receive(:save).and_return(true)
       subject.save!
-    }
+    end
 
     its(:previous_changes) { should eq changes }
     its(:changes) { should be_empty }
   end
-
-  describe "#instantiate" do
-    let(:post) { Post.new }
-    let(:record) { ::Generic::Remote::Post.new(:name => "foo") }
-
-    it "clears previous changes" do
-      new_record = post.instantiate(record.to_hash)
-      expect(new_record.previous_changes).to eq({})
-    end
-
-    it "clears changes" do
-      new_record = post.instantiate(record.to_hash)
-      expect(new_record.changes).to be_empty
-    end
-  end
 end

data/spec/lib/active_remote/integration_spec.rb

@@ -2,37 +2,41 @@ require "spec_helper"
 
 describe ::ActiveRemote::Integration do
   let(:guid) { "GUID-derp" }
-  subject { Tag.new(:guid => guid) }
+  let(:tag) { ::Tag.new(:guid => guid) }
+
+  subject { tag }
+
+  context ".to_param" do
+    specify { expect(::Tag).to respond_to(:to_param) }
+  end
 
   context "#to_param" do
-    # API
     specify { expect(subject).to respond_to(:to_param) }
 
     it "returns the guid if the guid is present (by default)" do
-      expect(subject.to_param).to eq(guid)
+      expect(tag.to_param).to eq(guid)
     end
   end
 
   context "#cache_key" do
-    # API
     specify { expect(subject).to respond_to(:cache_key) }
 
     it "sets 'new' as the identifier when the record has not been persisted" do
-      expect(subject).to receive(:new_record?).and_return(true)
-      expect(subject.cache_key).to match(/tag\/new/)
+      expect(tag).to receive(:new_record?).and_return(true)
+      expect(tag.cache_key).to match(/tags\/new/)
     end
 
     it "sets the cache_key to the class/guid as a default" do
-      expect(subject).to receive(:new_record?).and_return(false)
-      expect(subject.cache_key).to eq("tag/#{guid}")
+      expect(tag).to receive(:new_record?).and_return(false)
+      expect(tag.cache_key).to eq("tags/#{guid}")
     end
 
     it "adds the 'updated_at' attribute to the cache_key if updated_at is present" do
       ::ActiveRemote.config.default_cache_key_updated_at = true
-      twenty_o_one_one = subject[:updated_at] = DateTime.new(2001, 0o1, 0o1)
-      expect(subject).to receive(:new_record?).and_return(false)
-      expect(subject.cache_key).to eq("tag/#{guid}-#{twenty_o_one_one.to_s(:number)}")
-      subject[:updated_at] = nil
+      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)}")
+      tag.updated_at = nil
       ::ActiveRemote.config.default_cache_key_updated_at = false
     end
 
@@ -40,4 +44,68 @@ describe ::ActiveRemote::Integration do
       expect(::ActiveRemote.config.default_cache_key_updated_at?).to be_falsey
     end
   end
+
+  describe "#cache_key_with_version" do
+    let(:tag) { ::Tag.new(:guid => guid, :updated_at => ::DateTime.current) }
+
+    specify { expect(subject).to respond_to(:cache_key_with_version) }
+
+    context "when cache versioning is enabled" do
+      around do |example|
+        cache_versioning_value = ::Tag.cache_versioning
+        ::Tag.cache_versioning = true
+        example.run
+        ::Tag.cache_versioning = cache_versioning_value
+      end
+
+      it "returns a cache key with the version" do
+        expect(tag.cache_version).to be_present
+        expect(tag.cache_key_with_version).to eq("#{tag.cache_key}-#{tag.cache_version}")
+      end
+    end
+
+    context "when cache versioning is not enabled" do
+      around do |example|
+        cache_versioning_value = ::Tag.cache_versioning
+        ::Tag.cache_versioning = false
+        example.run
+        ::Tag.cache_versioning = cache_versioning_value
+      end
+
+      it "returns a cache key without the version" do
+        expect(tag.cache_key_with_version).to eq(tag.cache_key)
+      end
+    end
+  end
+
+  describe "#cache_version" do
+    specify { expect(subject).to respond_to(:cache_version) }
+
+    context "when cache versioning is enabled" do
+      around do |example|
+        cache_versioning_value = ::Tag.cache_versioning
+        ::Tag.cache_versioning = true
+        example.run
+        ::Tag.cache_versioning = cache_versioning_value
+      end
+
+      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))
+      end
+    end
+
+    context "when cache versioning is not enabled" do
+      around do |example|
+        cache_versioning_value = ::Tag.cache_versioning
+        ::Tag.cache_versioning = false
+        example.run
+        ::Tag.cache_versioning = cache_versioning_value
+      end
+
+      it "returns nil" do
+        expect(tag.cache_version).to be_nil
+      end
+    end
+  end
 end

data/spec/lib/active_remote/query_attribute_spec.rb

@@ -4,18 +4,14 @@ describe ::ActiveRemote::QueryAttributes do
   subject { ::Author.new }
 
   describe "#query_attribute" do
-    it "raises when getting an undefined attribute" do
-      expect { subject.query_attribute(:foobar) }.to raise_error(::ActiveRemote::UnknownAttributeError)
-    end
-
     it "is false when the attribute is false" do
-      subject.name = false
-      expect(subject.name?).to eq false
+      subject.writes_fiction = false
+      expect(subject.writes_fiction?).to eq false
     end
 
     it "is true when the attribute is true" do
-      subject.name = true
-      expect(subject.name?).to eq true
+      subject.writes_fiction = true
+      expect(subject.writes_fiction?).to eq true
     end
 
     it "is false when the attribute is nil" do
@@ -23,11 +19,6 @@ describe ::ActiveRemote::QueryAttributes do
       expect(subject.name?).to eq false
     end
 
-    it "is true when the attribute is an Object" do
-      subject.name = Object.new
-      expect(subject.name?).to eq true
-    end
-
     it "is false when the attribute is an empty string" do
       subject.name = ""
       expect(subject.name?).to eq false
@@ -40,13 +31,13 @@ describe ::ActiveRemote::QueryAttributes do
 
     # This behavior varies from ActiveRecord, so we test it explicitly
     it "is true when the attribute is 0" do
-      subject.name = 0
-      expect(subject.name?).to eq true
+      subject.age = 0
+      expect(subject.age?).to eq true
     end
 
     it "is true when the attribute is 1" do
-      subject.name = 1
-      expect(subject.name?).to eq true
+      subject.age = 1
+      expect(subject.age?).to eq true
     end
   end
 end

data/spec/lib/active_remote/rpc_spec.rb

@@ -6,6 +6,10 @@ describe ::ActiveRemote::RPC do
   describe ".build_from_rpc" do
     let(:new_attributes) { { :name => "test" } }
 
+    it "dups the default attributes" do
+      expect { ::Tag.build_from_rpc(new_attributes) }.to_not change { ::Tag._default_attributes["name"] }
+    end
+
     context "missing attributes from rpc" do
       it "initializes to nil" do
         expect(::Tag.build_from_rpc(new_attributes)).to include("guid" => nil)
@@ -25,7 +29,7 @@ describe ::ActiveRemote::RPC do
 
       it "calls the typecasters" do
         expect(
-          ::TypecastedAuthor.build_from_rpc(new_attributes)
+          ::Author.build_from_rpc(new_attributes)
         ).to include("birthday" => "2017-01-01".to_datetime)
       end
     end

data/spec/lib/active_remote/search_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe ActiveRemote::Search do
-  let(:records) { [Generic::Remote::Tag.new] }
+  let(:records) { [Generic::Remote::Tag.new(:guid => "123")] }
   let(:response) { Generic::Remote::Tags.new(:records => records) }
   let(:rpc) { double(:rpc) }
 
@@ -37,7 +37,7 @@ describe ActiveRemote::Search do
   end
 
   describe ".search" do
-    let(:serialized_records) { [Tag.new] }
+    let(:serialized_records) { [Tag.instantiate(:guid => "123")] }
 
     context "given args that respond to :to_hash" do
       let(:args) { {} }
@@ -52,7 +52,8 @@ describe ActiveRemote::Search do
       end
 
       it "returns records" do
-        expect(Tag.search(args)).to eq serialized_records
+        records = Tag.search(args)
+        expect(records).to eq serialized_records
       end
     end
 

data/spec/support/models.rb

@@ -5,4 +5,3 @@ require "support/models/category"
 require "support/models/no_attributes"
 require "support/models/post"
 require "support/models/tag"
-require "support/models/typecasted_author"

data/spec/support/models/author.rb

@@ -6,12 +6,16 @@ require "support/protobuf/author.pb"
 class Author < ::ActiveRemote::Base
   service_class ::Generic::Remote::AuthorService
 
-  attribute :guid
-  attribute :name
-  attribute :user_guid
-  attribute :chief_editor_guid
-  attribute :editor_guid
-  attribute :category_guid
+  attribute :guid, :string
+  attribute :name, :string
+  attribute :user_guid, :string
+  attribute :chief_editor_guid, :string
+  attribute :editor_guid, :string
+  attribute :category_guid, :string
+  attribute :age, :integer
+  attribute :birthday, :datetime
+  attribute :writes_fiction, :boolean
+  attribute :net_sales, :float
 
   has_many :posts
   has_many :user_posts, :class_name => "::Post", :scope => :user_guid

data/spec/support/models/category.rb

@@ -6,9 +6,9 @@ require "support/protobuf/category.pb"
 class Category < ::ActiveRemote::Base
   service_class ::Generic::Remote::CategoryService
 
-  attribute :guid
-  attribute :user_guid
-  attribute :chief_editor_guid
+  attribute :guid, :string
+  attribute :user_guid, :string
+  attribute :chief_editor_guid, :string
 
   has_many :posts