waw 0.3.0 → 0.3.1

data/CHANGELOG.md

@@ -0,0 +1,85 @@
+# Version 0.3.1
+
+* Major enhancements
+
+  * Added &, | and negate on wawaccess's Matchers
+  * Fixed #447: user-friendly message when params is forgotten in action method signature
+  * Cleaned the gemspec to include official dependencies
+
+* On the devel side
+
+  * Bumped to ruby.noe 1.3.0
+  * Spec tests moved under spec/ instead of test/spec
+  * Removed the vendor library, as all dependencies are official gems
+
+# Version 0.3.0
+
+* Added a Matcher class in StaticController, and matcher dsl rule in .wawaccess
+* Modified some WawAccess API (env is passed instead of path at different places)
+* Kernel application has been extended to support internal requests
+* A DateTimeValidator has been added to the validation framework
+* Waw::ActionController::JSGeneration becomes a controller. This allows setting
+  configuration variable 'code_at_startup' to false (no code generated as a file
+  at all) and including generated javascript as follows:
+
+    waw.routing
+        map '/webservices.js' do
+          run ::Waw::ActionController::JSGeneration.new
+        end
+      
+    layout.wtpl
+  		  <script type="text/javascript" src="/webservices.js"></script>
+  		  
+* Set Rack version to 1.2.1
+* Fixed a bug with waw-profile when encountering relative links.
+* Moved to rspec 2.4.0
+
+# Version 0.2.1
+
+* Layouts have been cleaned. The empty layout is less complete than before
+* Layouts force the waw version that is loaded by config.ru to a version greater
+  than the one that created the layout. 
+* Bug/Feature #260 related to inclusion of ::Waw::Validation has been implemented
+* Bug/Feature #261 related to self referencing resource files has been implemented.
+* Features #305 and #306 related to default validators and validators taking blocks
+  have been implemented.
+
+# Version 0.2.0
+
+## Broken features and APIs (by order of importance)
+
+* Major changes due to wlang version 0.9.0 (see Changelog there). Waw 0.2.0 verifies
+  that a wlang gem >= 0.9.0 is installed in rubygems.
+* The 'using self' syntax is deprecated in .wtpl files. Equivalence can be obtained 
+  trough 'share all' (see also auto-waw-scoping later)
+
+## New features
+
+* All methods in Waw::ScopeUtils are automatically present in all wlang scopes as 
+  low priority variables (aka auto-waw-scoping)
+* wlang executable ensures that it executes the current version
+* 'waw create' applies WLang::encode(upper_name, 'ruby/method-case') for computing 
+  the lower project name.
+
+## Bugfixes
+
+* bug #290: Rack >= 1.1.0 is verified through rubygems
+* feature #259: CSS and JS files are sorted by names when put in css_files and js_files wlang 
+  variables
+
+# Version 0.1.3
+
+## Broken features and APIs (by order of importance)
+
+* wawspec become wspec, all old invocations and assertions have been removed
+* 'scenario' and 'because' in wspec are considered deprecated (but can still be used).
+  They are replaced by 'requirement' and 'therefore'
+
+## New features
+
+* A mail agent has been added in tools. It expects a smtp_config variable in Waw.config.
+  This agent really send mails in 'production' and 'acceptation' deployment modes. In
+  'devel' and 'test' modes, it simply put mails in internal mailboxes accessible through
+  accessors (see ::Waw::Tools::MailAgent)
+* validation architecture has been consolidated and is well tested
+* wawaccess files refactored and consolidated.

data/Gemfile

@@ -0,0 +1,2 @@
+source 'http://rubygems.org'
+gemspec :name => "waw"

data/Gemfile.lock

@@ -0,0 +1,37 @@
+PATH
+  remote: .
+  specs:
+    waw (0.3.1)
+      json (>= 1.1.9)
+      rack (~> 1.2.1)
+      wlang (~> 0.10.1)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    bluecloth (2.0.9)
+    diff-lcs (1.1.2)
+    json (1.5.1)
+    rack (1.2.1)
+    rake (0.8.7)
+    rspec (2.4.0)
+      rspec-core (~> 2.4.0)
+      rspec-expectations (~> 2.4.0)
+      rspec-mocks (~> 2.4.0)
+    rspec-core (2.4.0)
+    rspec-expectations (2.4.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.4.0)
+    wlang (0.10.1)
+    yard (0.6.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bluecloth (~> 2.0.9)
+  bundler (~> 1.0)
+  rake (~> 0.8.7)
+  rspec (~> 2.4.0)
+  waw!
+  yard (~> 0.6.4)

data/{LICENCE.rdoc → LICENCE.md}

@@ -1,8 +1,8 @@
-= Licence
+# Licence
 
 	The MIT License
 
-	Copyright (c) 2009 Bernard & Louis Lambeau and the University of Louvain 
+	Copyright (c) 2009-2011 Bernard & Louis Lambeau and the University of Louvain 
 	(Universite Catholique de Louvain, Louvain-la-Neuve, Belgium)
 	
 	Permission is hereby granted, free of charge, to any person obtaining a copy

data/Manifest.txt

@@ -0,0 +1,19 @@
+.gemtest
+bin/**/*
+CHANGELOG.md
+Gemfile
+Gemfile.lock
+layouts/**/*
+layouts/static/public/.wawaccess
+layouts/static/public/pages/.wawaccess
+layouts/static/public/templates/.wawaccess
+lib/**/*
+LICENCE.md
+Manifest.txt
+Rakefile
+README.md
+spec/**/*
+tasks/**/*
+test/**/*
+waw.gemspec
+waw.noespec

data/{README.rdoc → README.md}

@@ -1,10 +1,18 @@
-= Waw, making web applications simple
+# Waw, making web applications simple
 
 Waw is a web framework written in Ruby. It provides an alternative to Rails and other frameworks
 written in Ruby as well. It is designed to be somewhere in the middle between Rails (sometimes a 
-bit too heavy) and Rack (not really a framework, sometimes too low-level).
+bit too heavy) and Rack/Sinatra (not really a framework, sometimes too low-level).
 
-== Main features
+Waw has been originally designed in the ReQuest research project of the University of Louvain, has
+been entirely rewritten in ruby, and is still actively developped to reach its first real stable 
+version ;-)
+
+## Links
+
+http://github.com/blambeau/waw
+
+## Main features
 
 Waw basically provides an overall architecture for web sites and/or applications. Its main 
 features are
@@ -23,10 +31,4 @@ features are
 - When things become too restrictive for you (you don't fit the architecture exactly) you can 
   access lower stages ... edit the underlying Rack configuration and install your own services
   in a few minutes, bypassing waw when needed!
-  
-== Dependencies
-
-Waw requires the following ruby gems
 
-- rack >= 1.1.0 (provided through <code>gem install rack</code>)
-- wlang >= 0.9.0 (provided in the vendors folder)

data/Rakefile

@@ -0,0 +1,23 @@
+begin
+  gem "bundler", "~> 1.0"
+  require "bundler/setup"
+rescue LoadError => ex
+  puts ex.message
+  abort "Bundler failed to load, (did you run 'gem install bundler' ?)"
+end
+
+# Dynamically load the gem spec
+$gemspec_file = File.expand_path('../waw.gemspec', __FILE__)
+$gemspec      = Kernel.eval(File.read($gemspec_file))
+
+# We run tests by default
+task :default => :test
+
+#
+# Install all tasks found in tasks folder
+#
+# See .rake files there for complete documentation.
+#
+Dir["tasks/*.rake"].each do |taskfile|
+  instance_eval File.read(taskfile), taskfile
+end

data/lib/waw.rb

@@ -2,9 +2,7 @@ $waw_deprecated_io = nil
 require 'singleton'
 require 'waw/ext/core'
 require 'waw/ext/rack'
-# 
-# Main waw module, providing the strict micro kernel of waw loader
-#
+require 'waw/version'
 module Waw
   
   # Requirements on gems for this version
@@ -14,9 +12,6 @@ module Waw
     :json  => '>= 1.1.9'
   }
   
-  # Waw version
-  VERSION = "0.3.0".freeze
-  
   # Waw loading mutex
   WAW_KERNELS_LOCK = Mutex.new
   
@@ -74,10 +69,8 @@ end
 
 # Now, make ruby requires
 require 'rubygems'
-Waw::GEM_REQUIREMENTS.each_pair {|name, version|
-  gem(name.to_s, version)
-  require(name.to_s)
-}
+Waw::GEM_REQUIREMENTS.each_pair {|name, version| gem(name.to_s, version)}
+require 'waw/loader'
 require 'waw/errors'
 require 'waw/scope_utils'
 require 'waw/ext'

data/lib/waw/controllers/action_controller.rb

@@ -73,8 +73,13 @@ module Waw
           @critical = true
       
           # Create the action instance
-          action = Waw::ActionController::Action.new(name, @signature, @routing, self, instance_method(name))
-          actions[name] = action
+          meth = instance_method(name)
+          if meth.arity != 1
+            raise WawError, "Action #{self}::#{name} is missing its 'params' argument"
+          else
+            action = Waw::ActionController::Action.new(name, @signature, @routing, self, meth)
+            actions[name] = action
+          end
           
           # Installs the class method that returns the action
           instance_eval <<-EOF

data/lib/waw/controllers/static/matcher.rb

@@ -1,18 +1,13 @@
 module Waw
   class StaticController < ::Waw::Controller
-    class Matcher
+    class AbstractMatcher
       include Waw::ScopeUtils
-      
+
       # Waw access on which this matcher is defined
       attr_reader :wawaccess
       
-      # Matcher's predicate
-      attr_reader :predicate
-      
-      # Creates a matcher instance
-      def initialize(wawaccess, predicate)
+      def initialize(wawaccess)
         @wawaccess = wawaccess
-        @predicate = predicate
       end
       
       # Returns wawaccess's folder
@@ -25,11 +20,85 @@ module Waw
         wawaccess.req_path
       end
       
+      def &(other)
+        unless other.is_a?(AbstractMatcher)
+          raise ArgumentError, "Matcher expected for &, #{other} received"
+        end
+        AndMatcher.new(wawaccess, self, other)
+      end
+      
+      def |(other)
+        unless other.is_a?(AbstractMatcher)
+          raise ArgumentError, "Matcher expected for |, #{other} received"
+        end
+        OrMatcher.new(wawaccess, self, other)
+      end
+      
+      def negate
+        NegateMatcher.new(wawaccess, self)
+      end
+      
+    end
+    
+    class Matcher < AbstractMatcher
+      
+      # Matcher's predicate
+      attr_reader :predicate
+      
+      # Creates a matcher instance
+      def initialize(wawaccess, predicate)
+        super(wawaccess)
+        @predicate = predicate
+      end
+      
       # Does the matcher matches a given path?
       def matches?(env)
         instance_eval &predicate
       end
       
     end # class Matcher
+
+    class NegateMatcher < AbstractMatcher
+
+      def initialize(wawaccess, operand)
+        super(wawaccess)
+        @operand = operand
+      end
+      
+      # Does the matcher matches a given path?
+      def matches?(env)
+        !@operand.matches?(env)
+      end
+      
+    end
+
+    class AndMatcher < AbstractMatcher
+
+      def initialize(wawaccess, left, right)
+        super(wawaccess)
+        @left, @right = left, right
+      end
+      
+      # Does the matcher matches a given path?
+      def matches?(env)
+        @left.matches?(env) && @right.matches?(env)
+      end
+      
+    end # class AndMatcher
+
+    class OrMatcher < AbstractMatcher
+
+      def initialize(wawaccess, left, right)
+        super(wawaccess)
+        @left, @right = left, right
+      end
+      
+      # Does the matcher matches a given path?
+      def matches?(env)
+        @left.matches?(env) || @right.matches?(env)
+      end
+      
+    end # class AndMatcher
+    
   end # class StaticController
 end # module Waw

data/lib/waw/controllers/static/waw_access.rb

@@ -65,7 +65,7 @@ module Waw
       
       def recognized_pattern?(pattern)
         [FalseClass, TrueClass, String, 
-         Regexp, Waw::Validation::Validator, StaticController::Matcher].any?{|c| c===pattern}
+         Regexp, Waw::Validation::Validator, StaticController::AbstractMatcher].any?{|c| c===pattern}
       end
       
       # Adds a child in the hierarchy
@@ -190,7 +190,7 @@ module Waw
               if pattern.validate(matching_file(path))
                 return Match.new(self, path, block) 
               end
-            when StaticController::Matcher
+            when StaticController::AbstractMatcher
               if pattern.matches?(env)
                 return Match.new(self, path, block)
               end

data/lib/waw/loader.rb

@@ -0,0 +1,3 @@
+require "rack"
+require "wlang"
+require "json"

data/lib/waw/version.rb

@@ -0,0 +1,14 @@
+module Waw
+  module Version
+  
+    MAJOR = 0
+    MINOR = 3
+    TINY  = 1
+  
+    def self.to_s
+      [ MAJOR, MINOR, TINY ].join('.')
+    end
+  
+  end 
+  VERSION = Version.to_s
+end

data/{test/spec → spec}/assumptions_spec.rb

@@ -1,3 +1,4 @@
+require File.expand_path('../spec_helper', __FILE__)
 describe "Our understanding of ruby" do
   
   def sandbox_file_with_spaces

data/{test/spec → spec}/controllers/action_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'waw'
+require File.expand_path('../../spec_helper', __FILE__)
 describe ::Waw::ActionController do
   include ::Waw::Fixtures
   before(:each) { load_action_app   }

data/{test/spec → spec}/controllers/static/waw_access_spec.rb

@@ -1,5 +1,4 @@
-require 'waw'
-
+require File.expand_path('../../../spec_helper', __FILE__)
 describe "::Waw::StaticController::WawAccess.matching_file" do
   
   def folder

data/{test/spec → spec}/environment_utils_spec.rb

@@ -1,4 +1,4 @@
-require "waw"
+require File.expand_path('../spec_helper', __FILE__)
 describe Waw::EnvironmentUtils do
   include Waw::EnvironmentUtils
   

data/{test/spec → spec}/ext/core/hash_spec.rb

@@ -1,3 +1,4 @@
+require File.expand_path('../../../spec_helper', __FILE__)
 describe ::Hash do
  
   it "should provide a non-intrusive keep method" do