where_lower 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb05183f08ea309e144cdbcffaf26008e4dc7f45
-  data.tar.gz: 30367bed82e96ea4d079b9806b027a8f2bf031b1
+  metadata.gz: f84a4041a532127bb4bb9117fc11ecda4992f7ff
+  data.tar.gz: 51596a49ea5ee3f71eb6e375bc26562d90a4bf8a
 SHA512:
-  metadata.gz: b1f7bc135acc5a1a4833dfd510f0ac870cdc4b84fa63400fc000df6c7a462e08110574bbc7f159e358c1771fa9b00dea0d4eb35e6c788fafc77ef544370bbe50
-  data.tar.gz: 8f0ce99c9dd7ccb2ef814b9f000aeb31105a4f78f1ea51a6d7e9ee2fb1b015461dd5e23cdea63db23e9101fdf586681f192e0810bd4c63009ed333b051b1a9de
+  metadata.gz: 9bdd4d235dfa5ff8e92b2e59877c6a1cafd7f29d1fa50d6dced92e72aceab149a0f55b5d24058992e4adf38ff65f98bd9ea6289d783d391ad3dacb3faee4fa3e
+  data.tar.gz: 077019dc9f7008c13fab4cc2975e259fbcb2d17eb5f3d56dfcc744e0bf065b4705c38d6c333d91c8ba505b2b8038001a0b43515c3207f3577a816730a110279a

data/.gitignore

@@ -1,2 +1,5 @@
 gemfiles/*.gemfile.lock
 Gemfile.lock
+# Ignore Coverage Report
+coverage/.last_run.json
+coverage/.resultset.json

data/Appraisals

@@ -5,11 +5,11 @@ appraise "rails3-1" do
 end
 
 appraise "rails3-2" do
-  version = "3.2.13"
+  version = "3.2.14"
   gem 'activerecord', version
 end
 
 appraise "rails4-0" do
-  version = "4.0.0.beta1"
+  version = "4.0.0"
   gem 'activerecord', version
 end

data/Gemfile

@@ -2,8 +2,10 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'activerecord'
+gem 'squeel'
 gem 'appraisal'
 gem 'rake'
 gem 'sqlite3'
 gem 'rspec'
-gem 'database_cleaner', '>= 1.0.0.RC1' # Need RC1 for Rails 4 support
+gem 'database_cleaner'
+gem 'coveralls', require: false

data/README.md

@@ -10,6 +10,10 @@ Tested against:
 - Ruby `1.9.2`, `1.9.3`, `2.0.0` (except Rails 4 with `1.9.2`)
 
 [![Build Status](https://travis-ci.org/PikachuEXE/where_lower.png?branch=master)](https://travis-ci.org/PikachuEXE/where_lower)
+[![Gem Version](https://badge.fury.io/rb/where_lower.png)](http://badge.fury.io/rb/where_lower)
+[![Dependency Status](https://gemnasium.com/PikachuEXE/where_lower.png)](https://gemnasium.com/PikachuEXE/where_lower)
+[![Coverage Status](https://coveralls.io/repos/PikachuEXE/where_lower/badge.png)](https://coveralls.io/r/PikachuEXE/where_lower)
+[![Code Climate](https://codeclimate.com/github/PikachuEXE/where_lower.png)](https://codeclimate.com/github/PikachuEXE/where_lower)
 
 Install
 =======

data/gemfiles/rails3_1.gemfile

@@ -2,11 +2,13 @@
 
 source "https://rubygems.org"
 
+gem "squeel"
 gem "appraisal"
 gem "rake"
 gem "sqlite3"
 gem "rspec"
-gem "database_cleaner", ">= 1.0.0.RC1"
+gem "database_cleaner"
+gem "coveralls", :require=>false
 gem "activerecord", "3.1.12"
 
 gemspec :path=>"../"

data/gemfiles/rails3_2.gemfile

@@ -2,11 +2,13 @@
 
 source "https://rubygems.org"
 
+gem "squeel"
 gem "appraisal"
 gem "rake"
 gem "sqlite3"
 gem "rspec"
-gem "database_cleaner", ">= 1.0.0.RC1"
-gem "activerecord", "3.2.13"
+gem "database_cleaner"
+gem "coveralls", :require=>false
+gem "activerecord", "3.2.14"
 
 gemspec :path=>"../"

data/gemfiles/rails4_0.gemfile

@@ -2,11 +2,13 @@
 
 source "https://rubygems.org"
 
+gem "squeel"
 gem "appraisal"
 gem "rake"
 gem "sqlite3"
 gem "rspec"
-gem "database_cleaner", ">= 1.0.0.RC1"
-gem "activerecord", "4.0.0.beta1"
+gem "database_cleaner"
+gem "coveralls", :require=>false
+gem "activerecord", "4.0.0"
 
 gemspec :path=>"../"

data/lib/where_lower/core.rb

@@ -8,34 +8,55 @@ module WhereLower
       def where_lower(fields)
         fields.is_a?(Hash) or raise AugumentError, 'fields is not a Hash'
 
+        spawn_lower_scope(fields)
+      end
+
+      private
+
+      def spawn_lower_scope(fields)
         scope = self
-        table = self.arel_table
-
-        fields.each do |field_name, value|
-          case value
-          when Range
-            value = Range.new(value.begin.to_s.downcase, value.end.to_s.downcase, value.exclude_end?)
-            scope = scope.where(
-              table[field_name].lower.in(value)
-            )
-          when Array # Assume the content to be string, or can be converted to string
-            value = value.to_a.map {|x| x.to_s.downcase}
-            scope = scope.where(
-              table[field_name].lower.in(value)
-            )
-          when String
-            scope = scope.where(
-              table[field_name].lower.eq(table.lower(value))
-            )
-          else # other single value classes
-            scope = scope.where(
-              table[field_name].eq(value)
-            )
-          end
+
+        fields.each do |name, value|
+          scope = spawn_lower_scope_by_type(scope, name, value)
         end
 
         scope
       end
+
+      def spawn_lower_scope_by_type(scope, column_name, value)
+        case value
+        when Range
+          value = Range.new(value.begin.to_s.downcase, value.end.to_s.downcase, value.exclude_end?)
+          scope = scope.where(
+            lower_query_string(column_name, :in), value
+          )
+        when Array # Assume the content to be string, or can be converted to string
+          value = value.to_a.map {|x| x.to_s.downcase}
+          scope = scope.where(
+            lower_query_string(column_name, :in), value
+          )
+        when String
+          value = value.downcase
+          scope = scope.where(
+            lower_query_string(column_name), value
+          )
+        else # other single value classes
+          scope = scope.where(column_name => value)
+        end 
+
+        scope
+      end
+
+      # @param column_name [String/Symbol] name of column
+      # @param type [Symbol] :in or :eq
+      def lower_query_string(column_name, type = :eq)
+        case type
+        when :in
+          "lower(#{column_name}) IN (?)"
+        else #:eq
+          "lower(#{column_name}) = ?"
+        end
+      end
     end
   end
 end

data/lib/where_lower/version.rb

@@ -1,3 +1,3 @@
 module WhereLower
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/spec/spec_helper.rb

@@ -1,5 +1,11 @@
+require 'coveralls'
+Coveralls.wear!('rails')
+
 require 'active_record'
 require 'where_lower'
+
+require 'squeel'
+
 require 'database_cleaner'
 require 'logger'
 
@@ -58,6 +64,8 @@ end
 
 class Parent < ActiveRecord::Base
   has_many :children, inverse_of: :parent
+
+  scope :latest_first, proc { order('created_at DESC') }
 end
 
 class Child < ActiveRecord::Base

data/spec/where_lower_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe WhereLower do
 
-  let(:parent_name) { 'Parent #1' }
+  let(:parent_name) { 'Parent' }
   let(:parent_name2) { 'Parent #10' }
   let(:parent_name3) { 'Parent #20' }
   let(:parent_description) { 'I need a Medic!' }
@@ -73,10 +73,12 @@ describe WhereLower do
           it 'works like where' do
             Parent.where_lower(name: [parent_name, parent_name2]).should_not be_empty
             Parent.where_lower(name: [parent_name2, parent_name3]).should be_empty
+            Parent.where_lower(name: []).should be_empty
           end
           it 'works like where case insensitively' do
             Parent.where_lower(name: [parent_name.swapcase, parent_name2.swapcase]).should_not be_empty
             Parent.where_lower(name: [parent_name2.swapcase, parent_name3.swapcase]).should be_empty
+            Parent.where_lower(name: []).should be_empty
           end
         end
 
@@ -112,6 +114,36 @@ describe WhereLower do
             end.to_not change(Parent, :count)
           end
         end
+
+
+        describe 'with chaining' do
+          it 'can be chained with where' do
+            Parent.where_lower(name: parent_name).where(description: parent_description).should_not be_empty
+          end
+          
+          it 'can be chained with where_lower' do
+            Parent.where_lower(name: parent_name).where_lower(description: parent_description).should_not be_empty
+          end
+
+          it 'can be chained with order' do
+            Parent.where_lower(name: parent_name).order(:description).should_not be_empty
+          end
+
+
+          it 'can be chained with name scope' do
+            Parent.where_lower(name: parent_name).latest_first.should_not be_empty
+          end
+
+
+          it 'can be chained with where in squeel' do
+            description_value = parent_description
+            Parent.where_lower(name: parent_name).where{description.eq description_value}.should_not be_empty
+          end
+
+          it 'can be chained with order in squeel' do
+            Parent.where_lower(name: parent_name).order{description}.should_not be_empty
+          end
+        end
       end
     end
 

data/where_lower.gemspec

@@ -28,7 +28,8 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'appraisal'
+  s.add_development_dependency 'squeel'
   s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'rspec'
-  s.add_development_dependency 'database_cleaner', '>= 1.0.0.RC1'
+  s.add_development_dependency 'database_cleaner'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: where_lower
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - PikachuEXE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-12 00:00:00.000000000 Z
+date: 2013-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -58,6 +58,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: squeel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +106,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.RC1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.RC1
+        version: '0'
 description: ActiveRecord provides no method for case insensitive version of `where`
   method. So here is one. No longer need to use SQL fragment yeah!
 email:
@@ -144,10 +158,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: Provide an easy way to use case insensitive `where` in ActiveRecord.
 test_files:
 - spec/spec_helper.rb
 - spec/where_lower_spec.rb
+has_rdoc: