site_framework 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62be8f127063701148dbaea74352fe781c1f78a2
-  data.tar.gz: 39437c595f044e4a4ef5d6733b5178fa678b464c
+  metadata.gz: 2b4252d95379b102c247dc309c261d045fe84937
+  data.tar.gz: 68c40e49d6cff491ca81c2f57253753d0fa986b6
 SHA512:
-  metadata.gz: a9e3ca92919e98c4db6a46a08aaafc54045ef7ddf5192b2c74389b1222510f729b57fe418e9f138262ae7964e40f3bc9d001054af753dd8a4ac2824326257198
-  data.tar.gz: 8a51d6565a1b2725fa0bcad57cab31f213119c7c12d235a5728c6dd9eab37c14a5673c23a2dd886b28d672232cd820c5e2e60debc4f0c10b26e1827f0671ee1a
+  metadata.gz: 040026c637f50af1f17a72eec6ea6df09d99e508cf0805eeb47e15d6037d30eef3a7669aed08610264a07bcda4efc70e20690c10c9a57c026234d74ee4b7e438
+  data.tar.gz: 7f68cb7cf99211f460a8069e670e66ddc4cc7e550581376308b70320ace6f17970ee19db341f942ba27ec753c8cf690299099f892d3c96da022f48815f7852d2

data/lib/site_framework/action_controller/base.rb

@@ -3,10 +3,10 @@ ActionController::Base.class_eval do
   private
 
   def set_template_path
-    unless request.site
+    if request.site
       # We are in site namespace
       unless request.site.default_template.blank?
-        prepend_view_path[request.site.default_template]
+        prepend_view_path "app/views/#{request.site.default_template}"
       end
     end
   end

data/lib/site_framework/routing/default_constraint.rb

@@ -13,29 +13,34 @@ class SiteFramework::Routing::DefaultConstraint
     @domain_name = request.host
 
     if @default_domains.include? @domain_name
-      logger.debug("Loading default site configuration")
+      logger.debug('Loading default site configuration')
+      patch_request(request)
+      true
+
+    else
+      logger.info("Domain name '#{request.host}' does not match with any exist domains")
+      patch_request(request)
+      false
+    end
+  end
 
-      SiteFramework::CurrentState.instance.domain_name = nil
-      SiteFramework::CurrentState.instance.domain      = nil
-      SiteFramework::CurrentState.instance.site        = nil
+  private
 
-      request.instance_eval do
-        def site
-        end
+  def patch_request(request)
+    SiteFramework::CurrentState.instance.domain_name = nil
+    SiteFramework::CurrentState.instance.domain      = nil
+    SiteFramework::CurrentState.instance.site        = nil
 
-        def domain
-        end
+    request.instance_eval do
+      def site
+      end
 
-        def domamin_name
-        end
+      def domain
+      end
 
+      def domain_name
       end
 
-      true
-    else
-      logger.info("Domain name '#{request.host}' does not match with any exist domains")
-      false
     end
   end
-
 end

data/lib/site_framework/routing/site_constraint.rb

@@ -8,51 +8,67 @@ class SiteFramework::Routing::SiteConstraint
   end
 
   def domain(name)
-    @domain ||= if defined? ActiveRecord
-      SiteFramework::Domain.find_by(name: name)
+    return @domain if @domain_name == name
+
+    if defined? ActiveRecord
+      @domain = SiteFramework::Domain.find_by(name: name)
     elsif defined? Mongoid
-      SiteFramework::Site.where('domains.name' => name).domains.first
+      @domain = SiteFramework::Site.where('domains.name' => name).domains.first
     else
       nil
     end
   end
 
   def matches?(request)
-    @domain_name = request.host
-
     if domain_obj = domain(request.host)
-      logger.debug("''#{@domain_name}' matched.")
-      setup(domain_obj)
+      @domain_name = request.host
+      logger.debug("'#{@domain_name}' matched.")
+      setup(domain_obj, request)
       initialize_site_default_state
 
-      request.instance_eval do
-        def site
-          domain_obj.site
-        end
-
-        def domain
-          domain_obj.domain
-        end
-
-        def domamin_name
-          domain_obj.domain_name
-        end
-      end
-
       true
     else
       logger.info("Domain name '#{request.host}' does not match with any exist domains")
+      set_request_data_to_nil(request)
+      @domain_name = request.host
       false
     end
   end
 
   private
 
-  def setup(domain)
-    SiteFramework::CurrentState.instance.domain_name = domain.name
-    SiteFramework::CurrentState.instance.domain      = domain
-    SiteFramework::CurrentState.instance.site        = domain.site
-    @site                                            = domain.site
+  def setup(domain_, request)
+    SiteFramework::CurrentState.instance.domain_name = domain_.name
+    SiteFramework::CurrentState.instance.domain      = domain_
+    SiteFramework::CurrentState.instance.site        = domain_.site
+    @site                                            = domain_.site
+
+    request.instance_eval do
+      def site
+        SiteFramework::CurrentState.instance.site
+      end
+
+      def domain
+        SiteFramework::CurrentState.instance.domain
+      end
+
+      def domain_name
+        SiteFramework::CurrentState.instance.domain_name
+      end
+    end
+  end
+
+  def set_request_data_to_nil(request)
+    request.instance_eval do
+      def site
+      end
+
+      def domain
+      end
+
+      def domain_name
+      end
+    end
   end
 
   def initialize_site_default_state

data/lib/site_framework/version.rb

@@ -1,3 +1,3 @@
 module SiteFramework
-  VERSION = '4.0.0'
+  VERSION = '4.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: site_framework
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Sameer Rahmani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-16 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties