active_remote 2.1.1 → 2.2.0

data/spec/lib/active_remote/publication_spec.rb

@@ -12,7 +12,7 @@ describe ActiveRemote::Publication do
     after { reset_publishable_attributes(Tag) }
 
     it "serializes to a hash with only the publishable attributes" do
-      subject.publishable_hash.should eq expected_hash
+      expect(subject.publishable_hash).to eq expected_hash
     end
   end
 end

data/spec/lib/active_remote/rpc_spec.rb

@@ -13,13 +13,13 @@ describe ActiveRemote::RPC do
     before { ::Tag.better_stub(:rpc).and_return(rpc) }
 
     it "calls the given RPC method" do
-      Tag.rpc.should_receive(:execute).with(:remote_method, args)
+      expect(Tag.rpc).to receive(:execute).with(:remote_method, args)
       Tag.remote_call(:remote_method, args)
     end
 
     it "returns the response" do
-      Tag.rpc.stub(:execute).and_return(response)
-      Tag.remote_call(:remote_method, args).should eq response
+      allow(Tag.rpc).to receive(:execute).and_return(response)
+      expect(Tag.remote_call(:remote_method, args)).to eq response
     end
   end
 
@@ -27,13 +27,13 @@ describe ActiveRemote::RPC do
     let(:attributes) { Hash.new }
 
     it "builds an RPC request" do
-      Tag.request(:create, attributes).should eq Generic::Remote::Tag.new(attributes)
+      expect(Tag.request(:create, attributes)).to eq Generic::Remote::Tag.new(attributes)
     end
   end
 
   describe ".request_type" do
     it "fetches the request type for the given RPC method" do
-      Tag.request_type(:search).should eq Generic::Remote::TagRequest
+      expect(Tag.request_type(:search)).to eq Generic::Remote::TagRequest
     end
   end
 
@@ -49,7 +49,7 @@ describe ActiveRemote::RPC do
       mock_remote_service(Tag.service_class, :create, :response => double(:to_hash => {}))
 
       subject.execute(:create, request)
-      subject.last_request.should eq(request)
+      expect(subject.last_request).to eq(request)
     end
 
     context "when request args is a hash" do
@@ -57,12 +57,12 @@ describe ActiveRemote::RPC do
       let(:request) { double(:request) }
 
       before {
-        subject.stub(:request).and_return(request)
+        allow(subject).to receive(:request).and_return(request)
         mock_remote_service(Tag.service_class, :create, :response => double(:to_hash => {}))
       }
 
       it "creates a request" do
-        subject.should_receive(:request).with(:create, args)
+        expect(subject).to receive(:request).with(:create, args)
         subject.execute(:create, args)
       end
     end
@@ -76,7 +76,7 @@ describe ActiveRemote::RPC do
 
       it "sets the last response" do
         subject.execute(:create, request)
-        subject.last_response.should eq(success_response)
+        expect(subject.last_response).to eq(success_response)
       end
     end
 

data/spec/lib/active_remote/scope_keys_spec.rb

@@ -12,7 +12,7 @@ describe ActiveRemote::ScopeKeys do
 
     it 'adds scope_key to _scope_keys' do
       Tag.scope_key(key)
-      Tag._scope_keys.should eq(_scope_keys)
+      expect(Tag._scope_keys).to eq(_scope_keys)
     end
   end
 
@@ -20,13 +20,13 @@ describe ActiveRemote::ScopeKeys do
     before { Tag.better_stub(:_scope_keys).and_return(_scope_keys) }
 
     it "combines primary key with _scope_keys" do
-      Tag.scope_keys.should eq(['guid'] + _scope_keys)
+      expect(Tag.scope_keys).to eq(['guid'] + _scope_keys)
     end
   end
 
   describe "#scope_keys" do
     it "returns the scope keys for the class" do
-      Tag.new.scope_keys.should eq Tag.scope_keys
+      expect(Tag.new.scope_keys).to eq Tag.scope_keys
     end
   end
 
@@ -36,7 +36,7 @@ describe ActiveRemote::ScopeKeys do
     before { tag.better_stub(:scope_keys).and_return(scope_keys) }
 
     it "returns a attribute hash of scope_keys" do
-      tag.scope_key_hash.should eq(scope_key_hash)
+      expect(tag.scope_key_hash).to eq(scope_key_hash)
     end
   end
 end

data/spec/lib/active_remote/search_spec.rb

@@ -10,21 +10,21 @@ describe ActiveRemote::Search do
     let(:record) { double(:record) }
     let(:records) { [ record ] }
 
-    before { Tag.stub(:search).and_return(records) }
+    before { allow(Tag).to receive(:search).and_return(records) }
 
     it "searches with the given args" do
-      Tag.should_receive(:search).with(args)
+      expect(Tag).to receive(:search).with(args)
       Tag.find(args)
     end
 
     context "when records are returned" do
       it "returns the first record" do
-        Tag.find(args).should eq record
+        expect(Tag.find(args)).to eq record
       end
     end
 
     context "when no records are returned" do
-      before { Tag.stub(:search).and_return([]) }
+      before { allow(Tag).to receive(:search).and_return([]) }
 
       it "raise an exception" do
         expect { Tag.find(args) }.to raise_error(::ActiveRemote::RemoteRecordNotFound)
@@ -47,12 +47,12 @@ describe ActiveRemote::Search do
       before { ::Tag.better_stub(:rpc).and_return(rpc) }
 
       it "searches with the given args" do
-        Tag.rpc.should_receive(:execute).with(:search, args)
+        expect(Tag.rpc).to receive(:execute).with(:search, args)
         Tag.search(args)
       end
 
       it "returns records" do
-        Tag.search(args).should eq serialized_records
+        expect(Tag.search(args)).to eq serialized_records
       end
     end
 
@@ -71,17 +71,17 @@ describe ActiveRemote::Search do
     subject { Tag.new }
 
     before {
-      rpc.stub(:execute).and_return(response)
+      allow(rpc).to receive(:execute).and_return(response)
       Tag.better_stub(:rpc).and_return(rpc)
     }
 
     it "runs callbacks" do
-      subject.should_receive(:run_callbacks).with(:search)
+      expect(subject).to receive(:run_callbacks).with(:search)
       subject._active_remote_search(args)
     end
 
     it "executes the search" do
-      rpc.should_receive(:execute).with(:search, args)
+      expect(rpc).to receive(:execute).with(:search, args)
       subject._active_remote_search(args)
     end
   end
@@ -101,7 +101,7 @@ describe ActiveRemote::Search do
 
     it "assigns new attributes" do
       subject.reload
-      subject.attributes.should eq attributes
+      expect(subject.attributes).to eq attributes
     end
   end
 end

data/spec/lib/active_remote/serialization_spec.rb

@@ -8,7 +8,7 @@ describe ActiveRemote::Serialization do
 
     it "serializes records into active remote objects" do
       Tag.serialize_records(records).each do |record|
-        record.should be_a Tag
+        expect(record).to be_a Tag
       end
     end
   end
@@ -26,7 +26,7 @@ describe ActiveRemote::Serialization do
     context "when the response has errors" do
       it "adds the errors to the active remote object" do
         subject.add_errors(response.errors)
-        subject.errors[:name].should =~ ['Boom!']
+        expect(subject.errors[:name]).to match_array(['Boom!'])
       end
     end
   end

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

@@ -10,12 +10,12 @@ describe ActiveRemote::Serializers::JSON do
     context "with roots in json" do
       context "when options are nil" do
         it "substitutes an empty hash" do
-          subject.as_json(nil).should eq serializable_attributes
+          expect(subject.as_json(nil)).to eq serializable_attributes
         end
       end
 
       it "accepts standard JSON options" do
-        subject.as_json(:root => false).should eq attributes.stringify_keys
+        expect(subject.as_json(:root => false)).to eq attributes.stringify_keys
       end
 
       context "with publishable attributes defined" do
@@ -25,7 +25,7 @@ describe ActiveRemote::Serializers::JSON do
         after { reset_publishable_attributes(Tag) }
 
         it "serializes to JSON with only the publishable attributes" do
-          subject.to_json.should eq expected_json
+          expect(subject.to_json).to eq expected_json
         end
       end
 
@@ -33,7 +33,7 @@ describe ActiveRemote::Serializers::JSON do
         let(:expected_json) { { :tag => attributes }.to_json }
 
         it "serializes to JSON" do
-          subject.to_json.should eq expected_json
+          expect(subject.to_json).to eq expected_json
         end
       end
     end
@@ -51,7 +51,7 @@ describe ActiveRemote::Serializers::JSON do
 
       context "when options are nil" do
         it "substitutes an empty hash" do
-          subject.as_json(nil).should eq serializable_attributes
+          expect(subject.as_json(nil)).to eq serializable_attributes
         end
       end
 
@@ -62,7 +62,7 @@ describe ActiveRemote::Serializers::JSON do
         after { reset_publishable_attributes(Tag) }
 
         it "serializes to JSON with only the publishable attributes" do
-          subject.to_json.should eq expected_json
+          expect(subject.to_json).to eq expected_json
         end
       end
 
@@ -70,7 +70,7 @@ describe ActiveRemote::Serializers::JSON do
         let(:expected_json) { attributes.to_json }
 
         it "serializes to JSON" do
-          subject.to_json.should eq expected_json
+          expect(subject.to_json).to eq expected_json
         end
       end
     end

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

@@ -6,7 +6,7 @@ describe ActiveRemote::Serializers::Protobuf::Fields do
     let(:value) { { :records => { :name => 'Cool Post', :errors => { :message => 'Boom!' } } } }
 
     it "gets protobuf-ready fields from attributes" do
-      described_class.from_attributes(Generic::Remote::Posts, value).should eq ready_value
+      expect(described_class.from_attributes(Generic::Remote::Posts, value)).to eq ready_value
     end
   end
 end
@@ -21,7 +21,7 @@ describe ActiveRemote::Serializers::Protobuf::Field do
         let(:value) { { :name => 'Cool Post', :errors => { :message => 'Boom!' } } }
 
         it "gets protobuf-ready fields from the value" do
-          described_class.from_attribute(field, value).should eq ready_value
+          expect(described_class.from_attribute(field, value)).to eq ready_value
         end
       end
     end
@@ -34,7 +34,7 @@ describe ActiveRemote::Serializers::Protobuf::Field do
         let(:value) { { :name => 'Film', :errors => { :message => 'Boom!' } } }
 
         it "gets protobuf-ready fields from the value" do
-          described_class.from_attribute(field, value).should eq ready_value
+          expect(described_class.from_attribute(field, value)).to eq ready_value
         end
       end
     end
@@ -47,7 +47,7 @@ describe ActiveRemote::Serializers::Protobuf::Field do
         let(:value) { 'Cool Post' }
 
         it "gets protobuf-ready fields from the value" do
-          described_class.from_attribute(field, value).should eq ready_value
+          expect(described_class.from_attribute(field, value)).to eq ready_value
         end
       end
     end
@@ -65,7 +65,7 @@ describe ActiveRemote::Serializers::Protobuf::Field do
 
       def typecasts(field, conversion)
         field = Serializer.get_field(field, true)
-        described_class.from_attribute(field, conversion.first[0]).should eq conversion.first[1]
+        expect(described_class.from_attribute(field, conversion.first[0])).to eq conversion.first[1]
       end
 
       it { typecasts(:bool_field, '0' => false) }

data/spec/lib/active_remote/validations_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+describe ActiveRemote::Validations do
+  let(:invalid_record) { ::Post.new }
+  let(:valid_record) { ::Post.new(:name => 'test') }
+
+  before { allow(valid_record).to receive(:create_or_update).and_return(true) }
+  before { allow(invalid_record).to receive(:create_or_update).and_return(true) }
+
+  describe 'save' do
+    context 'valid record' do
+      it 'returns true' do
+        result = valid_record.save
+        expect(result).to be true
+      end
+    end
+
+    context 'invalid record' do
+      it 'returns false' do
+        result = invalid_record.save
+        expect(result).to be false
+      end
+    end
+  end
+
+  describe 'save!' do
+    context 'valid record' do
+      it 'returns true' do
+        result = valid_record.save!
+        expect(result).to be true
+      end
+    end
+
+    context 'invalid record' do
+      it 'raises invalid record error' do
+        expect { invalid_record.save! }.to raise_error(ActiveRemote::RemoteRecordInvalid)
+      end
+    end
+  end
+
+  describe 'valid?' do
+    context 'valid record' do
+      it 'returns true' do
+        result = valid_record.valid?
+        expect(result).to be true
+      end
+    end
+
+    context 'invalid record' do
+      it 'returns false' do
+        result = invalid_record.valid?
+        expect(result).to be false
+      end
+    end
+  end
+end

data/spec/support/models/post.rb

@@ -16,4 +16,6 @@ class Post < ::ActiveRemote::Base
   belongs_to :coauthor, :class_name => '::Author'
   belongs_to :bestseller, :class_name => '::Author', :foreign_key => :bestseller_guid
   belongs_to :user, :class_name => '::Author', :scope => :user_guid
+
+  validates :name, :presence => true
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_remote
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Adam Hutchison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-30 00:00:00.000000000 Z
+date: 2015-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-pride
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-nav
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -191,6 +205,7 @@ files:
 - lib/active_remote/serialization.rb
 - lib/active_remote/serializers/json.rb
 - lib/active_remote/serializers/protobuf.rb
+- lib/active_remote/validations.rb
 - lib/active_remote/version.rb
 - spec/core_ext/date_time_spec.rb
 - spec/lib/active_remote/association_spec.rb
@@ -208,6 +223,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/validations_spec.rb
 - spec/spec_helper.rb
 - spec/support/definitions/author.proto
 - spec/support/definitions/category.proto
@@ -248,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Active Record for your platform
@@ -269,6 +285,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/validations_spec.rb
 - spec/spec_helper.rb
 - spec/support/definitions/author.proto
 - spec/support/definitions/category.proto