native-query 0.9.3 → 0.9.4

data/Gemfile

@@ -7,8 +7,8 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "bundler", "~> 1.0.13"
-  gem "jeweler", "~> 1.6.0"
+  gem "bundler", ">= 1.0.13"
+  gem "jeweler2", ">= 2.0.0"
 end
 
 

data/Gemfile.lock

@@ -2,24 +2,23 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    fluent-query (0.9.2)
+    fluent-query (0.9.1)
       abstract (>= 1.0.0)
       hash-utils (>= 0.18.0)
       hashie (>= 1.0.0)
     git (1.2.5)
-    hash-utils (0.19.0)
-    hashie (1.1.0)
-    jeweler (1.6.4)
-      bundler (~> 1.0)
+    hash-utils (1.0.0)
+      ruby-version
+    hashie (1.2.0)
+    jeweler2 (2.0.9)
       git (>= 1.2.5)
-      rake
-    rake (0.9.2)
+    ruby-version (0.3.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.13)
+  bundler (>= 1.0.13)
   fluent-query (>= 0.9.1)
   hash-utils (>= 0.18.0)
-  jeweler (~> 1.6.0)
+  jeweler2 (>= 2.0.0)

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010 - 2011 Martin Kozák (martinkozak@martinkozak.net)
+Copyright (c) 2010 - 2012 Martin Kozák (martinkozak@martinkozak.net)
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -453,7 +453,7 @@ Contributing
 Copyright
 ---------
 
-Copyright © 2010-2011 [Martin Kozák][4]. See `LICENSE.txt` for
+Copyright © 2010-2012 [Martin Kozák][4]. See `LICENSE.txt` for
 further details.
 
 [1]: http://dibiphp.com/

data/Rakefile

@@ -12,14 +12,14 @@ rescue Bundler::BundlerError => e
 end
 
 require 'rake'
-require 'jeweler'
+require 'jeweler2'
 
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "native-query"
   gem.homepage = "http://github.com/martinkozak/native-query"
   gem.license = "MIT"
-  gem.summary = 'Cool way how to speak with database server. It\'s ellegant and very ruby SQL query helper which works by similar way as Arel or another ORM selecting logic. It\'s derived from Dibi database layer in its ideas, so is much more simple and (of sure) much more KISS, readable and straightforward.'
+  gem.summary = 'Cool way how to speak with database server. It\'s ellegant DSL; the SQL query helper which works by similar way as Arel or another ORM selecting logic. But it\'s derived from Dibi database layer in its ideas, so it\'s much more simple and (of sure) much more KISS, readable and straightforward.'
   gem.email = "martinkozak@martinkozak.net"
   gem.authors = ["Martin Kozák"]
   # Include your dependencies below. Runtime dependencies are required when using your gem,

data/VERSION

@@ -1 +1 @@
-0.9.3
+0.9.4

data/lib/native-query/join.rb

@@ -149,7 +149,7 @@ module NativeQuery
         #
         
         def backward(*args)
-            [:backward, args]
+            @direct = [:backward, args]
         end
            
         ##
@@ -215,10 +215,12 @@ module NativeQuery
         
         protected
         def _fix_where
-            NativeQuery::Query::fix_conditions(@where) do |args|
-                args.each do |i|
-                    __fix_field(i)
-                end
+            NativeQuery::Query::fix_conditions(@where) do |arg|
+                #p args
+                #args.each do |i|
+                #    __fix_field(i)
+                #end
+                __fix_field(arg)
             end
         end
         
@@ -281,12 +283,12 @@ module NativeQuery
         private
         def __direct
             
-            if (@direct.first == :backward) and (@direct.second.array?)
+            if @direct.array? and (@direct.first == :backward) and (@direct.second.array?)
                 backward = true
                 direct = @direct.second
             else
                 backward = false
-                direct = @direct
+                direct = [ ]
             end
             
             ##

data/lib/native-query/query.rb

@@ -383,10 +383,8 @@ module NativeQuery
         
         protected
         def _fix_where
-            Query::fix_conditions(@where) do |args|
-                args.each do |i|
-                    __fix_field(i)
-                end
+            Query::fix_conditions(@where) do |arg|
+                __fix_field(arg)
             end
         end
 
@@ -396,10 +394,10 @@ module NativeQuery
         
         protected
         def _fix_having
-            Query::fix_conditions(@having) do |args|
-                args.each do |i|
-                    __fix_field(i)
-                end
+            Query::fix_conditions(@having) do |arg|
+                #args.each do |i|
+                    __fix_field(arg)
+                #end
             end
         end
         
@@ -410,19 +408,34 @@ module NativeQuery
         
         def self.fix_conditions(where, &block)
             where.map do |specification|
-                if specification.hash?
-                    new = specification.map_keys do |k|
-                        if k.symbol?
-                            block.call(k)
-                        else
-                            k
-                        end
+              
+                if specification.array?
+                    _new = specification.map do |item|
+                        item.map_keys do |k|
+                            if k.symbol?
+                                block.call(k)
+                            else
+                                k
+                            end
+                        end 
                     end
                 else
-                    new = specification
+                    _new = specification
                 end
+              
+                #if specification.hash?
+                #    _new = specification.map_keys do |k|
+                #        if k.symbol?
+                #            block.call(k)
+                #        else
+                #            k
+                #        end
+                #    end
+                #else
+                #    _new = specification
+                #end
                 
-                new  # returns
+                _new  # returns
             end
         end
         

data/native-query.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "native-query"
-  s.version = "0.9.3"
+  s.version = "0.9.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Martin Koz\u{e1}k"]
-  s.date = "2011-09-07"
+  s.date = "2012-03-11"
   s.email = "martinkozak@martinkozak.net"
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -34,8 +34,8 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/martinkozak/native-query"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
-  s.summary = "Cool way how to speak with database server. It's ellegant and very ruby SQL query helper which works by similar way as Arel or another ORM selecting logic. It's derived from Dibi database layer in its ideas, so is much more simple and (of sure) much more KISS, readable and straightforward."
+  s.rubygems_version = "1.8.17"
+  s.summary = "Cool way how to speak with database server. It's ellegant DSL; the SQL query helper which works by similar way as Arel or another ORM selecting logic. But it's derived from Dibi database layer in its ideas, so it's much more simple and (of sure) much more KISS, readable and straightforward."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -43,19 +43,19 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<fluent-query>, [">= 0.9.1"])
       s.add_runtime_dependency(%q<hash-utils>, [">= 0.18.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.13"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.0"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.13"])
+      s.add_development_dependency(%q<jeweler2>, [">= 2.0.0"])
     else
       s.add_dependency(%q<fluent-query>, [">= 0.9.1"])
       s.add_dependency(%q<hash-utils>, [">= 0.18.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.13"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
+      s.add_dependency(%q<bundler>, [">= 1.0.13"])
+      s.add_dependency(%q<jeweler2>, [">= 2.0.0"])
     end
   else
     s.add_dependency(%q<fluent-query>, [">= 0.9.1"])
     s.add_dependency(%q<hash-utils>, [">= 0.18.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.13"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
+    s.add_dependency(%q<bundler>, [">= 1.0.13"])
+    s.add_dependency(%q<jeweler2>, [">= 2.0.0"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: native-query
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-07 00:00:00.000000000 Z
+date: 2012-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluent-query
-  requirement: &13959320 !ruby/object:Gem::Requirement
+  requirement: &13489740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.1
   type: :runtime
   prerelease: false
-  version_requirements: *13959320
+  version_requirements: *13489740
 - !ruby/object:Gem::Dependency
   name: hash-utils
-  requirement: &13956500 !ruby/object:Gem::Requirement
+  requirement: &13489220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,29 +32,29 @@ dependencies:
         version: 0.18.0
   type: :runtime
   prerelease: false
-  version_requirements: *13956500
+  version_requirements: *13489220
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &13955300 !ruby/object:Gem::Requirement
+  requirement: &13488340 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.13
   type: :development
   prerelease: false
-  version_requirements: *13955300
+  version_requirements: *13488340
 - !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &13954280 !ruby/object:Gem::Requirement
+  name: jeweler2
+  requirement: &13487220 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *13954280
+  version_requirements: *13487220
 description: 
 email: martinkozak@martinkozak.net
 executables: []
@@ -92,7 +92,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -655684086935263593
+      hash: -4245115407505943033
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -101,11 +101,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
-summary: Cool way how to speak with database server. It's ellegant and very ruby SQL
-  query helper which works by similar way as Arel or another ORM selecting logic.
-  It's derived from Dibi database layer in its ideas, so is much more simple and (of
+summary: Cool way how to speak with database server. It's ellegant DSL; the SQL query
+  helper which works by similar way as Arel or another ORM selecting logic. But it's
+  derived from Dibi database layer in its ideas, so it's much more simple and (of
   sure) much more KISS, readable and straightforward.
 test_files: []