site_framework 4.1.2 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb39a285f6315478ee14e0bdaab4745e464db519
-  data.tar.gz: 9f14109056c0a056ae3781a1966b47cd3df19b5f
+  metadata.gz: 736273988a8fa45f51be7a43b9672a70a25d9ddd
+  data.tar.gz: f27a518bc045aa5573a1591e553348446d0c28c9
 SHA512:
-  metadata.gz: a4a34b0ac25cef02b5c73f76f7aa7b927473b754bac6e19da2940d8a4c22cef522d0002dda3e05f7536450d003fb44d4597609583e13ebcec8d436a02e9f0cde
-  data.tar.gz: 29d1a16de2f085a4f4f5cdc45b3521409ecdb65469c7397efc9c76b65c0b857ca41fab019916390e620b19f3c9a9ec46e87837a43eb7aef36b7c91c681acf907
+  metadata.gz: 0e25ded29d90b07a38ff43525c558ecc3462d78e813c4d844430c1d463407a2fbc86e9cb455928f5a2b05facfb582779676e37e53ec3d98e4f9134405fd5c665
+  data.tar.gz: 04926aad616c3aa0b70daf50381267bc9d3f1f2d586e34fb455d51377843d099c97dc32bd019984ef46896fcbd575460a0cac6a91804f6c5d718a9699460ff46

data/lib/site_framework/action_controller/base.rb

@@ -11,6 +11,7 @@ ActionController::Base.class_eval do
       end
     end
   end
+
 end
 
 

data/lib/site_framework/active_record/concerns.rb

@@ -3,9 +3,22 @@ module SiteFramework
     extend ActiveSupport::Concern
 
     included do
+      puts "Warning: This concern is deprecated and will be removed in next version"
+      puts "Use 'SiteFramework::SiteAware' instead."
       belongs_to :domain, class_name: '::SiteFramework::Domain'
       default_scope -> {
-        where(domain_id: SiteFramework::CurrentState.instance.domain)
+        where(site: SiteFramework::CurrentState.instance.site)
+      }
+    end
+  end
+
+  module SiteAware
+    extend ActiveSupport::Concern
+
+    included do
+      belongs_to :site, class_name: '::SiteFramework::Site'
+      default_scope -> {
+        where(site: SiteFramework::CurrentState.instance.site)
       }
     end
   end

data/lib/site_framework/active_record/migration.rb

@@ -1,7 +1,13 @@
 class ActiveRecord::Migration
   def domain_aware(table_name)
+    fail "'domain_aware' deprecated use 'site_aware' instead."
+  end
+
+  def site_aware(table_name)
     change_table table_name do |t|
-      t.integer :domain_id
+      t.integer :site_id
     end
+
+    add_index table_name, :site_id
   end
 end

data/lib/site_framework/routing/default_constraint.rb

@@ -18,7 +18,7 @@ class SiteFramework::Routing::DefaultConstraint
       true
 
     else
-      logger.info("Domain name '#{request.host}' does not match with any exist domains")
+      logger.warn("Domain name '#{request.host}' does not match with any exist domains")
       patch_request(request)
       false
     end

data/lib/site_framework/version.rb

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

data/lib/site_framework.rb

@@ -2,14 +2,19 @@ require 'site_framework/helpers'
 
 # Main module of `site_framework` gem
 module SiteFramework
-  autoload :Middleware, 'site_framework/middleware'
+  autoload :Middleware ,  'site_framework/middleware'
+  autoload :DomainAware,  'site_framework/active_record/concerns'
+  autoload :SiteAware,    'site_framework/active_record/concerns'
+  autoload :CurrentState, 'site_framework/current_state'
+  #autoload :Engine,       'site_framework/engine'
+
   include  SiteFramework::Helpers
 
   module Routing
   end
 end
 
-require 'site_framework/current_state'
+#require 'site_framework/current_state'
 require 'site_framework/engine'
 require 'site_framework/railtie'
 require 'site_framework/orm'

metadata

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