Changeset 16

Timestamp:

10/16/2006 10:50:22 (2 years ago)

Author:

why

Message:

• lib/hoodwinkd/models.rb: methods to check for globs.
  
• lib/hoodwinkd/controllers.rb: use globs in the setup and wink calls.
  
• lib/hoodwinkd/dial.rb: allow asterisks in the domain name.
  
• lib/hoodwink.rb: load onslaught and dial by default.
  
• bin/hoodwinkd: a+x.
  

Location:

trunk

Files:

• bin/hoodwinkd (modified) (1 diff)
• lib/hoodwinkd.rb (modified) (1 diff)
• lib/hoodwinkd/controllers.rb (modified) (2 diffs)
• lib/hoodwinkd/dial.rb (modified) (1 diff)
• lib/hoodwinkd/models.rb (modified) (1 diff)

trunk/bin/hoodwinkd

@@ -4 +4 @@
 require 'hoodwinkd'
 
-# extensions to the core
-require 'hoodwinkd/dial'
-require 'hoodwinkd/onslaught'
-require 'hoodwinkd/summaries'
-
 Hoodwinkd.connect File.expand_path('../../config/database.yml', __FILE__)
 Hoodwinkd.create

trunk/lib/hoodwinkd.rb

@@ -6 +6 @@
 Camping.goes :Hoodwinkd
 
-DOMAIN = '[\w\-\.]+\.\w+'
+DOMAIN = '[\w\-\*\.]+\.\w+'
 STATIC = File.expand_path('../../static', __FILE__)
 SALT = ""
 
 require 'mimetypes_hash'
+
+# the raw guts
 require 'hoodwinkd/helpers'
 require 'hoodwinkd/models'
 require 'hoodwinkd/controllers'
 require 'hoodwinkd/views'
+
+# the niceties
+require 'hoodwinkd/dial'
+require 'hoodwinkd/onslaught'
+require 'hoodwinkd/summaries'
 
 module Hoodwinkd::UserSession

trunk/lib/hoodwinkd/controllers.rb

@@ -12 +12 @@
     class Setup < R "/(#{DOMAIN})/setup"
         def get(domain)
-            layers = 
-                Site.find_by_sql [<<-END, domain]
-                    SELECT l.name, l.fullpost_qvars, l.css, l.fullpost_xpath, l.fullpost_url_match,
-                           s.domain, s.enabled, s.created_at
-                    FROM hoodwinkd_sites s, hoodwinkd_layers l
-                    WHERE s.domain = ? AND l.site_id = s.id
-                END
+            layers = Site.find_setup(domain)
             output_json(layers) do |layer| 
                 layer['fullpost_qvars'] = layer['fullpost_qvars'].to_s.split(/\s*,\s+/)
@@ -106 +100 @@
             pass_in = decrypt( @user.security_token, @input.hoodwink_passc[32,32], @input.hoodwink_passc[0,32] )
             if pass_in == decrypt( @user.security_token, @user.password )
+                layer = Site.find_setup(domain).first
+                if layer.domain != domain
+                    site = AliasedSite.create(:creator_id => @user.id, :domain => domain, :linked_site => layer)
+                    linklayer = Layer.create(:site => site, :name => '-')
+                end
                 @post = Post.find_by_sql([<<-END, domain, @permalink]).first
                     SELECT p.*, IFNULL(s.real_domain, s.domain) AS real_domain

trunk/lib/hoodwinkd/dial.rb

@@ -7 +7 @@
                 @layer = @site.layers[0]
             end
-            @layer ||= Layer.new
+            @layer ||= Layer.new(:name => 'Root')
         end
         def get(domain)

trunk/lib/hoodwinkd/models.rb

@@ -124 +124 @@
                 GROUP BY s.id ORDER BY s.created_at DESC, s.id ASC LIMIT #{count.to_i}
             }
+        end
+        def self.globs(domain)
+            parts = domain.split('.')
+            [domain] + (1..parts.length-1).map { |x| "*.#{parts[x..-1].join('.')}" }
+        end
+        def self.find_setup(domain)
+            layers = nil
+            globs(domain).each do |gdom|
+                layers = 
+                    Site.find_by_sql [<<-END, gdom]
+                        SELECT s.*, l.name, l.fullpost_qvars, l.css, l.fullpost_xpath, l.fullpost_url_match
+                        FROM hoodwinkd_sites s, hoodwinkd_layers l
+                        WHERE s.domain = ? AND l.site_id = s.id AND l.fullpost_xpath IS NOT NULL
+                    END
+                break unless layers.blank?
+            end
+            layers
         end
     end