omf_sfa 0.1.4 → 0.1.5

data/lib/omf-sfa/am/am-rest/rest_handler.rb

@@ -2,16 +2,10 @@
 
 require 'nokogiri'
 require 'uuid'
-# require 'omf-sfa/resource/sliver'
-# require 'omf-sfa/resource/node'
-# require 'omf-sfa/resource/link'
-# require 'omf-sfa/resource/interface'
-
 require 'set'
 require 'json'
 
 require 'omf_base/lobject'
-require 'omf-sfa/am/am_manager'
 
 
 module OMF::SFA::AM::Rest
@@ -96,6 +90,10 @@ module OMF::SFA::AM::Rest
       @@service_name = name
     end
 
+    def self.service_name()
+      @@service_name || "Unknown Service"
+    end
+
     def self.load_api_template(fname)
       @@html_template =  File::read(fname)
     end
@@ -106,8 +104,6 @@ module OMF::SFA::AM::Rest
 
 
     def initialize(opts = {})
-      #puts "INIT>>> #{am_manager}::#{self}"
-      # @am_manager = am_manager
       @opts = opts
     end
 
@@ -115,6 +111,13 @@ module OMF::SFA::AM::Rest
       begin
         Thread.current[:http_host] = env["HTTP_HOST"]
         req = ::Rack::Request.new(env)
+        if req.request_method == 'OPTIONS'
+          return [200 ,{
+            'Access-Control-Allow-Origin' => '*' ,
+            'Access-Control-Allow-Methods' => 'GET, POST, OPTIONS',
+            'Access-Control-Allow-Headers' => 'origin, x-csrftoken, content-type, accept'
+          }, ""]
+        end
         content_type, body = dispatch(req)
         if req['_format'] == 'html'
           #body = self.class.convert_to_html(body, env, Set.new((@coll_handlers || {}).keys))
@@ -123,14 +126,15 @@ module OMF::SFA::AM::Rest
         elsif content_type == 'application/json'
           body = JSON.pretty_generate(body)
         end
-        return [200 ,{'Content-Type' => content_type}, body + "\n"]
+        #return [200 ,{'Content-Type' => content_type}, body + "\n"]
+        return [200 ,{'Content-Type' => content_type, 'Access-Control-Allow-Origin' => '*' , 'Access-Control-Allow-Methods' => 'GET, POST, OPTIONS' }, body + "\n"]
       rescue RackException => rex
         return rex.reply
       rescue RedirectException => rex
         debug "Redirecting to #{rex.path}"
         return [301, {'Location' => rex.path, "Content-Type" => ""}, ['Next window!']]
-      rescue OMF::SFA::AM::AMManagerException => aex
-        return RackException.new(400, aex.to_s).reply
+      # rescue OMF::SFA::AM::AMManagerException => aex
+        # return RackException.new(400, aex.to_s).reply
       rescue Exception => ex
         body = {
           :error => {
@@ -140,13 +144,7 @@ module OMF::SFA::AM::Rest
         }
         warn "ERROR: #{ex}"
         debug ex.backtrace.join("\n")
-        # root = _create_response('error', req = nil)
-        # doc = root.document
-        # reason = root.add_child(Nokogiri::XML::Element.new('reason', doc))
-        # reason.content = ex.to_s
-        # reason = root.add_child(Nokogiri::XML::Element.new('bt', doc))
-        # reason.content = ex.backtrace.join("\n\t")
-        return [500, {"Content-Type" => 'application/json'}, body]
+        return [500, { "Content-Type" => 'application/json', 'Access-Control-Allow-Origin' => '*', 'Access-Control-Allow-Methods' => 'GET, POST, OPTIONS' }, JSON.pretty_generate(body)]
       end
     end
 
@@ -163,15 +161,15 @@ module OMF::SFA::AM::Rest
     def on_post(resource_uri, opts)
       #debug 'POST: resource_uri "', resource_uri, '" - ', opts.inspect
       description, format = parse_body(opts, [:json, :form])
-      debug 'POST(', resource_uri, '): body(', format, '): "', description, '"'
+      #debug 'POST(', resource_uri, '): body(', format, '): "', description, '"'
 
       if resource = opts[:resource]
         debug 'POST: Modify ', resource
         modify_resource(resource, description, opts)
       else
-        debug 'POST: Create? ', description.class
         if description.is_a? Array
           resources = description.map do |d|
+            debug 'POST: Create? ', d
             create_resource(d, opts)
           end
           return show_resources(resources, nil, opts)
@@ -253,7 +251,7 @@ module OMF::SFA::AM::Rest
 
 
     def create_resource(description, opts, resource_uri = nil)
-      debug "Create: #{description.class}--#{description}"
+      #debug "Create: #{description.class}--#{description}"
 
       if resource_uri
         if UUID.validate(resource_uri)
@@ -272,7 +270,7 @@ module OMF::SFA::AM::Rest
         modify_resource(resource, description, opts)
       else
         resource = @resource_class.create(description)
-        debug "Created: #{resource}"
+        on_new_resource(resource)
       end
       if (context = opts[:context])
         add_resource_to_context(resource, context)
@@ -280,6 +278,13 @@ module OMF::SFA::AM::Rest
       return resource
     end
 
+    # Can be used to further customize a newly created
+    # resource.
+    #
+    def on_new_resource(resource)
+      debug "Created: #{resource}"
+    end
+
     def add_resource_to_context(user, context)
       raise UnsupportedMethodException.new
     end
@@ -312,7 +317,7 @@ module OMF::SFA::AM::Rest
         raise UnsupportedBodyFormatException.new('Send body raw, not as form data')
       end
       (body = body.string) if body.is_a? StringIO
-      debug 'PARSE_BODY(ct: ', req.content_type, '): ', body.inspect
+      #debug 'PARSE_BODY(ct: ', req.content_type, '): ', body.inspect
       unless content_type = req.content_type
         body.strip!
         if ['/', '{', '['].include?(body[0])
@@ -387,7 +392,6 @@ module OMF::SFA::AM::Rest
           #:about => about,
           :type => resource.resource_type,
         }.merge!(props)
-        #res = {"#{resource.resource_type}_response" => res}
       else
         res = {:error => 'Unknown resource'}
       end
@@ -487,11 +491,12 @@ module OMF::SFA::AM::Rest
     # * :result - hash or array describing the result (may used by JS to further format)
     #
     def render_html(parts = {})
+      #puts "PP>> #{parts}"
       tmpl = html_template()
       if (result = parts[:result])
         tmpl = tmpl.gsub('##JS##', JSON.pretty_generate(result))
       end
-      title = parts[:title] || @@service_name
+      title = parts[:title] || @@service_name || "Unknown Service"
       tmpl = tmpl.gsub('##TITLE##', title)
       if (service = parts[:service])
         tmpl = tmpl.gsub('##SERVICE##', service)
@@ -512,22 +517,16 @@ module OMF::SFA::AM::Rest
         level: 0,
         href_prefix: "#{req.path}/"
       }.merge(opts)
-      #tmpl = html_template()
-      #tmpl = tmpl.gsub('##JS##', JSON.pretty_generate(body))
 
-      #h1 = "<h1>#{@@service_name || env["HTTP_HOST"]}</h1>"
-      #tmpl = tmpl.gsub('##TITLE##', @@service_name || env["HTTP_HOST"])
       path = req.path.split('/').select { |p| !p.empty? }
       h2 = ["<a href='/?_format=html&_level=0'>ROOT</a>"]
       path.each_with_index do |s, i|
         h2 << "<a href='/#{path[0 .. i].join('/')}?_format=html&_level=#{i % 2 ? 0 : 1}'>#{s}</a>"
       end
-      #tmpl = tmpl.gsub('##SERVICE##', h2.join('/'))
 
       res = []
       _convert_obj_to_html(body, nil, res, opts)
 
-      #tmpl.gsub('##CONTENT##', res.join("\n"))
       render_html(
         result: body,
         title: @@service_name || env["HTTP_HOST"],
@@ -543,8 +542,8 @@ module OMF::SFA::AM::Rest
     protected
     def _convert_obj_to_html(obj, ref_name, res, opts)
       klass = obj.class
-      #puts ">>>> #{obj.class}::#{obj}"
-      if obj.is_a? Array
+      #puts "CONVERT>>>> #{obj.class}::#{obj}"
+      if (obj.is_a? OMF::SFA::Resource::OPropertyArray) || obj.is_a?(Array)
         if obj.empty?
           res << '<span class="empty">empty</span>'
         else

data/lib/omf-sfa/am/default_authorizer.rb

@@ -1,6 +1,7 @@
 
 
 require 'omf_base/lobject'
+require 'omf-sfa/am/am_manager'
 
 module OMF::SFA::AM
 

data/lib/omf-sfa/resource/oproperty.rb

@@ -1,6 +1,7 @@
 require 'omf-sfa/resource/oresource'
 require 'json'
 require 'time'
+require 'omf_base/lobject'
 
 # We use the JSON serialization for Time objecs from 'json/add/core' in order to avoid
 # the conflicts with the 'active_support/core_ext' which is included in 'omf_base'
@@ -28,113 +29,200 @@ class Time
   end
 end
 
-raise "JSON deserialisation no longer working - require 'json' early" unless JSON.load(Time.now.to_json).is_a? Time
+#raise "JSON deserialisation no longer working - require 'json' early" unless JSON.load(Time.now.to_json).is_a? Time
 
 module OMF::SFA::Resource
 
   # Each resource will have a few properties.
   #
   #
-  class OProperty
+  class OProperty < OMF::Base::LObject
     include DataMapper::Resource
     property :id,   Serial
 
     property :name, String
-    property :value, String # actually serialized Object
+    property :type, String, length: 2
+    property :s_value, String # actually serialized Object
+    property :n_value, Float
 
     belongs_to :o_resource
 
-    module ArrayProxy
-      def << (val)
-        if @on_set_block
-          val = @on_set_block.call(val)
-          return if val.nil?
-        end
-        @oproperty << val
-        @on_modified_block.call(val, true) if @on_add_block
-        super
-      end
-
-      def clear()
-        _remove { super }
-      end
-
-      def delete(obj)
-        _remove { super }
-      end
+    # module ArrayProxy
+      # def << (val)
+        # if @on_set_block
+          # val = @on_set_block.call(val)
+          # return if val.nil?
+        # end
+        # @oproperty << val
+        # @on_modified_block.call(val, true) if @on_add_block
+        # super
+      # end
+#
+      # def clear()
+        # _remove { super }
+      # end
+#
+      # def delete(obj)
+        # _remove { super }
+      # end
+#
+      # def delete_at(index)
+        # _remove { super }
+      # end
+#
+      # def delete_if(&block)
+        # _remove { super }
+      # end
+#
+      # # Callback to support 'reverse' operation
+      # def on_modified(&block)
+        # @on_modified_block = block
+      # end
+#
+      # def on_set(&block)
+        # @on_set_block = block
+      # end
+#
+      # private
+      # def _remove(&block)
+        # old = self.dup
+        # r = block.call()
+        # removed = old - self
+        # unless removed.empty?
+          # if @on_remove_block
+            # removed.each {|it| @on_modified_block.call(it, false) }
+          # end
+          # @oproperty.value = self
+        # end
+        # r
+      # end
+    # end
 
-      def delete_at(index)
-        _remove { super }
+    def self.prop_all(query, resource_class = nil)
+      i = 0
+      where = query.map do |pn, v|
+        h = _analyse_value(v)
+        tbl = "p#{i}"
+        i += 1
+        if (val = h[:v]).is_a? String
+          val = "'#{val}'"
+        end
+        "#{tbl}.#{h[:f]} #{h[:t] == 's' ? 'LIKE' : '='} #{val}"
       end
-
-      def delete_if(&block)
-        _remove { super }
+      i.times do |j|
+        where << "r.id = p#{j}.o_resource_id"
       end
+      where << "r.type = '#{resource_class}'" if resource_class
 
-      # Callback to support 'reverse' operation
-      def on_modified(&block)
-        @on_modified_block = block
-      end
+      table = storage_names[:default]
+      from = i.times.map {|j| "#{table} AS p#{j}" }
+      from << "omf_sfa_resource_o_resources AS r" # TODO: Shouldn't hard-code that
+      q = "SELECT r.id, r.type, r.uuid, r.name FROM #{from.join(', ')} WHERE #{where.join(' AND ')};"
+      debug "prop_all q: #{q}"
+      res = repository(:default).adapter.select(q)
+      puts OMF::JobService::Resource::Job
 
-      def on_set(&block)
-        @on_set_block = block
+      ores = res.map do |qr|
+        if resource_class
+          resource_class.first(id: qr.id, uuid: qr.uuid, name: qr.name) # TODO: Does this create a DB call?
+        else
+          _create_resource(qr)
+        end
       end
+      #puts "RES>>> #{ores}"
+      ores
+    end
 
-      private
-      def _remove(&block)
-        old = self.dup
-        r = block.call()
-        removed = old - self
-        unless removed.empty?
-          if @on_remove_block
-            removed.each {|it| @on_modified_block.call(it, false) }
-          end
-          @oproperty.value = self
+    @@name2class = {}
+    def self._create_resource(query_result)
+      qr = query_result
+      unless klass = @@name2class[qr.type]
+        begin
+        klass = qr.type.split('::').inject(Object) do |mod, class_name|
+          mod.const_get(class_name)
+        end
+        rescue Exception => ex
+          warn "Can't find class '#{qr.type}' for resource - #{ex}"
+          return nil
         end
-        r
+        @@name2class[qr.type] = klass
       end
+      klass.first(id: qr.id, uuid: qr.uuid, name: qr.name) # TODO: Does this create a DB call?
     end
 
     def value=(val)
-      attribute_set(:value, JSON.generate([val]))
+      h = self.class._analyse_value(val)
+      attribute_set(h[:f], h[:v])
+      attribute_set(:type, h[:t])
       save
     end
 
-    def value()
-      js = attribute_get(:value)
-      # http://www.ruby-lang.org/en/news/2013/02/22/json-dos-cve-2013-0269/
-      val = JSON.load(js)[0]
-      #puts "VALUE: #{js.inspect}-#{val.inspect}-#{val.class}"
-      if val.kind_of? Array
-        val.tap {|v| v.extend(ArrayProxy).instance_variable_set(:@oproperty, self) }
+      # if val.is_a? Numeric
+        # attribute_set(:n_value, val)
+        # attribute_set(:type, (val.is_a? Integer) ? 'i' : 'f')
+      # elsif val.is_a? String
+        # attribute_set(:s_value, val)
+        # attribute_set(:type, 's')
+      # elsif val.is_a? OResource
+        # attribute_set(:s_value, val.uuid.to_s)
+        # attribute_set(:type, 'r')
+      # elsif val.is_a? Time
+        # attribute_set(:n_value, val.to_i)
+        # attribute_set(:type, 't')
+      # else
+        # puts "OOOOO INSETRT (#{attribute_get(:name)})> #{val.class}"
+        # attribute_set(:s_value, JSON.generate([val]))
+        # attribute_set(:type, 'o')
+      # end
+      # save
+    # end
+
+    def self._analyse_value(val)
+
+      if val.is_a? Numeric
+        return {v: val, t: ((val.is_a? Integer) ? 'i' : 'f'), f: :n_value}
+      elsif val.is_a? String
+        return {v: val, t: 's', f: :s_value}
+      elsif val.is_a? Symbol
+        return {v: val.to_s, t: 's', f: :s_value}
+      elsif val.is_a? OResource
+        return {v: val.uuid.to_s, t: 'r', f: :s_value}
+      elsif val.is_a? Time
+        return {v: val.to_i, t: 'r', f: :n_value}
+      else
+        #debug "SETTING VALUE>  Class: #{val.class}"
+        return {v: JSON.generate([val]), t: 'o', f: :s_value}
       end
-      val
     end
 
-    def << (val)
-      v = attribute_get(:value)
-      v = JSON.load(v)[0]
-      v << val
-      attribute_set(:value, JSON.generate([v]))
-      save
+    def value()
+      case type = attribute_get(:type)
+      when 'i'
+        val =  attribute_get(:n_value).to_i
+      when 'f'
+        val =  attribute_get(:n_value)
+      when 's'
+        val = attribute_get(:s_value)
+      when 'r'
+        uuid = attribute_get(:s_value)
+        val = OResource.first(uuid: uuid)
+      when 't'
+        val = Time.at(attribute_get(:n_value))
+      when 'o'
+        js = attribute_get(:s_value)
+        #debug "GET VALUE>  <#{js}>"
+        # http://www.ruby-lang.org/en/news/2013/02/22/json-dos-cve-2013-0269/
+        val = JSON.load(js)[0]
+        #puts "VALUE: #{js.inspect}-#{val.inspect}-#{val.class}"
+        if val.kind_of? Array
+          val.tap {|v| v.extend(ArrayProxy).instance_variable_set(:@oproperty, self) }
+        end
+      else
+        throw "Unknown property type '#{type}'"
+      end
+      return val
     end
 
-    #def value()
-    #  #puts "VALUE() @value_:'#{@value_.inspect}'"
-    #  unless @value_
-    #    js = attribute_get(:value)
-    #    puts "JS #{js.inspect}"
-    #    if js
-    #      @value_ = JSON.parse(js)[0]
-    #      if @value_.kind_of? Array
-    #        @old_value_ = @value_.dup
-    #      end
-    #    end
-    #  end
-    #  #puts "VALUE()2 @value_:'#{@value_.inspect}'"
-    #  @value_
-    #end
-
     def valid?(context = :default)
       self.name != nil #&& self.value != nil
     end
@@ -156,6 +244,14 @@ module OMF::SFA::Resource
       false
     end
 
+     def to_hash
+      {name: self.name, value: self.value}
+    end
+
+     def to_json(*args)
+      to_hash.to_json(*args)
+    end
+
     def to_s()
       super() + " - name: #{self.name} value: #{self.value}"
     end
@@ -175,4 +271,62 @@ module OMF::SFA::Resource
 
   end # OProperty
 
+  class OPropertyArray
+    def <<(val)
+      p = OProperty.create(name: @name, o_resource: @resource)
+      p.value = val
+      @on_set_block.call(val) if @on_set_block
+      self
+    end
+
+    # Delete all members
+    def clear
+      OProperty.all(name: @name, o_resource: @resource).destroy
+      self
+    end
+
+    [:each, :each_with_index, :select, :map].each do |n|
+      define_method n do |&block|
+        c = OProperty.all(name: @name, o_resource: @resource)
+        e = Enumerator.new do |y|
+          if prop = c.first
+            val = prop.value
+            val = @on_set_block.call(val) if @on_set_block
+            y << val
+          end
+        end
+        e.send(n, &block)
+      end
+    end
+
+    def empty?
+      OProperty.count(name: @name, o_resource: @resource) == 0
+    end
+
+    # Callback to support 'reverse' operation
+    def on_modified(&block)
+      raise "Not implemented"
+      #@on_modified_block = block
+    end
+
+    def on_set(&block)
+      @on_set_block = block
+    end
+
+    def to_json(*args)
+      OProperty.all(name: @name, o_resource: @resource).map do |p|
+        p.value
+      end.to_json(*args)
+    end
+
+    def to_s
+      "<#{self.class}: name=#{@name} resource=#{@resource.name || @resource.uuid} >"
+    end
+
+    def initialize(resource, name)
+      @resource = resource
+      @name = name
+    end
+  end
+
 end # OMF::SFA::Resource

data/lib/omf-sfa/resource/oresource.rb

@@ -83,7 +83,7 @@ module OMF::SFA::Resource
         op[pname] = opts
 
         define_method pname do
-          res = oproperty_get(pname)
+          res = oproperty_array_get(pname)
           if res == nil
             oproperty_set(pname, [])
             # We make a oproperty_get in order to get the extended Array with
@@ -118,14 +118,16 @@ module OMF::SFA::Resource
         # helps other entities to learn if this property is functional or not.
         #
         define_method "#{pname}_add" do |v|
-          self.send(pname.to_sym) << v
+          oproperty_array_get(pname) << v
+          #self.send(pname.to_sym) << v
         end
 
         define_method "#{pname}=" do |v|
           unless v.is_a? Array
             raise "Property '#{pname}' in '#{self.class}' requires an Array in setter - #{v.inspect}"
           end
-          res = self.send(pname.to_sym)
+          #res = self.send(pname.to_sym)
+          res = oproperty_array_get(pname)
           res.clear # clear any old values
           v.each {|it| res << it }
           res
@@ -168,6 +170,10 @@ module OMF::SFA::Resource
       end
     end
 
+    def self.prop_all(query)
+      OProperty.prop_all(query, self)
+    end
+
     # Clone this resource this resource. However, the clone will have a unique UUID
     #
     def clone()
@@ -259,6 +265,11 @@ module OMF::SFA::Resource
     end
     alias_method :[]=, :oproperty_set
 
+    def oproperty_array_get(pname)
+      pname = pname.to_sym
+      ap = (@array_properties ||= {})[pname] ||= OPropertyArray.new(self, pname)
+    end
+
     def oproperties_as_hash
       res = {}
       oproperties.each do |p|
@@ -360,23 +371,26 @@ module OMF::SFA::Resource
     end
 
     def to_json(*a)
-      unless self.id
-        # need an id, means I haven't been saved yet
-        save
-      end
-      {
-        'json_class' => self.class.name,
-        'id'       => self.id
-      }.to_json(*a)
-    end
+      to_hash_brief().to_json(*a)
 
-    def as_json(options = { })
-      {
-        "json_class" => self.class.name,
-        "id" => self.id
-      }
+      # unless self.id
+        # # need an id, means I haven't been saved yet
+        # save
+      # end
+      # {
+        # 'json_class' => self.class.name,
+        # 'id'       => self.id
+      # }.to_json(*a)
     end
 
+    # def as_json(options = { })
+      # raise "DO WE STILL NEED THIS"
+      # {
+        # "json_class" => self.class.name,
+        # "id" => self.id
+      # }
+    # end
+
 
     #def self.from_json(o)
     #  puts "FROM_JSON"

data/lib/omf-sfa/version.rb

@@ -1,4 +1,4 @@
 module OMF; module SFA
   #VERSION = "6.0.0.pre.1"
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end; end

data/omf_sfa.gemspec

@@ -40,7 +40,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "rack-rpc", "~> 0.0.6"
   s.add_runtime_dependency "data_mapper", "~> 1.2.0"
   s.add_runtime_dependency "bluecloth", "~> 2.2.0"
-  s.add_runtime_dependency "omf_common", "~> 6.0.0"
+  #s.add_runtime_dependency "omf_common", "~> 6.0.0"
+  #s.add_runtime_dependency "omf_base", "~> 6.0.0"
   s.add_runtime_dependency "eventmachine", "~> 1.0.3"
   s.add_runtime_dependency "em-minitest-spec", "~> 1.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omf_sfa
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-14 00:00:00.000000000 Z
+date: 2014-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -331,22 +331,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.2.0
-- !ruby/object:Gem::Dependency
-  name: omf_common
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 6.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement