yaml_conditions 0.0.0.4 → 0.0.0.5

data/Manifest

@@ -14,7 +14,6 @@ lib/yaml/query_builder.rb
 lib/yaml/query_builder/sql/mysql.rb
 lib/yaml/query_builder/sql/postgresql.rb
 lib/yaml_conditions.rb
-out.txt
 spec/ar_spec_helper.rb
 spec/cases/orms/active_record/version_2_delayed_job_spec.rb
 spec/cases/orms/active_record/version_2_spec.rb

data/README.rdoc

@@ -33,6 +33,10 @@ On this last sample, the city attribute will be used to filter the objects on me
 BTW: All methods ActiveRecord::Base#{last, first, all} rely on ActiveRecord::Base#find, so we can use yaml_conditions with these methods too. As an example:
 Company.all(:yaml_conditions => { :data => { :address => { :street => '5551 LEAOPARD ST' } } }) behaves the same way as the first sample explained below.
 
+  Company.find(:last, :yaml_conditions => { :data => { :last_name => 'Marcelo' }, :flat_check => true}))
+
+Also when you don't want to check the hierarchy (for best performance), you can use the option :flat_check => true. Using this, you will receive the records that have the proper key/value for the leafs of the Hash structure (and it's all handled by the database by a mix of SQL's LIKE statements).
+
 == delayed_job
 
 Just to give you a little background, I build this gem/plugin just to filter my YAML objects created via delayed_job plugin ;)

data/Rakefile

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

data/lib/orms/active_record/version_2.rb

@@ -12,16 +12,22 @@ module Orms
     def find_with_yaml_conditions(*args)
       options = args.last.is_a?(::Hash) ? args.last : {}
       yaml_conditions = options[:yaml_conditions]
+      flat_check = yaml_conditions.delete(:flat_check) unless yaml_conditions.nil?
       return find_without_yaml_conditions(*args) if yaml_conditions.blank?
       __include_db_adapter_if_necessary__ if @db_adapter_included.nil?
       __include_delayedjob_adapter_if_necessary__ if defined?(Delayed::Job) && self == Delayed::Job && @delayed_adapter_included.nil?
       options = args.extract_options!
       adapted_args = args << refactor_options(options)
       selector = adapted_args.shift
-      result = find_without_yaml_conditions(:all, *adapted_args).select do |o|
+      result = find_without_yaml_conditions(flat_check ? selector : :all, *adapted_args)
+      if flat_check.present?
+        result
+      else
+        result = result.select do |o|
           __check_yaml_nested_hierarchy__(o, __prepare_yaml_conditions__(yaml_conditions))
+        end
+        selector == :all ? result : result.send(selector.to_sym)
       end
-      selector == :all ? result : result.send(selector.to_sym)
     end
 
     def refactor_options(options)

data/lib/yaml/conditions.rb

@@ -2,7 +2,7 @@ module Yaml
   module Conditions
     extend self
 
-    VERSION = '0.0.0.4'
+    VERSION = '0.0.0.5'
   end
 
   class NotSerializedField

data/lib/yaml/query_builder.rb

@@ -167,7 +167,7 @@ module Yaml
     end
 
     def __filter_yaml_attributes_to_check_on__(yaml_conditions)
-      yaml_conditions.reject { |k,v| k.to_s == 'class' }
+      yaml_conditions.reject { |k,v| k.to_s == 'class' || k.to_s == 'flat_check' }
     end
 
     def __join_yaml_conditions__(current_conditions, conditions)

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

@@ -305,5 +305,68 @@ describe ::Orms::ActiveRecordVersion2 do
 
           it { should be_nil }
         end
+
+    context "More on using wildcards and nested structures" do
+
+        before do
+          user = User.create(:name => 'marcelo')
+          @some_nested_job = Delayed::Job.enqueue Delayed::PerformableMethod.new(NotificationMailer, :deliver_admin_login, [ User.find_by_name('marcelo'), { :some => { :nested => 'structure' }} ] )
+        end
+
+        subject { Delayed::Job.first(:yaml_conditions => @yaml_conditions) }
+
+        context 'test nested structure with proper conditions' do
+
+          before do
+            @yaml_conditions = { :class => Delayed::PerformableMethod, :args => [ '*', '*', { :some => { :nested => 'structure' } }] }
+          end
+
+          it { should == @some_nested_job }
+        end
+
+        context 'test nested structure with wrong method' do
+
+          before do
+            @yaml_conditions = { :class => Delayed::PerformableMethod, :args => [ '*', :deliver_admin_login, { :some => { :nested => 'structure' } }] }
+          end
+
+          it { should be_nil }
+        end
+
+        context 'test nested structure with wrong args' do
+          context 'bad string' do
+            before do
+              @yaml_conditions = { :class => Delayed::PerformableMethod, :args => [ '*', :deliver_admin_login, { :some => { :nested => 'bad_structure' } }] }
+            end
+
+            it { should be_nil }
+          end
+
+          context 'bad key' do
+            before do
+              @yaml_conditions = { :class => Delayed::PerformableMethod, :args => [ '*', :bad_symbol, { :some => { :bad_nested => 'structure' } }] }
+            end
+
+            it { should be_nil }
+          end
+
+          context 'wrong hierarchy' do
+            before do
+              @yaml_conditions = { :class => Delayed::PerformableMethod, :args => [ '*', :deliver_admin_login, { :nested => 'structure' } ] }
+            end
+
+            it { should be_nil }
+          end
+
+          context 'wrong hierarchy but with :flat_check set to true' do
+            before do
+              @yaml_conditions = { :class => Delayed::PerformableMethod, :args => [ '*', :deliver_admin_login, { :nested => 'structure' } ], :flat_check => true }
+            end
+
+            it { should == @some_nested_job }
+          end
+        end
+    end
+
     end
 end if defined?(Delayed::Job)

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

@@ -262,6 +262,14 @@ describe Orms::ActiveRecordVersion2 do
         it { should be_nil }
       end
 
+      context "yaml_conditions that match key/value, WRONG hierarchy BUT flat_check => true" do
+        before do
+          @yaml_conditions = { :data => { :class => 'Struct', :struct => { :handler => { :another_nested_object => { :class => 'User', :name => 'marcelo' } } } }, :flat_check => true }
+        end
+
+        it { should == @job }
+      end
+
       context "correct yaml_conditions but WRONG class name" do
         before do
           @yaml_conditions = { :data => { :class => 'WrongModel', :struct => { :handler => { :class => 'User', :name => 'marcelo' } } } }

data/yaml_conditions.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{yaml_conditions}
-  s.version = "0.0.0.4"
+  s.version = "0.0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcelo Giorgi"]
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.email = %q{marklazz.uy@gmail.com}
   s.executables = ["console.sh"]
   s.extra_rdoc_files = ["README.rdoc", "bin/console.sh", "lib/orms/active_record.rb", "lib/orms/active_record/version2/delayed_job.rb", "lib/orms/active_record/version_2.rb", "lib/orms/active_record/version_3.rb", "lib/orms/datamapper.rb", "lib/yaml/conditions.rb", "lib/yaml/query_builder.rb", "lib/yaml/query_builder/sql/mysql.rb", "lib/yaml/query_builder/sql/postgresql.rb", "lib/yaml_conditions.rb", "tasks/yaml_conditions.rake"]
-  s.files = ["Manifest", "README.rdoc", "Rakefile", "TESTS.rdoc", "bin/console.sh", "init.rb", "lib/orms/active_record.rb", "lib/orms/active_record/version2/delayed_job.rb", "lib/orms/active_record/version_2.rb", "lib/orms/active_record/version_3.rb", "lib/orms/datamapper.rb", "lib/yaml/conditions.rb", "lib/yaml/query_builder.rb", "lib/yaml/query_builder/sql/mysql.rb", "lib/yaml/query_builder/sql/postgresql.rb", "lib/yaml_conditions.rb", "out.txt", "spec/ar_spec_helper.rb", "spec/cases/orms/active_record/version_2_delayed_job_spec.rb", "spec/cases/orms/active_record/version_2_spec.rb", "spec/connections/mysql/connection.rb", "spec/connections/postgresql/connection.rb", "spec/datamapper_spec_helper.rb", "spec/models/job.rb", "spec/models/period.rb", "spec/models/priority.rb", "spec/models/support_classes.rb", "spec/models/user.rb", "spec/models/user_data.rb", "spec/schema.rb", "spec/spec_helper.rb", "tasks/yaml_conditions.rake", "yaml_conditions.gemspec"]
+  s.files = ["Manifest", "README.rdoc", "Rakefile", "TESTS.rdoc", "bin/console.sh", "init.rb", "lib/orms/active_record.rb", "lib/orms/active_record/version2/delayed_job.rb", "lib/orms/active_record/version_2.rb", "lib/orms/active_record/version_3.rb", "lib/orms/datamapper.rb", "lib/yaml/conditions.rb", "lib/yaml/query_builder.rb", "lib/yaml/query_builder/sql/mysql.rb", "lib/yaml/query_builder/sql/postgresql.rb", "lib/yaml_conditions.rb", "spec/ar_spec_helper.rb", "spec/cases/orms/active_record/version_2_delayed_job_spec.rb", "spec/cases/orms/active_record/version_2_spec.rb", "spec/connections/mysql/connection.rb", "spec/connections/postgresql/connection.rb", "spec/datamapper_spec_helper.rb", "spec/models/job.rb", "spec/models/period.rb", "spec/models/priority.rb", "spec/models/support_classes.rb", "spec/models/user.rb", "spec/models/user_data.rb", "spec/schema.rb", "spec/spec_helper.rb", "tasks/yaml_conditions.rake", "yaml_conditions.gemspec"]
   s.homepage = %q{http://github.com/marklazz/yaml_conditions}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Yaml_conditions", "--main", "README.rdoc"]
   s.require_paths = ["lib"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: yaml_conditions
 version: !ruby/object:Gem::Version 
-  hash: 71
+  hash: 69
   prerelease: false
   segments: 
   - 0
   - 0
   - 0
-  - 4
-  version: 0.0.0.4
+  - 5
+  version: 0.0.0.5
 platform: ruby
 authors: 
 - Marcelo Giorgi
@@ -70,7 +70,6 @@ files:
 - lib/yaml/query_builder/sql/mysql.rb
 - lib/yaml/query_builder/sql/postgresql.rb
 - lib/yaml_conditions.rb
-- out.txt
 - spec/ar_spec_helper.rb
 - spec/cases/orms/active_record/version_2_delayed_job_spec.rb
 - spec/cases/orms/active_record/version_2_spec.rb