site_framework 4.2.0 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 736273988a8fa45f51be7a43b9672a70a25d9ddd
-  data.tar.gz: f27a518bc045aa5573a1591e553348446d0c28c9
+  metadata.gz: 837e5016c615d68c84e770a07dbda43a710064d0
+  data.tar.gz: 332d2d238b919e11075f25aa138d69ffd7f39926
 SHA512:
-  metadata.gz: 0e25ded29d90b07a38ff43525c558ecc3462d78e813c4d844430c1d463407a2fbc86e9cb455928f5a2b05facfb582779676e37e53ec3d98e4f9134405fd5c665
-  data.tar.gz: 04926aad616c3aa0b70daf50381267bc9d3f1f2d586e34fb455d51377843d099c97dc32bd019984ef46896fcbd575460a0cac6a91804f6c5d718a9699460ff46
+  metadata.gz: 8973d21a898910927bfc74f1683faccff9d83e926579205d1eca8585196b4afe52a230f2191ee8881f3e9d88e072a8d0bf3d0134fb808957b3727950174b8d81
+  data.tar.gz: 0a726fd7956bb053df96c438e911c893af119086506aabf091c7ac24b58ca8ade1ddf94eff6c4accd23b25cba3cf762baf444ab81062fd3dc7cb431d2aa9b196

data/README.md

@@ -33,7 +33,7 @@ make them domain aware (ActiveRecord Only). e.g in your migration:
 
 ```ruby
 # Make posts table domain aware
-domain_aware(:posts)
+site_aware(:posts)
 ```
 
 If you're using **Mongoid** just add a reference to **SiteFramework::Domain** in your model.
@@ -73,7 +73,7 @@ Note: You can provide default domains for **SiteFramework** via an
 initializer like this:
 
 ```ruby
-SiteFramework.setup do |config|
+SiteFramework::Engine.setup do |config|
 
   config.default_domains = ['localhost', 'example.com']
 
@@ -102,7 +102,7 @@ In case of default site these methods will return `nil`
 ### Model Concern
 **SiteFramework** provides an **ActiveSupport** concern which transparently
 makes your models aware of the current **Site** and **Domain**. By includeing
-`SiteFramework::DomainAware` into your model, default scope of your model will
+`SiteFramework::SiteAware` into your model, default scope of your model will
 change to return only records which belongs to current **Site**.
 
 This way you can use external gems with your multi-site application easily.

data/app/models/site_framework/domain.rb

@@ -4,7 +4,7 @@ module SiteFramework
   # belongs to another  **Domain**
   class Domain < (defined?(ActiveRecord) ? ActiveRecord::Base : Object)
 
-    PATTERN = /\A[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?\z/ix
+    PATTERN = /\A[a-z0-9]*(\.?[a-z0-9]+)\.[a-z]{2,5}(:[0-9]{1,5})?(\/.)?$/ix
 
     if defined? Mongoid
       include Mongoid::Document
@@ -31,7 +31,9 @@ module SiteFramework
       validates_associated :site
     end
 
-    validates(:name, presence: true, format: { with: PATTERN })
+    validates :name, presence: true, if: :valid_domain_name?
+
+
     validates_uniqueness_of :name
 
     before_save :normalize_name
@@ -39,5 +41,15 @@ module SiteFramework
     def normalize_name
       self.name = name.downcase
     end
+
+    def valid_domain_name?
+      if read_attribute :alias
+        false unless name =~ PATTERN
+        # TODO: Check the owner of domain
+      else
+        true
+      end
+    end
+
   end
 end

data/db/migrate/20140118200201_create_site_framework_domains.rb

@@ -1,9 +1,17 @@
 class CreateSiteFrameworkDomains < ActiveRecord::Migration
   def change
-    create_table :site_framework_domains do |t|
+    args = {}
+    args[:id] = :uuid if SiteFramework::Engine.use_uuid
+
+    create_table :site_framework_domains, **args do |t|
       t.string :name
-      t.integer :site_id
-      t.integer :parent_id, default: nil
+      if SiteFramework::Engine.use_uuid
+        t.uuid :site_id
+        t.uuid :parent_id, default: nil
+      else
+        t.integer :site_id
+        t.integer :parent_id, default: nil
+      end
       t.boolean :alias, default: false
 
       t.timestamps

data/db/migrate/20140303141448_create_site_framework_sites.rb

@@ -1,6 +1,9 @@
 class CreateSiteFrameworkSites < ActiveRecord::Migration
   def change
-    create_table :site_framework_sites do |t|
+    args = {}
+    args[:id] = :uuid if SiteFramework::Engine.use_uuid
+
+    create_table :site_framework_sites, **args do |t|
       t.string :title
       t.string :description
 

data/lib/site_framework/active_record/migration.rb

@@ -5,7 +5,11 @@ class ActiveRecord::Migration
 
   def site_aware(table_name)
     change_table table_name do |t|
-      t.integer :site_id
+      if SiteFramework::Engine.use_uuid
+        t.uuid :site_id
+      else
+        t.integer :site_id
+      end
     end
 
     add_index table_name, :site_id

data/lib/site_framework/engine.rb

@@ -9,13 +9,20 @@ module SiteFramework
       g.test_framework :rspec
     end
 
-    @@default_domains = ['localhost']
-    mattr_accessor :default_domains
+
+    mattr_accessor :default_domains do
+      ['localhost']
+    end
 
     # This option allows developers to specify the prefix of path
     # which they wanted to prepend to view_paths array
-    mattr_accessor :view_path_prefix
-    @@view_path_prefix = "app/views"
+    mattr_accessor :view_path_prefix do
+      'app/views'
+    end
+
+    mattr_accessor :use_uuid do
+      false
+    end
 
     def self.setup
       yield self

data/lib/site_framework/version.rb

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

metadata

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