activemodel-globalid 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7e637641e9bef7b9102466221a912f79e190f84
-  data.tar.gz: b14880a4afca3cd86b76b9c5e52612d034558dd1
+  metadata.gz: 18f0e49373df39b515e35d8d504ee95c2ec9a99a
+  data.tar.gz: e3fe91038bfbad848fb286f7584a239ebbeb3370
 SHA512:
-  metadata.gz: 0431d4062d488553aa64f953b7be68bea97e8c954ddba8082eebececd36f80e66091020473772d82880895e8466b3337266fdfcd53c987fe0f9143af52132493
-  data.tar.gz: e25345afa813172b5a68251675d41e46077934062e4e7309bb4381ae2399fe2ddd0de5fbb21e56415a06e1b4013bd5a37f7e915d71c605d2436f4c0541aaa32b
+  metadata.gz: b883aade679f9f1bba26f2a1ba6b1630905a3f399a18133b015c8852f4cc5eb5752ef35391b398b353c82abe21af05d290da35a9c5d32e8d0c7717e0a3b64fa2
+  data.tar.gz: 5cde9bb37bf26cd8c80d6427abfe5e5daa6e19591f4b947255f14310c264a6e2557a0076f67b16204c9feb361d4ba21fef5f16a94042c74eafb1fe24aa5b68d0

data/lib/active_model/global_id.rb

@@ -16,7 +16,7 @@ module ActiveModel
     end
 
     def model_id
-      @model_id ||= @gid.split("-").third
+      @model_id ||= @gid.split('-')[2..-1].join('-')
     end
 
     def ==(other_global_id)

data/lib/active_model/global_identification.rb

@@ -6,13 +6,13 @@ module ActiveModel
     extend ActiveSupport::Concern
 
     def global_id
-      GlobalID.create(self)
+      @global_id ||= GlobalID.create(self)
     end
     alias gid global_id
 
     def signed_global_id
-      SignedGlobalID.create(self)
+      @signed_global_id ||= SignedGlobalID.create(self)
     end
     alias sgid signed_global_id
   end
-end
+end

data/lib/active_model/global_locator.rb

@@ -18,7 +18,7 @@ module ActiveModel
         if sgid.is_a? SignedGlobalID
           sgid.model_class.find(sgid.model_id)
         else
-          locate SignedGlobalID.new(sgid)
+          locate_signed SignedGlobalID.new(sgid)
         end
       end
       

data/lib/active_model/railtie.rb

@@ -1,5 +1,19 @@
+require 'rails/railtie'
 require 'active_model/global_identification'
+require 'active_model/global_locator'
 
-ActiveModel::SignedGlobalID.verifier = Rails.application.message_verifier(:signed_global_ids)
+module ActiveModel
+  # = Active Model GlobalID Railtie
+  class Railtie < Rails::Railtie # :nodoc:
+    initializer "active_model.globalid" do
+      config.after_initialize do |app|
+        ActiveModel::SignedGlobalID.verifier = app.message_verifier(:signed_global_ids)
+      end
+
+      ActiveSupport.on_load(:active_record) do
+        send :include, ActiveModel::GlobalIdentification
+      end
+    end
+  end
+end
 
-ActiveRecord::Base.send :include, ActiveModel::GlobalIdentification

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: activemodel-globalid
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-19 00:00:00.000000000 Z
+date: 2014-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.0
 description: Serializing models to a single string makes it easy to pass references
@@ -61,17 +61,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Serialize models that can be found by id again (will be part of Active Model).