odata 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64f90a5ad13079e0238b44ce57d7bd8e0fc3f93a
-  data.tar.gz: 7afb091b0a7dcfdade84a5f1ebbd8e8feab25076
+  metadata.gz: aa4d834f3960bec296cd529858811a0ae77483ad
+  data.tar.gz: 95870d1562b87cd913148cb5c62d9f894579c92a
 SHA512:
-  metadata.gz: 11f24245a4d87f00fa7b1acd6103d1e5ccd9f190f149afac192d025175ed1b9edecedbfe205ef91abf41b14d6f235c5f176eb92550e16e706abd96ebdf79733e
-  data.tar.gz: bcf9ae832061fe082c715b01bd22fa8cd41f3fce929c7943267a03889c8f97032f3ac192fca92aaa11ecd74743a335a343cbe3ec535eb3cb9e36c1e890c893fa
+  metadata.gz: 22e48b9956b60803f12a0eb70fb18f9c602d844387368f8fb7e1f8cae5c68a11e6fc2c3b31fd43eb2fa9b3d9539793b679df04baca0eeca7bd233e389e993ecd
+  data.tar.gz: e6bbcf71180124d2f689c0be23bfab9abc9babc4af83cdcd47913d4dbd2c8c7e71c51b3e267e546f40b4376fe475373f4290a9348b88f7aeb3fd47299d4e200c

data/lib/odata.rb

@@ -9,6 +9,7 @@ require 'typhoeus'
 # require 'active_support/concern'
 
 require 'odata/version'
+require 'odata/property_registry'
 require 'odata/property'
 require 'odata/properties'
 require 'odata/complex_type'

data/lib/odata/entity.rb

@@ -120,17 +120,20 @@ module OData
 
     def instantiate_property(property_name, value)
       value_type = service.get_property_type(name, property_name)
-      if value_type =~ /^#{namespace}\./
+      klass = ::OData::PropertyRegistry[value_type]
+
+      if klass.nil? && value_type =~ /^#{namespace}\./
         type_name = value_type.gsub(/^#{namespace}\./, '')
         property = ::OData::ComplexType.new(name: type_name, service: service)
         value.element_children.each do |node|
           property[node.name] = node.content
         end
         property
+      elsif klass.nil?
+        raise RuntimeError, "Unknown property type: #{value_type}"
       else
-        klass_name = value_type.gsub(/^Edm\./, '')
         value = value.content unless value.nil?
-        ::OData::Properties.const_get(klass_name).new(property_name, value)
+        klass.new(property_name, value)
       end
     end
 

data/lib/odata/properties.rb

@@ -12,4 +12,12 @@ require 'odata/properties/guid'
 require 'odata/properties/integer'
 require 'odata/properties/string'
 require 'odata/properties/time'
-require 'odata/properties/geography_point'
+require 'odata/properties/geography_point'
+
+OData::Properties.constants.each do |property_name|
+  klass = OData::Properties.const_get(property_name)
+  if klass.is_a?(Class)
+    property = klass.new('test', nil)
+    OData::PropertyRegistry.add(property.type, property.class)
+  end
+end

data/lib/odata/properties/geography_point.rb

@@ -1,6 +1,9 @@
 module OData
   module Properties
     class GeographyPoint < OData::Property
+      def type
+        'Edm.GeographyPoint'
+      end
     end
   end
 end

data/lib/odata/property_registry.rb

@@ -0,0 +1,41 @@
+require 'singleton'
+
+module OData
+  # Provides a registry for keeping track of various property types used by
+  # OData.
+  class PropertyRegistry
+    include Singleton
+
+    # Add a property type to the registry
+    #
+    # @param type_name [String] property type name to register
+    # @param klass [Class] Ruby class to use for the specified type
+    def add(type_name, klass)
+      properties[type_name] = klass
+    end
+
+    # Lookup a property by name and get the Ruby class to use for its instances
+    #
+    # @param type_name [String] the type name to lookup
+    # @return [Class, nil] the proper class or nil
+    def [](type_name)
+      properties[type_name]
+    end
+
+    # (see #add)
+    def self.add(type_name, klass)
+      OData::PropertyRegistry.instance.add(type_name, klass)
+    end
+
+    # (see #[])
+    def self.[](type_name)
+      OData::PropertyRegistry.instance[type_name]
+    end
+
+    private
+
+    def properties
+      @properties ||= {}
+    end
+  end
+end

data/lib/odata/query/criteria.rb

@@ -74,7 +74,7 @@ module OData
       end
 
       def value_for_string
-        value.is_a?(String) ? "'#{value}'" : value
+        value.is_a?(String) ? "#{value}" : value
       end
     end
   end

data/lib/odata/service.rb

@@ -188,10 +188,6 @@ module OData
 
     private
 
-    def get_property_class(klass_name)
-      ::OData::Properties.const_get(klass_name)
-    end
-
     def default_options
       {
           typhoeus: {}
@@ -217,13 +213,16 @@ module OData
       value_type = property_xml.attributes['Type'].value
       property_options = {}
 
-      if value_type =~ /^#{namespace}\./
+      klass = ::OData::PropertyRegistry[value_type]
+
+      if klass.nil? && value_type =~ /^#{namespace}\./
         type_name = value_type.gsub(/^#{namespace}\./, '')
         property = ::OData::ComplexType.new(name: type_name, service: self)
+      elsif klass.nil?
+        raise RuntimeError, "Unknown property type: #{value_type}"
       else
-        klass_name = value_type.gsub(/^Edm\./, '')
         property_options[:allows_nil] = false if property_xml.attributes['Nullable'] == 'false'
-        property = ::OData::Properties.const_get(klass_name).new(property_name, nil, property_options)
+        property = klass.new(property_name, nil, property_options)
       end
 
       return [property_name, property]

data/lib/odata/version.rb

@@ -1,3 +1,3 @@
 module OData
-  VERSION = '0.5.5'
+  VERSION = '0.5.6'
 end

data/spec/odata/property_registry_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe OData::PropertyRegistry do
+  let(:subject) { OData::PropertyRegistry }
+
+  it { expect(subject).to respond_to(:add) }
+  it { expect(subject).to respond_to(:[]) }
+
+  describe '#add' do
+    before(:each) do
+      subject.add('Edm.Guid', OData::Properties::Guid)
+    end
+
+    it { expect(subject['Edm.Guid']).to eq(OData::Properties::Guid) }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: odata
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - James Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-16 00:00:00.000000000 Z
+date: 2014-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -170,6 +170,7 @@ files:
 - lib/odata/properties/string.rb
 - lib/odata/properties/time.rb
 - lib/odata/property.rb
+- lib/odata/property_registry.rb
 - lib/odata/query.rb
 - lib/odata/query/criteria.rb
 - lib/odata/query/result.rb
@@ -213,6 +214,7 @@ files:
 - spec/odata/properties/integer_spec.rb
 - spec/odata/properties/string_spec.rb
 - spec/odata/properties/time_spec.rb
+- spec/odata/property_registry_spec.rb
 - spec/odata/property_spec.rb
 - spec/odata/query/criteria_spec.rb
 - spec/odata/query/result_spec.rb
@@ -280,6 +282,7 @@ test_files:
 - spec/odata/properties/integer_spec.rb
 - spec/odata/properties/string_spec.rb
 - spec/odata/properties/time_spec.rb
+- spec/odata/property_registry_spec.rb
 - spec/odata/property_spec.rb
 - spec/odata/query/criteria_spec.rb
 - spec/odata/query/result_spec.rb