rest-in-peace 4.0.0 → 4.1.0

data/.gitignore

@@ -1,2 +1,3 @@
 Gemfile.lock
 coverage
+*.gem

data/VERSION

@@ -1 +1 @@
-4.0.0
+4.1.0

data/lib/rest_in_peace/active_model_api.rb

@@ -18,6 +18,8 @@ module RESTinPeace
 
       base.send(:alias_method, :save_without_dirty_tracking, :save)
       base.send(:alias_method, :save, :save_with_dirty_tracking)
+      base.send(:alias_method, :create_without_dirty_tracking, :create)
+      base.send(:alias_method, :create, :create_with_dirty_tracking)
 
       def base.human_attribute_name(attr, options = {})
         attr.to_s
@@ -35,8 +37,20 @@ module RESTinPeace
 
     def save_with_dirty_tracking
       save_without_dirty_tracking.tap do
-        clear_changes
+        clear_changes if valid?
       end
+      valid?
+    end
+
+    def create_with_dirty_tracking
+      create_without_dirty_tracking.tap do
+        clear_changes if valid?
+      end
+      valid?
+    end
+
+    def valid?
+      !errors.any?
     end
 
     def persisted?

data/lib/rest_in_peace/api_call.rb

@@ -8,6 +8,7 @@ module RESTinPeace
       @url_template = url_template
       @klass = klass
       @params = params
+      @attributes = {}
     end
 
     def get
@@ -43,8 +44,12 @@ module RESTinPeace
       sanitizer.leftover_params
     end
 
+    def attributes
+      @attributes = @klass.to_h if @klass.respond_to?(:to_h)
+    end
+
     def sanitizer
-      @sanitizer ||= RESTinPeace::TemplateSanitizer.new(@url_template, @params)
+      @sanitizer ||= RESTinPeace::TemplateSanitizer.new(@url_template, @params, attributes)
     end
 
     def convert_response(response)

data/lib/rest_in_peace/template_sanitizer.rb

@@ -5,9 +5,10 @@ module RESTinPeace
 
     class IncompleteParams < RESTinPeace::DefaultError; end
 
-    def initialize(url_template, params)
+    def initialize(url_template, params, attributes)
       @url_template = url_template
       @params = params.dup
+      @attributes = attributes
       @url = nil
     end
 
@@ -16,6 +17,7 @@ module RESTinPeace
       @url = @url_template.dup
       tokens.each do |token|
         param = @params.delete(token.to_sym)
+        param ||= @attributes[token.to_sym]
         raise IncompleteParams, "Unknown parameter for token :#{token} found" unless param
         @url.sub!(%r{:#{token}}, param.to_s)
       end

data/spec/rest_in_peace/active_model_api_spec.rb

@@ -124,7 +124,7 @@ describe RESTinPeace do
         let(:response) { OpenStruct.new(body: { name: 'new name from api' }) }
 
         specify { expect { instance.save }.to_not raise_error }
-        specify { expect(instance.save.object_id).to eq(instance.object_id) }
+        specify { expect(instance.save).to eq(true) }
         specify { expect { instance.save }.to change(instance, :name) }
       end
 
@@ -137,6 +137,7 @@ describe RESTinPeace do
         specify { expect { instance.save }.to change { instance.errors.any? } }
         specify { expect { instance.save }.to_not change { instance.description } }
         specify { expect { instance.save }.to_not change { instance.name } }
+        specify { expect(instance.save).to eq(false) }
       end
     end
 
@@ -145,7 +146,7 @@ describe RESTinPeace do
         let(:response) { OpenStruct.new(body: { name: 'new name from api' }) }
 
         specify { expect { instance.create }.to_not raise_error }
-        specify { expect(instance.create.object_id).to eq(instance.object_id) }
+        specify { expect(instance.create).to eq(true) }
         specify { expect { instance.create }.to change(instance, :name) }
       end
 
@@ -158,11 +159,13 @@ describe RESTinPeace do
         specify { expect { instance.create }.to change { instance.errors.any? } }
         specify { expect { instance.create }.to_not change { instance.description } }
         specify { expect { instance.create }.to_not change { instance.name } }
+        specify { expect(instance.save).to eq(false) }
       end
     end
 
     describe 'validation handling' do
       let(:description) { 'desc' }
+      let(:errors) { { description: ['must not be empty'] } }
 
       specify { expect(instance).to respond_to(:read_attribute_for_validation).with(1).argument }
       specify { expect(instance.read_attribute_for_validation(:description)).to eq('desc') }
@@ -172,9 +175,22 @@ describe RESTinPeace do
       end
 
       describe '#errors=' do
-        let(:errors) { { description: ['must not be empty'] } }
         specify { expect { instance.errors = errors }.to change { instance.errors.count } }
       end
+
+      describe '#valid?' do
+        context 'without errors' do
+          specify { expect(instance.valid?).to eq(true) }
+        end
+
+        context 'with errors' do
+          before do
+            instance.errors = errors
+          end
+
+          specify { expect(instance.valid?).to eq(false) }
+        end
+      end
     end
   end
 end

data/spec/rest_in_peace/template_sanitizer_spec.rb

@@ -1,8 +1,8 @@
 require 'rest_in_peace/template_sanitizer'
 
 describe RESTinPeace::TemplateSanitizer do
-
-  let(:template_sanitizer) { RESTinPeace::TemplateSanitizer.new(url_template, params) }
+  let(:template_sanitizer) { RESTinPeace::TemplateSanitizer.new(url_template, params, attributes) }
+  let(:attributes) { {} }
 
   describe '#url' do
     subject { template_sanitizer.url }
@@ -48,6 +48,20 @@ describe RESTinPeace::TemplateSanitizer do
       let(:url_template) { '/a/:id' }
       specify { expect { subject }.to_not change { params } }
     end
+
+    context 'tokens from attributes' do
+      let(:params) { { id: 1 } }
+      let(:attributes) { { a_id: 2 } }
+      let(:url_template) { '/a/:a_id/b/:id' }
+      specify { expect(subject).to eq('/a/2/b/1') }
+    end
+
+    context 'incomplete params and attributes' do
+      let(:params) { { id: 1 } }
+      let(:attributes) { {} }
+      let(:url_template) { '/a/:a_id/b/:id' }
+      specify { expect { subject }.to raise_error(RESTinPeace::TemplateSanitizer::IncompleteParams) }
+    end
   end
 
   describe '#tokens' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest-in-peace
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-05 00:00:00.000000000 Z
+date: 2015-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel