odata4 0.8.0 → 0.8.1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: odata4
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Christoph Wagner
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-10 00:00:00.000000000 Z
+date: 2018-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -212,6 +212,7 @@ files:
 - lib/odata4/properties.rb
 - lib/odata4/properties/binary.rb
 - lib/odata4/properties/boolean.rb
+- lib/odata4/properties/collection.rb
 - lib/odata4/properties/date.rb
 - lib/odata4/properties/date_time.rb
 - lib/odata4/properties/date_time_offset.rb
@@ -238,16 +239,20 @@ files:
 - lib/odata4/query/criteria/lambda_operators.rb
 - lib/odata4/query/criteria/string_functions.rb
 - lib/odata4/query/in_batches.rb
-- lib/odata4/query/result.rb
-- lib/odata4/query/result/atom.rb
-- lib/odata4/query/result/json.rb
 - lib/odata4/railtie.rb
 - lib/odata4/schema.rb
 - lib/odata4/service.rb
+- lib/odata4/service/request.rb
+- lib/odata4/service/response.rb
+- lib/odata4/service/response/atom.rb
+- lib/odata4/service/response/json.rb
+- lib/odata4/service/response/plain.rb
+- lib/odata4/service/response/xml.rb
 - lib/odata4/service_registry.rb
 - lib/odata4/version.rb
 - odata4.gemspec
 - spec/fixtures/files/entity_to_xml.xml
+- spec/fixtures/files/error.xml
 - spec/fixtures/files/metadata.xml
 - spec/fixtures/files/product_0.json
 - spec/fixtures/files/product_0.xml
@@ -264,6 +269,7 @@ files:
 - spec/fixtures/vcr_cassettes/navigation_property_proxy_specs.yml
 - spec/fixtures/vcr_cassettes/query/result_specs.yml
 - spec/fixtures/vcr_cassettes/query_specs.yml
+- spec/fixtures/vcr_cassettes/service/request_specs.yml
 - spec/fixtures/vcr_cassettes/service_registry_specs.yml
 - spec/fixtures/vcr_cassettes/service_specs.yml
 - spec/fixtures/vcr_cassettes/usage_example_specs.yml
@@ -277,6 +283,7 @@ files:
 - spec/odata4/navigation_property_spec.rb
 - spec/odata4/properties/binary_spec.rb
 - spec/odata4/properties/boolean_spec.rb
+- spec/odata4/properties/collection_spec.rb
 - spec/odata4/properties/date_spec.rb
 - spec/odata4/properties/date_time_offset_spec.rb
 - spec/odata4/properties/date_time_spec.rb
@@ -294,9 +301,10 @@ files:
 - spec/odata4/property_registry_spec.rb
 - spec/odata4/property_spec.rb
 - spec/odata4/query/criteria_spec.rb
-- spec/odata4/query/result_spec.rb
 - spec/odata4/query_spec.rb
 - spec/odata4/schema_spec.rb
+- spec/odata4/service/request_spec.rb
+- spec/odata4/service/response_spec.rb
 - spec/odata4/service_registry_spec.rb
 - spec/odata4/service_spec.rb
 - spec/odata4/usage_example_spec.rb
@@ -329,6 +337,7 @@ specification_version: 4
 summary: Simple OData library
 test_files:
 - spec/fixtures/files/entity_to_xml.xml
+- spec/fixtures/files/error.xml
 - spec/fixtures/files/metadata.xml
 - spec/fixtures/files/product_0.json
 - spec/fixtures/files/product_0.xml
@@ -345,6 +354,7 @@ test_files:
 - spec/fixtures/vcr_cassettes/navigation_property_proxy_specs.yml
 - spec/fixtures/vcr_cassettes/query/result_specs.yml
 - spec/fixtures/vcr_cassettes/query_specs.yml
+- spec/fixtures/vcr_cassettes/service/request_specs.yml
 - spec/fixtures/vcr_cassettes/service_registry_specs.yml
 - spec/fixtures/vcr_cassettes/service_specs.yml
 - spec/fixtures/vcr_cassettes/usage_example_specs.yml
@@ -358,6 +368,7 @@ test_files:
 - spec/odata4/navigation_property_spec.rb
 - spec/odata4/properties/binary_spec.rb
 - spec/odata4/properties/boolean_spec.rb
+- spec/odata4/properties/collection_spec.rb
 - spec/odata4/properties/date_spec.rb
 - spec/odata4/properties/date_time_offset_spec.rb
 - spec/odata4/properties/date_time_spec.rb
