RubyApp 0.0.91 → 0.2.0

data/.gitignore

@@ -1,5 +1,4 @@
 .bundle
-.cache
 .DS_Store
 .idea
 .sass-cache

data/.rvmrc

@@ -1 +1,56 @@
-rvm ruby-1.8.7-p352@RubyApp
+#!/usr/bin/env bash
+
+# This is an RVM Project .rvmrc file, used to automatically load the ruby
+# development environment upon cd'ing into the directory
+
+# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional.
+# environment_id="ruby-1.9.3-p125@RubyApp"
+environment_id="ruby-1.8.7-p352@RubyApp"
+
+#
+# Uncomment following line if you want options to be set only for given project.
+#
+# PROJECT_JRUBY_OPTS=( --1.9 )
+
+#
+# First we attempt to load the desired environment directly from the environment
+# file. This is very fast and efficient compared to running through the entire
+# CLI and selector. If you want feedback on which environment was used then
+# insert the word 'use' after --create as this triggers verbose mode.
+#
+if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
+  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
+then
+  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
+
+  if [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]]
+  then
+    . "${rvm_path:-$HOME/.rvm}/hooks/after_use"
+  fi
+else
+  # If the environment file has not yet been created, use the RVM CLI to select.
+  if ! rvm --create  "$environment_id"
+  then
+    echo "Failed to create RVM environment '${environment_id}'."
+    exit 1
+  fi
+fi
+
+#
+# If you use an RVM gemset file to install a list of gems (*.gems), you can have
+# it be automatically loaded. Uncomment the following and adjust the filename if
+# necessary.
+#
+# filename=".gems"
+# if [[ -s "$filename" ]]
+# then
+#   rvm gemset import "$filename" | grep -v already | grep -v listed | grep -v complete | sed '/^$/d'
+# fi
+
+# If you use bundler, this might be useful to you:
+# if command -v bundle && [[ -s Gemfile ]]
+# then
+#   bundle install
+# fi
+
+

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    RubyApp (0.0.91)
+    RubyApp (0.2.0)
       BlueCloth
       chronic
       chronic_duration
@@ -22,7 +22,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     BlueCloth (1.0.1)
-    addressable (2.2.6)
+    addressable (2.2.7)
     builder (3.0.0)
     capybara (1.1.2)
       mime-types (>= 1.16)
@@ -31,15 +31,15 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    childprocess (0.3.0)
+    childprocess (0.3.1)
       ffi (~> 1.0.6)
     chronic (0.6.7)
     chronic_duration (0.9.6)
       numerizer (~> 0.1.1)
-    cucumber (1.1.4)
+    cucumber (1.1.9)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (~> 2.7.1)
+      gherkin (~> 2.9.0)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.6)
     diff-lcs (1.1.3)
@@ -47,15 +47,15 @@ GEM
     ffi (1.0.11)
     fileutils (0.7)
       rmagick (>= 2.13.1)
-    gherkin (2.7.6)
+    gherkin (2.9.1)
       json (>= 1.4.6)
     haml (3.1.4)
     json (1.6.5)
-    launchy (2.0.5)
+    launchy (2.1.0)
       addressable (~> 2.2.6)
     mime-types (1.17.2)
-    multi_json (1.0.4)
-    nokogiri (1.5.0)
+    multi_json (1.1.0)
+    nokogiri (1.5.2)
     numerizer (0.1.1)
     r18n-core (0.4.14)
     rack (1.4.1)
@@ -63,22 +63,22 @@ GEM
       rack (>= 1.0)
     rake (0.9.2.2)
     rmagick (2.13.1)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
     ruby-event (1.0.0)
     ruby-openid (2.1.8)
-    rubyzip (0.9.5)
-    sass (3.1.12)
-    selenium-webdriver (2.18.0)
+    rubyzip (0.9.6.1)
+    sass (3.1.15)
+    selenium-webdriver (2.20.0)
       childprocess (>= 0.2.5)
-      ffi (~> 1.0.9)
-      multi_json (~> 1.0.4)
+      ffi (~> 1.0)
+      multi_json (~> 1.0)
       rubyzip
     term-ansicolor (1.0.7)
     xpath (0.1.4)

data/bin/console.rb

@@ -1,8 +1,16 @@
 require 'rubygems'
 require 'bundler/setup'
 
-require 'ruby_app/application'
+require 'ruby_app'
 
 puts "Running #{__FILE__.inspect}"
 
+RubyApp::Configuration.load!([File.join(RubyApp::ROOT, %w[configuration.yml])])
+RubyApp::Log.open!
 RubyApp::Application.create!
+
+at_exit do
+  RubyApp::Application.destroy!
+  RubyApp::Log.close!
+  RubyApp::Configuration.unload!
+end

data/bin/ruby_app

@@ -17,9 +17,8 @@ usage: ruby_app <command> <arguments>
 
 Available commands include:
   create application    Create a basic application in the current folder named <arguments>.
-  create page           DISABLED: Create a baisc page consisting of .rb, .html, .css. and .js files (not implemented)
   console               Open an interactive console
-  run                   Run the application identified by the config.ru in <arguments>
+  run                   Run the application identified by the configuration.ru in <arguments>
 
 USAGE
 end
@@ -101,25 +100,6 @@ def create_application
   copy_folder(source, full_folder, replacements)
 end
 
-#def create_page
-#  argument = $*[2]
-#  folder = File.dirname(File.join(File.join(FileUtils.pwd, %w[elements arguments]), downcode(argument).split('/')))
-#  namespace_class = "#{upcode(File.basename(FileUtils.pwd))}::Elements::Pages::#{upcode(argument)}"
-#  _class = namespace_class.split('::').last
-#  replacements =  [
-#                   {
-#                     :pattern => /_PAGE_DOWNCODE_/,
-#                     :text => downcode(_class)
-#                   },
-#                   {
-#                     :pattern => /_PAGE_UPCODE_/,
-#                     :text => _class
-#                   }
-#                 ]
-#  source = File.join(File.dirname(__FILE__), %w[.. lib ruby_app templates argument])
-#  copy_folder(source, folder, replacements)
-#end
-
 def console
   argument = $*[1]
   system("irb --back-trace-limit 100 -r #{argument || ( File.exists?(File.join(FileUtils.pwd, %w[console.rb])) ? File.join(FileUtils.pwd, %w[console.rb]) : File.join(File.dirname(__FILE__), %w[console.rb]) )}")
@@ -127,7 +107,7 @@ end
 
 def run
   argument = $*[1]
-  Rack::Server.start(:config => argument || File.join(FileUtils.pwd, %w[config.ru]))
+  Rack::Server.start(:config => argument || File.join(FileUtils.pwd, %w[configuration.ru]))
 end
 
 def downcode(value)
@@ -151,8 +131,6 @@ else
       case $*[1].downcase
         when 'application'
           create_application
-        # when 'page'
-        #  create_page
         else
           puts "Blank or unrecognized command '#{$*[1].downcase}'"
           puts usage

data/features/default.feature

@@ -3,3 +3,4 @@ Feature: Default Page
   Scenario: View the default page
     Given I am viewing "/"
     Then I should see "Click here to go to the test pages"
+    Then I quit

data/features/elements/input.feature

@@ -56,3 +56,5 @@ Feature: Input elements
     When I click "Close"
     And I uncheck the "ToggleInput" field
     Then I should see "You input 'false'"
+    Then I click "Close"
+    Then I quit

data/features/elements/page.feature

@@ -21,12 +21,3 @@ Feature: A page
     And I click "_TestPage"
     Then I should see "The cookie value is 'value'."
     Then I quit
-
-  Scenario Outline: Loading the home page
-    Given I am viewing "/"
-    And I should see "Loaded"
-
-    Scenarios: Count
-      | count |
-      | X     |
-      | X     |

data/features/step_definitions/default_macros.rb

@@ -8,9 +8,6 @@ end
 
 Then /^I quit$/ do
   steps %Q{
-    When I click "Settings"
-    Then I should see "Quit the session"
-    When I click "Quit"
-    Then I should see "Click here to go to the test pages"
+    Given I am viewing "/quit"
   }
 end

data/features/step_definitions/default_steps.rb

@@ -1,5 +1,5 @@
 Given /^I am viewing "([^"]*)"$/ do |url|
-  visit("#{url}?event_error=false")
+  visit("#{url}?_event_error=false")
 end
 
 When /^I refresh the page$/ do

data/lib/ruby_app.rb

@@ -1 +1,8 @@
-require "ruby_app/version"
+require 'ruby_app/application'
+require 'ruby_app/configuration'
+require 'ruby_app/language'
+require 'ruby_app/log'
+require 'ruby_app/request'
+require 'ruby_app/response'
+require 'ruby_app/session'
+require 'ruby_app/version'

data/lib/ruby_app/application.rb

@@ -4,22 +4,15 @@ require 'bundler/setup'
 require 'fileutils'
 
 module RubyApp
-  require 'ruby_app/configuration'
-  require 'ruby_app/log'
-  require 'ruby_app/mixins/configuration_mixin'
-  require 'ruby_app/mixins/delegate_mixin'
-  require 'ruby_app/mixins/hash_mixin'
-  require 'ruby_app/session'
-  require 'ruby_app/version'
+  require 'ruby_app/mixins'
 
   class Application
+    extend RubyApp::Mixins::ConfigurationMixin
     extend RubyApp::Mixins::DelegateMixin
-    include RubyApp::Mixins::ConfigurationMixin
 
     attr_reader :options, :environment
 
-    def initialize(options)
-      @options = options
+    def initialize
       @environment = {}
     end
 
@@ -27,69 +20,14 @@ module RubyApp
       @@_application ||= nil
     end
 
-    def self.create!(options = {})
-      _options = { :application_class => RubyApp::Application,
-                   :session_class => RubyApp::Session,
-                   :log_path => File.join(RubyApp::ROOT, %w[process log application.log]),
-                   :configuration_paths => [],
-                   :default_language => :en,
-                   :translations_paths => [] }.merge(options)
-      _options[:configuration_paths] = [File.join(RubyApp::ROOT, %w[config.yml])] + ( _options[:configuration_paths].is_a?(Array) ? _options[:configuration_paths] : [_options[:configuration_paths]] )
-      _options[:translations_paths] = [File.join(RubyApp::ROOT, %w[translations])] + ( _options[:translations_paths].is_a?(Array) ? _options[:translations_paths] : [_options[:translations_paths]] )
-      RubyApp::Log.open!(_options[:log_path])
-      RubyApp::Configuration.load!(_options[:configuration_paths])
-      @@_application = _options[:application_class].new(_options)
+    def self.create!
+      @@_application = ( Kernel.eval(RubyApp::Application.configuration._class) ).new
     end
 
     def self.destroy!
-      RubyApp::Configuration.unload!
-      RubyApp::Log.close!
       @@_application = nil
     end
 
-    def self.create_cache(path, root)
-      RubyApp::Application.create!
-      begin
-        Dir.glob(File.join(path, %w[** *.rb])).each do |element_file|
-          RubyApp::Request.create!
-          begin
-            require element_file
-            element_class = element_file.gsub(root, '')
-            element_class = element_class.gsub(/^\//, '')
-            element_class = element_class.gsub(/\.rb$/, '')
-            element_class = RubyApp::Application.upcode(element_class)
-            begin
-              element_class = eval(element_class)
-              [:css, :js].each do |format|
-                begin
-                  element_class.render(format, true)
-                rescue Exception => exception
-                  puts "#{element_class}.render(#{format.inspect}) exception=#{exception.message}"
-                end
-              end
-            rescue Exception => exception
-              puts exception.message
-            end
-          ensure
-            RubyApp::Request.destroy!
-          end
-        end
-      ensure
-        RubyApp::Application.destroy!
-      end
-    end
-
-    def self.destroy_cache(path)
-      Dir.glob(File.join(path, %w[** .cache])).each do |directory|
-        FileUtils.rm_r(directory)
-      end
-    end
-
-    def self.upcode(value)
-      value = value.gsub(/\/(.?)/) { "::#{$1.upcase}" }
-      value.gsub(/(?:^|_)(.)/) { $1.upcase }
-    end
-
   end
 
 end

data/lib/ruby_app/configuration.rb

@@ -1,8 +1,7 @@
 require 'yaml'
 
 module RubyApp
-  require 'ruby_app/mixins/delegate_mixin'
-  require 'ruby_app/mixins/hash_mixin'
+  require 'ruby_app/mixins'
 
   class Configuration
     extend RubyApp::Mixins::DelegateMixin
@@ -10,7 +9,7 @@ module RubyApp
     attr_reader :document
 
     def self.get
-      @@_configuration
+      @@_configuration ||= nil
     end
 
     def self.load!(paths)

data/lib/ruby_app/configuration.ru

@@ -0,0 +1,32 @@
+#\ --warn --port 8008 --pid ./rack.pid --debug true
+require 'rubygems'
+require 'bundler/setup'
+
+require 'rack'
+
+require 'ruby_app'
+require 'ruby_app/rack'
+
+use Rack::ShowExceptions
+use Rack::Reloader
+
+#use RubyApp::Rack::Duration
+#use RubyApp::Rack::Memory
+
+use RubyApp::Rack::Application, :configuration_paths  => [File.join(RubyApp::ROOT, %w[configuration.yml])]
+
+map '/ruby_app/resources' do
+  run Rack::File.new(File.join(RubyApp::ROOT, %w[resources]))
+end
+
+map '/favicon.ico' do
+  run Rack::File.new(File.join(RubyApp::ROOT, %w[resources favicon.ico]))
+end
+
+map '/' do
+  use RubyApp::Rack::Request
+  use RubyApp::Rack::Response
+  use RubyApp::Rack::Language
+  use RubyApp::Rack::Session
+  run RubyApp::Rack::Route.new
+end

data/lib/ruby_app/configuration.yml

@@ -0,0 +1,28 @@
+default:
+  ruby_app:
+    application:
+      _class: "RubyApp::Application"
+    language:
+      default: "en"
+      paths:
+        - "#{RubyApp::ROOT}/translations"
+    log:
+      path: "#{RubyApp::ROOT}/process/log/application.log"
+    session:
+      _class: "RubyApp::Session"
+      expires: 60
+      interval: 15
+    elements:
+      pages:
+        authentication:
+          open_id:
+            google_authentication_page:
+              attributes:
+                email: "http://schema.openid.net/contact/email"
+              identifier: "https://www.google.com/accounts/o8/id"
+            my_open_id_authentication_page:
+              identifier: "http://myopenid.com"
+            yahoo_authentication_page:
+              attributes:
+                email: "http://axschema.org/contact/email"
+              identifier: "https://www.yahoo.com"