ihoka-friendly 0.7.1.2 → 0.8.0.pre

data/.travis.yml

@@ -1,6 +1,8 @@
 language: ruby
 rvm:
   - 1.9.3
+services:
+  - memcached
 before_script:
   - mysql -e 'create database friendly_test;'
   - cp spec/config.sample.yml spec/config.yml

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    ihoka-friendly (0.7.1.2)
+    ihoka-friendly (0.8.0.pre)
       activesupport (~> 2.3.18)
       rufus-json (~> 0.2.3)
-      sequel (~> 3.16.0)
+      sequel (~> 4.10.0)
       will_paginate (~> 2.3.15)
 
 GEM
@@ -14,13 +14,13 @@ GEM
     jferris-mocha (0.9.8.20100526112143)
       rake
     memcached (1.7.2)
-    mysql (2.9.1)
-    rake (10.1.0)
+    mysql2 (0.3.16)
+    rake (10.3.2)
     rspec (1.3.2)
     rufus-json (0.2.7)
-    sequel (3.16.0)
+    sequel (4.10.0)
     will_paginate (2.3.16)
-    yajl-ruby (0.7.9)
+    yajl-ruby (1.2.0)
 
 PLATFORMS
   ruby
@@ -29,7 +29,7 @@ DEPENDENCIES
   ihoka-friendly!
   jferris-mocha (~> 0.9.8.20100526112143)
   memcached (~> 1.7.2)
-  mysql (~> 2.9.1)
+  mysql2 (~> 0.3.15)
   rake
   rspec (~> 1.3.1)
-  yajl-ruby (~> 0.7.7)
+  yajl-ruby (~> 1.2.0)

data/VERSION

@@ -1 +1 @@
-0.7.1.2
+0.8.0.pre

data/ihoka-friendly.gemspec

@@ -11,12 +11,12 @@ Gem::Specification.new do |s|
   s.homepage = "http://friendlyorm.com"
   s.authors = ["James Golick", "Istvan Hoka"]
 
-  s.add_development_dependency 'mysql',         '~> 2.9.1'
+  s.add_development_dependency 'mysql2',        '~> 0.3.15'
   s.add_development_dependency 'memcached',     '~> 1.7.2'
-  s.add_development_dependency 'yajl-ruby',     '~> 0.7.7'
+  s.add_development_dependency 'yajl-ruby',     '~> 1.2.0'
   s.add_development_dependency 'rspec',         '~> 1.3.1'
   s.add_development_dependency 'jferris-mocha', '~> 0.9.8.20100526112143'
-  s.add_dependency "sequel", "~> 3.16.0"
+  s.add_dependency "sequel", "~> 4.10.0"
   s.add_dependency "activesupport", "~> 2.3.18"
   s.add_dependency "will_paginate", "~> 2.3.15"
   s.add_dependency "rufus-json", "~> 0.2.3"

data/lib/friendly.rb

@@ -10,7 +10,6 @@ require 'friendly/index'
 require 'friendly/indexer'
 require 'friendly/memcached'
 require 'friendly/query'
-require 'friendly/sequel_monkey_patches'
 require 'friendly/scope'
 require 'friendly/scope_proxy'
 require 'friendly/storage_factory'
@@ -20,6 +19,8 @@ require 'friendly/uuid'
 
 require 'will_paginate/collection'
 
+Sequel.extension :core_extensions
+
 module Friendly
   class << self
     attr_accessor :datastore, :db, :cache

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: ihoka-friendly
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.7.1.2
+  prerelease: 6
+  version: 0.8.0.pre
 platform: ruby
 authors:
 - James Golick
@@ -10,152 +10,152 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-12 00:00:00.000000000 Z
+date: 2014-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: mysql
+  name: mysql2
   type: :development
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.9.1
-    none: false
+        version: 0.3.15
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.9.1
-    none: false
-  prerelease: false
+        version: 0.3.15
 - !ruby/object:Gem::Dependency
   name: memcached
   type: :development
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.7.2
-    none: false
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.7.2
-    none: false
-  prerelease: false
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   type: :development
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.7
-    none: false
+        version: 1.2.0
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.7
-    none: false
-  prerelease: false
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rspec
   type: :development
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.1
-    none: false
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.1
-    none: false
-  prerelease: false
 - !ruby/object:Gem::Dependency
   name: jferris-mocha
   type: :development
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.8.20100526112143
-    none: false
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.8.20100526112143
-    none: false
-  prerelease: false
 - !ruby/object:Gem::Dependency
   name: sequel
   type: :runtime
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.16.0
-    none: false
+        version: 4.10.0
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.16.0
-    none: false
-  prerelease: false
+        version: 4.10.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   type: :runtime
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.3.18
-    none: false
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.3.18
-    none: false
-  prerelease: false
 - !ruby/object:Gem::Dependency
   name: will_paginate
   type: :runtime
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.3.15
-    none: false
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.3.15
-    none: false
-  prerelease: false
 - !ruby/object:Gem::Dependency
   name: rufus-json
   type: :runtime
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.3
-    none: false
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.3
-    none: false
-  prerelease: false
 description: ''
 email: istvan.hoka@gmail.com
 executables: []
@@ -202,7 +202,6 @@ files:
 - lib/friendly/query.rb
 - lib/friendly/scope.rb
 - lib/friendly/scope_proxy.rb
-- lib/friendly/sequel_monkey_patches.rb
 - lib/friendly/storage.rb
 - lib/friendly/storage_factory.rb
 - lib/friendly/storage_proxy.rb
@@ -308,26 +307,20 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: -3352695715280030317
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: -3352695715280030317
-      version: '0'
-  none: false
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.23.2
 signing_key: 
 specification_version: 3
 summary: NoSQL with MySQL in Ruby
@@ -376,3 +369,4 @@ test_files:
 - spec/unit/storage_factory_spec.rb
 - spec/unit/storage_proxy_spec.rb
 - spec/unit/translator_spec.rb
+has_rdoc: 

data/lib/friendly/sequel_monkey_patches.rb

@@ -1,34 +0,0 @@
-require 'sequel'
-
-# Out of the box, Sequel uses IS TRUE/FALSE for boolean parameters
-# This prevents MySQL from using indexes.
-#
-# This patch fixes that.
-module Sequel
-  module SQL
-    class BooleanExpression
-      def self.from_value_pairs(pairs, op=:AND, negate=false)
-        pairs = pairs.collect do |l,r|
-          ce = case r
-          when Range
-            new(:AND, new(:>=, l, r.begin), new(r.exclude_end? ? :< : :<=, l, r.end))
-          when Array, ::Sequel::Dataset, SQLArray
-            new(:IN, l, r)
-          when NegativeBooleanConstant
-            new(:"IS NOT", l, r.constant)
-          when BooleanConstant
-            new(:IS, l, r.constant)
-          when NilClass
-            new(:IS, l, r)
-          when Regexp
-            StringExpression.like(l, r)
-          else
-            new(:'=', l, r)
-          end
-          negate ? invert(ce) : ce
-        end
-        pairs.length == 1 ? pairs.at(0) : new(op, *pairs)
-      end
-    end
-  end
-end