frodo 0.10.4 → 0.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f99ab9fe921f7fdb4661c5a6e54b91b4c8149e2
-  data.tar.gz: ad5c5fdaa375d9fcaf0de8bf5ed09b5e5abe15d5
+  metadata.gz: d625c77ac93f7c66bfe21f5e5080cf00458cc76e
+  data.tar.gz: 67cd17ce735175b4670382677c0c200313f20bc0
 SHA512:
-  metadata.gz: 48247e31fa6dc5588e54570c27a9dd6a0922587e7728f7211266cabe4c5452c5136d674312821862ab29c1fe1320869d8dee479eb682ba5f6f0765a3c117cc78
-  data.tar.gz: d23a1ecd6f8d49aa670f4c67971922d6bd16e914faf9265c78645d9c24ea9cabdb8d98e9604a4e7b1ede844bf8ca390932ec7ddce484a9129b7249170bf7e903
+  metadata.gz: '08d6bba647323abc803c11123adedd0d56ee0630b4eb74037b630a43980cc55099aa06a3f75e4dad24fa66568557eb9ed182154d9c882c4d79c41c8f6b4e9fd6'
+  data.tar.gz: 2b66c975a180d4824d08c7d8358cf7db4182ee714a80a1cd32c62fe013c249561f857ebdec95e476655e4188e7ec0d9297096d488a598739e45793a02bc3671d

data/lib/frodo/entity.rb

@@ -88,6 +88,12 @@ module Frodo
       end
     end
 
+    # strip inline annotations from property names and return separately
+    def parse_annotations_from_property_name(property_name)
+      prop_name, annotation = property_name.to_s.split('@', 2)
+      return prop_name, annotation
+    end
+
     def property_names
       [
         @properties_xml_value.andand.keys,
@@ -131,7 +137,9 @@ module Frodo
         end
 
         new_properties.each do |property_name, property_value|
-          self[property_name] = property_value
+          prop_name, annotation = parse_annotations_from_property_name(property_name)
+          # TODO: Do something with the annotation?
+          self[prop_name] = property_value
         end
       end
       entity

data/lib/frodo/version.rb

@@ -1,3 +1,3 @@
 module Frodo
-  VERSION = '0.10.4'
+  VERSION = '0.10.5'
 end

data/spec/frodo/concerns/api_spec.rb

@@ -201,6 +201,16 @@ describe Frodo::Concerns::API do
         expect{ subject }.to raise_error(ArgumentError)
       end
     end
+
+    context 'with @odata.bind properties' do
+      let(:attributes) {{
+          'ownerid@odata.bind': '/systemusers(12345)'
+      }}
+      it 'calls .update! with unmodified attributes' do
+        expect(client).to receive(:update!).with(entity_type, attributes).and_return(true)
+        expect(subject).to be(true)
+      end
+    end
   end
 
   describe '.destroy' do

data/spec/frodo/entity_set_spec.rb

@@ -90,6 +90,17 @@ describe Frodo::EntitySet, vcr: {cassette_name: 'entity_set_specs'} do
     it { expect(new_entity['DiscontinuedDate']).to be_nil }
     it { expect(new_entity['Rating']).to eq(4) }
     it { expect(new_entity['Price']).to eq(3.5) }
+
+    context 'with @odata.bind properties' do
+      let(:properties) { super().merge({
+          'Supplier@odata.bind': '/systemusers(12345)'
+      })}
+      it 'creates entity without annotations' do
+        expect(new_entity.entity_set).to eq(subject)
+        expect(new_entity['Supplier']).to eq('/systemusers(12345)')
+      end
+    end
+
   end
 
   # describe '#[]' do

data/spec/frodo/entity_spec.rb

@@ -59,8 +59,8 @@ describe Frodo::Entity, vcr: false do
     let(:properties) { {
       "firstname"                => "Christoph",
       "lastname"                 => "Wagner",
-      "ownerid"                  => "odata.bind@/systemusers(95B9F1A8-3D5A-E911-A956-000D3A3B9CD8)",
-      "parentcustomerid_account" => "odata.bind@/accounts(60fb3f1c-b766-e911-a955-000d3a3b9316)",
+      "ownerid@odata.bind"                  => "/systemusers(95B9F1A8-3D5A-E911-A956-000D3A3B9CD8)",
+      "parentcustomerid_account@odata.bind" => "/accounts(60fb3f1c-b766-e911-a955-000d3a3b9316)",
     } }
     let(:entity_set) {
       Frodo::EntitySet.new(
@@ -89,8 +89,8 @@ describe Frodo::Entity, vcr: false do
         expect(subject.id).to eq('contacts()')
         expect(subject['firstname']).to eq('Christoph')
         expect(subject['lastname']).to eq('Wagner')
-        expect(subject['ownerid']).to eq('odata.bind@/systemusers(95B9F1A8-3D5A-E911-A956-000D3A3B9CD8)')
-        expect(subject['parentcustomerid_account']).to eq('odata.bind@/accounts(60fb3f1c-b766-e911-a955-000d3a3b9316)')
+        expect(subject['ownerid']).to eq('/systemusers(95B9F1A8-3D5A-E911-A956-000D3A3B9CD8)')
+        expect(subject['parentcustomerid_account']).to eq('/accounts(60fb3f1c-b766-e911-a955-000d3a3b9316)')
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: frodo
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.10.5
 platform: ruby
 authors:
 - Emmanuel Pinault