lhs 4.1.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e27399738c34692f15a9ba1068981cf12443631e
-  data.tar.gz: e8eaccb70ea546cefbe1257cf381710ca238efc3
+  metadata.gz: 9054af3b33bec8e693c84c84e44ba80845e4525c
+  data.tar.gz: 6ebd3acdaa73985d3f1845c92fe3cf57803c604f
 SHA512:
-  metadata.gz: c8a1c670452d45d81ed4d107887f40911b20909a4c834877571ad1d2d2ea7192506fe5fd15dde441446bd544f679b625143af9d78882d790a069a5e336f9ead5
-  data.tar.gz: 5f6a52abd26aa3521f1afeef73ab872b6f7d1a121d56a5f660aec54796c6c413f2694afe688ead9fade514c5cce0b87a5be809dbf5760942a4f1079662d567b8
+  metadata.gz: 51165a2c4256deb6cf82f445c8a597b7c1830a40edc1004239c32b34bf629bd5e81417590351e0f88159c5a60aebaf68f79199042ccffb8b80a078096879fe1e
+  data.tar.gz: ee0fe6d834cf6194276852903e7a33215fba61eb6b0b1715bea3da2b9a2c8478c465c32c8c13fb9371131c907d09d506bb7e20efcce5e32cb438498d7aba6d80

data/lib/lhs/concerns/item/save.rb

@@ -16,12 +16,14 @@ class LHS::Item < LHS::Proxy
     def save!
       record = _data.class
       data = _data._raw.dup
-      url =
-        if href.present?
-          href
-        else
-          record.find_endpoint(data).compile(data)
-        end
+      if href.present?
+        url = href
+      else
+        endpoint = record.find_endpoint(data)
+        url = endpoint.compile(data)
+        endpoint.remove_interpolated_params!(data)
+      end
+
       data = record.request(method: :post, url: url, body: data.to_json, headers: { 'Content-Type' => 'application/json' })
       _data.merge_raw!(data)
       true

data/lib/lhs/concerns/record/create.rb

@@ -7,19 +7,15 @@ class LHS::Record
 
     module ClassMethods
       def create(data = {})
-        create!(data)
-      rescue LHC::Error => e
-        json = JSON.parse(data.to_json)
-        data = LHS::Data.new(json, nil, self, e.response.request)
-        item = LHS::Item.new(data)
-        item.errors = LHS::Errors.new(e.response)
-        data._record.new(LHS::Data.new(item, data))
+        record = new(data)
+        record.save
+        record
       end
 
       def create!(data = {})
-        url = compute_url!(data)
-        data = request(url: url, method: :post, body: data.to_json, headers: { 'Content-Type' => 'application/json' })
-        data._record.new(data)
+        record = new(data)
+        record.save!
+        record
       end
     end
   end

data/lib/lhs/version.rb

@@ -1,3 +1,3 @@
 module LHS
-  VERSION = "4.1.0"
+  VERSION = "4.2.0"
 end

data/spec/record/create_spec.rb

@@ -76,5 +76,59 @@ describe LHS::Record do
         }).to raise_error
       end
     end
+
+    context 'custom setters' do
+      before(:each) do
+        class Feedback
+          def ratings=(ratings)
+            _raw[:ratings] = ratings.map { |k, v| { name: k.to_s, value: v } }
+          end
+        end
+
+        stub_request(:post, "#{datastore}/feedbacks")
+          .with(body: { ratings: converted_ratings }.to_json)
+          .to_return(status: 200, body: { ratings: converted_ratings }.to_json)
+      end
+
+      let(:ratings) do
+        {
+          a: 1,
+          b: 2
+        }
+      end
+
+      let(:converted_ratings) do
+        [
+          { name: 'a', value: 1 },
+          { name: 'b', value: 2 }
+        ]
+      end
+
+      it 'are used by create' do
+        feedback = Feedback.create(ratings: ratings)
+        expect(feedback.ratings.raw).to eq(converted_ratings)
+      end
+
+      it 'can be used directly to change raw data' do
+        feedback = Feedback.create(ratings: ratings)
+        feedback.ratings = { z: 3 }
+        expect(feedback.ratings.first.name).to eq 'z'
+      end
+
+      context 'and custom getters' do
+        before(:each) do
+          class Feedback
+            def ratings
+              Hash[_raw[:ratings].map { |r| [r[:name].to_sym, r[:value]] }]
+            end
+          end
+        end
+
+        it 'uses custom getters to show data for exploration' do
+          feedback = Feedback.create(ratings: ratings)
+          expect(feedback.ratings).to eq(ratings)
+        end
+      end
+    end
   end
 end

data/spec/record/new_spec.rb

@@ -6,15 +6,15 @@ describe LHS::Record do
 
     before(:each) do
       LHC.config.placeholder('datastore', datastore)