@@ -375,9 +386,10 @@ test_files:
 - spec/odata4/property_registry_spec.rb
 - spec/odata4/property_spec.rb
 - spec/odata4/query/criteria_spec.rb
-- spec/odata4/query/result_spec.rb
 - spec/odata4/query_spec.rb
 - spec/odata4/schema_spec.rb
+- spec/odata4/service/request_spec.rb
+- spec/odata4/service/response_spec.rb
 - spec/odata4/service_registry_spec.rb
 - spec/odata4/service_spec.rb
 - spec/odata4/usage_example_spec.rb

data/lib/odata4/query/result.rb

@@ -1,84 +0,0 @@
-module OData4
-  class Query
-    # Represents the results of executing a OData4::Query.
-    # @api private
-    class Result
-      include Enumerable
-
-      attr_reader :query
-
-      # Initialize a result with the query and the result.
-      # @param query [OData4::Query]
-      # @param result [Typhoeus::Result]
-      def initialize(query, result)
-        @query      = query
-        @result     = result
-        check_result_type
-      end
-
-      # Provided for Enumerable functionality
-      # @param block [block] a block to evaluate
-      # @return [OData4::Entity] each entity in turn for the query result
-      def each(&block)
-        unless empty?
-          process_results(&block)
-          until next_page.nil?
-            # ensure query gets executed with the same options
-            result = query.execute(next_page_url)
-            process_results(&block)
-          end
-        end
-      end
-
-      # Checks whether the result set contains any results
-      # @return [Boolean]
-      def empty?
-        @empty_result ||= find_entities.empty?
-      end
-
-      private
-
-      attr_accessor :result
-
-      def check_result_type
-        # Dynamically extend instance with methods for
-        # processing the current result type
-        if is_atom_result?
-          extend OData4::Query::Result::Atom
-        elsif is_json_result?
-          extend OData4::Query::Result::JSON
-        elsif result.body.empty?
-          # Some services (*cough* Microsoft *cough*) return
-          # an empty response with no `Content-Type` header set.
-          # We catch that here and bypass content type detection.
-          @empty_result = true
-        else
-          raise ArgumentError, "Invalid result type '#{content_type}'"
-        end
-      end
-
-      def is_atom_result?
-        content_type =~ /#{Regexp.escape OData4::Service::MIME_TYPES[:atom]}/
-      end
-
-      def is_json_result?
-        content_type =~ /#{Regexp.escape OData4::Service::MIME_TYPES[:json]}/
-      end
-
-      def content_type
-        result.headers['Content-Type'] || ''
-      end
-
-      def service
-        query.entity_set.service
-      end
-
-      def entity_options
-        query.entity_set.entity_options
-      end
-    end
-  end
-end
-
-require 'odata4/query/result/atom'
-require 'odata4/query/result/json'

data/spec/odata4/query/result_spec.rb

@@ -1,53 +0,0 @@
-require 'spec_helper'
-
-shared_examples 'valid result' do
-  it { expect(result.count).to eq(11) }
-
-  describe '#empty?' do
-    it { expect(result).to respond_to(:empty?) }
-    it { expect(result.empty?).to eq(false) }
-  end
-
-  describe '#each' do
-    it { expect(result).to respond_to(:each) }
-    it 'returns just OData4::Entities of the right type' do
-      result.each do |entity|
-        expect(entity).to be_a(OData4::Entity)
-        expect(entity.type).to eq('ODataDemo.Product')
-      end
-    end
-  end
-end
-
-describe OData4::Query::Result, vcr: {cassette_name: 'query/result_specs'} do
-  before(:example) do
-    OData4::Service.open('http://services.odata.org/V4/OData/OData.svc', name: 'ODataDemo')
-  end
-
-  let(:entity_set) { OData4::ServiceRegistry['ODataDemo']['Products'] }
-  # let(:subject) { entity_set.query.execute }
-
-  let(:response) do
-    response = double('response')
-    allow(response).to receive_messages(
-      headers: { 'Content-Type' => content_type },
-      body: response_body
-    )
-    response
-  end
-  let(:result) { OData4::Query::Result.new(entity_set.query, response) }
-
-  context 'with Atom Result' do
-    let(:content_type) { 'application/atom+xml' }
-    let(:response_body) { File.read('spec/fixtures/files/products.xml') }
-
-    it_behaves_like 'valid result'
-  end
-
-  context 'with JSON Result' do
-    let(:content_type) { 'application/json' }
-    let(:response_body) { File.read('spec/fixtures/files/products.json') }
-
-    it_behaves_like 'valid result'
-  end
-end