RubyApp 0.0.8 → 0.0.9

data/.gitignore

@@ -1,10 +1,10 @@
-*.gem
 .bundle
 .DS_Store
 .idea
 .sass-cache
-chromedriver.log
-rack.pid
+*.gem
+*.log
+*.pid
 lib/ruby_app/elements/pages/authentication/open_id/associations
 lib/ruby_app/elements/pages/authentication/open_id/nonces
 lib/ruby_app/elements/pages/authentication/open_id/temp

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    RubyApp (0.0.8)
+    RubyApp (0.0.9)
       BlueCloth
       chronic_duration
       facets

data/features/default.feature

@@ -1,5 +1,5 @@
 Feature: Default Page
 
   Scenario: View the default page
-    Given I am viewing "/en"
-    Then I should see "This is the default start page"
+    Given I am viewing "/"
+    Then I should see "Click here to go to the test pages"

data/features/elements/button.feature

@@ -0,0 +1,9 @@
+Feature: A button
+
+  Scenario: Rendering a button and process its event
+    Given I go to the test pages
+    When I click "ButtonTestPage"
+    Then I should see "Click"
+    When I click "Click"
+    Then I should see "This is the other page"
+    Then I quit

data/features/{dialog.feature → elements/dialog.feature}

@@ -3,21 +3,31 @@ Feature: Dialog Test Page
   @broken
   Scenario: Show a busy dialog
     Given I go to the test pages
-    Then I should see "DialogTestPage"
     When I click "DialogTestPage"
-    Then I should see "BusyDialog"
     When I click "BusyDialog"
     Then I should see "Busy dialog"
     When I wait 30 seconds
     Then I should not see "Busy dialog"
     Then I quit
 
+  Scenario: Show a confirmation dialog
+    Given I go to the test pages
+    When I click "DialogTestPage"
+    And I click "ConfirmationDialog"
+    Then I should see "Confirmation Dialog"
+    And I should see "Are you sure?"
+    When I click "Yes"
+    Then I should not see "Confirmation Dialog"
+    And I should not see "Are you sure?"
+    And I should see "You clicked"
+    And I should see "true"
+    Then I click "Close"
+    Then I quit
+
   Scenario: Show an exception dialog
     Given I go to the test pages
-    Then I should see "DialogTestPage"
     When I click "DialogTestPage"
-    Then I should see "ExceptionDialog"
-    When I click "ExceptionDialog"
+    And I click "ExceptionDialog"
     Then I should see "RuntimeError"
     And I should see "Exception dialog"
     When I click "Close"
@@ -27,10 +37,8 @@ Feature: Dialog Test Page
 
   Scenario: Show a message dialog
     Given I go to the test pages
-    Then I should see "DialogTestPage"
     When I click "DialogTestPage"
-    Then I should see "MessageDialog"
-    When I click "MessageDialog"
+    And I click "MessageDialog"
     Then I should see "Message Dialog"
     And I should see "This is a Message Dialog"
     When I click "Close"
@@ -40,17 +48,15 @@ Feature: Dialog Test Page
 
   Scenario: Show a calendar month dialog
     Given I go to the test pages
-    Then I should see "DialogTestPage"
     When I click "DialogTestPage"
-    Then I should see "MonthDialog"
-    When I click "MonthDialog"
+    And I click "MonthDialog"
     Then I should see "Wed"
     When I click "15"
     Then I should not see "Wed"
-    And I should see "You selected"
+    And I should see "You clicked"
     And I should see "15/"
     When I click "Close"
-    Then I should not see "You selected"
+    Then I should not see "You clicked"
     And I should not see "15/"
     And I should see "-15"
     Then I quit

data/features/elements/input.feature

@@ -0,0 +1,20 @@
+Feature: Input elements
+
+  Scenario: Render a simple input element and process its event
+    Given I go to the test pages
+    When I click "InputTestPage"
+    Then I should see "Input"
+    And I fill in the "Input" field with "value" and I press enter
+    Then I should see "You input 'value'."
+    Then I click "Close"
+    Then I quit
+
+  Scenario: Render a duration input element and process its event
+    Given I go to the test pages
+    When I click "InputTestPage"
+    Then I should see "DurationInput"
+    And I fill in the "DurationInput" field with "2h 3m" and I press enter
+    Then I should see "You input '7,380'."
+    When I click "Close"
+    Then the "DurationInput" field should contain "2 hrs 3 mins"
+    Then I quit

data/features/elements/link.feature

@@ -0,0 +1,9 @@
+Feature: A link
+
+  Scenario: Rendering a link and process its event
+    Given I go to the test pages
+    When I click "LinkTestPage"
+    Then I should see "Click"
+    When I click "Click"
+    Then I should see "This is the other page"
+    Then I quit

data/features/elements/list.feature

@@ -0,0 +1,19 @@
+Feature: List element
+
+  Scenario: Render a list element and process its event
+    Given I go to the test pages
+    When I click "ListTestPage"
+    Then I should see "Item 03"
+    When I click "Item 03"
+    Then I should see "You clicked 'Item 03'."
+    Then I click "Close"
+    Then I quit
+
+  Scenario: Render a select list element and process its event
+    Given I go to the test pages
+    When I click "ListTestPage"
+    Then I should see "Item 13"
+    When I click "Item 13"
+    Then I should see "You clicked 'Item 13'."
+    Then I click "Close"
+    Then I quit

data/features/elements/markdown.feature

@@ -0,0 +1,9 @@
+Feature: A block of markdown
+
+  Scenario: Rendering a block of markdown and process its events
+    Given I go to the test pages
+    When I click "MarkdownTestPage"
+    Then I should see "Click here"
+    When I click "here"
+    Then I should see "This is the other page"
+    Then I quit

data/features/elements/page.feature

@@ -0,0 +1,10 @@
+Feature: A page
+
+  Scenario: Rendering a page
+    Given I go to the test pages
+    When I click "TestPage"
+    Then I should see "Rendered"
+    And I should see "Loaded"
+    When I wait 4 seconds
+    Then I should see "Triggered"
+    Then I quit

data/features/elements/pages/exception_page.feature

@@ -0,0 +1,10 @@
+Feature: Exception page
+
+  Scenario: View the exception page
+    Given I go to the test pages
+    When I click "ExceptionTestPage"
+    Then I should see "RuntimeError"
+    And I should see "Exception page"
+    Given I am viewing "/quit"
+    Then I should see "Click here to go to the test pages"
+

data/features/step_definitions/default_macros.rb

@@ -1,6 +1,6 @@
 Given /^I go to the test pages$/ do
   steps %Q{
-    Given I am viewing "/en"
+    Given I am viewing "/"
     Then I should see "Click here to go to the test pages"
     Then I click "here"
   }

data/features/step_definitions/default_steps.rb

@@ -1,11 +1,11 @@
 Given /^I am viewing "([^"]*)"$/ do |url|
   visit(url)
 end
- 
+
 When /^I refresh the page$/ do
   visit(current_path)
 end
- 
+
 Then /^I should (not )?see "([^"]*)"$/ do |negative, text|
   unless negative
     page.should have_content(text)
@@ -19,7 +19,7 @@ When /^I click "([^"]*)"$/ do |text|
   sleep 1
 end
 
-When /^I fill in "([^"]*)" with "([^"]*)"( and I press enter)?$/ do |field, value, enter|
+When /^I fill in the "([^"]*)" field with "([^"]*)"( and I press enter)?$/ do |field, value, enter|
   fill_in(field, :with => value)
   if enter
     find_field(field).native.send_key(:enter)
@@ -27,6 +27,10 @@ When /^I fill in "([^"]*)" with "([^"]*)"( and I press enter)?$/ do |field, valu
   end
 end
 
+Then /^the "([^\"]*)" field should contain "([^\"]*)"$/ do |field, value|
+  field_labeled(field).value.should =~ /#{value}/
+end
+
 Then /^show me the page$/ do
   save_and_open_page
 end

data/features/support/env.rb

@@ -3,7 +3,7 @@ require 'capybara/cucumber'
 require 'capybara/dsl'
 
 Capybara.register_driver :chrome do |app|
-  Capybara::Selenium::Driver.new(app, :browser => :chrome)
+  Capybara::Selenium::Driver.new(app, :browser => :firefox)
 end
 
 Capybara.default_driver = :chrome

data/lib/ruby_app/application.rb

@@ -1,69 +1,44 @@
-require 'rubygems'
-require 'bundler/setup'
-
-require 'fileutils'
-
 module RubyApp
   require 'ruby_app/configuration'
-  require 'ruby_app/language'
   require 'ruby_app/log'
-  require 'ruby_app/mixins/configuration'
-  require 'ruby_app/mixins/delegate'
-  require 'ruby_app/request'
+  require 'ruby_app/mixins/configure_mixin'
+  require 'ruby_app/mixins/delegate_mixin'
+  require 'ruby_app/mixins/hash_mixin'
   require 'ruby_app/session'
   require 'ruby_app/version'
 
   class Application
-    extend RubyApp::Mixins::Delegate
-    extend RubyApp::Mixins::Configuration
-    include RubyApp::Mixins::Configuration
+    extend RubyApp::Mixins::DelegateMixin
+    include RubyApp::Mixins::ConfigureMixin
 
-    attr_reader :options
+    attr_reader :options, :environment
 
     def initialize(options)
       @options = options
       @environment = {}
-
-      RubyApp::Log.open(@options[:log_path])
-      RubyApp::Configuration.load(@options[:configuration_paths])
-
-    end
-
-    def execute(environment = nil)
-      _environment = environment || @environment
-      RubyApp::Request.create(_environment) do |request|
-        RubyApp::Language.load(RubyApp::Request.language || @options[:default_language], @options[:translations_paths]) do |language|
-          RubyApp::Session.create(@options[:session_class]) do |session|
-            Thread.current[:_rendered] = {}
-            begin
-              return yield
-            ensure
-              Thread.current[:_rendered] = nil
-            end
-          end
-        end
-      end
     end
 
     def self.get
-      @@_application
+      @@_application ||= nil
     end
 
-    def self.create(options = {})
+    def self.create!(options = {})
       _options = { :application_class => RubyApp::Application,
                    :session_class => RubyApp::Session,
                    :log_path => File.join(RubyApp::ROOT, %w[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]] )
-      @@_application = _options[:application_class].new(_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] )
+      @@_application = _options.application_class.new(_options)
+      RubyApp::Log.open!
+      RubyApp::Configuration.load!
     end
 
-    def self.destroy
-      RubyApp::Configuration.unload
-      RubyApp::Log.close
+    def self.destroy!
+      RubyApp::Configuration.unload!
+      RubyApp::Log.close!
       @@_application = nil
     end
 

data/lib/ruby_app/configuration.rb

@@ -1,12 +1,12 @@
 require 'yaml'
 
 module RubyApp
-  require 'ruby_app/log'
-  require 'ruby_app/mixins/delegate'
-  require 'ruby_app/mixins/hash'
+  require 'ruby_app/application'
+  require 'ruby_app/mixins/delegate_mixin'
+  require 'ruby_app/mixins/hash_mixin'
 
   class Configuration
-    extend RubyApp::Mixins::Delegate
+    extend RubyApp::Mixins::DelegateMixin
 
     attr_reader :document
 
@@ -14,31 +14,23 @@ module RubyApp
       @@_configuration
     end
 
-    def self.load(configuration_paths)
-      @@_configuration = RubyApp::Configuration.new(configuration_paths)
+    def self.load!
+      @@_configuration = RubyApp::Configuration.new(RubyApp::Application.options.configuration_paths)
     end
 
-    def self.unload
+    def self.unload!
       @@_configuration = nil
     end
 
     private
 
-      def initialize(configuration_paths)
-
+      def initialize(paths)
         @document = {}
-
-        configuration_paths.each do |path|
-          RubyApp::Log.debug("#{self.class}##{__method__}(...) path=#{path.inspect}")
+        paths.each do |path|
           @document.merge!(YAML::load(File.open(path)))
         end
-
       end
 
   end
 
 end
-
-class Hash
-  include RubyApp::Mixins::Hash
-end

data/lib/ruby_app/element.rb

@@ -6,31 +6,35 @@ require 'json'
 require 'ruby-event'
 
 module RubyApp
-  require 'ruby_app/mixins/configuration'
-  require 'ruby_app/mixins/render'
-  require 'ruby_app/mixins/template'
-  require 'ruby_app/mixins/translate'
+  require 'ruby_app/mixins/configure_mixin'
+  require 'ruby_app/mixins/render_mixin'
+  require 'ruby_app/mixins/template_mixin'
+  require 'ruby_app/mixins/translate_mixin'
 
   class Element
-    extend RubyApp::Mixins::Configuration
-    include RubyApp::Mixins::Configuration
-    extend RubyApp::Mixins::Translate
-    include RubyApp::Mixins::Translate
-    extend RubyApp::Mixins::Template
-    include Haml::Helpers
+    extend RubyApp::Mixins::ConfigureMixin
+    include RubyApp::Mixins::ConfigureMixin
+    extend RubyApp::Mixins::TranslateMixin
+    include RubyApp::Mixins::TranslateMixin
+    extend RubyApp::Mixins::TemplateMixin
     extend Haml::Helpers
-    extend RubyApp::Mixins::Render
-    include RubyApp::Mixins::Render
+    include Haml::Helpers
+    extend RubyApp::Mixins::RenderMixin
+    include RubyApp::Mixins::RenderMixin
 
     class Event
 
       attr_reader :source
 
-      def initialize(data = nil)
-        @source = data ? RubyApp::Element.get_element(data['source_id']) : nil
+      def initialize(data)
+        @source = RubyApp::Element.get_element(data['source_id'])
         @statements = []
       end
 
+      def process!
+        source.send(:on_event, self)
+      end
+
       def alert(message)
         execute("RubyApp.alert(#{message.to_json});")
       end
@@ -60,31 +64,31 @@ module RubyApp
       end
 
       def go(url)
-        execute("RubyApp.go('#{url}');")
+        execute("RubyApp.go(#{url.to_json});")
       end
 
       def execute(statement)
         @statements << statement
       end
 
-      def self.from_hash(data)
-        eval(data['_class']).new(data)
-      end
-
       def to_hash
         {
           '_class' => self.class.to_s,
-          'source_id' => @source ? @source.element_id : nil,
+          'source_id' => @source.element_id,
           'statements' => @statements
         }
       end
 
+      def self.from_hash(data)
+        eval(data['_class']).new(data)
+      end
+
     end
 
     class ExceptionEvent < RubyApp::Element::Event
 
-      def initialize(exception)
-        super()
+      def initialize(data, exception)
+        super(data)
         self.alert(exception.message)
       end
 
@@ -97,7 +101,7 @@ module RubyApp
     event :evented
 
     def initialize
-      @attributes = {:id => element_id}
+      @attributes = {:id => self.element_id}
     end
 
     def element_id