odata 0.0.10 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcb9a746bd19061bb07c0311b4bdc705c084ad5b
-  data.tar.gz: 1f2c9dae62cbec8852a2f65a29826f3ee5412a33
+  metadata.gz: a62f54f63a4c6c397d711b31eea1d31f41383e80
+  data.tar.gz: 8a4e945b39e401bfbaaaba43e2e52c884949318a
 SHA512:
-  metadata.gz: 28a93be11707fe9adcf4aa51af4a0c48d73bce1b680525ac293ceb89c9cb8b11e4045321da62d4a5e280158efb289fcd50325eaf20b1f2b5d6b5bf198ab3480e
-  data.tar.gz: 88b1a0bc6fb085880e20f102bebf8e16aad9a4313641cf1a5b6a5f75fde34caa47bc677ad886a473e843c4e82d04509bfea6351c5a504818e445a3eea130d3e4
+  metadata.gz: 591263ed5f45b8f12ef3ebf167bed9fff9e3e61c98de34b58601a5c3db2b89f18c4207feabbdccf08d9970a67c93f0f2d340747b7f767f64a615255c54769735
+  data.tar.gz: 4bc3b99da624d26e44d77ff8400c1ae5067d77aa56a8f435f739b37de0d50de3dc28967e8aae3fce004491e00808167fdd022133d2d25782347b28296d698cc3

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+# CHANGELOG
+
+## 0.1.0
+
+* Core read/write behavior for OData v1-3

data/README.md

@@ -1,11 +1,11 @@
 # OData
 
-[![Build Status](https://travis-ci.org/plainprogrammer/odata.svg?branch=master)](https://travis-ci.org/plainprogrammer/odata)
-[![Code Climate](https://codeclimate.com/github/plainprogrammer/odata.png)](https://codeclimate.com/github/plainprogrammer/odata)
-[![Coverage](https://codeclimate.com/github/plainprogrammer/odata/coverage.png)](https://codeclimate.com/github/plainprogrammer/odata)
+[![Build Status](https://travis-ci.org/ruby-odata/odata.svg?branch=master)](https://travis-ci.org/ruby-odata/odata)
+[![Code Climate](https://codeclimate.com/github/ruby-odata/odata.png)](https://codeclimate.com/github/ruby-odata/odata)
+[![Coverage](https://codeclimate.com/github/ruby-odata/odata/coverage.png)](https://codeclimate.com/github/ruby-odata/odata)
 [![Gem Version](https://badge.fury.io/rb/odata.svg)](http://badge.fury.io/rb/odata)
-[![Dependency Status](https://gemnasium.com/plainprogrammer/odata.svg)](https://gemnasium.com/plainprogrammer/odata)
-[![Documentation](http://inch-ci.org/github/plainprogrammer/odata.png?branch=master)](http://rubydoc.info/github/plainprogrammer/odata/master/frames)
+[![Dependency Status](https://gemnasium.com/ruby-odata/odata.svg)](https://gemnasium.com/ruby-odata/odata)
+[![Documentation](http://inch-ci.org/github/ruby-odata/odata.png?branch=master)](http://rubydoc.info/github/ruby-odata/odata/master/frames)
 
 The OData gem provides a simple wrapper around the OData API protocol. It has
 the ability to automatically inspect compliant APIs and expose the relevant

data/lib/odata.rb

@@ -9,14 +9,18 @@ require 'active_support/core_ext'
 require 'active_support/concern'
 
 require 'odata/version'
+require 'odata/property'
+require 'odata/properties'
 require 'odata/entity'
 require 'odata/entity_set'
 require 'odata/service'
 require 'odata/service_registry'
-require 'odata/model'
 
 require 'odata/railtie' if defined?(::Rails)
 
+# The OData gem provides a convenient way to interact with OData services from
+# Ruby. Please look to the {file:README.md README} for how to get started using
+# the OData gem.
 module OData
   # Your code goes here...
 end

data/lib/odata/entity.rb

@@ -5,7 +5,6 @@ module OData
     def initialize(options = {})
       @type = options[:type]
       @namespace = options[:namespace]
-      @properties = {}
     end
 
     def name
@@ -13,7 +12,34 @@ module OData
     end
 
     def [](property_name)
-      @properties[property_name.to_s].value
+      begin
+       properties[property_name.to_s].value
+      rescue NoMethodError
+        raise ArgumentError, "Unknown property: #{property_name}"
+      end
+    end
+
+    def []=(property_name, value)
+      begin
+        properties[property_name.to_s].value = value
+      rescue NoMethodError
+        raise ArgumentError, "Unknown property: #{property_name}"
+      end
+    end
+
+    def self.with_properties(new_properties = {}, options = {})
+      entity = OData::Entity.new(options)
+      entity.instance_eval do
+        # TODO Define the properties
+        service.properties_for(name).each do |name, instance|
+          set_property(name, instance)
+        end
+
+        new_properties.each do |property_name, property_value|
+          self[property_name] = property_value
+        end
+      end
+      entity
     end
 
     def self.from_xml(xml_doc, options = {})
@@ -55,14 +81,56 @@ module OData
       entity
     end
 
+    def to_xml
+      builder = Nokogiri::XML::Builder.new do |xml|
+        xml.entry('xmlns'           => 'http://www.w3.org/2005/Atom',
+                  'xmlns:data'      => 'http://schemas.microsoft.com/ado/2007/08/dataservices',
+                  'xmlns:metadata'  => 'http://schemas.microsoft.com/ado/2007/08/dataservices/metadata',
+                  'xmlns:georss'    => 'http://www.georss.org/georss',
+                  'xmlns:gml'       => 'http://www.opengis.net/gml',
+                  'xml:base'        => 'http://services.odata.org/OData/OData.svc/') do
+          xml.category(term: "#{namespace}.#{type}",
+                       scheme: 'http://schemas.microsoft.com/ado/2007/08/dataservices/scheme')
+          xml.author { xml.name }
+
+          xml.content(type: 'application/xml') do
+            xml['metadata'].properties do
+              properties.each do |name, property|
+                next if name == primary_key
+                attributes = {
+                  'metadata:type' => property.type,
+                }
+
+                if property.value.nil?
+                  attributes['metadata:null'] = 'true'
+                  xml['data'].send(name.to_sym, attributes)
+                else
+                  xml['data'].send(name.to_sym, attributes, property.xml_value)
+                end
+              end
+            end
+          end
+        end
+      end
+      builder.to_xml
+    end
+
+    def primary_key
+      service.primary_key_for(name)
+    end
+
     private
 
+    def properties
+      @properties ||= {}
+    end
+
     def service
       @service ||= OData::ServiceRegistry[namespace]
     end
 
     def set_property(name, odata_property)
-      @properties[name.to_s] = odata_property.dup
+      properties[name.to_s] = odata_property.dup
     end
   end
 end

data/lib/odata/entity_set.rb

@@ -39,7 +39,7 @@ module OData
           page_position = 0
         end
 
-        entity = OData::Entity.from_xml(entities[page_position], namespace: namespace, type: type)
+        entity = OData::Entity.from_xml(entities[page_position], entity_options)
         block_given? ? block.call(entity) : yield(entity)
 
         counter += 1
@@ -47,17 +47,61 @@ module OData
       end
     end
 
+    def first
+      result = service.execute("#{name}?$skip=0&$top=1")
+      entities = service.find_entities(result)
+      OData::Entity.from_xml(entities[0], entity_options)
+    end
+
     # Returns the number of entities within the set
     def count
       service.execute("#{name}/$count").body.to_i
     end
 
+    def new_entity(properties = {})
+      OData::Entity.with_properties(properties, entity_options)
+    end
+
+    def <<(entity)
+      new_entity = entity[entity.primary_key].nil?
+
+      url_chunk = name
+      url_chunk += "(#{entity[entity.primary_key]})" unless new_entity
+
+      options = {
+          method: :post,
+          body:   entity.to_xml.gsub(/\n\s+/, ''),
+          headers: {
+              Accept: 'application/atom+xml',
+              'Content-Type' => 'application/atom+xml'
+          }
+      }
+
+      result = service.execute(url_chunk, options)
+      if result.code.to_s =~ /^2[0-9][0-9]$/
+        if new_entity
+          doc = ::Nokogiri::XML(result.body).remove_namespaces!
+          entity[entity.primary_key] = doc.xpath("//content/properties/#{entity.primary_key}").first.content
+        end
+      else
+        raise StandardError, 'Something went wrong committing your entity'
+      end
+      entity
+    end
+
     private
 
     def service
       @service ||= OData::ServiceRegistry[namespace]
     end
 
+    def entity_options
+      {
+          namespace:  namespace,
+          type:       type
+      }
+    end
+
     def get_paginated_entities(per_page, page)
       result = service.execute("#{name}?$inlinecount=allpages&$skip=#{per_page * page}&$top=#{per_page}")
       entities = service.find_entities(result)

data/lib/odata/properties/date_time.rb

@@ -26,14 +26,16 @@ module OData
 
       def validate(value)
         begin
+          return if value.nil? && allows_nil?
           return if value.is_a?(::DateTime)
           ::DateTime.strptime(value, '%Y-%m-%dT%H:%M:%S.%L')
-        rescue => e
+        rescue
           raise ArgumentError, 'Value is not a date time format that can be parsed'
         end
       end
 
       def parse_value(value)
+        return value if value.nil? && allows_nil?
         parsed_value = value
         parsed_value = ::DateTime.parse(value) unless value.is_a?(::DateTime)
         parsed_value.strftime('%Y-%m-%dT%H:%M:%S.%L')

data/lib/odata/property.rb

@@ -25,6 +25,10 @@ module OData
       @concurrecy_mode ||= options[:concurrency_mode]
     end
 
+    def xml_value
+      @value
+    end
+
     private
 
     def default_options

data/lib/odata/service.rb

@@ -61,27 +61,9 @@ module OData
       "#<#{self.class.name}:#{self.object_id} namespace='#{self.namespace}' service_url='#{self.service_url}'>"
     end
 
-    # Handles getting OData resources from the service.
-    #
-    # @param model [OData::Model] the type of resource being requested
-    # @param criteria [Hash] any criteria to narrow the request
-    # @return [Array] instances of the requested model
-    def get(model, criteria = {})
-      request = ::Typhoeus::Request.new(
-          build_request_url(model, criteria),
-          options[:typhoeus].merge({
-            method: :get
-          })
-      )
-      request.run
-      response = request.response
-      feed = ::Nokogiri::XML(response.body).remove_namespaces!
-      feed.xpath('//entry').collect {|entry| parse_model_from_feed(model, entry)}
-    end
-
     # Retrieves the EntitySet associated with a specific EntityType by name
     #
-    # @param entity_type_name [to_s] the name of the EntityType you want the EntitySet of
+    # @param entity_set_name [to_s] the name of the EntitySet desired
     # @return [OData::EntitySet] an OData::EntitySet to query
     def [](entity_set_name)
       xpath_query = "//EntityContainer/EntitySet[@Name='#{entity_set_name}']"
@@ -95,6 +77,11 @@ module OData
                            container: container_name)
     end
 
+    # Execute a request against the service
+    #
+    # @param url_chunk [to_s] string to append to service url
+    # @param additional_options [Hash] options to pass to Typhoeus
+    # @return [Typhoeus::Response]
     def execute(url_chunk, additional_options = {})
       request = ::Typhoeus::Request.new(
           "#{service_url}/#{url_chunk}",
@@ -106,30 +93,70 @@ module OData
       request.response
     end
 
+    # Find a specific node in the given result set
+    #
+    # @param results [Typhoeus::Response]
+    # @return [Nokogiri::XML::Element]
     def find_node(results, node_name)
       document = ::Nokogiri::XML(results.body)
       document.remove_namespaces!
       document.xpath("//#{node_name}").first
     end
 
+    # Find entity entries in a result set
+    #
+    # @param results [Typhoeus::Response]
+    # @return [Nokogiri::XML::NodeSet]
     def find_entities(results)
       document = ::Nokogiri::XML(results.body)
       document.remove_namespaces!
       document.xpath('//entry')
     end
 
+    # Get the property type for an entity from metadata.
+    #
+    # @param entity_name [to_s] the name of the relevant entity
+    # @param property_name [to_s] the property name needed
+    # @return [String] the name of the property's type
     def get_property_type(entity_name, property_name)
       metadata.xpath("//EntityType[@Name='#{entity_name}']/Property[@Name='#{property_name}']").first.attributes['Type'].value
     end
 
+    # Get the property used as the title for an entity from metadata.
+    #
+    # @param entity_name [to_s] the name of the relevant entity
+    # @return [String] the name of the property used as the entity title
     def get_title_property_name(entity_name)
       metadata.xpath("//EntityType[@Name='#{entity_name}']/Property[@FC_TargetPath='SyndicationTitle']").first.attributes['Name'].value
     end
 
+    # Get the property used as the summary for an entity from metadata.
+    #
+    # @param entity_name [to_s] the name of the relevant entity
+    # @return [String] the name of the property used as the entity summary
     def get_summary_property_name(entity_name)
       metadata.xpath("//EntityType[@Name='#{entity_name}']/Property[@FC_TargetPath='SyndicationSummary']").first.attributes['Name'].value
     end
 
+    def primary_key_for(entity_name)
+      metadata.xpath("//EntityType[@Name='#{entity_name}']/Key/PropertyRef").first.attributes['Name'].value
+    end
+
+    def properties_for(entity_name)
+      type_definition = metadata.xpath("//EntityType[@Name='#{entity_name}']").first
+      raise ArgumentError, "Unknown EntityType: #{entity_name}" if type_definition.nil?
+      properties_to_return = {}
+      type_definition.xpath('./Property').each do |property_xml|
+        property_name = property_xml.attributes['Name'].value
+        value_type = property_xml.attributes['Type'].value
+        property_options = {}
+        property_options[:allows_nil] = false if property_xml.attributes['Nullable'] == 'false'
+        klass_name = value_type.gsub(/^Edm\./, '')
+        properties_to_return[property_name] = "OData::Properties::#{klass_name}".constantize.new(property_name, nil, property_options)
+      end
+      properties_to_return
+    end
+
     private
 
     def default_options
@@ -151,41 +178,5 @@ 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
-
-    def parse_model_from_feed(model, entry)
-      attributes = {}
-
-      %w{title summary}.each do |attribute_name|
-        attributes[attribute_name.to_sym] = {
-            value: entry.xpath("//#{attribute_name}").first.content,
-            type: entry.xpath("//#{attribute_name}").first.attributes['type'].value
-        }
-      end
-
-      entry.xpath('//content/properties/*').each do |property|
-        if property.attributes['null']
-          if property.attributes['null'].value == 'true'
-            property_type = nil
-          else
-            property_type = property.attributes['type'].value
-          end
-        else
-          property_type = property.attributes['type'].value
-        end
-
-        attributes[property.name.underscore.to_sym] = {
-            value: property.content,
-            type: property_type
-        }
-      end
-
-      model.load_from_feed(attributes)
-    end
   end
 end

data/lib/odata/version.rb

@@ -1,3 +1,3 @@
 module OData
-  VERSION = '0.0.10'
+  VERSION = '0.1.0'
 end

data/odata.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'codeclimate-test-reporter'
   spec.add_development_dependency 'rspec', '~> 3.0.0'
   spec.add_development_dependency 'webmock', '~> 1.18.0'
+  spec.add_development_dependency 'timecop', '~> 0.7.1'
 
   spec.add_dependency 'backports', '~> 3.6.0'
   spec.add_dependency 'nokogiri', '~> 1.6.2'

data/spec/fixtures/sample_service/first_product.xml

@@ -0,0 +1,42 @@
+<?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-07T20:01:27Z</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"
+          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-07-07T20:01:27Z</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>
+</feed>

data/spec/fixtures/sample_service/product_9999.xml

@@ -0,0 +1,34 @@
+<?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(9999)</id>
+  <category term="ODataDemo.Product" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"/>
+  <link rel="edit" title="Product" href="Products(9999)"/>
+  <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Categories" type="application/atom+xml;type=feed" title="Categories" href="Products(9999)/Categories"/>
+  <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Supplier" type="application/atom+xml;type=entry" title="Supplier" href="Products(9999)/Supplier"/>
+  <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ProductDetail" type="application/atom+xml;type=entry" title="ProductDetail" href="Products(9999)/ProductDetail"/>
+  <title type="text">Widget</title>
+  <summary type="text">A simple widget</summary>
+  <updated>2014-07-07T18:47:05Z</updated>
+  <author>
+    <name/>
+  </author>
+  <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/relatedlinks/Categories" type="application/xml" title="Categories" href="Products(9999)/$links/Categories"/>
+  <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/relatedlinks/Supplier" type="application/xml" title="Supplier" href="Products(9999)/$links/Supplier"/>
+  <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/relatedlinks/ProductDetail" type="application/xml" title="ProductDetail" href="Products(9999)/$links/ProductDetail"/>
+  <m:action
+          metadata="http://services.odata.org/OData/OData.svc/$metadata#DemoService.Discount"
+          title="Discount"
+          target="http://services.odata.org/OData/OData.svc/Products(9999)/Discount"/>
+  <content type="application/xml">
+    <m:properties>
+      <d:ID m:type="Edm.Int32">9999</d:ID>
+      <d:ReleaseDate m:type="Edm.DateTime">2014-07-07T12:44:13</d:ReleaseDate>
+      <d:DiscontinuedDate m:null="true"/>
+      <d:Rating m:type="Edm.Int16">4</d:Rating>
+      <d:Price m:type="Edm.Double">3.5</d:Price>
+    </m:properties>
+  </content>
+</entry>

data/spec/odata/entity_set_spec.rb

@@ -11,8 +11,7 @@ describe OData::EntitySet do
     OData::Service.open('http://services.odata.org/OData/OData.svc')
   end
 
-  # Basic Instance Methods
-  it { expect(subject).to respond_to(:name, :type, :container, :namespace) }
+  it { expect(subject).to respond_to(:name, :type, :container, :namespace, :new_entity) }
 
   it { expect(subject.name).to eq('Products') }
   it { expect(subject.container).to eq('DemoService') }
@@ -37,4 +36,65 @@ describe OData::EntitySet do
     it { expect(subject).to respond_to(:count) }
     it { expect(subject.count).to eq(11) }
   end
+
+  describe '#new_entity' do
+    let(:new_entity) { subject.new_entity(properties) }
+    let(:release_date) { DateTime.new(2014,7,5) }
+    let(:properties) { {
+        Name:             'Widget',
+        Description:      'Just a simple widget',
+        ReleaseDate:      release_date,
+        DiscontinuedDate: nil,
+        Rating:           4,
+        Price:            3.5
+    } }
+
+    it { expect(new_entity['ID']).to be_nil }
+    it { expect(new_entity['Name']).to eq('Widget') }
+    it { expect(new_entity['Description']).to eq('Just a simple widget') }
+    it { expect(new_entity['ReleaseDate']).to eq(release_date) }
+    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) }
+  end
+
+  describe '#<<' do
+    let(:new_entity) { subject.new_entity(properties) }
+    let(:bad_entity) { subject.new_entity }
+    let(:existing_entity) { subject.first }
+    let(:properties) { {
+        Name:             'Widget',
+        Description:      'Just a simple widget',
+        ReleaseDate:      DateTime.now.new_offset(0),
+        DiscontinuedDate: nil,
+        Rating:           4,
+        Price:            3.5
+    } }
+
+    it { expect(subject).to respond_to(:<<) }
+
+    it 'with an existing entity' do
+      WebMock.stub_request(:post, 'http://services.odata.org/OData/OData.svc/Products(0)').
+          to_return(status: 200, body: File.open('spec/fixtures/sample_service/product_0.xml'))
+
+      expect {subject << existing_entity}.to_not raise_error
+    end
+
+    it 'with a new entity' do
+      WebMock.stub_request(:post, 'http://services.odata.org/OData/OData.svc/Products').
+          to_return(status: 201, body: File.open('spec/fixtures/sample_service/product_9999.xml'))
+
+      expect(new_entity['ID']).to be_nil
+      expect {subject << new_entity}.to_not raise_error
+      expect(new_entity['ID']).to_not be_nil
+      expect(new_entity['ID']).to eq(9999)
+    end
+
+    it 'with a bad entity' do
+      WebMock.stub_request(:post, 'http://services.odata.org/OData/OData.svc/Products').
+          to_return(status: 400, body: nil)
+
+      expect {subject << bad_entity}.to raise_error(StandardError, 'Something went wrong committing your entity')
+    end
+  end
 end

data/spec/odata/entity_spec.rb

@@ -39,5 +39,8 @@ describe OData::Entity do
     it { expect(subject['DiscontinuedDate']).to be_nil }
     it { expect(subject['Rating']).to eq(4) }
     it { expect(subject['Price']).to eq(2.5) }
+
+    it { expect {subject['NonExistant']}.to raise_error(ArgumentError) }
+    it { expect {subject['NonExistant'] = 5}.to raise_error(ArgumentError) }
   end
 end

data/spec/odata/service_spec.rb

@@ -59,27 +59,6 @@ describe OData::Service do
     it { expect(subject.namespace).to eq('ODataDemo') }
   end
 
-  describe '#get' do
-    describe 'a set of entities' do
-      it { expect(subject.get(::Examples::Product).size).to eq(11) }
-      it { expect(subject.get(::Examples::Product).first).to be_instance_of(::Examples::Product) }
-      it { expect(subject.get(::Examples::Product).shuffle.first).to be_instance_of(::Examples::Product) }
-      it { expect(subject.get(::Examples::Product).last).to be_instance_of(::Examples::Product) }
-    end
-
-    describe 'a specific entity by key' do
-      it { expect(subject.get(::Examples::Product, {key: 0}).size).to eq(1) }
-      it { expect(subject.get(::Examples::Product, {key: 0}).first).to be_instance_of(::Examples::Product) }
-      it { expect(subject.get(::Examples::Product, {key: 0}).first.id).to eq(0) }
-      it { expect(subject.get(::Examples::Product, {key: 0}).first.name).to eq('Bread') }
-      it { expect(subject.get(::Examples::Product, {key: 0}).first.description).to eq('Whole grain bread') }
-      it { expect(subject.get(::Examples::Product, {key: 0}).first.release_date).to eq(DateTime.parse('1992-01-01T00:00:00')) }
-      it { expect(subject.get(::Examples::Product, {key: 0}).first.discontinued_date).to eq(nil) }
-      it { expect(subject.get(::Examples::Product, {key: 0}).first.rating).to eq(4) }
-      it { expect(subject.get(::Examples::Product, {key: 0}).first.price).to eq(2.5) }
-    end
-  end
-
   describe '#[]' do
     it { expect(subject['Products']).to be_a(OData::EntitySet) }
     it { expect {subject['Nonexistant']}.to raise_error(ArgumentError) }

data/spec/spec_helper.rb

@@ -17,6 +17,8 @@ else
   WebMock.disable_net_connect!(allow_localhost: true, allow: 'codeclimate.com')
 end
 
+require 'timecop'
+
 RSpec.configure do |config|
   if config.files_to_run.one?
     config.default_formatter = 'doc'
@@ -52,6 +54,9 @@ RSpec.configure do |config|
       WebMock.stub_request(:get, 'http://services.odata.org/OData/OData.svc/Products?$inlinecount=allpages&$skip=10&$top=5').
           to_return(status: 200, body: File.open('spec/fixtures/sample_service/products_skip10_top5.xml'))
 
+      WebMock.stub_request(:get, 'http://services.odata.org/OData/OData.svc/Products?$skip=0&$top=1').
+          to_return(status: 200, body: File.open('spec/fixtures/sample_service/first_product.xml'))
+
       WebMock.stub_request(:get, 'http://services.odata.org/OData/OData.svc/Products/$count').
           to_return(status: 200, :body => '11')
 
@@ -64,5 +69,6 @@ RSpec.configure do |config|
     # We're calling this as a private method because there should not be any
     # reasons to have to flush the service registry except in testing.
     OData::ServiceRegistry.instance.send(:flush)
+    WebMock.reset!
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: odata
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.1.0
 platform: ruby
 authors:
 - James Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-05 00:00:00.000000000 Z
+date: 2014-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.18.0
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: backports
   requirement: !ruby/object:Gem::Requirement
@@ -161,6 +175,7 @@ files:
 - ".rspec"
 - ".ruby-version"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -168,7 +183,6 @@ files:
 - lib/odata.rb
 - lib/odata/entity.rb
 - lib/odata/entity_set.rb
-- lib/odata/model.rb
 - lib/odata/properties.rb
 - lib/odata/properties/binary.rb
 - lib/odata/properties/boolean.rb
@@ -187,16 +201,16 @@ files:
 - lib/odata/service_registry.rb
 - lib/odata/version.rb
 - odata.gemspec
-- spec/examples/product_model.rb
+- spec/fixtures/sample_service/first_product.xml
 - spec/fixtures/sample_service/metadata.xml
 - spec/fixtures/sample_service/product_0.xml
+- spec/fixtures/sample_service/product_9999.xml
 - spec/fixtures/sample_service/products.xml
 - spec/fixtures/sample_service/products_skip0_top5.xml
 - spec/fixtures/sample_service/products_skip10_top5.xml
 - spec/fixtures/sample_service/products_skip5_top5.xml
 - spec/odata/entity_set_spec.rb
 - spec/odata/entity_spec.rb
-- spec/odata/model_spec.rb
 - spec/odata/properties/binary_spec.rb
 - spec/odata/properties/boolean_spec.rb
 - spec/odata/properties/date_time_offset_spec.rb
@@ -236,16 +250,16 @@ signing_key:
 specification_version: 4
 summary: Simple OData library
 test_files:
-- spec/examples/product_model.rb
+- spec/fixtures/sample_service/first_product.xml
 - spec/fixtures/sample_service/metadata.xml
 - spec/fixtures/sample_service/product_0.xml
+- spec/fixtures/sample_service/product_9999.xml
 - spec/fixtures/sample_service/products.xml
 - spec/fixtures/sample_service/products_skip0_top5.xml
 - spec/fixtures/sample_service/products_skip10_top5.xml
 - spec/fixtures/sample_service/products_skip5_top5.xml
 - spec/odata/entity_set_spec.rb
 - spec/odata/entity_spec.rb
-- spec/odata/model_spec.rb
 - spec/odata/properties/binary_spec.rb
 - spec/odata/properties/boolean_spec.rb
 - spec/odata/properties/date_time_offset_spec.rb

data/lib/odata/model.rb

@@ -1,116 +0,0 @@
-require 'odata/property'
-require 'odata/properties'
-
-module OData
-  # Provides a convenient way to represent OData entities as Ruby objects.
-  # Instances that include this module gain the ability to define how to map
-  # OData properties to attributes as well as the ability to query and persist
-  # data to the underlying OData service.
-  #
-  # If the module detects the presence of Rails, along with ActiveModel::Model
-  # it will automatically mixin support ActiveModel::Model to provide better
-  # integration with Rails apps.
-  module Model
-    extend ::ActiveSupport::Concern
-    include ::ActiveModel::Model if defined?(::Rails) && defined?(::ActiveModel::Model)
-
-    included do
-      cattr_accessor :registered_properties
-      cattr_accessor :primary_key
-
-      self.class_eval <<-EOS
-        @@registered_properties = {}
-        @@primary_key = nil
-      EOS
-    end
-
-    # Converts supplied value based on its type
-    #
-    # @param value [*] usually a string representation of the value
-    # @param type [String] OData type name as string
-    # @return [*]
-    def convert_value_for_type(value, type)
-      return nil if value.nil? || type.nil?
-      if type =~ /Int(16|32|64)$/
-        value.to_i
-      elsif type =~ /Boolean$/
-        (value == 'true' || value == '1')
-      elsif type =~ /(Decimal|Double|Single)$/
-        value.to_f
-      elsif type =~ /DateTime$/
-        DateTime.parse(value)
-      else
-        value.to_s
-      end
-    end
-
-    module ClassMethods
-      # Returns the class' name
-      def model_name
-        self.to_s.demodulize
-      end
-
-      # Pluralizes #model_name for OData requests
-      def odata_name
-        model_name.pluralize
-      end
-
-      # Instantiates an OData::Model instance from a hash of attributes and
-      # their details.
-      #
-      # @param feed_hash [Hash] attribute names as keys, and details as values
-      # @return [OData::Model]
-      def load_from_feed(feed_hash)
-        loaded_instance = self.new
-        feed_hash.each do |attribute_name, details|
-          loaded_instance.instance_eval do
-            @properties ||= {}
-            @properties[attribute_name] = convert_value_for_type(details[:value], details[:type])
-          end
-        end
-        loaded_instance
-      end
-
-      # Define a property and it's options
-      #
-      # @param name [to_s] the literal property name expected by the OData service
-      # @param options [Hash] options for setting up the property
-      def property(name, options = {})
-        register_property(name.to_s.underscore, {literal_name: name}.merge(options))
-        create_accessors(name.to_s.underscore, options)
-        register_primary_key(name.to_s.underscore) if options[:primary_key]
-      end
-
-      private
-
-      def register_property(name, options)
-        new_registered_properties = registered_properties
-        new_registered_properties[name.to_sym] = options
-        registered_properties = new_registered_properties
-      end
-
-      def create_accessors(name, options)
-        self.class_eval do
-          if options[:entity_title]
-            define_method(name) { @properties[:title] || nil }
-            define_method("#{name}=") {|value| @properties[:title] = value}
-          elsif options[:entity_summary]
-            define_method(name) { @properties[:summary] || nil }
-            define_method("#{name}=") {|value| @properties[:summary] = value}
-          else
-            define_method(name) { @properties[name.to_sym] || nil }
-            define_method("#{name}=") {|value| @properties[name.to_sym] = value}
-          end
-        end
-      end
-
-      def register_primary_key(name)
-        if primary_key.nil?
-          self.class_eval <<-EOS
-            @@primary_key = :#{name}
-          EOS
-        end
-      end
-    end
-  end
-end

data/spec/examples/product_model.rb

@@ -1,13 +0,0 @@
-module Examples
-  class Product
-    include OData::Model
-
-    property 'ID', primary_key: true
-    property 'Name', entity_title: true
-    property 'Description', entity_summary: true
-    property 'ReleaseDate'
-    property 'DiscontinuedDate'
-    property 'Rating'
-    property 'Price'
-  end
-end

data/spec/odata/model_spec.rb

@@ -1,25 +0,0 @@
-require 'spec_helper'
-require 'examples/product_model'
-
-describe OData::Model do
-  describe 'class methods' do
-    it { expect(::Examples::Product).to respond_to(:model_name) }
-    it { expect(::Examples::Product.model_name).to eq('Product') }
-    it { expect(::Examples::Product.odata_name).to eq('Products') }
-  end
-
-  describe 'defining properties' do
-    let(:subject) { ::Examples::Product.new }
-
-    it { expect(subject).to respond_to(:id) }
-    it { expect(subject).to respond_to(:name) }
-    it { expect(subject).to respond_to(:description) }
-    it { expect(subject).to respond_to(:release_date) }
-    it { expect(subject).to respond_to(:discontinued_date) }
-    it { expect(subject).to respond_to(:rating) }
-    it { expect(subject).to respond_to(:price) }
-
-    it { expect(::Examples::Product).to respond_to(:primary_key) }
-    it { expect(::Examples::Product.primary_key).to eq(:id)}
-  end
-end