caboose-cms 0.8.40 → 0.8.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22b48d7ce6d1545a3e67e1fa703b71738911a7e3
-  data.tar.gz: 1817cf46b3229a1f6952fd9827655831547caa00
+  metadata.gz: 945c437e933d397c1638c61f648474f9144bfaa5
+  data.tar.gz: 32696496ae665b5937f15cb846227c5db9ad4df9
 SHA512:
-  metadata.gz: c020e9dc6acc89b63678f551792d44b393a4771056b126d03d9b9952bbf57b8f0c4b4b8154032a8ecc6ace54e868ac4b22d4dc663c8e76b2bffed5582c856ac9
-  data.tar.gz: 6198d93c11ec8cbcc22984d2c65519de2b649207616072a26cc9961291525e1c2899af98da61bed77b5b7d4d5db90c99569d4d9ed7806b5f9c7cd6a0bcad6ef9
+  metadata.gz: 2d9873f6add7c68e6bc4c398c9cf7849e824f9dc285dcd1cd8a1fbcd4a54b5d2cd67b3c6aaee813f7cc23e90a29a1288604fdc5bfcc1771609727db90e6f30f0
+  data.tar.gz: 9f8b80d544fb73d64a31fd18e89d7f3683e64493ff535cf27a5c3ed8667b0ad24a6c3248d0c7660bff5a1a6136abe88a2c2fc39695786545f55add7d85403dd3

data/app/controllers/caboose/application_controller.rb

@@ -8,7 +8,7 @@ module Caboose
     
     @find_page = true    
     
-    def before_before_action           
+    def before_before_action
       
       # Modify the built-in params array with URL params if necessary
       parse_url_params if Caboose.use_url_params

data/app/models/caboose/comment_routes.rb

@@ -28,6 +28,7 @@ module Caboose
           f2 = File.open(file, "r")
                   
           domains = []
+          domains_constrainer = false
           module_name = nil
           class_name = nil
           class_priority = 20
@@ -44,9 +45,14 @@ module Caboose
               class_name = line.gsub(/^(.*?)class (.*?)Controller(.*?)$/, '\2').gsub(/([A-Z])/, '_\1').downcase
               class_name[0] = '' if class_name[0] == '_'
               class_name = "#{module_name}::#{class_name}" if module_name
-            elsif line =~ /# @route_domain (.*?)$/            
-              domain = line.gsub(/# @route_domain (.*?)$/, '\1')
-              domains << domain if !domains.include?(domain)
+            elsif line =~ /# @route_domain (.*?)$/
+              # Ignore if we have a domain constrainer
+              if domains.is_a?(Array)
+                domain = line.gsub(/# @route_domain (.*?)$/, '\1')
+                domains << domain if !domains.include?(domain)
+              end
+            elsif line =~ /# @route_domain_constrainer (.*?)$/
+              domains = line.gsub(/# @route_domain_constrainer (.*?)$/, '\1')              
             elsif line =~ /# @route_constraints (.*?)$/            
               constraints = line.gsub(/# @route_constraints (.*?)$/, '\1')
               uris.last[1] = constraints if uris.length > 0
@@ -67,7 +73,7 @@ module Caboose
             elsif line =~ /# @route DELETE (.*?)/    then uris << ["delete \"#{line.gsub(/# @route DELETE (.*?)/    , '\1').strip}\"", nil]              
             end
           end
-          ds = domains.count > 0 ? domains.sort.join(' ') : 'zzz_all_domains' 
+          ds = domains.is_a?(Array) ? (domains.count > 0 ? domains.sort.join(' ') : 'zzz_all_domains') : "CONSTRAIN #{domains}" 
           classes[ds] = [] if classes[ds].nil?
           classes[ds] << [class_name, actions, class_priority]
         end
@@ -76,9 +82,14 @@ module Caboose
       routes = []
       classes.sort_by{ |domain, domain_classes| domain }.to_h.each do |domain, domain_classes|
                         
-        if domain != 'zzz_all_domains'
-          domains = domain.split(' ').collect{ |d| "'#{d}'" }.join(', ')
-          routes << "constraints Caboose::DomainConstraint.new([#{domains}]) do"
+        if domain != 'zzz_all_domains'                      
+          if domain.starts_with?('CONSTRAIN ')
+            constrainer = domain.gsub('CONSTRAIN ', '')
+            routes << "constraints #{constrainer}.new do"
+          else
+            domains = domain.split(' ').collect{ |d| "'#{d}'" }.join(', ')
+            routes << "constraints Caboose::DomainConstraint.new([#{domains}]) do"                      
+          end            
         end
         domain_classes.sort_by{ |arr| arr[2] }.each do |carr|
         

data/app/models/caboose/domain_constraint.rb

@@ -1,5 +1,5 @@
 class Caboose::DomainConstraint
-  def initialize(domains)    
+  def initialize(domains)
     @domains = domains.is_a?(Array) ? domains.flatten : [domains].flatten
   end
 

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.8.40'
+  VERSION = '0.8.41'
 end

data/lib/tasks/caboose.rake

@@ -188,32 +188,34 @@ namespace :caboose do
     puts "Create a new Nine Lite site\n"
     puts "--------------------------------------------------------------------------------\n"
 
-    input = ''
-    STDOUT.puts "What is the name of the site?"
-    input = STDIN.gets.chomp
-    puts "\n"
-
-    input2 = ''
-    STDOUT.puts "What is the ID of the home page?"
-    input2 = STDIN.gets.chomp
+    site_name = ''
+    while site_name.nil? || site_name.strip.length == 0 do
+      STDOUT.puts "What is the name of the site?"
+      site_name = STDIN.gets.chomp
+    end
     puts "\n"
-
-    input3 = ''
-    STDOUT.puts "E-commerce? (y/n)"
-    input3 = STDIN.gets.chomp
+    
+    use_store = ''
+    while use_store.nil? || (use_store.downcase != 'y' && use_store.downcase != 'n') do 
+      STDOUT.puts "E-commerce? (y/n)"
+      use_store = STDIN.gets.chomp
+    end
     puts "\n"
-
-    if !input.blank? && !input2.blank? && !input3.blank?
-      helper = SiteHelper.new(input,input2,input3)
-      helper.create_site
-
-      puts "\n"
-      puts "--------------------------------------------------------------------------------\n"
-      puts "Choo! Choo! Your site is set up!\n"
-      puts "--------------------------------------------------------------------------------\n"
-    else
-      puts "Invalid site name or home page ID"
+    
+    use_mls = ''
+    while use_mls.nil? || (use_mls.downcase != 'y' && use_mls.downcase != 'n') do
+      STDOUT.puts "MLS? (y/n)"
+      use_mls = STDIN.gets.chomp
     end
+    puts "\n"
+    
+    helper = SiteHelper.new    
+    helper.create_site(site_name, use_store.downcase == 'y', use_mls.downcase == 'y')
+    
+    puts "\n"
+    puts "--------------------------------------------------------------------------------\n"
+    puts "Choo! Choo! Your site is set up!\n"
+    puts "--------------------------------------------------------------------------------\n"    
   end
 
   desc "Create blocks for new site"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.8.40
+  version: 0.8.41
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-10 00:00:00.000000000 Z
+date: 2016-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg