sexy_scopes 0.6.0 → 0.7.0

data/lib/sexy_scopes/arel/math.rb

@@ -0,0 +1,28 @@
+module SexyScopes
+  module Arel
+    module Math
+      include Typecasting if SexyScopes.arel_6?
+      
+      def *(other)
+        SexyScopes.extend_expression(super)
+      end
+      
+      def +(other)
+        SexyScopes.extend_expression(super)
+      end
+      
+      def -(other)
+        SexyScopes.extend_expression(super)
+      end
+      
+      def /(other)
+        SexyScopes.extend_expression(super)
+      end
+      
+      def coerce(other)
+        expression = ::Arel.sql(other.to_s)
+        [SexyScopes.extend_expression(expression), self]
+      end
+    end
+  end
+end

data/lib/sexy_scopes/arel/nodes/regexp_matches.rb

@@ -0,0 +1,12 @@
+module SexyScopes
+  module Arel
+    module Nodes
+      class RegexpMatches < ::Arel::Nodes::InfixOperation
+        def initialize(left, right)
+          right = Regexp.try_convert(right) || Regexp.compile(right.to_s)
+          super(:REGEXP, left, right)
+        end
+      end
+    end
+  end
+end

data/lib/sexy_scopes/arel/predicate_methods.rb

@@ -1,50 +1,25 @@
 module SexyScopes
   module Arel
     module PredicateMethods
-      def eq(other)
-        extend_predicate(super)
-      end
-      alias == eq
-      
-      def in(other)
-        extend_predicate(super)
-      end
-      
-      def matches(other)
-        extend_predicate(super)
-      end
-      alias =~ matches
-      
-      def does_not_match(other)
-        extend_predicate(super)
-      end
-      alias !~ does_not_match
-      
-      def gteq(other)
-        extend_predicate(super)
-      end
-      alias >= gteq
-      
-      def gt(other)
-        extend_predicate(super)
-      end
-      alias > gt
+      # <tt>Arel::Grouping</tt> nodes didn't include <tt>Arel::Predications</tt> before Arel 3, but <tt>or</tt> 
+      # returns an <tt>Arel::Grouping</tt> node (surrounds the SQL <tt>OR</tt> clause with parenthesis).
+      # Since ActiveRecord 3.1 depends on Arel 2, including the module here ensures the methods will exist.
+      include ::Arel::Predications
       
-      def lt(other)
-        extend_predicate(super)
+      def not
+        SexyScopes.extend_predicate(super)
       end
-      alias < lt
+      alias ~ not
       
-      def lteq(other)
-        extend_predicate(super)
+      def or(other)
+        SexyScopes.extend_predicate(super)
       end
-      alias <= lteq
+      alias | or
       
-      def not_eq(other)
-        extend_predicate(super)
+      def and(other)
+        SexyScopes.extend_predicate(super)
       end
-      alias != not_eq
+      alias & and
     end
   end
 end
-

data/lib/sexy_scopes/arel/predications.rb

@@ -0,0 +1,67 @@
+module SexyScopes
+  module Arel
+    module Predications
+      def eq(other)
+        SexyScopes.extend_predicate(super)
+      end
+      alias == eq
+      
+      def in(other)
+        SexyScopes.extend_predicate(super)
+      end
+      
+      def matches(other)
+        if Regexp === other
+          matches_regexp(other)
+        else
+          SexyScopes.extend_predicate(super)
+        end
+      end
+      alias =~ matches
+      
+      def does_not_match(other)
+        if Regexp === other
+          does_not_match_regexp(other)
+        else
+          SexyScopes.extend_predicate(super)
+        end
+      end
+      alias !~ does_not_match
+      
+      def matches_regexp(other)
+        predicate = Arel::Nodes::RegexpMatches.new(self, other)
+        SexyScopes.extend_predicate(predicate)
+      end
+      
+      def does_not_match_regexp(other)
+        matches_regexp(other).not
+      end
+      
+      def gteq(other)
+        SexyScopes.extend_predicate(super)
+      end
+      alias >= gteq
+      
+      def gt(other)
+        SexyScopes.extend_predicate(super)
+      end
+      alias > gt
+      
+      def lt(other)
+        SexyScopes.extend_predicate(super)
+      end
+      alias < lt
+      
+      def lteq(other)
+        SexyScopes.extend_predicate(super)
+      end
+      alias <= lteq
+      
+      def not_eq(other)
+        SexyScopes.extend_predicate(super)
+      end
+      alias != not_eq
+    end
+  end
+end
+

data/lib/sexy_scopes/arel/typecasting.rb

@@ -0,0 +1,21 @@
+module SexyScopes
+  module Arel
+    module Typecasting
+      def *(other)
+        super SexyScopes.type_cast(other, self)
+      end
+      
+      def +(other)
+        super SexyScopes.type_cast(other, self)
+      end
+      
+      def -(other)
+        super SexyScopes.type_cast(other, self)
+      end
+      
+      def /(other)
+        super SexyScopes.type_cast(other, self)
+      end
+    end
+  end
+end

data/lib/sexy_scopes/version.rb

@@ -1,7 +1,7 @@
 module SexyScopes
   module Version
     MAJOR = 0
-    MINOR = 6
+    MINOR = 7
     TINY  = 0
     
     STRING = [MAJOR, MINOR, TINY].join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sexy_scopes
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Samuel Lebeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-29 00:00:00.000000000 Z
+date: 2014-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -24,6 +24,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -53,61 +67,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -143,39 +171,23 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
 - CHANGELOG.md
-- Gemfile
-- LICENSE
 - README.md
-- Rakefile
-- ci/Gemfile.ar-edge
-- ci/Gemfile.ar3.1
-- ci/Gemfile.ar3.2
-- lib/sexy_scopes.rb
-- lib/sexy_scopes/active_record.rb
+- LICENSE
+- lib/arel/visitors_extensions.rb
 - lib/sexy_scopes/active_record/class_methods.rb
 - lib/sexy_scopes/active_record/dynamic_methods.rb
-- lib/sexy_scopes/arel.rb
-- lib/sexy_scopes/arel/boolean_methods.rb
-- lib/sexy_scopes/arel/math_methods.rb
+- lib/sexy_scopes/active_record.rb
+- lib/sexy_scopes/arel/expression_methods.rb
+- lib/sexy_scopes/arel/math.rb
+- lib/sexy_scopes/arel/nodes/regexp_matches.rb
 - lib/sexy_scopes/arel/predicate_methods.rb
-- lib/sexy_scopes/expression_wrappers.rb
-- lib/sexy_scopes/predicate_wrappers.rb
+- lib/sexy_scopes/arel/predications.rb
+- lib/sexy_scopes/arel/typecasting.rb
+- lib/sexy_scopes/arel.rb
 - lib/sexy_scopes/railtie.rb
 - lib/sexy_scopes/version.rb
-- lib/sexy_scopes/wrappers.rb
-- sexy_scopes.gemspec
-- spec/active_record_spec.rb
-- spec/boolean_methods_spec.rb
-- spec/fixtures/models.rb
-- spec/fixtures/schema.rb
-- spec/matchers/be_extended_by.rb
-- spec/matchers/convert_to_sql.rb
-- spec/math_methods_spec.rb
-- spec/predicate_methods_spec.rb
-- spec/spec_helper.rb
+- lib/sexy_scopes.rb
 homepage: https://github.com/samleb/sexy_scopes
 licenses:
 - MIT
@@ -196,18 +208,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Write beautiful and expressive ActiveRecord scopes without SQL.
-test_files:
-- spec/active_record_spec.rb
-- spec/boolean_methods_spec.rb
-- spec/fixtures/models.rb
-- spec/fixtures/schema.rb
-- spec/matchers/be_extended_by.rb
-- spec/matchers/convert_to_sql.rb
-- spec/math_methods_spec.rb
-- spec/predicate_methods_spec.rb
-- spec/spec_helper.rb
+test_files: []
 has_rdoc: 

data/.gitignore

@@ -1,4 +0,0 @@
-Gemfile.lock
-coverage
-pkg
-doc

data/.travis.yml

@@ -1,19 +0,0 @@
-language: ruby
-bundler_args: --without development --standalone
-rvm:
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-  - jruby-19mode
-  - rbx-19mode
-gemfile:
-  - ci/Gemfile.ar3.1
-  - ci/Gemfile.ar3.2
-  - ci/Gemfile.ar-edge
-matrix:
-  exclude:
-    - rvm: 1.9.2
-      gemfile: ci/Gemfile.ar-edge
-branches:
-  only:
-    - master

data/Gemfile

@@ -1,2 +0,0 @@
-source 'https://rubygems.org'
-gemspec

data/Rakefile

@@ -1,13 +0,0 @@
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
-
-desc "Run specifications"
-RSpec::Core::RakeTask.new(:spec)
-
-desc "Measure test coverage"
-task :cov do
-  ENV['COVERAGE'] = '1'
-  Rake::Task['spec'].invoke
-end
-
-task :default => :spec