tune_my_query 0.1.1 → 0.2.0

data/.rspec

@@ -0,0 +1 @@
+--color

data/Gemfile

@@ -0,0 +1,6 @@
+source "http://rubygems.org"
+
+gem "rails",        "3.0.3"
+gem "rspec",        "2.4.0"
+gem "mysql",        "2.8.1"
+gem "pg",  "0.10.1"

data/Gemfile.lock

@@ -0,0 +1,85 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.3)
+      actionpack (= 3.0.3)
+      mail (~> 2.2.9)
+    actionpack (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.6)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.3)
+      activesupport (= 3.0.3)
+      builder (~> 2.1.2)
+      i18n (~> 0.4)
+    activerecord (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+    activesupport (3.0.3)
+    arel (2.0.7)
+    builder (2.1.2)
+    diff-lcs (1.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    i18n (0.5.0)
+    mail (2.2.14)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    mysql (2.8.1)
+    pg (0.10.1)
+    polyglot (0.3.1)
+    rack (1.2.1)
+    rack-mount (0.6.13)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.3)
+      actionmailer (= 3.0.3)
+      actionpack (= 3.0.3)
+      activerecord (= 3.0.3)
+      activeresource (= 3.0.3)
+      activesupport (= 3.0.3)
+      bundler (~> 1.0)
+      railties (= 3.0.3)
+    railties (3.0.3)
+      actionpack (= 3.0.3)
+      activesupport (= 3.0.3)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
+    rake (0.8.7)
+    rspec (2.4.0)
+      rspec-core (~> 2.4.0)
+      rspec-expectations (~> 2.4.0)
+      rspec-mocks (~> 2.4.0)
+    rspec-core (2.4.0)
+    rspec-expectations (2.4.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.4.0)
+    thor (0.14.6)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.24)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  mysql (= 2.8.1)
+  pg (= 0.10.1)
+  rails (= 3.0.3)
+  rspec (= 2.4.0)

data/HISTORY

@@ -0,0 +1,7 @@
+21 January 2011
+----------------
+
+* Upgraded to Rails3
+* Upgraded to Bundler
+* Bumped version from 0.1.1 -> 0.2.0
+

data/README.markdown

@@ -36,9 +36,9 @@ Specs
 -----
 In order to run the specs you should have mysql and postgresql installed. [Here's](http://developer.apple.com/internet/opensource/postgres.html) how to install PostgreSql on a Mac. And, just do:
 
-    sudo gem install postgres-pr
+    sudo gem install pg
 
-to install postgreSql adapter. 
+to install postgreSql adapter or you can use bundler and install project dependencies with it.
 
 
 Bugs
@@ -55,4 +55,4 @@ Authors
 
 Roadmap
 -------
-* To make it work for any database extension. At the moment it would only work for PostgreSql specific SQL extensions.
+* To make it work for any database extension. At the moment it would only work for PostgreSql specific SQL extensions.

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/tune_my_query.rb

@@ -1,6 +1,7 @@
 $: << File.join(File.dirname(__FILE__), "..", "lib")
 
 require "tune_my_query/tune_my_query"
+
 Dir.glob("#{File.dirname(__FILE__)}/tune_my_query/commands/*.*").each{|file| require file}
 
-ActiveRecord::Base.send(:include, TuneMyQuery)
+ActiveRecord::Base.send(:include, TuneMyQuery)

data/lib/tune_my_query/commands/LikeCommand.rb

@@ -8,8 +8,8 @@ class LikeCommand
       if condition.is_a?(Array)
         condition.each { |c| execute(c) } # Calling itself on each element if the supplied parameter is an Array
       elsif condition.is_a?(String)
-        condition.gsub!(/ ilike /i, " like ") if condition.is_a?(String)          
-      end      
-    end    
+        condition.gsub!(/ ilike /i, " like ") if condition.is_a?(String)
+      end
+    end
   end
-end
+end

data/lib/tune_my_query/tune_my_query.rb

@@ -1,51 +1,51 @@
 module TuneMyQuery
-  
+
   # Hook invoked in include
   def self.included(base)
     base.class_eval do
       extend ClassMethods
       class << self
-        alias_method :super_merge_conditions, :merge_conditions
-        alias_method :merge_conditions, :standardise_sql
+        alias_method :super_where, :where
+        alias_method :where, :standardise_sql
       end
     end
   end
-  
+
   #                                                                                                   #
   # Adds tune_my_query method to ActiveRecord and its subclasses.                                     #
   #                                                                                                   #
-  # USAGE:                                                                                            #    
+  # USAGE:                                                                                            #
   #      tune_my_query :like                                                                          #
   #                                                                                                   #
   # 'like' signifies the command to be invoked.                                                       #
   # It also makes it apparent that an extension to LIKE needs to be standardise. Works only for       #
   # PostgreSQL specfific extensions. If MySql were to add its own extension to the standard SQL then  #
-  # this gem would cease to work.                                                                     #  
+  # this gem would cease to work.                                                                     #
   #                                                                                                   #
-  # METHODS:                                                                                          # 
+  # METHODS:                                                                                          #
   #                                                                                                   #
   # tune_my_query - Adds the command_type to to an instance variable namely, @command_type            #
   #                                                                                                   #
   # standardise_sql - Checks if PostgreSQLAdapter is used only then runs the conditions through the   #
   #                   Command. if not leaves the conditions untouched                                 #
   #                                                                                                   #
-  #                                                                                                   #  
-  module ClassMethods    
+  #                                                                                                   #
+  module ClassMethods
     def tune_my_query(command_type)
-       @command_type = command_type      
+       @command_type = command_type
     end
-    
+
     def standardise_sql(*conditions)
       if @command_type
         conditions = conditions.dup
         @adapter = connection && !connection.class.to_s.include?("PostgreSQLAdapter")
         command = "#{@command_type.to_s.camelize}Command".constantize
-        if @adapter      
+        if @adapter
           conditions.each { |condition| command.execute(condition) }
         end
       end
-      super_merge_conditions(*conditions)
-    end    
+      super_where(*conditions)
+    end
   end
-  
-end
+
+end

data/spec/database.yml

@@ -1,12 +1,12 @@
 mysql:
    :adapter:  mysql
-   :database: tune_my_query  
+   :database: tune_my_query
    :username: root
    :hostname: localhost
-      
+
 postgres:
    :adapter:  postgresql
    :database: tune_my_query
    :username: postgres
-   :password: postgres        
-   :hostname: localhost
+   :password: postgres
+   :hostname: localhost

data/spec/lib/tune_my_query_spec.rb

@@ -1,7 +1,7 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'spec_helper'
 
 describe "TuneMyQuery" do
-  
+
   shared_examples_for "a class that responds to tune_my_query method" do
     it "should respond to method tune_my_query" do
       Auberdine.should respond_to(:tune_my_query)
@@ -10,48 +10,45 @@ describe "TuneMyQuery" do
 
   shared_examples_for "" do
   end
-  
+
   context "When connected to MySql" do
-    before do    
+    before do
       connect('mysql')
     end
-    
+
     it_should_behave_like "a class that responds to tune_my_query method"
-    
+
     context "for LIKE SQL command" do
       it "should convert from postgresql specific to standard SQL" do
-        Auberdine.merge_conditions(["name = 'joe'"], ["address ilike 'main'"]).
-                      should be_eql("(name = 'joe') AND (address like 'main')")
+        Auberdine.where("name = 'joe' AND description ilike 'main'").to_sql.should include %{name = 'joe' AND description like 'main'}
       end
-      
+
       it "should ensure that other model objects work normally" do
-        Exodar.merge_conditions(["name = 'joe'"]).should be_eql("(name = 'joe')")
+        Exodar.where("name = 'joe'").to_sql.should include %{name = 'joe'}
       end
-      
+
     end
-              
+
   end
-  
-  
+
   context "When connected to PostgreSql" do
-    before do    
+    before do
       connect('postgres')
     end
-    
-    it_should_behave_like "a class that responds to tune_my_query method"
-    
+
+    #it_should_behave_like "a class that responds to tune_my_query method"
+
     context "for LIKE SQL command" do
       it "should not convert from postgresql specific to standard SQL" do
-        Auberdine.merge_conditions(["name = 'joe'"], ["address ilike 'main'"]).
-                      should be_eql("(name = 'joe') AND (address ilike 'main')")
+        Auberdine.where("name = 'joe' AND description ilike 'main'").to_sql.should include %{name = 'joe' AND description ilike 'main'}
       end
-      
+
       it "should ensure that other model objects work normally" do
-        Exodar.merge_conditions(["name = 'joe'"]).should be_eql("(name = 'joe')")
+        Exodar.where("name = 'joe'").to_sql.should include %{name = 'joe'}
       end
-            
+
     end
-              
+
   end
-  
-end
+
+end

data/spec/models.rb

@@ -3,4 +3,4 @@ class Auberdine < ActiveRecord::Base
 end
 
 class Exodar < ActiveRecord::Base
-end  
+end

data/spec/spec_helper.rb

@@ -1,8 +1,11 @@
-%w(activerecord active_support yaml spec).each{|path| require path }
+#%w(activerecord active_support yaml spec).each{|path| require path }
 
-require File.join(File.dirname(__FILE__), "..", "lib", "tune_my_query")
+require "bundler"
+Bundler.setup
 
-%w(models).each{|path| require File.join(File.dirname(__FILE__), path) }
+require 'active_record'
+require File.expand_path('../../lib/tune_my_query', __FILE__)
+require File.expand_path('../models', __FILE__)
 
 def connect(adapter)
   fix_quote_ident_postgres_error if adapter == "postgres"
@@ -12,6 +15,6 @@ def connect(adapter)
 end
 
 def fix_quote_ident_postgres_error
-  require "postgres"
+  require "pg"
   def PGconn.quote_ident(name); %("#{name}") end
-end
+end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: tune_my_query
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Anuj Dutta
@@ -9,10 +14,69 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-16 00:00:00 +05:30
+date: 2011-01-21 00:00:00 +00:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rails
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 3
+        version: 3.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 4
+        - 0
+        version: 2.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: mysql
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 8
+        - 1
+        version: 2.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: pg
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 10
+        - 1
+        version: 0.10.1
+  type: :runtime
+  prerelease: false
+  version_requirements: *id004
 description: Switches between standard SQL and extended SQL syntax depending on the adapter.
 email: anuj@andhapp.com
 executables: []
@@ -23,6 +87,9 @@ extra_rdoc_files:
 - LICENSE
 - README.markdown
 files: 
+- .rspec
+- Gemfile
+- Gemfile.lock
 - HISTORY
 - LICENSE
 - README.markdown
@@ -33,6 +100,7 @@ files:
 - lib/tune_my_query/commands/LikeCommand.rb
 - lib/tune_my_query/tune_my_query.rb
 - pkg/tune_my_query-0.1.0.gem
+- pkg/tune_my_query-0.1.1.gem
 - spec/database.yml
 - spec/lib/tune_my_query_spec.rb
 - spec/models.rb
@@ -44,26 +112,30 @@ homepage: http://github.com/andhapp/tune_my_query
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Standardises SQL syntax across databases.