activerecord-propertybase_id 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b2198cfd17a6377ce1959968ebf3a3aac67b1cc
-  data.tar.gz: 59bb49f34e49c28efce1f059c823604441b9d521
+  metadata.gz: 26f5a4e1850a56a83d8c6000780eaa95f7fb63cc
+  data.tar.gz: f1528ea64f6392619ada3b46ea1bb6c1e714902e
 SHA512:
-  metadata.gz: 9a0171a81ed4e44f36515ba7427d505943bfdee3dfb7be8b71a46bb0ceddf1c4d0d549fb41160c2ad5dcb7dbf2051476dc859603e1e72e116f61044a9d35b88f
-  data.tar.gz: b31e21c40ce98917e618e035b53835f4d2c16cd8bdb240763f29e0737bc09284e9d1b7a0fd0eb1943022279f7de2be6350e00e13bcebc5bbae6c2d28f2373a5c
+  metadata.gz: 98b5137743e268d3fe435913aac6bf25f25f1df08b6507d94c003fb50b17bdd221c8d35847098783176162be352f4b5daeb223e6cd61956595cc5aa5dfcea774
+  data.tar.gz: 08e5d12ffcf030d7e15a4802fa3b6e32cc25a73ae129cee31c1caa4ebd70b434762b95006fac468ce5342f0016bb4e43fd86c09ec0e9298d28489c5c6a2b0e44

data/.gitignore

@@ -8,3 +8,4 @@
 /spec/reports/
 /spec/debug.log
 /tmp/
+/vendor/bundle

data/.travis.yml

@@ -2,7 +2,7 @@ language: ruby
 cache: bundler
 rvm:
   - 2.1.5
-  - 2.2.1
+  - 2.2.2
   - rbx
   - ruby-head
   - jruby-head

data/README.md

@@ -1,8 +1,6 @@
 # ActiveRecord::PropertybaseId
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/activerecord/propertybase_id`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+This Gem lets you easily integrate [propertybase_id](github.com/propertybase/propertybase_id) into your ActiveRecord model.
 
 ## Installation
 
@@ -26,7 +24,7 @@ This ActiveRecord extension lets you use the [Propertybase ID](https://github.co
 
 ### Migration
 
-The Propertybase ID is stored via the `char(8)` data type (currently only tested on SQLite and PostgreSQL). You can also use the cusom migration type `propertybase_id`.
+The Propertybase ID is stored via the `char(18)` data type (currently only tested on SQLite and PostgreSQL). You can also use the cusom migration type `propertybase_id`.
 
 Note: As Rails doesn't really support changing the type of the primary key in the migration. You need to work around a little bit. You need to disable the ID for a sepcific table and then add it as
 
@@ -75,7 +73,7 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release` to create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
-## Atribution
+## Attribution
 
 Heavily inspired by [activeuuid](https://github.com/jashmenn/activeuuid).
 

data/activerecord-propertybase_id.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "propertybase_id", ">= 0.3.3"
+  spec.add_dependency "propertybase_id", ">= 0.4.0"
   spec.add_dependency "activerecord", ">= 4.2", "< 4.3"
 
   spec.add_development_dependency "bundler", "< 1.10"

data/lib/activerecord/propertybase_id/patches.rb

@@ -18,7 +18,7 @@ module ActiveRecord
 
         included do
           def add_column_with_propertybase_id(name, type, options)
-            type = PB_ID_SQL_TYPE if type.to_sym == :propertybase_id
+            type = PB_ID_SQL_TYPE if type.to_s == "propertybase_id"
             add_column_without_propertybase_id(name, type, options)
           end
 
@@ -26,10 +26,42 @@ module ActiveRecord
         end
       end
 
+      module AddReferencePropertybaseIdColumn
+        extend ActiveSupport::Concern
+
+        included do
+          def add_reference_with_propertybase_id(table_name, ref_name, options = {})
+            options.merge!(type: PB_ID_SQL_TYPE) if options[:type].to_s == "propertybase_id"
+            add_reference_without_propertybase_id(table_name, ref_name, options)
+          end
+
+          alias_method_chain :add_reference, :propertybase_id
+        end
+      end
+
+      module ReferencesPropertybaseIdColumn
+        extend ActiveSupport::Concern
+
+        included do
+          def references_with_propertybase_id(*args)
+            options = args.extract_options!
+            options.merge!(type: PB_ID_SQL_TYPE) if options[:type].to_s == "propertybase_id"
+            args << options
+            references_without_propertybase_id(*args)
+          end
+
+          alias_method_chain :references, :propertybase_id
+        end
+      end
+
       def self.apply!
         ActiveRecord::ConnectionAdapters::Table.send :include, Migrations if defined? ActiveRecord::ConnectionAdapters::Table
+        ActiveRecord::ConnectionAdapters::Table.send :include, ReferencesPropertybaseIdColumn if defined? ActiveRecord::ConnectionAdapters::Table
         ActiveRecord::ConnectionAdapters::TableDefinition.send :include, Migrations if defined? ActiveRecord::ConnectionAdapters::TableDefinition
+        ActiveRecord::ConnectionAdapters::TableDefinition.send :include, ReferencesPropertybaseIdColumn if defined? ActiveRecord::ConnectionAdapters::TableDefinition
         ActiveRecord::ConnectionAdapters::AlterTable.send :include, AddPropertybaseIdColumn
+
+        ActiveRecord::ConnectionAdapters::SchemaStatements.send :include, AddReferencePropertybaseIdColumn
       end
     end
   end

data/lib/activerecord/propertybase_id/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module PropertybaseId
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-propertybase_id
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Leif Gensert
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2015-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: propertybase_id
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement