omf_sfa 0.2.0 → 0.2.2

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

@@ -98,7 +98,7 @@ module OMF::SFA::Resource
       # end
     # end
 
-    def self.prop_all(query, resource_class = nil)
+    def self.prop_all(query, opts = {}, resource_class = nil)
       i = 0
       where = query.map do |pn, v|
         h = _analyse_value(v)
@@ -117,7 +117,10 @@ module OMF::SFA::Resource
       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 ')};"
+      q = "SELECT DISTINCT r.id, r.type, r.uuid, r.name FROM #{from.join(', ')} WHERE #{where.join(' AND ')};"
+      if l = opts[:limit]
+        q += " LIMIT #{l} OFFSET #{opts[:offset] || 0}"
+      end
       debug "prop_all q: #{q}"
       res = repository(:default).adapter.select(q)
       ores = res.map do |qr|
@@ -284,6 +287,7 @@ module OMF::SFA::Resource
       p = OProperty.create(name: @name, o_resource: @resource)
       if @on_set_block
         val = @on_set_block.call(val)
+        return if val.nil? #
       end
       p.value = val
       self

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

@@ -145,6 +145,7 @@ module OMF::SFA::Resource
         define_method "#{name}=" do |v|
           if sf = opts[:set_filter]
             v = self.send(sf, v)
+            return if v.nil? #
           end
           return if (old = oproperty_get(name)) == v
           oproperty_set(name, v)
@@ -166,8 +167,11 @@ module OMF::SFA::Resource
       end
     end
 
-    def self.prop_all(query)
-      OProperty.prop_all(query, self)
+    # param opts :limit
+    # param opts :offset
+    #
+    def self.prop_all(query, opts = {})
+      OProperty.prop_all(query, opts, self)
     end
 
     # Clone this resource this resource. However, the clone will have a unique UUID

data/lib/omf-sfa/version.rb

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

metadata

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