safrano 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 302464268b9b4475861347fca0cf7c330bed4dc35a0357b1ad4dc866b020134c
-  data.tar.gz: 968c331ca598e6eb84682ac8f2ab94aa71ac1cdfa83744b310a2a75e22dc3008
+  metadata.gz: a69035d5b1015e36842490919163234c4ae55591657fb7d3b4b730b871c0035b
+  data.tar.gz: 5c0024539a67f37cbf397975315066b1df803dd826b242b873147bbd1da60062
 SHA512:
-  metadata.gz: 0c374f75c178787452357907e8e81ba315ac4f855ff4f658e40bbc7b5e9ae1d0d2a9849973c80a94e1101731dd79fbc597c51e4a804721da999db28535fd7c78
-  data.tar.gz: 3528b0d9150fd2b0bfc825894a03d438a77cf9d0b9bb11de2c3681938927d83187ac7ff21e16fb8240821f0f2931041ef0e75611928d8fa2948a8e377040ad24
+  metadata.gz: 7538b83433db7381e77a34415e9cd4887cd2db20bfe8ba05db66e6d3703a0358e9f3024f137bddfca3b9b490caf3afbc2262b6b26514a36efeae792c8983a670
+  data.tar.gz: b12e002bdbdeb826678d9cd1f8c1c9dce8bd11791adf8205464d12b115551bebbc59ddf4635d4406e93c4f5cee955f5356fea3d373857bac662ddbe5dd098ef7

data/lib/odata/attribute.rb

@@ -0,0 +1,58 @@
+require 'json'
+require_relative '../safrano_core.rb'
+require_relative './entity.rb'
+
+module OData
+  # Represents a named and valued attribute of an Entity
+  class Attribute
+    attr_reader :name
+    attr_reader :entity
+    def initialize(entity, name)
+      @entity = entity
+      @name = name
+    end
+
+    def value
+      @entity.values[@name.to_sym]
+    end
+
+    def odata_get(req)
+      if req.walker.raw_value
+        [200, { 'Content-Type' => 'text/plain;charset=utf-8' },
+         value.to_s]
+      elsif req.accept?('application/json')
+        [200, { 'Content-Type' => 'application/json;charset=utf-8' },
+         to_odata_json(service: req.service)]
+      else # TODO: other formats
+        406
+      end
+    end
+
+    # output as OData json (v2)
+    def to_odata_json(*)
+      { 'd' => { @name => value } }.to_json
+    end
+
+    # for testing purpose (assert_equal ...)
+    def ==(other)
+      (@entity == other.entity) && (@name == other.name)
+    end
+
+    # methods related to transitions to next state (cf. walker)
+    module Transitions
+      def transition_end(_match_result)
+        [nil, :end]
+      end
+
+      def transition_value(_match_result)
+        [self, :end_with_value]
+      end
+
+      def allowed_transitions
+        [Safrano::TransitionEnd,
+         Safrano::TransitionValue]
+      end
+    end
+    include Transitions
+  end
+end

data/lib/odata/collection.rb

@@ -87,9 +87,9 @@ module OData
       enty = new
       hash.delete('__metadata')
       # DONE: move this somewhere else where it's evaluated only once at setup
-      #data_fields = db_schema.map do |col, cattr|
+      # data_fields = db_schema.map do |col, cattr|
       #  cattr[:primary_key] ? nil : col
-      #end.select { |col| col }
+      # end.select { |col| col }
       enty.set_fields(hash, @data_fields, missing: :skip)
       enty.save
       enty

data/lib/odata/collection_filter.rb

@@ -88,8 +88,8 @@ module OData
   class Filter
     attr_reader :assoc
     attr_reader :assocs
-    QUOTED_RGX = /'((?:[^']|(?:\'{2}))*)'/.freeze
-    NOTQ_RGX = /((?:[^'\s\)])*)/.freeze
+    QUO = /'((?:[^']|(?:\'{2}))*)'/.freeze
+    NOTQ = /((?:[^'\s\)])*)/.freeze
 
     def initialize(matx)
       @matx = matx
@@ -139,11 +139,10 @@ module OData
   class EqualFilter < Filter
     include FilterWithRuby
     include FilterWithAssoc
-    EQUAL_KW_RGX = '[eE][qQ]|[LlgGNn][eETt]'.freeze
-    RIGHT_RGX = %q{'[^']+'|[^'\)\s]+}.freeze
+    EQL = '[eE][qQ]|[LlgGNn][eETt]'.freeze
 
     def self.qualified_regexp(paths_rx)
-      /\s*(#{paths_rx})\s+(#{EQUAL_KW_RGX})\s+(?:#{QUOTED_RGX}|#{NOTQ_RGX})\s*/
+      /\s*(#{paths_rx})\s+(#{EQL})\s+(?:#{QUO}|#{NOTQ})\s*/
     end
 
     def initialize(matx)
@@ -208,6 +207,82 @@ module OData
     end
   end
 
+  # equality expressions with functions ... length(name) eq 2
+  class FuncEqualFilter < EqualFilter
+    FUNC = 'length|trim|tolower|toupper'.freeze
+
+    attr_reader :funcname
+
+    def self.qualified_regexp(pathsrx)
+      /\s*(#{FUNC})\((#{pathsrx})\)\s+(#{EQL})\s+(?:#{QUO}|#{NOTQ})\s*/
+    end
+
+    def initialize(matx)
+      super(matx)
+      @funcname = matx[1]
+      self.fn = matx[2]
+      get_assoc if @fn
+
+      @val = matx[4] ? matx[4].gsub("''", "'") : matx[5]
+
+      @op = matx[3].downcase
+    end
+
+    # ugly hack... but working
+    def gen_sql(dtcx)
+      # handle ambiguous column names (joins) by qualifiying the names
+      #      seqfn = @assoc ? Sequel[@assoc.to_sym][@fn.to_sym] : @fn.to_sym
+      # handle ambiguous column names (joins) by qualifiying the names
+      # for the main table as well
+      # TODO: find a better way to differentiate between the two types
+      #      of dtcx : Model or Dataset
+
+      # DONE: same handling for order and substring and everywhere where
+      # qualified fieldnames could be needed (uses attrib path regexp)
+      x = apply_to_dataset(dtcx)
+      # ugly ugly hack :-(
+      y = x.unordered.sql.sub(x.unfiltered.unordered.sql + ' WHERE', '')
+      y
+    end
+
+    def apply_to_dataset(dtcx)
+      seqfn = get_qualified_fn(dtcx)
+      # using @val in Procs below does not work reliably. Using a local var
+      # seems to work better
+      argval = @val
+      seqfunc = case @funcname
+                when 'length'
+                  argval = Sequel.lit(@val)
+                  Sequel.char_length(seqfn)
+                when 'trim'
+                  Sequel.trim(seqfn)
+                when 'toupper'
+                  Sequel.function(:upper, seqfn)
+                when 'tolower'
+                  Sequel.function(:lower, seqfn)
+                else
+                  raise OData::FilterParseError
+                end
+
+      case @op
+      when 'eq'
+        dtcx.where(seqfunc => argval)
+      when 'ne'
+        dtcx.exclude(seqfunc => argval)
+      when 'le'
+        dtcx.where { seqfunc  <= argval }
+      when 'ge'
+        dtcx.where { seqfunc  >= argval }
+      when 'lt'
+        dtcx.where { seqfunc < argval }
+      when 'gt'
+        dtcx.where { seqfunc > argval }
+      else
+        raise OData::FilterParseError
+      end
+    end
+  end
+
   # keyword based
   class FilterWithKeyword < Filter
     attr_reader :keyword
@@ -221,8 +296,9 @@ module OData
     def self.qualified_regexp(paths_rx)
       # Note:    QUOTED_RGX captures the string content without
       #          start and end quote (no need to un-quote)
-      #          NOTQ_RGX captures an not-quoted value argument (like for numbers)
-      /(substringof)\((?:#{QUOTED_RGX}|#{NOTQ_RGX}),\s*(#{paths_rx})\)/
+      #          NOTQ_RGX captures an not-quoted value argument
+      #          (like for numbers)
+      /(substringof)\((?:#{QUO}|#{NOTQ}),\s*(#{paths_rx})\)/
     end
 
     def initialize(matx)
@@ -237,7 +313,7 @@ module OData
 
     def whcl(dtcx)
       # handle ambiguous column names (joins) by qualifiying the names
-      #      seqfn = @assoc ? Sequel[@assoc.to_sym][@fn.to_sym] : @fn.to_sym
+      # seqfn = @assoc ? Sequel[@assoc.to_sym][@fn.to_sym] : @fn.to_sym
       seqfn = get_qualified_fn(dtcx)
       Sequel.like(seqfn, "%#{@val}%")
     end
@@ -289,7 +365,7 @@ module OData
     # example : startswith(year, 190')
 
     def self.qualified_regexp(paths)
-      /(endswith|startswith)\((#{paths}),\s*(?:#{QUOTED_RGX}|#{NOTQ_RGX})\s*\)/
+      /(endswith|startswith)\((#{paths}),\s*(?:#{QUO}|#{NOTQ})\s*\)/
     end
 
     def initialize(matx)
@@ -358,6 +434,7 @@ module OData
   class ComplexFilter < Filter
     # list of active Subfilter classes. The ordering is important
     SUBFILTERS = [EqualFilter,
+                  FuncEqualFilter,
                   SubstringOfFilterSig1,
                   StartOrEndsWithFilter].freeze
     # for counting number of AND OR's
@@ -375,6 +452,7 @@ module OData
                                  else
                                    dtset.model.attrib_paths_url_regexp.dup
                                  end
+
       @active_subfs = []
       @osql = filterstr.dup
       @dt = dtset

data/lib/odata/entity.rb

@@ -1,6 +1,3 @@
-#!/usr/bin/env ruby
-# !/usr/bin/env ruby
-
 require 'json'
 require 'pp'
 require 'rexml/document'
@@ -47,7 +44,8 @@ module OData
 
       def transition_attribute(match_result)
         attrib = match_result[1]
-        [values[attrib.to_sym], :run]
+        #        [values[attrib.to_sym], :run]
+        [OData::Attribute.new(self, attrib), :run]
       end
 
       def transition_nav_collection(match_result)
@@ -156,7 +154,6 @@ module OData
     end
 
     def odata_patch(req)
-
       data = JSON.parse(req.body.read)
       @uribase = req.uribase
 

data/lib/odata/walker.rb

@@ -22,6 +22,9 @@ module OData
     # is $count requested?
     attr_accessor :do_count
 
+    # is $value requested?
+    attr_reader :raw_value
+
     def initialize(service, path)
       path = URI.decode_www_form_component(path)
       @context = service
@@ -78,11 +81,15 @@ module OData
           @contexts << @context
           @path_remain = @tr_next.path_remain
           @path_done << @tr_next.path_done
-          # little hack
+          # little hack's
           if @status == :end_with_count
             @do_count = true
             @status == :end
           end
+          if @status == :end_with_value
+            @raw_value = true
+            @status == :end
+          end
         else
           @context = nil
           @status = :error

data/lib/safrano.rb

@@ -4,6 +4,7 @@ require 'json'
 require 'rexml/document'
 require 'safrano_core.rb'
 require 'odata/entity.rb'
+require 'odata/attribute.rb'
 require 'odata/collection.rb'
 require 'service.rb'
 require 'odata/walker.rb'

data/lib/safrano_core.rb

@@ -83,31 +83,7 @@ module Safrano
                                    trans: 'transition_batch')
   TransitionCount = Transition.new('(\A\/\$count)(.*)\z',
                                    trans: 'transition_count')
+  TransitionValue = Transition.new('(\A\/\$value)(.*)\z',
+                                   trans: 'transition_value')
   attr_accessor :allowed_transitions
 end
-
-# for $count and number type attributes
-# class Fixnum  deprecated as of ruby 2.4+
-class Integer
-  def odata_get(_req)
-    [200, { 'Content-Type' => 'text/plain;charset=utf-8' }, to_s]
-  end
-end
-
-# for string type attributes
-class String
-  def odata_get(_req)
-    [200, { 'Content-Type' => 'text/plain;charset=utf-8' }, to_s]
-  end
-end
-
-# Final attribute value....
-class Object
-  def allowed_transitions
-    [Safrano::TransitionEnd]
-  end
-
-  def transition_end(_match_result)
-    [nil, :end]
-  end
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: safrano
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - D.M.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-15 00:00:00.000000000 Z
+date: 2019-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -73,6 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/odata/attribute.rb
 - lib/odata/batch.rb
 - lib/odata/collection.rb
 - lib/odata/collection_filter.rb
@@ -110,5 +111,5 @@ requirements: []
 rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: Safrano
+summary: Safrano is a ruby (Sequel + Rack) OData provider
 test_files: []