frodo 0.12.7 → 0.12.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a40dc4c7d9c0ce23fe834d93e91365b8a0d23f60fc42317378a4f9eb021e688
-  data.tar.gz: b2ed79b9746182ef6af02ec480925e87107d2412c4d44316fc36070f28d1511a
+  metadata.gz: 5a388c9e2e7916ae2e41438e5880a185e8669d24a3e69305e5feba9dcffe6969
+  data.tar.gz: 1e454f5b727aa91d5c8953771a55d46470fcc07f3ba915109ba482d8191749ee
 SHA512:
-  metadata.gz: 929f1284a12b79d4ad569e043740f6893d1811cefd1f5bf6ca14fd3054c5e287544d6dfb1d7d157e0112c96ad2f755750ee84249a8f20fa03465a140a5323658
-  data.tar.gz: 3521fb729651a1cd94333ab08d7680cd9cd0fbcf5e21c277d26db72dcb15e6821e80efe0bba9d7d68a9de9a586ffb6fdc29ac9f869595f0cda6c1d3a1370783f
+  metadata.gz: ba148923cea7fe4537475e6f0b2667079730b02a949b3a8fbc77bffe18399b351000542d49bebec118455d833b39c20210360dcc4445b9d01901a9914f1f96d7
+  data.tar.gz: da0d8abbf0c24dfaf42c2bddf8cb9ad06bc69e8000b29d975691df32a149cfb01ddab4d6189f4b3da897615958655610d9738c62960c9d14a326b69f2186465d

data/lib/frodo/concerns/api.rb

@@ -41,7 +41,7 @@ module Frodo
 
       def metadata_on_init
         # Creating Metadata using a different client than the one that is stored
-        Frodo::Client.new(@options).api_get("$metadata").body unless @options[:with_metadata]
+        Frodo::Client.new(@options).api_get("$metadata").body if @options[:with_metadata]
       end
 
       # Public: Execute a query and returns the result.

data/lib/frodo/service.rb

@@ -1,4 +1,3 @@
-
 module Frodo
   # Encapsulates the basic details and functionality needed to interact with an
   # Frodo service.
@@ -21,7 +20,7 @@ module Frodo
       @service_url = service_url
 
       Frodo::ServiceRegistry.add(self)
-      register_custom_types unless options[:with_metadata]
+      register_custom_types if @options[:with_metadata]
     end
 
     # Returns user supplied name for service, or its URL
@@ -173,14 +172,15 @@ module Frodo
     end
 
     def with_metadata?
-      !options.key?(:with_metadata) || options[:with_metadata]
+      !@options.key?(:with_metadata) || @options[:with_metadata]
     end
 
     private
 
     def default_options
       {
-        strict: true # strict property validation
+        strict: true, # strict property validation
+        with_metadata: true
       }
     end
 

data/lib/frodo/version.rb

@@ -1,3 +1,3 @@
 module Frodo
-  VERSION = '0.12.7'
+  VERSION = '0.12.8'
 end

data/spec/frodo/client_spec.rb

@@ -14,7 +14,8 @@ describe Frodo::Client do
       instance_url: instance_url,
       base_path: base_path,
       client_id: 'client_id',
-      client_secret: 'secret'
+      client_secret: 'secret',
+      with_metadata: true
     )
 
     expect(client.options[:client_id]).to eql("client_id")
@@ -26,13 +27,36 @@ describe Frodo::Client do
         to_return(body: File.new('spec/fixtures/files/metadata.xml'), status: 200)
 
     service = client.service
-    allow(service).to receive(:with_metadata?).and_return(true)
+    expect(service.with_metadata?).to be_truthy
 
     expect(service['Products']).to_not be_nil
     expect(service['Products'].name).to eql('Products')
     expect(service['Products'].type).to eql('ODataDemo.Product')
   end
 
+  it "creates a client without metadata" do
+    client = subject.new(
+      instance_url: instance_url,
+      base_path: base_path,
+      client_id: 'client_id',
+      client_secret: 'secret',
+      with_metadata: false
+    )
+
+    expect(client.options[:client_id]).to eql("client_id")
+    expect(client.options[:client_secret]).to eql("secret")
+    expect(client.options[:instance_url]).to eql(instance_url)
+    expect(client.options[:base_path]).to eql("/api")
+
+    expect_any_instance_of(Frodo::Client).to_not receive(:api_get)
+    service = client.service
+    expect(service.with_metadata?).to be_falsey
+
+    expect(service['Products']).to_not be_nil
+    expect(service['Products'].name).to eql('Products')
+    expect(service['Products'].type).to eql(nil)   #because we init new EntitySet only with name
+  end
+
   it "creates a client and inject a service instead of pulling the configured one" do
     service = Frodo::Service.new(service_url, name: 'Demo', metadata_file: 'spec/fixtures/files/metadata.xml')
     client = subject.new(

data/spec/frodo/service_spec.rb

@@ -3,7 +3,8 @@ require 'spec_helper'
 describe Frodo::Service do
   let(:service_url) { 'http://services.odata.org/V4/OData/OData.svc' }
   let(:metadata_file) { 'spec/fixtures/files/metadata.xml' }
-  let(:subject) { Frodo::Service.new(service_url, name: 'ODataDemo', metadata_file: metadata_file) }
+  let(:options){{name: 'ODataDemo', metadata_file: metadata_file }}
+  let(:subject) { Frodo::Service.new(service_url, options) }
 
   describe '.new' do
     it 'adds itself to Frodo::ServiceRegistry on creation' do
@@ -34,6 +35,21 @@ describe Frodo::Service do
         expect(Frodo::PropertyRegistry['mscrm.BooleanManagedProperty']).to be_a(Class)
       end
     end
+
+    context "with 'with_metadata' option" do
+      it "call 'register_custom_types'" do
+        expect_any_instance_of(Frodo::Service).to receive(:register_custom_types)
+        subject
+      end
+    end
+
+    context "without 'with_metadata' option" do
+      let(:options){{name: 'ODataDemo', with_metadata:false, metadata_file: metadata_file }}
+      it "call 'register_custom_types'" do
+        expect_any_instance_of(Frodo::Service).to_not receive(:register_custom_types)
+        subject
+      end
+    end
   end
 
   describe '#logger' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frodo
 version: !ruby/object:Gem::Version
-  version: 0.12.7
+  version: 0.12.8
 platform: ruby
 authors:
 - Emmanuel Pinault
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-27 00:00:00.000000000 Z
+date: 2020-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri