interview 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e2d2216c636d036ba63292418a62839b715c0b4
-  data.tar.gz: 8d113b3b730417a9ab24b679f9831f8cb3716116
+  metadata.gz: 1f72fac32d421925cb9de553456f7d05725c4307
+  data.tar.gz: f1fdabaee5c509642c1b927fa8ac45d757d71415
 SHA512:
-  metadata.gz: 0206e158d51c3f65d05347b3fe351940aca9a5c76e34d8519aa482051c55a7a429159b9799fa72b45a2d7e592ceec543d188e5cf3248fd697e42c18b9f073727
-  data.tar.gz: 40f9876819b6c93f3cfe0a2a5c8a3cbabc280387920522f61bef535e703243f73e874e2550eb6193d222e4d9a5e45c454d1e557f865c3415618354097132ed32
+  metadata.gz: a2a38a6cafd9890b5cf2d4b4aae750c6b7c8207d7cbaec77a8bf71d6d7d9986f2a6dd3505bfcb8cf260a2c900970eff8308e71a6fbd435020c9bb36881ea44a3
+  data.tar.gz: 18de1347ac17165a494057db3c5ac79c03168508ba29fa1f7b69b3d9f89703f8bab73a18d1eec961415771a2a05c18a9b3e04f643b6e74e05d60edf3a26aec78

data/lib/interview/version.rb

@@ -1,3 +1,3 @@
 module Interview
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/interview.rb

@@ -89,9 +89,9 @@ module ActiveRecord
     # todo: auslagern in eigenes gem
     def self.filter(filter)
       relation = self
-      self.joins_for_filter(filter).each do |join_table|
-        relation = relation.joins(join_table)
-      end
+      # self.joins_for_filter(filter).each do |join_table|
+      #   relation = relation.joins(join_table)
+      # end
       return relation.where(*self.filter_to_sql(filter))
     end
 
@@ -104,8 +104,35 @@ module ActiveRecord
       end
       return join_tables.uniq
     end
-
+    
     def self.filter_to_sql(filter)
+      if filter.is_a? Hash # todo
+        result = hash_filter_to_sql(filter)
+      elsif filter.respond_to? :each
+        result = filter_combination_to_sql(filter)
+      end # todo: else
+      puts result.first
+      return result
+    end
+    
+    def self.filter_combination_to_sql(filter)
+      if [:and, :or].include? filter.first
+        combination = filter.first
+        filter = filter[1..-1]
+      end
+      combination ||= :or
+      sqls = []
+      values = []
+      filter.each do |f|
+        f = self.filter_to_sql(f)
+        sqls << f.first
+        values += f[1..-1]
+      end
+      sql = '(' + sqls.join(" #{combination.to_s.upcase} ") + ')'
+      return [sql] + values
+    end
+
+    def self.hash_filter_to_sql(filter)
       sqls = []
       values = []
       filter.each do |attr, filter|
@@ -133,7 +160,7 @@ module ActiveRecord
       return [sql] + values
     end
 
-    def self.string_filter_to_sql(attr, filter)
+    def self.string_filter_to_sql(attr, filter, not_filter=false)
       if filter.respond_to?(:each)
         sql = "#{attr} in (?)"
       else
@@ -141,22 +168,12 @@ module ActiveRecord
       end
       return [sql, filter]
     end
-
-    def self.number_filter_to_sql(attr, filter)
-      if filter.respond_to?(:each) and filter.none? { |f| f.is_a? String }
-        sql = "#{attr} in (?)"
-        values = [filter]
-      elsif filter.respond_to?(:each)
-        sqls = []
-        values = []
-        filter.each do |f|
-          result = self.number_filter_to_sql(attr, f)
-          sqls << result.first
-          values += results[1..-1]
-        end
-        sql = sqls.join(' OR ')
+    
+    def self.number_filter_to_sql(attr, filter, not_filter=false)
+      if filter.respond_to?(:each)
+        return self.value_combination_to_sql(attr, filter, :number)
       elsif filter.is_a? String
-        unless result = filter.match(/^([<>=]*)(\d+\.?\d*)$/)
+        unless result = filter.match(/^([!<>=]*)(\d+\.?\d*)$/)
           raise "invalid number filter: '#{filter}'"
         end
         operator = result[1] != '' ? result[1] : '='
@@ -170,7 +187,7 @@ module ActiveRecord
       return [sql] + values
     end
 
-    def self.date_filter_to_sql(attr, filter)
+    def self.date_filter_to_sql(attr, filter, not_filter=false)
       if filter.respond_to?(:each)
         if filter.size != 2
           raise "invalid date filter: #{filter.inspect} 2 elements expected, #{filter.size} given"
@@ -184,18 +201,41 @@ module ActiveRecord
       return [sql] + values
     end
 
-    def self.boolean_filter_to_sql(attr, filter)
+    def self.boolean_filter_to_sql(attr, filter, not_filter=false)
       return ["#{attr} = ?", filter]
     end
-
-    def self.assoc_filter_to_sql(attr, filter)
+    
+    def self.assoc_filter_to_sql(attr, filter, not_filter=false)
+      if filter.respond_to?(:each)
+        return self.value_combination_to_sql(attr, filter, :assoc)
+      end
       assoc = self.reflect_on_association(attr)
-      if assoc.macro == :belongs_to
-        attr = "#{attr}_id"
-      else
-        attr = "#{assoc.plural_name}.id" # todo
+      if assoc.macro == :has_and_belongs_to_many
+        number_filter = self.number_filter_to_sql(assoc.association_foreign_key, filter)
+        values = number_filter[1..-1]
+        sql = "id #{ not_filter ? 'NOT ' : ''}IN (SELECT #{assoc.foreign_key} FROM #{assoc.join_table} WHERE #{number_filter.first})"
+      end # todo: erweitern
+      return [sql] + values
+    end
+    
+    def self.value_combination_to_sql(attr, filter, filter_type)
+      # todo: check if set is possible
+      if filter.first == :not
+        return self.send("#{filter_type}_filter_to_sql", attr, filter[1], true)
+      elsif [:and, :or].include? filter.first
+        combination = filter.first
+        filter = filter[1..-1]
       end
-      return self.number_filter_to_sql(attr, filter)
+      combination ||= :or
+      sqls = []
+      values = []
+      filter.each do |f|
+        f = self.send("#{filter_type}_filter_to_sql", attr, f)
+        sqls << f.first
+        values += f[1..-1]
+      end
+      sql = '(' + sqls.join(" #{combination.to_s.upcase} ") + ')'
+      return [sql] + values
     end
     
     def self.human_name(options={})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: interview
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Jannes Köhler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler