odata 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f93b8a7046cdffd27d35aa5bd2e2ca565adb8e6
-  data.tar.gz: e0e75126d52b80bef3bffc5b8a0a76d934631807
+  metadata.gz: c0999c3b85269d2ad6c9855aa813ed5e6e10a24e
+  data.tar.gz: ee7cf848b1c47f15375c2e9cbd6e7cb5a2cbc89f
 SHA512:
-  metadata.gz: 547f5aa48bc1b31c67ccd009dbf7b43ad32b6dbd6c4a38fdd3a0cc8c55ce97608779adc048bb44cb0d52064d70452a4e25f2471e873e7f12556911ed3fe8ef48
-  data.tar.gz: b77801487b5f05c0982a04ebffa103b47434eba6a6adce9a578166e4e69a3992b91e9f4c021b9cccf80f62ef7b16b013dd0a5cda66bbbb974c1b63d5d45d7dda
+  metadata.gz: 516fa042cb00120bd214aeb52e9c12dbede85614562ccd760cbf4b41d1b6aed5571c82589949f795b42a3e9d4d61c687fb485db4f4bafc36d83c3666dfeb5921
+  data.tar.gz: 0654fbc52376a5446c86fb8303f6b5ca267b7eae694d87f3bcac4644cf824a953b3ed347a0f40864c022039947d312de4b9038a2775679a32140d4a1e1024186

data/.travis.yml

@@ -11,6 +11,9 @@ jdk:
   - openjdk7
   - oraclejdk7
   - oraclejdk8
+env:
+  - REAL_HTTP=true
+  - REAL_HTTP=false
 branches:
   only:
     - master
@@ -22,30 +25,40 @@ matrix:
       jdk: oraclejdk7
     - rvm: 1.9.3
       jdk: oraclejdk8
+    - rvm: 1.9.3
+      env: REAL_HTTP=true
     - rvm: 2.0.0
       jdk: openjdk6
     - rvm: 2.0.0
       jdk: oraclejdk7
     - rvm: 2.0.0
       jdk: oraclejdk8
+    - rvm: 2.0.0
+      env: REAL_HTTP=true
     - rvm: 2.1.0
       jdk: openjdk6
     - rvm: 2.1.0
       jdk: oraclejdk7
     - rvm: 2.1.0
       jdk: oraclejdk8
+    - rvm: 2.1.0
+      env: REAL_HTTP=true
     - rvm: 2.1.1
       jdk: openjdk6
     - rvm: 2.1.1
       jdk: oraclejdk7
     - rvm: 2.1.1
       jdk: oraclejdk8
+    - rvm: 2.1.1
+      env: REAL_HTTP=true
     - rvm: 2.1.2
       jdk: openjdk6
     - rvm: 2.1.2
       jdk: oraclejdk7
     - rvm: 2.1.2
       jdk: oraclejdk8
+    - rvm: jruby
+      env: REAL_HTTP=true
 addons:
   code_climate:
     repo_token: 323644d852f6ba54213f25446d6f4276dbec0adb74fefce770b083cd3e83ea1e

data/lib/odata.rb

@@ -1,3 +1,5 @@
+require 'backports/2.1.0/enumerable/to_h'
+
 require 'date'
 require 'nokogiri'
 require 'typhoeus'
@@ -7,6 +9,8 @@ require 'active_support/core_ext'
 require 'active_support/concern'
 
 require 'odata/version'
+require 'odata/entity'
+require 'odata/entity_set'
 require 'odata/service'
 require 'odata/service_registry'
 require 'odata/model'

data/lib/odata/entity.rb

@@ -0,0 +1,68 @@
+module OData
+  class Entity
+    attr_reader :type, :namespace
+
+    def initialize(options = {})
+      @type = options[:type]
+      @namespace = options[:namespace]
+      @properties = {}
+    end
+
+    def name
+      @name ||= type.gsub(/#{namespace}\./, '')
+    end
+
+    def [](property_name)
+      @properties[property_name.to_s].value
+    end
+
+    def self.from_xml(xml_doc, options = {})
+      entity = OData::Entity.new(options)
+      entity.instance_eval do
+        xml_doc.xpath('//content/properties/*').each do |property_xml|
+          property_name = property_xml.name
+          if property_xml.attributes['null'] &&
+              property_xml.attributes['null'].value == 'true'
+            value = nil
+            value_type = service.get_property_type(name, property_name)
+          else
+            value_type = property_xml.attributes['type'].value
+            value = property_xml.content
+          end
+          klass_name = value_type.gsub(/^Edm\./, '')
+          property = "OData::Properties::#{klass_name}".constantize.new(property_name, value)
+          set_property(property_name, property)
+        end
+
+        begin
+          title_value = xml_doc.xpath('//title').first.content
+          property_name = service.get_title_property_name(name)
+          value_type = service.get_property_type(name, property_name)
+          klass_name = value_type.gsub(/^Edm\./, '')
+          property = "OData::Properties::#{klass_name}".constantize.new(property_name, title_value)
+          set_property(property_name, property)
+        end
+
+        begin
+          summary_value = xml_doc.xpath('//summary').first.content
+          property_name = service.get_summary_property_name(name)
+          value_type = service.get_property_type(name, property_name)
+          klass_name = value_type.gsub(/^Edm\./, '')
+          property = "OData::Properties::#{klass_name}".constantize.new(property_name, summary_value)
+          set_property(property_name, property)
+        end
+      end
+      entity
+    end
+
+    private
+
+    def service
+      @service ||= OData::ServiceRegistry[namespace]
+    end
+
+    def set_property(name, odata_property)
+      @properties[name.to_s] = odata_property.dup
+    end
+  end
+end

data/lib/odata/entity_set.rb

@@ -0,0 +1,68 @@
+module OData
+  # This class represents a set of entities within an OData service. It is
+  # instantiated whenever an OData::Service is asked for an EntitySet via the
+  # OData::Service#[] method call. It also provides Enumerable behavior so that
+  # you can interact with the entities within a set in a very comfortable way.
+  #
+  # This class also implements a query interface for finding certain entities
+  # based on query criteria or limiting the result set returned by the set. This
+  # functionality is implemented through transparent proxy objects.
+  class EntitySet
+    include Enumerable
+
+    attr_reader :name, :type, :namespace, :container
+
+    # Sets up the EntitySet to permit querying for the resources in the set.
+    #
+    # @param options [Hash] the options to setup the EntitySet
+    # @return [OData::EntitySet] an instance of the EntitySet
+    def initialize(options = {})
+      @name = options[:name]
+      @type = options[:type]
+      @namespace = options[:namespace]
+      @container = options[:container]
+      self
+    end
+
+    # Provided for Enumerable functionality
+    #
+    # @param block [block] a block to evaluate
+    # @return [OData::Entity] each entity in turn from this set
+    def each(&block)
+      per_page = 5; page = 0; page_position = 0; counter = 0
+      total, entities = get_paginated_entities(per_page, page)
+
+      until counter == total
+        if page_position >= per_page
+          page += 1
+          _, entities = get_paginated_entities(per_page, page)
+          page_position = 0
+        end
+
+        entity = OData::Entity.from_xml(entities[page_position], namespace: namespace, type: type)
+        block_given? ? block.call(entity) : yield(entity)
+
+        counter += 1
+        page_position += 1
+      end
+    end
+
+    # Returns the number of entities within the set
+    def count
+      service.execute("#{name}/$count").body.to_i
+    end
+
+    private
+
+    def service
+      @service ||= OData::ServiceRegistry[namespace]
+    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)
+      total = service.find_node(result, 'count').content.to_i
+      return total, entities
+    end
+  end
+end

data/lib/odata/model.rb

@@ -24,6 +24,11 @@ module OData
       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)$/
@@ -50,6 +55,11 @@ module OData
         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|

data/lib/odata/properties.rb

@@ -1,3 +1,7 @@
+# Modules
+require 'odata/properties/number'
+
+# Implementations
 require 'odata/properties/binary'
 require 'odata/properties/boolean'
 require 'odata/properties/date_time'

data/lib/odata/properties/date_time.rb

@@ -2,10 +2,14 @@ module OData
   module Properties
     class DateTime < OData::Property
       def value
-        if @value.nil? && allow_nil?
+        if @value.nil? && allows_nil?
           nil
         else
-          ::DateTime.strptime(@value, '%Y-%m-%dT%H:%M:%S.%L')
+          begin
+            ::DateTime.strptime(@value, '%Y-%m-%dT%H:%M:%S.%L')
+          rescue ArgumentError
+            ::DateTime.parse(@value)
+          end
         end
       end
 

data/lib/odata/properties/decimal.rb

@@ -21,18 +21,17 @@ module OData
       private
 
       def validate(value)
-        if (value > max_value || value < min_value) &&
-           (value.exponent > 29 || value.exponent < -29)
-          raise ::ArgumentError, "Value is outside accepted range: #{min_value} to #{max_value}, or has more than 29 significant digits"
+        if value > max_value || value < min_value || value.precs.first > 29
+          raise ArgumentError, "Value is outside accepted range: #{min_value} to #{max_value}, or has more than 29 significant digits"
         end
       end
 
       def min_value
-        @min ||= -(7.9 * (10**28))
+        @min ||= BigDecimal(-7.9 * (10**28), 2)
       end
 
       def max_value
-        @max ||= (7.9 * (10**28))
+        @max ||= BigDecimal(7.9 * (10**28), 2)
       end
     end
   end

data/lib/odata/properties/float.rb

@@ -1,6 +1,8 @@
 module OData
   module Properties
     class Float < OData::Property
+      include OData::Properties::Number
+
       def value
         if @value.nil? && allows_nil?
           nil
@@ -20,12 +22,6 @@ module OData
 
       private
 
-      def validate(value)
-        if value > max_value || value < min_value
-          raise ::ArgumentError, "Value is outside accepted range: #{min_value} to #{max_value}"
-        end
-      end
-
       def min_value
         @min ||= -(1.7 * (10**308))
       end

data/lib/odata/properties/integer.rb

@@ -1,6 +1,8 @@
 module OData
   module Properties
     class Integer < OData::Property
+      include OData::Properties::Number
+
       def value
         if @value.nil? && allows_nil?
           nil
@@ -20,12 +22,6 @@ module OData
 
       private
 
-      def validate(value)
-        if value > max_value || value < min_value
-          raise ::ArgumentError, "Value is outside accepted range: #{min_value} to #{max_value}"
-        end
-      end
-
       def min_value
         @min ||= -(2**63)
       end
@@ -59,11 +55,11 @@ module OData
       private
 
       def min_value
-        @min ||= -(2**15)
+        @min ||= -(2**31)
       end
 
       def max_value
-        @max ||= (2**15)-1
+        @max ||= (2**31)-1
       end
     end
 

data/lib/odata/properties/number.rb

@@ -0,0 +1,13 @@
+module OData
+  module Properties
+    module Number
+      private
+
+      def validate(value)
+        if value > max_value || value < min_value
+          raise ::ArgumentError, "Value is outside accepted range: #{min_value} to #{max_value}"
+        end
+      end
+    end
+  end
+end

data/lib/odata/properties/string.rb

@@ -1,9 +1,57 @@
 module OData
   module Properties
     class String < OData::Property
+      def value
+        if @value.nil? && allows_nil?
+          nil
+        else
+          encode_value(@value)
+        end
+      end
+
+      def value=(new_value)
+        validate(new_value)
+        @value = new_value.nil? ? nil : encode_value(new_value.to_s)
+      end
+
       def type
         'Edm.String'
       end
+
+      def is_unicode?
+        options[:unicode]
+      end
+
+      def has_default_value?
+        not(options[:default_value].nil?)
+      end
+
+      def default_value
+        options[:default_value]
+      end
+
+      private
+
+      def default_options
+        super.merge({
+          unicode: true,
+          default_value: nil
+        })
+      end
+
+      def validate(new_value)
+        if new_value.nil? && !allows_nil?
+          raise ArgumentError, 'This property does not allow for nil values to be set'
+        end
+      end
+
+      def encode_value(new_value)
+        if options[:unicode]
+          new_value.encode(Encoding::UTF_8)
+        else
+          new_value.encode(Encoding::ASCII)
+        end
+      end
     end
   end
 end

data/lib/odata/property.rb

@@ -21,38 +21,6 @@ module OData
       @allows_nil ||= options[:allows_nil]
     end
 
-    def max_length
-      raise NotImplementedError
-    end
-
-    def fixed_length
-      raise NotImplementedError
-    end
-
-    def precision
-      raise NotImplementedError
-    end
-
-    def scale
-      raise NotImplementedError
-    end
-
-    def is_unicode?
-      raise NotImplementedError
-    end
-
-    def collation
-      raise NotImplementedError
-    end
-
-    def srid
-      raise NotImplementedError
-    end
-
-    def default_value
-      raise NotImplementedError
-    end
-
     def concurrency_mode
       @concurrecy_mode ||= options[:concurrency_mode]
     end