site_framework 4.1.0 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 154edfb2dab5c5bb42f28dc9f7a9093e50354120
-  data.tar.gz: 76b660d2ca27b37a5672291090dcbc483d2b33ff
+  metadata.gz: cb39a285f6315478ee14e0bdaab4745e464db519
+  data.tar.gz: 9f14109056c0a056ae3781a1966b47cd3df19b5f
 SHA512:
-  metadata.gz: 64dc5b007c5e48fc333f09046ad816f4338f0abe2fd52358d4346f31ca7a4dacc34287ea265259d6dc4b3b7a15c74400b0207c510233c8b848b34d61df9f3e1f
-  data.tar.gz: d325071a5bf298f9682a6789519e7f373196f3a3507bd135b9cfec30523df9a4763446ce69f6756ee7e44713924430a1bed3da86e3513afa5d1fdbee08dec6b5
+  metadata.gz: a4a34b0ac25cef02b5c73f76f7aa7b927473b754bac6e19da2940d8a4c22cef522d0002dda3e05f7536450d003fb44d4597609583e13ebcec8d436a02e9f0cde
+  data.tar.gz: 29d1a16de2f085a4f4f5cdc45b3521409ecdb65469c7397efc9c76b65c0b857ca41fab019916390e620b19f3c9a9ec46e87837a43eb7aef36b7c91c681acf907

data/app/models/site_framework/domain.rb

@@ -27,7 +27,7 @@ module SiteFramework
       belongs_to :site
 
       # Self relation
-      belongs_to :parent, class_name: self.class.to_s
+      belongs_to :parent, class_name: self.to_s
       validates_associated :site
     end
 

data/lib/site_framework/active_record/concerns.rb

@@ -3,8 +3,10 @@ module SiteFramework
     extend ActiveSupport::Concern
 
     included do
-      belongs_to :domain
-      default_scope -> { where(:domain => Rails.application.domain) }
+      belongs_to :domain, class_name: '::SiteFramework::Domain'
+      default_scope -> {
+        where(domain_id: SiteFramework::CurrentState.instance.domain)
+      }
     end
   end
 end

data/lib/site_framework/active_record/migration.rb

@@ -1,7 +1,7 @@
 class ActiveRecord::Migration
   def domain_aware(table_name)
     change_table table_name do |t|
-      t.belongs_to :domain
+      t.integer :domain_id
     end
   end
 end

data/lib/site_framework/current_state.rb

@@ -1,7 +1,9 @@
-# This singleton class act as an temp storage for the
-# current site and domain
-class SiteFramework::CurrentState
-  include Singleton
+module SiteFramework
+  # This singleton class act as an temp storage for the
+  # current site and domain
+  class CurrentState
+    include Singleton
 
-  attr_accessor :site, :domain, :domain_name
+    attr_accessor :site, :domain, :domain_name
+  end
 end

data/lib/site_framework/version.rb

@@ -1,3 +1,3 @@
 module SiteFramework
-  VERSION = '4.1.0'
+  VERSION = '4.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: site_framework
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.2
 platform: ruby
 authors:
 - Sameer Rahmani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-06 00:00:00.000000000 Z
+date: 2016-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties