odata 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6981ed111f758f019824c0616927692584ad31a
-  data.tar.gz: 2f187e5ea95313d48ce325f752e59787624bb9a8
+  metadata.gz: 4d4292a0e518b0b7733528f80c2b5c2e9097fc80
+  data.tar.gz: ca790d90d9beb0d6deac504ec66bc563621a5fee
 SHA512:
-  metadata.gz: e49a84b9757a07d297ac25606a0f92a0760bac242d07a2de0e0d404006382d93c256e08e5e983a72119c28d1f57322d541ee2fabd3e7d4c3a69e07d3d48f61b5
-  data.tar.gz: 4a55c19eba6a3e609ffae47a24e737148992f98ab433fab36bdd9d285f876eb0c8b88bab54d94bd7cd881b88cd80fe7f2c434236c7b1b3ce8a3b5d63a48b656e
+  metadata.gz: af023f47d0d372cf7c3c85cc0cdaef18eca711381e22dd3aa2ebf222b26b4faef3fc6a3d522307dc3577e863fd366d212c749d201157ae28ba1f1307e299a5a7
+  data.tar.gz: e5837bc7f3a012fd7c94c66f7d9774e90e684f0a7f3d1be93e96c8d0a8e489cb548e4d6f4b4ca9e2ae9dfe9ba0752636a8052c7ede9b00d2b716c85d3d701cc3

data/lib/odata/service.rb

@@ -28,9 +28,9 @@ module OData
       "#<#{self.class.name}:#{self.object_id} namespace='#{self.namespace}' service_url='#{self.service_url}'>"
     end
 
-    def get(model)
+    def get(model, criteria = {})
       request = ::Typhoeus::Request.new(
-          "#{service_url}/#{model.odata_name}",
+          build_request_url(model, criteria),
           method: :get
       )
       request.run
@@ -52,5 +52,11 @@ module OData
         ::Nokogiri::XML(response.body).remove_namespaces!
       }.call
     end
+
+    def build_request_url(model, criteria)
+      request_url = "#{service_url}/#{model.odata_name}"
+      request_url += "(#{criteria[:key]})" if criteria[:key]
+      request_url
+    end
   end
 end

data/lib/odata/version.rb

@@ -1,3 +1,3 @@
 module OData
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/spec/fixtures/sample_service/product_0.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<entry xml:base="http://services.odata.org/OData/OData.svc/" xmlns="http://www.w3.org/2005/Atom"
+       xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"
+       xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"
+       xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://services.odata.org/OData/OData.svc/Products(0)</id>
+  <category term="ODataDemo.Product" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"/>
+  <link rel="edit" title="Product" href="Products(0)"/>
+  <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Categories"
+        type="application/atom+xml;type=feed" title="Categories" href="Products(0)/Categories"/>
+  <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Supplier"
+        type="application/atom+xml;type=entry" title="Supplier" href="Products(0)/Supplier"/>
+  <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ProductDetail"
+        type="application/atom+xml;type=entry" title="ProductDetail" href="Products(0)/ProductDetail"/>
+  <title type="text">Bread</title>
+  <summary type="text">Whole grain bread</summary>
+  <updated>2014-06-20T07:16:24Z</updated>
+  <author>
+    <name/>
+  </author>
+  <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/relatedlinks/Categories" type="application/xml"
+        title="Categories" href="Products(0)/$links/Categories"/>
+  <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/relatedlinks/Supplier" type="application/xml"
+        title="Supplier" href="Products(0)/$links/Supplier"/>
+  <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/relatedlinks/ProductDetail" type="application/xml"
+        title="ProductDetail" href="Products(0)/$links/ProductDetail"/>
+  <content type="application/xml">
+    <m:properties>
+      <d:ID m:type="Edm.Int32">0</d:ID>
+      <d:ReleaseDate m:type="Edm.DateTime">1992-01-01T00:00:00</d:ReleaseDate>
+      <d:DiscontinuedDate m:null="true"/>
+      <d:Rating m:type="Edm.Int16">4</d:Rating>
+      <d:Price m:type="Edm.Double">2.5</d:Price>
+    </m:properties>
+  </content>
+</entry>

data/spec/odata/service_spec.rb

@@ -52,5 +52,6 @@ describe OData::Service do
 
   describe '#get' do
     it { expect(subject.get(::Examples::Product).size).to eq(11) }
+    it { expect(subject.get(::Examples::Product, {key: 0}).size).to eq(1) }
   end
 end

data/spec/spec_helper.rb

@@ -37,5 +37,8 @@ RSpec.configure do |config|
 
     WebMock.stub_request(:get, 'http://services.odata.org/OData/OData.svc/Products').
         to_return(status: 200, body: File.open('spec/fixtures/sample_service/products.xml'))
+
+    WebMock.stub_request(:get, 'http://services.odata.org/OData/OData.svc/Products(0)').
+        to_return(status: 200, body: File.open('spec/fixtures/sample_service/product_0.xml'))
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: odata
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - James Thompson
@@ -160,6 +160,7 @@ files:
 - odata.gemspec
 - spec/examples/product_model.rb
 - spec/fixtures/sample_service/metadata.xml
+- spec/fixtures/sample_service/product_0.xml
 - spec/fixtures/sample_service/products.xml
 - spec/odata/model_spec.rb
 - spec/odata/service_registry_spec.rb
@@ -192,6 +193,7 @@ summary: Simple OData library
 test_files:
 - spec/examples/product_model.rb
 - spec/fixtures/sample_service/metadata.xml
+- spec/fixtures/sample_service/product_0.xml
 - spec/fixtures/sample_service/products.xml
 - spec/odata/model_spec.rb
 - spec/odata/service_registry_spec.rb