fluent-query 0.9.1 → 0.9.3

data/Gemfile

@@ -3,13 +3,12 @@ source "http://rubygems.org"
 # Example:
    gem "hash-utils", ">= 0.18.0"
    gem "abstract", ">= 1.0.0"
-   gem "hashie", ">= 1.0.0"
 
 # 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

@@ -3,20 +3,17 @@ GEM
   specs:
     abstract (1.0.0)
     git (1.2.5)
-    hash-utils (0.18.0)
-    hashie (1.0.0)
-    jeweler (1.6.3)
-      bundler (~> 1.0)
+    hash-utils (2.0.0)
+      ruby-version
+    jeweler2 (2.0.9)
       git (>= 1.2.5)
-      rake
-    rake (0.9.2)
+    ruby-version (0.3.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   abstract (>= 1.0.0)
-  bundler (~> 1.0.13)
+  bundler (>= 1.0.13)
   hash-utils (>= 0.18.0)
-  hashie (>= 1.0.0)
-  jeweler (~> 1.6.0)
+  jeweler2 (>= 2.0.0)

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2009 - 2011 Martin Kozák (martinkozak@martinkozak.net)
+Copyright (c) 2009 - 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

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

data/Rakefile

@@ -11,7 +11,7 @@ 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

data/VERSION

@@ -1 +1 @@
-0.9.1
+0.9.3

data/fluent-query.gemspec

@@ -4,13 +4,13 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{fluent-query}
-  s.version = "0.9.1"
+  s.name = "fluent-query"
+  s.version = "0.9.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Martin Kozák}]
-  s.date = %q{2011-07-14}
-  s.email = %q{martinkozak@martinkozak.net}
+  s.authors = ["Martin Koz\u{e1}k"]
+  s.date = "2012-05-30"
+  s.email = "martinkozak@martinkozak.net"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -42,11 +42,11 @@ Gem::Specification.new do |s|
     "lib/fluent-query/token.rb",
     "lib/fluent-query/tokens/raw.rb"
   ]
-  s.homepage = %q{http://github.com/martinkozak/fluent-query}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.5}
-  s.summary = %q{Cool way how to write SQL queries and general way how to convert series of method calls to string query in an universal and system independent manner. This gem contains base libraries only. SQL implementation is available standalone.}
+  s.homepage = "http://github.com/martinkozak/fluent-query"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.24"
+  s.summary = "Cool way how to write SQL queries and general way how to convert series of method calls to string query in an universal and system independent manner. This gem contains base libraries only. SQL implementation is available standalone."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -54,22 +54,19 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<hash-utils>, [">= 0.18.0"])
       s.add_runtime_dependency(%q<abstract>, [">= 1.0.0"])
-      s.add_runtime_dependency(%q<hashie>, [">= 1.0.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<hash-utils>, [">= 0.18.0"])
       s.add_dependency(%q<abstract>, [">= 1.0.0"])
-      s.add_dependency(%q<hashie>, [">= 1.0.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<hash-utils>, [">= 0.18.0"])
     s.add_dependency(%q<abstract>, [">= 1.0.0"])
-    s.add_dependency(%q<hashie>, [">= 1.0.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
 

data/lib/fluent-query/compiler.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
-require "date"
-require "fluent-query/query"
 require "fluent-query/compilers/result"
+require "fluent-query/query"
 require "hash-utils/array"  # >= 0.17.0
+require "date"
 
 module FluentQuery
 

data/lib/fluent-query/connection.rb

@@ -1,4 +1,6 @@
 # encoding: utf-8
+
+require "hash-utils/symbol"
 require "fluent-query/result"
 require "fluent-query/driver"
 require "fluent-query/exception"
@@ -268,7 +270,7 @@ module FluentQuery
 
 
         #####
-
+=begin
         ##
         # Handles built-in shortcut.
         #
@@ -283,7 +285,7 @@ module FluentQuery
 
             return result
         end
-
+=end
         ##
         # Performs query initiating call.
         #
@@ -295,7 +297,7 @@ module FluentQuery
             # Executes query conditionally. If query isn't suitable for
             # executing, sends the symbol to it and returns call result.
 
-            query.send(sym, *args)
+            query = query.send(sym, *args)
             
             # Calls given block in query context.
             

data/lib/fluent-query/data.rb

@@ -1,6 +1,4 @@
 # encoding: utf-8
-require "hash-utils/string"
-require "hashie/mash"
 
 module FluentQuery
 
@@ -11,7 +9,46 @@ module FluentQuery
      # access its fields by "object way".
      #
      
-     class Data < ::Hashie::Mash
+     class Data
+     
+        ##
+        # Contained data hash.
+        #
+        
+        @data
+     
+        ## 
+        # Constructor.
+        #
+        
+        def initialize(data)
+            @data = data
+        end
+     
+        ##
+        # Maps missing calls to data elements.
+        #
+        
+        def method_missing(name, *args)
+            @data[name]
+        end
+        
+        ##
+        # Maps array access to underlying data object.
+        #
+        
+        def [](key)
+            @data[key.to_sym]
+        end
+        
+        ##
+        # Converts data to hash.
+        #
+        
+        def to_hash
+            @data.to_hash.dup
+        end
+        
      end
      
 end

data/lib/fluent-query/driver.rb

@@ -273,6 +273,29 @@ module FluentQuery
         def prepare(query)
             not_implemented
         end
+                    
+        ##
+        # Checks query conditionally. It's called after first token
+        # of the query.
+        #
+        # @since 0.9.2
+        #
+        
+        public
+        def check_conditionally(query, sym, *args, &block)
+        end
+
+        ##
+        # Corrects token before it's pushed to the token. So allows to
+        # modify data assigned to the query from driver level.
+        #
+        # @since 0.9.2
+        #
+        
+        public
+        def correct_token(name, args)
+            return [name, args]
+        end
 
      end
 end

data/lib/fluent-query/queries/prepared.rb

@@ -5,7 +5,7 @@ module FluentQuery
     module Queries
     
          ##
-         # Compiled query.
+         # Prepared query.
          #
          
          class Prepared < FluentQuery::Queries::Abstract

data/lib/fluent-query/queries/processor.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
-require "date"
 require "hash-utils/string"
+require "hash-utils/object"
+require "date"
 
 require "fluent-query/query"
 require "fluent-query/compiler"
@@ -120,12 +121,9 @@ module FluentQuery
 
             public
             def process_array(array, glue = ",")
-                result = [ ]
-                
-                array.each do |item|
-                    result << self.quote_value(item)
+                result = array.map do |i| 
+                    self.quote_value(i)
                 end
-
                 return result.join(glue + " ")
             end
 
@@ -232,9 +230,12 @@ module FluentQuery
             ##
             # Processed strings with format definitions and data specifications.
             #
-            # Mode can be :compile, :build or :finish. Compiling means building the 
-            # query without expanding the formatting directives. Finishing means
-            # building the prepared query.
+            # Mode can be +:compile+, +:build+, +:prepare+ or +:finish+. 
+            # Compiling means building the query without expanding the 
+            # formatting directives. Finishing means building the 
+            # compiled query. Building means both of them. Preparing is 
+            # basically the same as compiling, but modifies behaviour 
+            # of some tokens such as +INSERT+.
             #
 
             public
@@ -258,14 +259,14 @@ module FluentQuery
                         #  finding expression directive processing. In each call increases
                         #  sequence position counter so moves forward.
 
-                        if mode != :finish
+                        if mode.in? [:compile, :build, :prepare]
                             item.gsub!(self.replacer) do |directive| 
                                 directive.strip!
                                 self.process_directive(directive, nil, replacer_settings)
                             end
                         end
                         
-                        if mode != :compile
+                        if mode.in? [:finish, :build]
                             item.gsub!(self.expander) do |directive| 
                                 self.process_directive(directive, sequence[i += 1], expander_settings) 
                             end
@@ -300,7 +301,7 @@ module FluentQuery
                     result = directive.gsub(self.class::COLUMN_DIRECTIVE_SIMPLE) { |value| self.quote_identifier(value[1..-2]) }
                 elsif (replacements & self.class::STRING_REPLACEMENT > 0) and (directive[-1].ord == 34)           # "\"", String directive
                     result = directive.gsub('"', @driver.quote_string("").last)
-                elsif (replacements & self.class::FORMATTING_REPLACEMENT > 0) and (directive[0..1].to_sym == :"%%")   # Formatting directive
+                elsif (replacements & self.class::FORMATTING_REPLACEMENT > 0) and (directive[0..1] == "%%")   # Formatting directive
                     result = directive.gsub(self.class::FORMATTING_DIRECTIVE_SIMPLE) { |value| self.process_formatting(value[2..-1], argument) }
                 else
                     result = directive

data/lib/fluent-query/query.rb

@@ -36,17 +36,18 @@ module FluentQuery
 
         public
         def method_missing(sym, *args, &block)
-            
-            self.push_token(sym, args)
             driver = @connection.driver
-            conditionally = driver.execute_conditionally(self, sym, *args, &block)
-
+            _sym, args = driver.correct_token(sym, args)
+# p [sym, args]
+            self.push_token(_sym, args)
+            conditionally = driver.check_conditionally(self, sym, *args, &block)
+            
             if not conditionally.nil?
                 result = conditionally
             else
                 result = self
             end
-            
+           
             return result
         end
 

metadata

@@ -1,82 +1,88 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: fluent-query
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.9.3
   prerelease: 
-  version: 0.9.1
 platform: ruby
-authors: 
-- "Martin Koz\xC3\xA1k"
+authors:
+- Martin Kozák
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-14 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: hash-utils
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.18.0
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.18.0
+- !ruby/object:Gem::Dependency
   name: abstract
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: hashie
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.13
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.6.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.13
+- !ruby/object:Gem::Dependency
+  name: jeweler2
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *id005
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 description: 
 email: martinkozak@martinkozak.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.md
-files: 
+files:
 - .document
 - Gemfile
 - Gemfile.lock
@@ -103,34 +109,33 @@ files:
 - lib/fluent-query/token.rb
 - lib/fluent-query/tokens/raw.rb
 homepage: http://github.com/martinkozak/fluent-query
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 1837985845976862931
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 3034922038781819026
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Cool way how to write SQL queries and general way how to convert series of method calls to string query in an universal and system independent manner. This gem contains base libraries only. SQL implementation is available standalone.
+summary: Cool way how to write SQL queries and general way how to convert series of
+  method calls to string query in an universal and system independent manner. This
+  gem contains base libraries only. SQL implementation is available standalone.
 test_files: []
-