yaml_conditions 0.0.0.3 → 0.0.0.4

data/README.rdoc

@@ -39,6 +39,8 @@ Just to give you a little background, I build this gem/plugin just to filter my
 
 So, I added some custom magic for filtering Delayed::Job objects, like this:
 
+  Delayed::Job.find(:first, :yaml_conditions => { :class => Delayed::PerformableMethod, :args => [ QuoteRequest.find(435), Supplier.find(57) ] })
+
   Delayed::Job.first(:yaml_conditions => { :handler => { :class => Delayed::PerformableMethod, :method => :new_registration, :args => [ User.find(1), '*', '*' ] } })
 
   Delayed::Job.first(:yaml_conditions => { :handler => { :args => [ { :user => { :last_name => 'Marcelo', :address => { :city => 'Rio Negro' } } } ] } })
@@ -47,8 +49,8 @@ As you probably realize, '*' is interpreted as a wildcard.
 
 If :handler is not provided as top level key of the hash, then the hash will be wrapped inside a handler key. For example, the following queries return the same results:
 
-  Delayed::Job.last(:yaml_conditions => { :handler => { :class => SimpleJob, :method => :new_registration }})
-  Delayed::Job.last(:yaml_conditions => { :class => SimpleJob, :method => :new_registration })
+  Delayed::Job.last(:yaml_conditions => { :handler => { :class => SimpleJob, :name => 'job_name', :kind => 'some_kind' }})
+  Delayed::Job.last(:yaml_conditions => { :class => SimpleJob , :name => 'job_name', :kind => 'some_kind' })
 
 This wrapping magic it's only available for Delayed::Job for now.
 

data/Rakefile

@@ -3,7 +3,7 @@ require 'echoe'
 
 # PACKAGING ============================================================
 
-Echoe.new('yaml_conditions', '0.0.0.3') do |p|
+Echoe.new('yaml_conditions', '0.0.0.4') do |p|
   p.description = ''
   p.url = 'http://github.com/marklazz/yaml_conditions'
   p.author = 'Marcelo Giorgi'

data/lib/yaml/conditions.rb

@@ -1,9 +1,8 @@
 module Yaml
   module Conditions
     extend self
-    ParseObjectFromYaml = /\!ruby\/\w+\:([^\s]+)/
 
-    VERSION = '0.0.0.3'
+    VERSION = '0.0.0.4'
   end
 
   class NotSerializedField

data/lib/yaml/query_builder.rb

@@ -1,6 +1,8 @@
 module Yaml
   module QueryBuilder
 
+    ParseObjectFromYaml = /\!ruby\/\w+\:([^\s]+)/
+
     def __include_db_adapter_if_necessary__
       adapter_name = self.connection.adapter_name
       adapter_capitalized = adapter_name.upcase[0].chr + adapter_name.downcase[1..-1]
@@ -56,7 +58,16 @@ module Yaml
     end
 
     def __check_yaml_nested_hierarchy_on_list__(value, yaml_conditions)
-      return false if !value.is_a?(Array) || value.length != yaml_conditions.length
+      return false if !value.is_a?(Array)
+      yaml_conditions = if value.length != yaml_conditions.length
+        if value.length > yaml_conditions.length
+          yaml_conditions + (['*'] * (value.length - yaml_conditions.length))
+        else
+          yaml_conditions[0..-1+(value.length-yaml_conditions.length)]
+        end
+      else
+        yaml_conditions
+      end
       yaml_conditions.zip(value).inject(true) do |result, (cond, nested_value)|
           result &= __check_yaml_nested_hierarchy__(nested_value, cond)
       end
@@ -99,14 +110,32 @@ module Yaml
     end
 
     def __yaml_load_object_recursively__(object)
+      return nil if object.nil?
+      return object.map { |v| __yaml_load_object_recursively__(v) } if object.is_a?(Array)
+      if object.is_a?(Hash)
+        return object.keys.inject({}) do |result, k|
+          result[__yaml_load_object_recursively__(k).to_sym] = __yaml_load_object_recursively__(object[k])
+          result
+        end
+      elsif object.is_a?(Symbol)
+        return object
+      end
       yaml_object = __yaml_deserialize__(object)
-      if yaml_object.respond_to?(:value) && yaml_object.respond_to?(:type_id) && yaml_object.type_id == 'struct'
-        yaml_object = yaml_object.value
-        yaml_object = yaml_object.keys.inject(yaml_object) do |yobject, key|
-          yobject[key] = yobject[key].is_a?(String) ? __yaml_load_object_recursively__(yobject[key]) : yobject[key]
+      if yaml_object.is_a?(Struct) || (yaml_object.respond_to?(:value) && yaml_object.respond_to?(:type_id) && yaml_object.type_id == 'struct')
+        yaml_object = yaml_object.respond_to?(:value) ? yaml_object.value : yaml_object
+        keys = yaml_object.respond_to?(:members) ? yaml_object.members : yaml_object.keys
+        yaml_object = keys.inject(yaml_object) do |yobject, key|
+          value = yobject.respond_to?(key.to_sym) ? yobject.send(key.to_sym) : yobject[key]
+          yobject[key] = begin
+            if value.is_a?(Array) || value.is_a?(String)
+              __yaml_load_object_recursively__(value)
+            else
+              value
+            end
+          end
           yobject
         end
-        yaml_object[:class] = yaml_object.class.to_s
+        yaml_object[:class]=(yaml_object.class.to_s) unless yaml_object.is_a?(Struct)
         yaml_object
       else
         yaml_object

data/spec/cases/orms/active_record/version_2_delayed_job_spec.rb

@@ -10,7 +10,6 @@ rescue LoadError
   # not installed
 end
 
-
 describe ::Orms::ActiveRecordVersion2 do
 
   before do
@@ -28,6 +27,16 @@ describe ::Orms::ActiveRecordVersion2 do
 
         subject { Delayed::Job.first(:yaml_conditions => @yaml_conditions) }
 
+        context 'test filter by class' do
+
+          before do
+            @yaml_conditions = { :class => Delayed::PerformableMethod }
+          end
+
+          it { should == @job }
+        end
+
+
         context 'test filter by args' do
 
           before do

data/tasks/yaml_conditions.rake

@@ -61,7 +61,7 @@ for adapter in %w( mysql postgresql )
     end
 
   namespace adapter do
-    task "spec_#{adapter}" => [ "rebuild_#{adapter}_databases" ]
+    #task "spec_#{adapter}" => [ "rebuild_#{adapter}_databases" ]
     task :spec => "spec_#{adapter}"
   end
 end

data/yaml_conditions.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{yaml_conditions}
-  s.version = "0.0.0.3"
+  s.version = "0.0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcelo Giorgi"]
-  s.date = %q{2010-11-27}
+  s.date = %q{2010-11-28}
   s.default_executable = %q{console.sh}
   s.description = %q{}
   s.email = %q{marklazz.uy@gmail.com}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: yaml_conditions
 version: !ruby/object:Gem::Version 
-  hash: 73
+  hash: 71
   prerelease: false
   segments: 
   - 0
   - 0
   - 0
-  - 3
-  version: 0.0.0.3
+  - 4
+  version: 0.0.0.4
 platform: ruby
 authors: 
 - Marcelo Giorgi
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-27 00:00:00 -02:00
+date: 2010-11-28 00:00:00 -02:00
 default_executable: console.sh
 dependencies: 
 - !ruby/object:Gem::Dependency