odata 0.5.7 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 132bf64833bd5c6888ca24a33d5526cb8c689607
-  data.tar.gz: 323694626b51ea8db8736a85af8a20b77069c73a
+  metadata.gz: c8fdea1fa3181e24c43f5f2121d48d6685df3780
+  data.tar.gz: 4eeda811bf149b107b23a540162041c025c9647d
 SHA512:
-  metadata.gz: 458ff34118c913fa55776d7b6fc514a60e9f130955b36138ad4aa68373213443c503b8e87915ff5e4151d5268d1fbe79910b120c42cd24feb8f6cca3f95dfe96
-  data.tar.gz: 4ec2cb74a93adf716c139c3c4af606509282cdfd83ab01737c3b9e426cbb18e95f177b55a05d50eea9a411accfe88e51259b24083a4de0683ac4c05f1b7db8d4
+  metadata.gz: 436b465b08302628869a881377446d3dcbef41d788c5be2052d4fa9741503d7198959010ab956e0a81685a15435e3e3f96375e27cdf4e959ee34824b0476c41a
+  data.tar.gz: 8498c3425a1b3999857c863dc211d5f5c0aaceb69598cd025456cb15c9c7b485e065524e6e86182c8dfbfe4645ead9e33a0e7d7e2d3ec2a7b6e16d4e8426ca9f

data/lib/odata/properties/string.rb

@@ -19,6 +19,12 @@ module OData
         @value = new_value.nil? ? nil : encode_value(new_value.to_s)
       end
 
+      # Value to be used in URLs.
+      # @return [String]
+      def url_value
+        "'#{value}'"
+      end
+
       # The OData type name
       def type
         'Edm.String'

data/lib/odata/query.rb

@@ -14,7 +14,8 @@ module OData
     # Instantiates an OData::Query::Criteria for the named property.
     # @param property [to_s]
     def [](property)
-      OData::Query::Criteria.new(property: property)
+      property_instance = @entity_set.new_entity.send(:properties)[property.to_s]
+      OData::Query::Criteria.new(property: property_instance)
     end
 
     # Adds a filter criteria to the query.

data/lib/odata/query/criteria.rb

@@ -62,20 +62,18 @@ module OData
 
       # Returns criteria as query-ready string.
       def to_s
-        "#{property} #{operator} #{value_for_string}"
+        "#{property.name} #{operator} #{property.url_value}"
       end
 
       private
 
       def set_operator_and_value(operator, value)
+        property.value = value
+
         @operator = operator
         @value = value
         self
       end
-
-      def value_for_string
-        value.is_a?(String) ? "#{value}" : value
-      end
     end
   end
 end

data/lib/odata/service.rb

@@ -190,7 +190,9 @@ module OData
 
     def default_options
       {
-          typhoeus: {}
+          typhoeus: {
+              headers: { 'DataServiceVersion' => '3.0' }
+          }
       }
     end
 

data/lib/odata/version.rb

@@ -1,3 +1,3 @@
 module OData
-  VERSION = '0.5.7'
+  VERSION = '0.5.8'
 end

data/spec/fixtures/vcr_cassettes/query_specs.yml

@@ -9,6 +9,8 @@ http_interactions:
     headers:
       User-Agent:
       - Typhoeus - https://github.com/typhoeus/typhoeus
+      DataServiceVersion:
+      - '3.0'
   response:
     status:
       code: 200
@@ -39,9 +41,9 @@ http_interactions:
       Access-Control-Expose-Headers:
       - DataServiceVersion
       Set-Cookie:
-      - ARRAffinity=a9aad020fb0149d28d0efdb1e8bab24ad3481a904c8fb94abced8813c01ee265;Path=/;Domain=services.odata.org
+      - ARRAffinity=cb44902b614a02a3a0dc1bccc3de360d89b180ff17e14b11fd9b289a8de75827;Path=/;Domain=services.odata.org
       Date:
-      - Sat, 19 Jul 2014 02:59:53 GMT
+      - Mon, 29 Sep 2014 04:25:33 GMT
     body:
       encoding: UTF-8
       string: <?xml version="1.0" encoding="utf-8"?><edmx:Edmx Version="1.0" xmlns:edmx="http://schemas.microsoft.com/ado/2007/06/edmx"><edmx:DataServices
@@ -160,7 +162,7 @@ http_interactions:
     http_version: '1.1'
     adapter_metadata:
       effective_url: http://services.odata.org/OData/OData.svc/$metadata
-  recorded_at: Sat, 19 Jul 2014 02:59:53 GMT
+  recorded_at: Mon, 29 Sep 2014 04:25:33 GMT
 - request:
     method: get
     uri: http://services.odata.org/OData/OData.svc/Products
@@ -170,6 +172,8 @@ http_interactions:
     headers:
       User-Agent:
       - Typhoeus - https://github.com/typhoeus/typhoeus
+      DataServiceVersion:
+      - '3.0'
   response:
     status:
       code: 200
@@ -200,16 +204,16 @@ http_interactions:
       Access-Control-Expose-Headers:
       - DataServiceVersion
       Set-Cookie:
-      - ARRAffinity=a9aad020fb0149d28d0efdb1e8bab24ad3481a904c8fb94abced8813c01ee265;Path=/;Domain=services.odata.org
+      - ARRAffinity=cb44902b614a02a3a0dc1bccc3de360d89b180ff17e14b11fd9b289a8de75827;Path=/;Domain=services.odata.org
       Date:
-      - Sun, 20 Jul 2014 21:01:21 GMT
+      - Mon, 29 Sep 2014 04:25:33 GMT
     body:
       encoding: UTF-8
       string: <?xml version="1.0" encoding="utf-8"?><feed 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</id><title
-        type="text">Products</title><updated>2014-07-20T21:01:22Z</updated><link rel="self"
+        type="text">Products</title><updated>2014-09-29T04:25:33Z</updated><link rel="self"
         title="Products" href="Products" /><entry><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"
@@ -218,7 +222,7 @@ http_interactions:
         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-07-20T21:01:22Z</updated><author><name
+        /><title type="text">Bread</title><summary type="text">Whole grain bread</summary><updated>2014-09-29T04:25:33Z</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"
@@ -235,7 +239,7 @@ http_interactions:
         type="application/atom+xml;type=entry" title="Supplier" href="Products(1)/Supplier"
         /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ProductDetail"
         type="application/atom+xml;type=entry" title="ProductDetail" href="Products(1)/ProductDetail"
-        /><title type="text">Milk</title><summary type="text">Low fat milk</summary><updated>2014-07-20T21:01:22Z</updated><author><name
+        /><title type="text">Milk</title><summary type="text">Low fat milk</summary><updated>2014-09-29T04:25:33Z</updated><author><name
         /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/relatedlinks/Categories"
         type="application/xml" title="Categories" href="Products(1)/$links/Categories"
         /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/relatedlinks/Supplier"
@@ -253,7 +257,7 @@ http_interactions:
         /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ProductDetail"
         type="application/atom+xml;type=entry" title="ProductDetail" href="Products(2)/ProductDetail"
         /><title type="text">Vint soda</title><summary type="text">Americana Variety
-        - Mix of 6 flavors</summary><updated>2014-07-20T21:01:22Z</updated><author><name
+        - Mix of 6 flavors</summary><updated>2014-09-29T04:25:33Z</updated><author><name
         /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/relatedlinks/Categories"
         type="application/xml" title="Categories" href="Products(2)/$links/Categories"
         /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/relatedlinks/Supplier"
@@ -271,7 +275,7 @@ http_interactions:
         /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ProductDetail"
         type="application/atom+xml;type=entry" title="ProductDetail" href="Products(3)/ProductDetail"
         /><title type="text">Havina Cola</title><summary type="text">The Original
-        Key Lime Cola</summary><updated>2014-07-20T21:01:22Z</updated><author><name
+        Key Lime Cola</summary><updated>2014-09-29T04:25:33Z</updated><author><name
         /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/relatedlinks/Categories"
         type="application/xml" title="Categories" href="Products(3)/$links/Categories"
         /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/relatedlinks/Supplier"
@@ -290,7 +294,7 @@ http_interactions:
         /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ProductDetail"
         type="application/atom+xml;type=entry" title="ProductDetail" href="Products(4)/ProductDetail"
         /><title type="text">Fruit Punch</title><summary type="text">Mango flavor,
-        8.3 Ounce Cans (Pack of 24)</summary><updated>2014-07-20T21:01:22Z</updated><author><name
+        8.3 Ounce Cans (Pack of 24)</summary><updated>2014-09-29T04:25:33Z</updated><author><name
         /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/relatedlinks/Categories"
         type="application/xml" title="Categories" href="Products(4)/$links/Categories"
         /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/relatedlinks/Supplier"
@@ -308,7 +312,7 @@ http_interactions:
         /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ProductDetail"
         type="application/atom+xml;type=entry" title="ProductDetail" href="Products(5)/ProductDetail"
         /><title type="text">Cranberry Juice</title><summary type="text">16-Ounce
-        Plastic Bottles (Pack of 12)</summary><updated>2014-07-20T21:01:22Z</updated><author><name
+        Plastic Bottles (Pack of 12)</summary><updated>2014-09-29T04:25:33Z</updated><author><name
         /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/relatedlinks/Categories"
         type="application/xml" title="Categories" href="Products(5)/$links/Categories"
         /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/relatedlinks/Supplier"
@@ -326,7 +330,7 @@ http_interactions:
         /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ProductDetail"
         type="application/atom+xml;type=entry" title="ProductDetail" href="Products(6)/ProductDetail"
         /><title type="text">Pink Lemonade</title><summary type="text">36 Ounce Cans
-        (Pack of 3)</summary><updated>2014-07-20T21:01:22Z</updated><author><name
+        (Pack of 3)</summary><updated>2014-09-29T04:25:33Z</updated><author><name
         /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/relatedlinks/Categories"
         type="application/xml" title="Categories" href="Products(6)/$links/Categories"
         /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/relatedlinks/Supplier"
@@ -344,7 +348,7 @@ http_interactions:
         /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ProductDetail"
         type="application/atom+xml;type=entry" title="ProductDetail" href="Products(7)/ProductDetail"
         /><title type="text">DVD Player</title><summary type="text">1080P Upconversion
-        DVD Player</summary><updated>2014-07-20T21:01:22Z</updated><author><name /></author><link
+        DVD Player</summary><updated>2014-09-29T04:25:33Z</updated><author><name /></author><link
         rel="http://schemas.microsoft.com/ado/2007/08/dataservices/relatedlinks/Categories"
         type="application/xml" title="Categories" href="Products(7)/$links/Categories"
         /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/relatedlinks/Supplier"
@@ -362,7 +366,7 @@ http_interactions:
         /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ProductDetail"
         type="application/atom+xml;type=entry" title="ProductDetail" href="Products(8)/ProductDetail"
         /><title type="text">LCD HDTV</title><summary type="text">42 inch 1080p LCD
-        with Built-in Blu-ray Disc Player</summary><updated>2014-07-20T21:01:22Z</updated><author><name
+        with Built-in Blu-ray Disc Player</summary><updated>2014-09-29T04:25:33Z</updated><author><name
         /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/relatedlinks/Categories"
         type="application/xml" title="Categories" href="Products(8)/$links/Categories"
         /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/relatedlinks/Supplier"
@@ -383,7 +387,7 @@ http_interactions:
         /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Advertisement"
         type="application/atom+xml;type=entry" title="Advertisement" href="Products(9)/ODataDemo.FeaturedProduct/Advertisement"
         /><title type="text">Lemonade</title><summary type="text">Classic, refreshing
-        lemonade (Single bottle)</summary><updated>2014-07-20T21:01:22Z</updated><author><name
+        lemonade (Single bottle)</summary><updated>2014-09-29T04:25:33Z</updated><author><name
         /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/relatedlinks/Categories"
         type="application/xml" title="Categories" href="Products(9)/ODataDemo.FeaturedProduct/$links/Categories"
         /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/relatedlinks/Supplier"
@@ -406,7 +410,7 @@ http_interactions:
         /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Advertisement"
         type="application/atom+xml;type=entry" title="Advertisement" href="Products(10)/ODataDemo.FeaturedProduct/Advertisement"
         /><title type="text">Coffee</title><summary type="text">Bulk size can of instant
-        coffee</summary><updated>2014-07-20T21:01:22Z</updated><author><name /></author><link
+        coffee</summary><updated>2014-09-29T04:25:33Z</updated><author><name /></author><link
         rel="http://schemas.microsoft.com/ado/2007/08/dataservices/relatedlinks/Categories"
         type="application/xml" title="Categories" href="Products(10)/ODataDemo.FeaturedProduct/$links/Categories"
         /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/relatedlinks/Supplier"
@@ -421,5 +425,5 @@ http_interactions:
     http_version: '1.1'
     adapter_metadata:
       effective_url: http://services.odata.org/OData/OData.svc/Products
-  recorded_at: Sun, 20 Jul 2014 21:01:22 GMT
+  recorded_at: Mon, 29 Sep 2014 04:25:33 GMT
 recorded_with: VCR 2.9.2

data/spec/odata/query/criteria_spec.rb

@@ -1,10 +1,12 @@
 require 'spec_helper'
 
 describe OData::Query::Criteria do
-  let(:subject) { OData::Query::Criteria.new(property: :Name) }
+  let(:string_property) { OData::Properties::String.new(:Name, nil) }
+  let(:integer_property) { OData::Properties::Integer.new(:Name, nil) }
+  let(:subject) { OData::Query::Criteria.new(property: string_property) }
 
   it { expect(subject).to respond_to(:property) }
-  it { expect(subject.property).to eq(:Name)}
+  it { expect(subject.property).to eq(string_property)}
 
   it { expect(subject).to respond_to(:operator) }
   it { expect(subject).to respond_to(:value) }
@@ -35,6 +37,8 @@ describe OData::Query::Criteria do
     end
 
     it '#gt sets up criteria properly' do
+      subject = OData::Query::Criteria.new(property: integer_property)
+
       criteria = subject.gt(5)
       expect(criteria).to eq(subject)
       expect(criteria.operator).to eq(:gt)
@@ -43,6 +47,8 @@ describe OData::Query::Criteria do
     end
 
     it '#ge sets up criteria properly' do
+      subject = OData::Query::Criteria.new(property: integer_property)
+
       criteria = subject.ge(5)
       expect(criteria).to eq(subject)
       expect(criteria.operator).to eq(:ge)
@@ -51,6 +57,8 @@ describe OData::Query::Criteria do
     end
 
     it '#lt sets up criteria properly' do
+      subject = OData::Query::Criteria.new(property: integer_property)
+
       criteria = subject.lt(5)
       expect(criteria).to eq(subject)
       expect(criteria.operator).to eq(:lt)
@@ -59,6 +67,8 @@ describe OData::Query::Criteria do
     end
 
     it '#le sets up criteria properly' do
+      subject = OData::Query::Criteria.new(property: integer_property)
+
       criteria = subject.le(5)
       expect(criteria).to eq(subject)
       expect(criteria.operator).to eq(:le)

data/spec/odata/query_spec.rb

@@ -18,7 +18,7 @@ describe OData::Query, vcr: {cassette_name: 'query_specs'} do
   it { expect(subject).to respond_to(:[]) }
   describe '#[]' do
     it { expect(subject[:Name]).to be_a(OData::Query::Criteria) }
-    it { expect(subject[:Name].property).to eq(:Name) }
+    it { expect(subject[:Name].property).to be_a(OData::Property) }
   end
 
   it { expect(subject).to respond_to(:where) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: odata
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors:
 - James Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-26 00:00:00.000000000 Z
+date: 2014-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler