omf_sfa 0.1.5 → 0.2.0

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

@@ -120,8 +120,6 @@ module OMF::SFA::Resource
       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
-
       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?
@@ -188,7 +186,10 @@ module OMF::SFA::Resource
       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}
+        return {v: val.to_i, t: 't', f: :n_value}
+      elsif val.class.included_modules.include?(DataMapper::Resource)
+        #puts "SET>>>>> #{val}:#{val.class}"
+        return {v: "#{val.class}@#{val.id}", t: 'd', f: :s_value}
       else
         #debug "SETTING VALUE>  Class: #{val.class}"
         return {v: JSON.generate([val]), t: 'o', f: :s_value}
@@ -208,6 +209,12 @@ module OMF::SFA::Resource
         val = OResource.first(uuid: uuid)
       when 't'
         val = Time.at(attribute_get(:n_value))
+      when 'd'
+        v = attribute_get(:s_value)
+        klass_s, id_s = v.split('@')
+        klass = klass_s.split('::').inject(Kernel) {|k, s| k.const_get(s) }
+        val = klass.first(id: id_s.to_i)
+        #puts "GET>>>>> #{v} - #{val}"
       when 'o'
         js = attribute_get(:s_value)
         #debug "GET VALUE>  <#{js}>"
@@ -253,7 +260,7 @@ module OMF::SFA::Resource
     end
 
     def to_s()
-      super() + " - name: #{self.name} value: #{self.value}"
+      "#<#{self.class} id: #{self.id} subj: #{self.o_resource} name: #{self.name} value: #{self.value}>"
     end
 
     #before :save do
@@ -273,9 +280,12 @@ module OMF::SFA::Resource
 
   class OPropertyArray
     def <<(val)
+      #puts ">>> Adding #{val} to #{@name} - #{@on_set_block}"
       p = OProperty.create(name: @name, o_resource: @resource)
+      if @on_set_block
+        val = @on_set_block.call(val)
+      end
       p.value = val
-      @on_set_block.call(val) if @on_set_block
       self
     end
 
@@ -287,15 +297,9 @@ module OMF::SFA::Resource
 
     [: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)
+        #c = OProperty.all(name: @name, o_resource: @resource)
+        c = self.to_a()
+        c.send(n, &block)
       end
     end
 
@@ -313,6 +317,10 @@ module OMF::SFA::Resource
       @on_set_block = block
     end
 
+    def to_a
+      OProperty.all(name: @name, o_resource: @resource).all.map {|p| p.value }
+    end
+
     def to_json(*args)
       OProperty.all(name: @name, o_resource: @resource).map do |p|
         p.value

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

@@ -83,7 +83,7 @@ module OMF::SFA::Resource
         op[pname] = opts
 
         define_method pname do
-          res = oproperty_array_get(pname)
+          res = oproperty_array_get(pname, opts[:set_filter])
           if res == nil
             oproperty_set(pname, [])
             # We make a oproperty_get in order to get the extended Array with
@@ -106,11 +106,6 @@ module OMF::SFA::Resource
               end
             end
           end
-          if sf = opts[:set_filter]
-            res.on_set do |v|
-              self.send(sf, v)
-            end
-          end
           res
         end
 
@@ -118,7 +113,7 @@ module OMF::SFA::Resource
         # helps other entities to learn if this property is functional or not.
         #
         define_method "#{pname}_add" do |v|
-          oproperty_array_get(pname) << v
+          oproperty_array_get(pname, opts[:set_filter]) << v
           #self.send(pname.to_sym) << v
         end
 
@@ -127,8 +122,9 @@ module OMF::SFA::Resource
             raise "Property '#{pname}' in '#{self.class}' requires an Array in setter - #{v.inspect}"
           end
           #res = self.send(pname.to_sym)
-          res = oproperty_array_get(pname)
+          res = oproperty_array_get(pname, opts[:set_filter])
           res.clear # clear any old values
+          #puts ">>>> SET: #{v} - #{res}"
           v.each {|it| res << it }
           res
         end
@@ -265,9 +261,19 @@ module OMF::SFA::Resource
     end
     alias_method :[]=, :oproperty_set
 
-    def oproperty_array_get(pname)
+    def oproperty_array_get(pname, set_filter)
       pname = pname.to_sym
-      ap = (@array_properties ||= {})[pname] ||= OPropertyArray.new(self, pname)
+      unless ap = (@array_properties ||= {})[pname]
+        ap = OPropertyArray.new(self, pname)
+        if set_filter
+          # TODO: The following block can most likely be optimised away
+          ap.on_set do |v|
+            self.send(set_filter, v)
+          end
+        end
+        @array_properties[pname] = ap
+      end
+      ap
     end
 
     def oproperties_as_hash

data/lib/omf-sfa/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omf_sfa
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2014-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest