ymdp 0.1.10 → 0.1.11

data/.gitignore

@@ -23,3 +23,5 @@ pkg
 vendor/bin/*
 vendor/gems/*
 !vendor/gems/cache/
+features/data/servers
+features/data/tmp

data/Gemfile

@@ -1,17 +1,24 @@
 gem "rspec", ">= 1.2.6"
+gem "polyglot"
+gem "treetop"
+gem "cucumber"
 gem "haml"
 gem "json"
 gem "hpricot"
+gem "mime-types", :require_as => "mime/types"
 gem "ruby-growl"
+gem "grit"
 gem "activesupport", :require_as => "active_support"
 gem "sishen-rtranslate"
-gem "progressions-basepath", :require_as => "basepath"
+gem "progressions-basepath", :require_as => "basepath", :except => :cucumber
 gem "progressions-g", :require_as => "g"
 gem "timer"
 gem "serenity"
+gem "natural_time"
 gem "ymdp_generator"
 gem "ymdt"
 gem "yrb"
 gem "idiom"
+gem "w3c_validators"
 
 bin_path "vendor/bin"

data/History.txt

@@ -1,5 +1,16 @@
-== in Git
-  
+== 0.1.11 2010-01-25
+  * minor enhancements
+    * changed implementation of configuration object
+    * exposed "host" attribute within templates
+    * send content into template with <tt>yield</tt> instead of instance variable
+    * Cucumber tests
+    * refactor application_view into "view" folder
+    * rename "processor" folder into "compressor" and "validator" folders
+    * move JS validator and JS compressor into YMDP gem
+    * replace HTML validator with w3c_validator gem
+  * bug fixes
+    * fixed filename in form_post.rb
+    * removed unneeded data folder from /spec
 
 == 0.1.10 2010-01-22
   * minor enhancements

data/Rakefile

@@ -25,6 +25,7 @@ begin
     gem.add_runtime_dependency "ymdp_generator", ">= 0"
     gem.add_runtime_dependency "ymdt", ">= 0"
     gem.add_runtime_dependency "yrb", ">= 0"
+    gem.add_runtime_dependency "w3c_validators", ">= 0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
@@ -48,6 +49,7 @@ Spec::Rake::SpecTask.new(:rcov) do |spec|
 end
 
 task :bundle do
+  YMDP_TEST = true
   require 'vendor/gems/environment'
   Bundler.require_env
 end
@@ -65,3 +67,8 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+require 'cucumber/rake/task'
+Cucumber::Rake::Task.new do |t|
+  t.cucumber_opts = "--format pretty"
+end

data/VERSION

@@ -1 +1 @@
-0.1.10
+0.1.11

data/features/data/app/assets/yrb/en-US/keys_en-US.pres

@@ -0,0 +1 @@
+KEY=value

data/features/data/app/javascripts/application.js

@@ -0,0 +1,7 @@
+// This contains application-level JavaScript
+
+var Application = {
+  init: function() {
+    $('main').update("Hello");
+  }
+};

data/features/data/app/stylesheets/application.css

@@ -0,0 +1,3 @@
+html {
+  font-family: Arial, Helvetica, sans-serif;
+}

data/features/data/app/views/layouts/application.html.haml

@@ -0,0 +1,25 @@
+!!!
+%html
+  %head
+    /
+      = "Sprint #{@version} #{@sprint_name}"
+      = "'#{@view}' view for #{@domain}: #{@server}.#{@host}"
+      = "built at #{Time.now}"
+      = "commit #{@hash}, '#{@message}'"
+      
+    %title= "#{@view} view for #{@domain}: #{@server}.#{@host}"
+    
+    = render :stylesheet => 'application'
+
+  %body{:class => @view}
+
+    #content
+      = yield
+    
+    = render :javascript => 'application'
+    
+/
+  = "Sprint #{@version} #{@sprint_name}"
+  = "'#{@view}' view for #{@domain}: #{@server}.#{@host}"
+  = "built at #{Time.now}"
+  = "commit #{@hash}, '#{@message}'"

data/features/data/app/views/page.html.haml

@@ -0,0 +1,2 @@
+%p This is some content.
+

data/{spec → features}/data/config/config.yml

@@ -1,11 +1,10 @@
 config:
-  username: user
+  username: username
   password: password
   default_server: staging
-  host: myserver.com
   production_server: my
-  doctype: HTML 4.0 Transitional
-  growl: false
+  host: mysite.com
+  growl: true
   
   verbose: false
   compress:
@@ -17,10 +16,10 @@ config:
     html: 
       doctype: HTML 4.0 Transitional
       build: true
-      deploy: true
+      deploy: false
     embedded_js:
       build: true
-      deploy: true
+      deploy: false
     js_assets:
       build: false
       deploy: false

data/features/data/config/content.yml

@@ -0,0 +1,2 @@
+version: 1
+sprint_name: Apple

data/features/data/config/jslint.js

@@ -0,0 +1 @@
+

data/features/data/config/servers.yml

@@ -0,0 +1,10 @@
+servers:
+  production:
+    server: www
+    application_id: abcdefg
+    assets_id: hijklmnop_1
+
+  development:
+    server: staging
+    application_id: aeiouefgj
+    assets_id: jklmnopqrs_1

data/features/step_definitions/ymdp_steps.rb

@@ -0,0 +1,54 @@
+Given %r{I load config.yml} do
+  require 'ymdp/configuration/constants'
+end
+
+Then %r{my "([^\"]*)" setting should be "([^\"]*)"} do |key, value|
+  YMDP::Base.configuration.send(key).should == value
+end
+
+Given %r{I compile the application with the message "([^\"]*)"} do |message|
+  begin
+    @options = {
+      :commit => false,
+      :branch => "master",
+      :base_path => BASE_PATH,
+      :servers => SERVERS,
+      :message => message
+    }
+    Object.send(:remove_const, :YMDP_ENV) if defined?(YMDP_ENV)
+    YMDP_ENV = "build"
+    YMDP::Compiler::Domains.new(@options).compile
+  rescue StandardError => e
+    @exception = e.message
+  end
+end
+
+And %r{I should see "([^\"]*)" in "([^\"]*)"} do |content, path|
+  File.read("#{BASE_PATH}/#{path}").should =~ /#{content}/
+end
+
+Given %r{the file "([^\"]*)" exists with "([^\"]*)"} do |filename, content|
+  content.gsub!("\\n", "\n")
+  File.open("#{BASE_PATH}/#{filename}", "w") do |f|
+    content.split("\n").each do |line|
+      f.puts line
+    end
+  end
+  @files << "#{BASE_PATH}/#{filename}"
+end
+
+Then /^an exception should have been raised with the message "([^\"]*)"$/ do |message|
+  @exception.should == message
+end
+
+Then %r{no exceptions should have been raised} do
+  @exception.should be_nil
+end
+
+And %r{I remove the file "([^\"]*)"} do |filename|
+  system "rm #{BASE_PATH}/#{filename}"
+end
+
+When %r{I deploy the application} do
+  
+end

data/features/support/env.rb

@@ -0,0 +1,40 @@
+require 'vendor/gems/environment'
+Bundler.require_env :cucumber
+
+require 'spec/expectations'
+require 'spec/mocks'
+  
+require 'lib/ymdp'
+require 'compiler/domains'
+
+require 'spec/stubs'
+
+Before do
+  unless defined?(BASE_PATH)
+    BASE_PATH = File.expand_path("./features/data")
+    APPLICATION_PATH = File.expand_path("./features/data/app")
+    CONFIG_PATH = File.expand_path("./features/data/config")
+    SERVERS_PATH = File.expand_path("./features/data/servers")
+    TMP_PATH = File.expand_path("./features/data/tmp")
+  end
+  
+  @exception = nil
+  @files = []
+
+  $rspec_mocks ||= Spec::Mocks::Space.new  
+  
+  stub_growl
+  
+  @git_helper = 'git_helper'
+  @git_helper.stub(:commit).as_null_object
+  YMDP::GitHelper.stub!(:new).and_return(@git_helper)
+  
+  @ymdt = "ymdt"
+  YMDT::Base.stub!(:new).and_return(@ymdt)
+end
+
+After do
+  @files.each do |file|
+    system "rm #{file}"
+  end
+end

data/features/ymdp.feature

@@ -0,0 +1,61 @@
+Feature: Configuration
+
+  Background:
+    Given I load config.yml
+
+  Scenario: Load the config file
+    Then my "username" setting should be "username"
+    And my "password" setting should be "password"
+    
+  @wip
+  Scenario: Ensure the commit message is in the view
+    Given I compile the application with the message "this is my commit message"
+    Then I should see "this is my commit message" in "servers/production/views/page"
+    Then I should see "this is my commit message" in "servers/development/views/page"
+    And I should see "Apple" in "servers/production/views/page"
+    And I should see "Apple" in "servers/development/views/page"
+    And I should see "mysite.com" in "servers/production/views/page"
+    And I should see "mysite.com" in "servers/development/views/page"
+    And I should see "font-family:Arial,Helvetica,sans-serif;" in "servers/production/views/page"
+    And I should see "font-family:Arial,Helvetica,sans-serif;" in "servers/development/views/page"
+    And I should see "var Application" in "servers/production/views/page"
+    And I should see "var Application" in "servers/development/views/page"
+    And no exceptions should have been raised
+    
+
+  Scenario: Build application with invalid HTML
+    Given the file "app/views/invalid.html.haml" exists with "%span\n  #invalid_div This won't validate"
+    And I compile the application with the message "this shouldn't validate"
+    Then an exception should have been raised with the message "HTML Validation Errors"
+    
+    
+  Scenario: Render nil on nonexistent scripts
+    Given the file "app/views/valid.html.haml" exists with "%p Hello\n= render :javascript => 'nonexistent'\n%p Goodbye"
+    And I compile the application with the message "this should have no javascript"
+    Then I should see "<p>Hello</p>\n      \n      <p>Goodbye</p>" in "servers/production/views/valid"
+    And no exceptions should have been raised
+    
+    
+  Scenario: Render nil on nonexistent stylesheets
+    Given the file "app/views/valid.html.haml" exists with "%p Hello\n= render :stylesheet => 'nonexistent'\n%p Goodbye"
+    And I compile the application with the message "this should have no stylesheet"
+    Then I should see "<p>Hello</p>\n      \n      <p>Goodbye</p>" in "servers/production/views/valid"
+    And no exceptions should have been raised
+
+
+  Scenario: Build application with valid JavaScript
+    Given the file "app/views/valid.html.haml" exists with "= render :javascript => 'valid'"
+    And the file "app/javascripts/valid.js" exists with "var a = 'hello'; alert(a);"
+    And I compile the application with the message "this should validate"
+    Then no exceptions should have been raised
+    
+
+  Scenario: Build application with invalid JavaScript
+    Given the file "app/javascripts/invalid.js" exists with "A = function() { alert('hello'); }"
+    And the file "app/views/invalid.html.haml" exists with "= render :javascript => 'invalid'"
+    And I compile the application with the message "this shouldn't validate"
+    Then an exception should have been raised with the message "JavaScript Errors embedded in /tmp/invalid.js"
+    
+    
+    
+    

data/lib/ymdp.rb

@@ -8,18 +8,13 @@ $LOAD_PATH.unshift dir unless $LOAD_PATH.include?(dir)
 #
 
 require 'rubygems'
+require 'haml'
 require 'erb'
 require 'set'
 
-require File.expand_path("#{dir}/tag_helper")
-require File.expand_path("#{dir}/asset_tag_helper")
-
-Dir["#{dir}/*.rb"].each do |path|
-  require File.expand_path(path)
-end
-
-["support", "configuration"].each do |directory|
-  Dir["#{dir}/#{directory}/*.rb"].each do |path|
-    require File.expand_path(path)
-  end
-end
+require 'base'
+require 'validator/validator'
+require 'view/tag_helper'
+require 'view/asset_tag_helper'
+require 'support/file'
+require 'configuration/config'

data/lib/ymdp/base.rb

@@ -31,62 +31,41 @@ module YMDP
   # These options are still evolving.
   #
   class Base
-    # Configures global YMDP settings. Sends a YMDP::Configuration::Setter instance to
-    # the block, which is used to define global settings.
-    #
-    def self.configure
-      setter = YMDP::Configuration::Setter.new
-      
-      yield setter
-      
-      @@paths = setter.paths if setter.paths.try(:any?)
-      @@servers = setter.servers if setter.servers.try(:any?)
-      
-      @@content_variables ||= {}
-      
-      setter.instance_variables.each do |key|
-        unless ["@servers", "@paths", "@content_variables"].include?(key)
-          value = setter.instance_variable_get(key)
-          create_accessor(key, value)
-        end
-      end
-      
-      if setter.content_variables.any?
-        content_variables = @@content_variables.merge(setter.content_variables)
-        create_accessor("content_variables", content_variables)
-      end
+    def self.configuration
+      @@configuration ||= YMDP::Configuration::Setter.new
     end
     
-    # Returns the server definition hash as a class variable, making it available to
-    # any class derived from YMDP::Base.
-    #
-    def self.servers
-      @@servers
+    def content_variables
+      configuration.content_variables
     end
     
-    # Returns the paths definition hash as a class variable, making it available to
-    # any class derived from YMDP::Base.
-    #   
-    def self.paths
-      @@paths
+    def configuration
+      @@configuration
+    end
+    
+    # Configures global YMDP settings. Sends a YMDP::Configuration::Setter instance to
+    # the block, which is used to define global settings.
+    #
+    def self.configure
+      yield configuration
     end
     
     # Returns the server definition hash as an instance variable, making it available to
     # instances of any class derived from YMDP::Base.
     #
     def servers
-      self.class.servers
+      configuration.servers
     end
     
     # Returns the paths definition hash as an instance variable, making it available to 
     # instances of any class derived from YMDP::Base.
     #
     def paths
-      self.class.paths
+      configuration.paths
     end
     
     def self.base_path
-      paths[:base_path]
+      configuration.paths[:base_path]
     end
     
     def base_path
@@ -104,33 +83,5 @@ module YMDP
     def display_path(path)
       self.class.display_path(path)
     end
-    
-    
-    private
-    
-    # Creates class- and instance-level accessors for the key and value.
-    #
-    def self.create_accessor(key, value)
-      if key
-        value_str = "\"#{value}\""
-      
-        key = key.to_s.gsub("@", "")
-      
-        class_eval %(
-          class << self
-            attr_accessor :#{key}
-          end
-        )
-        
-        self.send("#{key}=".to_sym, value)
-      
-        eval %(
-          def #{key}
-            #{self}.#{key}
-          end
-        )
-      end
-    end
   end
 end
-