-      class Feedback < LHS::Record
+      class Rating < LHS::Record
         endpoint ':datastore/content-ads/:campaign_id/feedbacks'
         endpoint ':datastore/feedbacks'
       end
     end
 
     it 'builds a new item from scratch (like build)' do
-      feedback = Feedback.new recommended: true
-      expect(feedback).to be_kind_of Feedback
+      feedback = Rating.new recommended: true
+      expect(feedback).to be_kind_of Rating
       expect(feedback.recommended).to eq true
       stub_request(:post, "http://local.ch/v2/feedbacks")
         .with(body: "{\"recommended\":true}")
@@ -22,7 +22,7 @@ describe LHS::Record do
     end
 
     it 'builds new items also with keys containing dashes' do
-      feedback = Feedback.new('some-key' => [])
+      feedback = Rating.new('some-key' => [])
       expect(feedback._raw[:'some-key']).to eq([])
     end
 
@@ -47,7 +47,7 @@ describe LHS::Record do
 
     context 'custom setters' do
       before(:each) do
-        class Feedback
+        class Rating
           def ratings=(ratings)
             _raw[:ratings] = ratings.map { |k, v| { name: k, value: v } }
           end
@@ -55,19 +55,19 @@ describe LHS::Record do
       end
 
       it 'are used by initializer' do
-        feedback = Feedback.new(ratings: { a: 1, b: 2 })
+        feedback = Rating.new(ratings: { a: 1, b: 2 })
         expect(feedback.ratings.raw).to eq([{ name: :a, value: 1 }, { name: :b, value: 2 }])
       end
 
       it 'can be used directly to change raw data' do
-        feedback = Feedback.new(ratings: { a: 1 })
+        feedback = Rating.new(ratings: { a: 1 })
         feedback.ratings = { z: 3 }
         expect(feedback.ratings.first.name).to eq :z
       end
 
       context 'and custom getters' do
         before(:each) do
-          class Feedback
+          class Rating
             def ratings
               Hash[_raw[:ratings].map { |r| [r[:name], r[:value]] }]
             end
@@ -75,7 +75,7 @@ describe LHS::Record do
         end
 
         it 'uses custom getters to show data for exploration' do
-          feedback = Feedback.new(ratings: { a: 1, b: 2 })
+          feedback = Rating.new(ratings: { a: 1, b: 2 })
           expect(feedback.ratings).to eq(a: 1, b: 2)
         end
       end

data/spec/record/persisted_spec.rb

@@ -21,13 +21,8 @@ describe LHS::Record do
 
     context 'for saved record' do
       let(:campaign_id) { 'aaa' }
-      let(:parameters) do
-        {
-          recommended: true,
-          campaign_id: campaign_id
-        }
-      end
-      subject { Feedback.new(parameters) }
+      let(:parameters) { { recommended: true } }
+      subject { Feedback.new(parameters.merge(campaign_id: campaign_id)) }
 
       before do
         stub_request(:post, "#{datastore}/content-ads/#{campaign_id}/feedbacks")

data/spec/record/save_spec.rb

@@ -0,0 +1,28 @@
+require 'rails_helper'
+
+describe LHS::Record do
+  context 'save!' do
+    context 'without href' do
+      before do
+        LHC.config.placeholder('datastore', datastore)
+        class Feedback < LHS::Record
+          endpoint ':datastore/content-ads/:campaign_id/feedbacks'
+        end
+      end
+
+      let(:datastore) { 'http://local.ch/v2' }
+      let(:campaign_id) { 12345 }
+      let(:object) { { recommended: true } }
+      let(:item) { Feedback.new(object.merge(campaign_id: campaign_id)) }
+
+      it 'removes params used to compute url from send data' do
+        datastore_request = stub_request(:post, "#{datastore}/content-ads/#{campaign_id}/feedbacks")
+          .with(body: object.to_json)
+          .to_return(status: 200, body: object.to_json)
+
+        item.save!
+        expect(datastore_request).to have_been_made.once
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.0
 platform: ruby
 authors:
 - https://github.com/local-ch/lhs/graphs/contributors
@@ -295,6 +295,7 @@ files:
 - spec/record/pagination_spec.rb
 - spec/record/persisted_spec.rb
 - spec/record/request_spec.rb
+- spec/record/save_spec.rb
 - spec/record/select_spec.rb
 - spec/record/to_json_spec.rb
 - spec/record/where_spec.rb
@@ -419,6 +420,7 @@ test_files:
 - spec/record/pagination_spec.rb
 - spec/record/persisted_spec.rb
 - spec/record/request_spec.rb
+- spec/record/save_spec.rb
 - spec/record/select_spec.rb
 - spec/record/to_json_spec.rb
 - spec/record/where_spec.rb