wagn 1.12.13 → 1.13.0.pre

data/lib/card/set_pattern.rb

@@ -1,140 +1,165 @@
-class Card::SetPattern
+class Card
+  class SetPattern
 
-  class << self
-    attr_accessor :key, :key_id, :opt_keys, :junction_only, :method_key, :assigns_type, :anchorless
+    class << self
+      attr_accessor :key, :key_id, :opt_keys, :junction_only, :method_key, :assigns_type, :anchorless
     
-    def junction_only?
-      !!junction_only
-    end
+      def junction_only?
+        !!junction_only
+      end
     
-    def anchorless?
-      !!anchorless
-    end
+      def anchorless?
+        !!anchorless
+      end
 
-    def new card
-      super if pattern_applies? card
-    end
+      def new card
+        super if pattern_applies? card
+      end
 
-    def key_name
-      Card.fetch(self.key_id, :skip_modules=>true).cardname
-    end
+      def key_name
+        Card.fetch(self.key_id, :skip_modules=>true).cardname
+      end
 
-    def register key, opts={}
-      if self.key_id = Card::Codename[key]
-        self.key = key
-        Card.set_patterns.insert opts.delete(:index).to_i, self
-        if self.anchorless = !respond_to?( :anchor_name )
-          self.method_key = opts[:method_key] || key
+      def register key, opts={}
+        if self.key_id = Card::Codename[key]
+          self.key = key
+          Card.set_patterns.insert opts.delete(:index).to_i, self
+          if self.anchorless = !respond_to?( :anchor_name )
+            self.method_key = opts[:method_key] || key
+          end
+          self.opt_keys = Array.wrap( opts.delete(:opt_keys) || key.to_sym )
+          opts.each { |key, val| send "#{key}=", val }
+        else
+          warn "no codename for key #{key}"
         end
-        self.opt_keys = Array.wrap( opts.delete(:opt_keys) || key.to_sym )
-        opts.each { |key, val| send "#{key}=", val }
-      else
-        warn "no codename for key #{key}"
       end
-    end
 
-    def method_key_from_opts opts
-      method_key || ((opt_keys.map do |opt_key|
-        opts[opt_key].to_name.key.gsub('+', '-')
-      end << key) * '_' )
-    end
+      def method_key_from_opts opts
+        method_key || ((opt_keys.map do |opt_key|
+          opts[opt_key].to_name.key.gsub('+', '-')
+        end << key) * '_' )
+      end
 
-    def pattern_applies? card
-      junction_only? ? card.cardname.junction? : true
-    end
+      def pattern_applies? card
+        junction_only? ? card.cardname.junction? : true
+      end
+    
+      def write_tmp_file pattern_key, from_file, seq
+        to_file = "#{Wagn.paths['tmp/set_patterns'].first}/#{seq}-#{pattern_key}.rb"
+        klass = "Card::SetPattern::#{pattern_key.camelize}Pattern"
+        file_content = <<EOF
+# -*- encoding : utf-8 -*-
+class #{klass} < Card::SetPattern
+  cattr_accessor :options
+  class << self
+# ~~~~~~~~~~~ above autogenerated; below pulled from #{from_file} ~~~~~~~~~~~
+
+#{ File.read from_file }
+
+# ~~~~~~~~~~~ below autogenerated; above pulled from #{from_file} ~~~~~~~~~~~
   end
+  register "#{pattern_key}", (options || {})
+end
+
+EOF
+        File.write to_file, file_content
+        to_file
+      end
+    end
 
 
-  # Instance methods
+    # Instance methods
 
-  def initialize card
+    def initialize card
     
-    unless self.class.anchorless?
-      @anchor_name = self.class.anchor_name(card).to_name
+      unless self.class.anchorless?
+        @anchor_name = self.class.anchor_name(card).to_name
 
-      @anchor_id = if self.class.respond_to? :anchor_id
-        self.class.anchor_id card
-      else
-        Card.fetch_id @anchor_name
+        @anchor_id = if self.class.respond_to? :anchor_id
+          self.class.anchor_id card
+        else
+          Card.fetch_id @anchor_name
+        end
       end
+
+      self
     end
 
-    self
-  end
 
+    def set_module_name
+      tail = case
+        when self.class.anchorless?   ; self.class.key.camelize
+        when opt_vals.member?( nil )  ; nil
+        else "#{self.class.key.camelize}::#{opt_vals.map(&:to_s).map(&:camelize) * '::'}"
+        end
+      tail && "Card::Set::#{ tail }"
+    end
 
-  def set_module_name
-    tail = case
-      when self.class.anchorless?   ; self.class.key.camelize
-      when opt_vals.member?( nil )  ; nil
-      else "#{self.class.key.camelize}::#{opt_vals.map(&:to_s).map(&:camelize) * '::'}"
+    def set_const
+      if set_module = self.set_module_name
+        Card::Set.includable_modules[ set_module ]
       end
-    tail && "Card::Set::#{ tail }"
-  end
 
-  def set_const
-    if set_module = self.set_module_name
-      Card::Set.includable_modules[ set_module ]
+    rescue Exception => e
+      warn "exception set_const #{e.inspect}, #{e.backtrace*"\n"}"
     end
 
-  rescue Exception => e
-    warn "exception set_const #{e.inspect}, #{e.backtrace*"\n"}"
-  end
-
-  def get_method_key
-    if self.class.anchorless?
-      self.class.method_key
-    else
-      opts = {}
-      self.class.opt_keys.each_with_index do |key, index|
-        return nil unless opt_vals[index]
-        opts[key] = opt_vals[index]
+    def get_method_key
+      if self.class.anchorless?
+        self.class.method_key
+      else
+        opts = {}
+        self.class.opt_keys.each_with_index do |key, index|
+          return nil unless opt_vals[index]
+          opts[key] = opt_vals[index]
+        end
+        self.class.method_key_from_opts opts
       end
-      self.class.method_key_from_opts opts
     end
-  end
 
-  def opt_vals
-    if @opt_vals.nil?
-      @opt_vals = self.class.anchorless? ? [] : find_opt_vals
+    def opt_vals
+      if @opt_vals.nil?
+        @opt_vals = self.class.anchorless? ? [] : find_opt_vals
+      end
+      @opt_vals
     end
-    @opt_vals
-  end
 
-  def find_opt_vals
-    anchor_parts = if self.class.opt_keys.size > 1
-      [ @anchor_name.left, @anchor_name.right ]
-    else
-      [ @anchor_name ]
-    end
-    anchor_parts.map do |part|
-      part_id = Card.fetch_id part
-      part_id && Card::Codename[ part_id.to_i ] or return []
+    def find_opt_vals
+      anchor_parts = if self.class.opt_keys.size > 1
+        [ @anchor_name.left, @anchor_name.right ]
+      else
+        [ @anchor_name ]
+      end
+      anchor_parts.map do |part|
+        part_id = Card.fetch_id part
+        part_id && Card::Codename[ part_id.to_i ] or return []
+      end
     end
-  end
 
-  def key_name
-    @key_name ||= self.class.key_name
-  end
+    def key_name
+      @key_name ||= self.class.key_name
+    end
 
-  def to_s
-    self.class.anchorless? ? key_name.s : "#{@anchor_name}+#{key_name}"
-  end
+    def to_s
+      self.class.anchorless? ? key_name.s : "#{@anchor_name}+#{key_name}"
+    end
 
-  def inspect
-    "<#{self.class} #{to_s.to_name.inspect}>"
-  end
+    def inspect
+      "<#{self.class} #{to_s.to_name.inspect}>"
+    end
 
-  def safe_key()
-    caps_part = self.class.key.gsub(' ','_').upcase
-    self.class.anchorless? ? caps_part : "#{caps_part}-#{@anchor_name.safe_key}"
-  end
+    def safe_key()
+      caps_part = self.class.key.gsub(' ','_').upcase
+      self.class.anchorless? ? caps_part : "#{caps_part}-#{@anchor_name.safe_key}"
+    end
 
-  def rule_set_key
-    if self.class.anchorless?
-      self.class.key
-    elsif @anchor_id
-      [ @anchor_id, self.class.key ].map( &:to_s ) * '+'
+    def rule_set_key
+      if self.class.anchorless?
+        self.class.key
+      elsif @anchor_id
+        [ @anchor_id, self.class.key ].map( &:to_s ) * '+'
+      end
     end
+  
   end
 end

data/lib/wagn/all.rb

@@ -8,18 +8,11 @@ if Rails.env.development?
   end
 end
 
+require 'htmlentities'
 require 'recaptcha'
 require 'airbrake'
-
-require 'smart_name'
-require 'htmlentities'
-require 'uuid'
 require 'RMagick'
 require 'paperclip'
-
-# require 'xmlscan'
-# require 'rubyzip'
 require 'coderay'
-#require 'sass'
 
 require 'wagn/application'

data/lib/wagn/application.rb

@@ -1,6 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 require 'wagn/all'
+require 'active_support/core_ext/numeric/time'
 
 if defined?(Bundler)
   # If you precompile assets before deploying to production, use this line
@@ -25,11 +26,13 @@ module Wagn
       @config ||= begin
         config = super
         
+        config.i18n.enforce_available_locales = true
+        
         config.autoload_paths += Dir["#{Wagn.gem_root}/app/**/"]
         config.autoload_paths += Dir["#{Wagn.gem_root}/lib/**/"]
         config.autoload_paths += Dir["#{Wagn.gem_root}/mods/standard/lib/**/"]
         
-        config.assets.enabled = true
+        config.assets.enabled = false
         config.assets.version = '1.0'
         
         
@@ -45,11 +48,12 @@ module Wagn
         config.recaptcha_private_key = nil
         config.recaptcha_proxy       = nil
         
-        config.send_emails           = !ENV['WAGN_MIGRATION']
         config.email_defaults        = nil
         config.override_host         = nil
         config.override_protocol     = nil
         
+        config.token_expiry          = 2.days
+        
         config
       end
     end
@@ -58,14 +62,10 @@ module Wagn
     def paths
       @paths ||= begin
         paths = super
-        add_wagn_path paths, 'public'
         add_wagn_path paths, "app",                 :eager_load => true, :glob => "*"
         add_wagn_path paths, "app/assets",          :glob => "*"
         add_wagn_path paths, "app/controllers",     :eager_load => true
-        add_wagn_path paths, "app/models",          :eager_load => true
-        add_wagn_path paths, "app/mailers",         :eager_load => true
-        add_wagn_path paths, "app/views"
-        add_wagn_path paths, "lib/tasks",           :glob => "**/*.rake"
+        add_wagn_path paths, "lib/tasks",           :with => "lib/wagn/tasks", :glob => "**/*.rake"
         add_wagn_path paths, "config"
         add_wagn_path paths, "config/environments", :glob => "#{Rails.env}.rb"
         add_wagn_path paths, "config/initializers", :glob => "**/*.rb"
@@ -75,9 +75,16 @@ module Wagn
         add_wagn_path paths, "db/migrate_cards"
         add_wagn_path paths, "db/seeds",            :with => "db/seeds.rb"        
         add_wagn_path paths, 'gem-mods',            :with => 'mods'
+        add_wagn_path paths, 'gem-assets',          :with => 'public/assets'
 
+        paths['app/models'] = []
+        paths['app/mailers'] = []
+        paths['app/views'] = File.join( Wagn.gem_root, 'lib/card' )
         paths['local-mods'] = approot_is_gemroot? ? [] : 'mods'        
+
         paths.add 'files'
+        paths.add 'tmp/sets'
+        paths.add 'tmp/set_patterns'
         
         paths
       end

data/lib/wagn/commands/application.rb

@@ -1,5 +1,5 @@
 require 'rails/generators'
-require File.expand_path( '../../../generators/wagn/wagn_generator', __FILE__ )
+require File.expand_path( '../../generators/wagn/wagn_generator', __FILE__ )
 
 if ARGV.first != "new"
   ARGV[0] = "--help"

data/lib/wagn/generators/wagn/templates/public/files/htaccess

@@ -0,0 +1,9 @@
+# Some browsers still send conditional-GET requests if there's a
+# Last-Modified header or an ETag header even if they haven't
+# reached the expiry date sent in the Expires header.
+Header unset Last-Modified
+Header unset ETag
+FileETag None
+# RFC says only cache for 1 year
+ExpiresActive On
+ExpiresDefault "access plus 1 year"

data/lib/{generators → wagn/generators}/wagn/wagn_generator.rb

@@ -58,7 +58,19 @@ class WagnGenerator < Rails::Generators::AppBase
       template "boot.rb"
       template "databases/#{options[:database]}.yml", "database.yml"  
     end
+  end
+  
+  def public
+    empty_directory "public"
     
+    inside "public" do
+      template "robots.txt"
+      empty_directory "files"
+    
+      inside "files" do
+        template "htaccess", ".htaccess"
+      end
+    end
   end
   
   def script

data/lib/wagn/location.rb

@@ -45,16 +45,12 @@ module Wagn::Location
    # -----------( urls and redirects from application.rb) ----------------
 
 
-  # FIXME: missing test  shouldn't this have the rootpath?
+  # TESTME
   def page_path title, opts={}
-    format = (opts[:format] ? ".#{opts.delete(:format)}"  : "")
-    vars = ''
-    if !opts.empty?
-      pairs = []
-      opts.each_pair{|k,v| pairs<< "#{k}=#{v}"}
-      vars = '?' + pairs.join('&')
-    end
-    wagn_path "#{title.to_name.url_key}#{format}#{vars}"
+    
+    format = opts[:format] ? ".#{opts.delete(:format)}"  : ''
+    query  = opts.present? ? "?#{opts.to_param}"         : ''
+    wagn_path "#{title.to_name.url_key}#{format}#{query}"
   end
 
   def wagn_path rel #should be in smartname?
@@ -70,7 +66,7 @@ module Wagn::Location
     if rel =~ /^https?\:/
       rel
     else
-      "#{ Wagn::Env[:protocol] }#{ Wagn::Env[:host] }#{ wagn_path rel }"
+      "#{ Card::Env[:protocol] }#{ Card::Env[:host] }#{ wagn_path rel }"
     end
   end
 
@@ -81,7 +77,7 @@ module Wagn::Location
     title ||= text
     url_options = {}
     [:type, :view].each { |k| url_options[k] = options.delete(k) if options[k] }
-    url = wagn_path page_path( title, url_options )
+    url = page_path( title, url_options )
     link_to text, url, options
   end