activeuuid 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a34ea714bbb400c87aa8d865d1f9d6b9d18721e
-  data.tar.gz: 3571be3cd2b99c70035a061b3ba431433507ff86
+  metadata.gz: d15ef1e740f7978061ce1b7fb5806f0087b4232d
+  data.tar.gz: 3dc8b818564e59e4b9986a31091337cb87cd293e
 SHA512:
-  metadata.gz: f5a48da1daa91b2e1f870aab9bf64d019aa058317dda0e58c5bedf9e9c05ec79314a2bdc2b3ba6027e5df0a27a826fc9e5e04fb3b93af25707f46504946519f5
-  data.tar.gz: 0293b179642829f7633ec4d1f84de53beaaddf1b17f98e167e003b7269c9119d2c80486e1fd5dbaf689c752ac568cf1b738152d6e76b5afa8957cd346a4fce9e
+  metadata.gz: 822ee89119c1efdc50429b2956bfe79b5a2a2c986d69701b0b35234e66e43494a744ddd8b06f8e6163a0cb2275e8ed95139e65638f7442f78ece6a6b15850bd9
+  data.tar.gz: a6de0eb4b24f109b701b4dc6033889fcb4fc717753093cf2bf3f42529de4316fbf4bd0931ba4c600092954f8e5d2420a658fc118936160947d88bd0f193af606

data/.rvmrc

@@ -1 +1 @@
-rvm use 2.1.5@activeuuid --create
+rvm use 2.2@activeuuid --create

data/.travis.yml

@@ -8,6 +8,7 @@ rvm:
   - 2.1.5
   - 2.2.0
   - rbx-2
+  - jruby
 
 gemfile:
   - Gemfile
@@ -31,3 +32,16 @@ matrix:
       gemfile: gemfiles/Gemfile.rails-3-1
     - rvm: 2.2.0
       gemfile: gemfiles/Gemfile.rails-3-2
+    - rvm: jruby
+      gemfile: gemfiles/Gemfile.rails-3-1
+      env: DB=postgresql
+    - rvm: jruby
+      gemfile: gemfiles/Gemfile.rails-3-2
+      env: DB=postgresql
+    - rvm: jruby
+      gemfile: gemfiles/Gemfile.rails-4-0
+      env: DB=postgresql
+    - rvm: jruby
+      gemfile: gemfiles/Gemfile.rails-4-1
+      env: DB=postgresql
+

data/activeuuid.gemspec

@@ -23,9 +23,16 @@ Gem::Specification.new do |s|
   s.add_development_dependency "database_cleaner"
   s.add_development_dependency "forgery"
   s.add_development_dependency "fabrication"
-  s.add_development_dependency "sqlite3"
-  s.add_development_dependency "pg"
-  s.add_development_dependency "mysql2"
+
+  if RUBY_ENGINE == 'jruby'
+    s.add_development_dependency "activerecord-jdbcsqlite3-adapter"
+    s.add_development_dependency "activerecord-jdbcpostgresql-adapter"
+    s.add_development_dependency "activerecord-jdbcmysql-adapter"
+  else
+    s.add_development_dependency "sqlite3"
+    s.add_development_dependency "pg"
+    s.add_development_dependency "mysql2"
+  end
 
   s.add_runtime_dependency "uuidtools"
   s.add_runtime_dependency "activerecord", '>= 3.1'

data/lib/activeuuid.rb

@@ -1,4 +1,4 @@
-require "activeuuid/version"
+require 'activeuuid/version'
 require 'activeuuid/patches'
 require 'activeuuid/uuid'
 require 'activeuuid/railtie' if defined?(Rails::Railtie)

data/lib/activeuuid/patches.rb

@@ -69,6 +69,32 @@ module ActiveUUID
       end
     end
 
+    module MysqlJdbcColumn
+      extend ActiveSupport::Concern
+
+      included do
+        # This is a really hacky solution, but it's the only way to support the
+        # MySql JDBC adapter without breaking backwards compatibility.
+        # It would be a lot easier if AR had support for custom defined types.
+        #
+        # Here's the path of execution:
+        # (1) JdbcColumn calls ActiveRecord::ConnectionAdapters::Column super constructor
+        # (2) super constructor calls simplified_type from MysqlJdbcColumn, since it's redefined here
+        # (3) if it's not a uuid, it calls original_simplified_type from ArJdbc::MySQL::Column module
+        # (4)   if there's no match ArJdbc::MySQL::Column calls super (ActiveUUID::Column.simplified_type_with_uuid)
+        # (5)     Since it's no a uuid (see step 3), simplified_type_without_uuid is called,
+        #         which maps to AR::ConnectionAdapters::Column.simplified_type (which has no super call, so we're good)
+        #
+        alias_method :original_simplified_type, :simplified_type
+
+        def simplified_type(field_type)
+          return :uuid if field_type == 'binary(16)' || field_type == 'binary(16,0)'
+          original_simplified_type(field_type)
+        end
+      end
+    end
+
+
     module PostgreSQLColumn
       extend ActiveSupport::Concern
 
@@ -162,7 +188,9 @@ module ActiveUUID
         ActiveRecord::ConnectionAdapters::Column.send :include, Column
         ActiveRecord::ConnectionAdapters::PostgreSQLColumn.send :include, PostgreSQLColumn if defined? ActiveRecord::ConnectionAdapters::PostgreSQLColumn
       end
+      ArJdbc::MySQL::Column.send :include, MysqlJdbcColumn if defined? ArJdbc::MySQL::Column
 
+      ActiveRecord::ConnectionAdapters::MysqlAdapter.send :include, Quoting if defined? ActiveRecord::ConnectionAdapters::MysqlAdapter
       ActiveRecord::ConnectionAdapters::Mysql2Adapter.send :include, Quoting if defined? ActiveRecord::ConnectionAdapters::Mysql2Adapter
       ActiveRecord::ConnectionAdapters::SQLite3Adapter.send :include, Quoting if defined? ActiveRecord::ConnectionAdapters::SQLite3Adapter
       ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.send :include, PostgreSQLQuoting if defined? ActiveRecord::ConnectionAdapters::PostgreSQLAdapter

data/lib/activeuuid/uuid.rb

@@ -8,6 +8,10 @@ module UUIDTools
     # duck typing activerecord 3.1 dirty hack )
     def gsub *; self; end
 
+    def ==(another_uuid)
+      self.to_s == another_uuid.to_s
+    end
+
     def next
       self.class.random_create
     end
@@ -18,11 +22,11 @@ module UUIDTools
     end
 
     def as_json(options = nil)
-      hexdigest.upcase
+      to_s
     end
 
     def to_param
-      hexdigest.upcase
+      to_s
     end
 
     def self.serialize(value)
@@ -36,6 +40,10 @@ module UUIDTools
       end
     end
 
+    def bytesize
+      16
+    end
+
   private
 
     def self.parse_string(str)
@@ -65,6 +73,12 @@ module Arel
       end
     end
 
+    class WhereSql < Arel::Visitors::ToSql
+      def visit_UUIDTools_UUID(o)
+        o.quoted_id
+      end
+    end
+
     class SQLite < Arel::Visitors::ToSql
       def visit_UUIDTools_UUID(o, a = nil)
         o.quoted_id

data/lib/activeuuid/version.rb

@@ -1,3 +1,3 @@
 module Activeuuid
-  VERSION = "0.6.0"
+  VERSION = '0.6.1'
 end

data/spec/lib/uuid_mokeypatch_spec.rb

@@ -10,8 +10,8 @@ describe UUIDTools::UUID do
     let(:sql_out) { "x'e4618518cb9f11e1aa7c14dae903e06a'" }
 
     its(:quoted_id) {should == sql_out}
-    its(:as_json) {should == hex}
-    its(:to_param) {should == hex}
+    its(:as_json) {should == uuid.to_s}
+    its(:to_param) {should == uuid.to_s}
     its(:next) {should be_a(described_class)}
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeuuid
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Nate Murray
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-11 00:00:00.000000000 Z
+date: 2015-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -240,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Add binary UUIDs to ActiveRecord in MySQL