RubyApp 0.0.74 → 0.0.75

data/.gitignore

@@ -3,13 +3,11 @@
 .DS_Store
 .idea
 .sass-cache
-*.gem
-*.log
-*.pid
-failures_in.txt
-failures_out.txt
 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
 log
 sandbox
+*.gem
+*.log
+*.pid

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    RubyApp (0.0.74)
+    RubyApp (0.0.75)
       BlueCloth
       chronic
       chronic_duration

data/lib/ruby_app/application.rb

@@ -55,14 +55,12 @@ module RubyApp
       @@_application = nil
     end
 
-    def self.create_cache(path, root, *formats)
-      RubyApp::Application.destroy_cache(path)
+    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
-            RubyApp::Request.cache = true
             require element_file
             element_class = element_file.gsub(root, '')
             element_class = element_class.gsub(/^\//, '')
@@ -70,9 +68,9 @@ module RubyApp
             element_class = RubyApp::Application.upcode(element_class)
             begin
               element_class = eval(element_class)
-              (formats.empty? ? [:css, :js] : formats).each do |format|
+              [:css, :js].each do |format|
                 begin
-                  element_class.render(format)
+                  element_class.render(format, true)
                 rescue Exception => exception
                   puts "#{element_class}.render(#{format.inspect}) exception=#{exception.message}"
                 end
@@ -90,9 +88,8 @@ module RubyApp
     end
 
     def self.destroy_cache(path)
-      Dir.glob(File.join(path, %w[** .cache *])).each do |file|
-        puts "Removing #{file.inspect}"
-        FileUtils.rm(file)
+      Dir.glob(File.join(path, %w[** .cache])).each do |directory|
+        FileUtils.rm_r(directory)
       end
     end
 

data/lib/ruby_app/elements/base/base_page.html.haml

@@ -14,6 +14,21 @@
             :type => 'text/javascript'}
     %title
       = yield(:title) || self.translate.title
+    /
+      RubyApp::Session.data
+    %meta{:name => :session_id, :content => RubyApp::Session.session_id}
+    - RubyApp::Session.data.each do |name, value|
+      %meta{:name => name, :content => value}
+    /
+      RubyApp::Language
+    %meta{:name => :locale, :content => RubyApp::Language.locale.code}
+    /
+      RubyApp::Elements::Base::BasePage#data
+    - self.data.each do |name, value|
+      %meta{:name => name, :content => value}
+    /
+      (other)
+    %meta{:name => :event_error_message, :content => RubyApp::Elements::Base::BasePage.translate.event_error_message}
   %body
     %div.body
       = yield :body

data/lib/ruby_app/elements/base/base_page.js.haml

@@ -2,10 +2,12 @@
   :plain
     // #{__FILE__}
     var RubyApp = new function() {
-      this.translation = {code:'#{RubyApp::Language.locale.code}', title:'#{RubyApp::Language.locale.title}'},
-      this.interval = #{self.interval * 1000},
       this._interval = 0,
       this._waitCount = 0,
+      this.getData = function(name, _default) {
+        var value = $('meta[name="' + name + '"]').attr('content');
+        return value == undefined ? _default : value;
+      },
       this.maximize = function(selector) {
         var element = $(selector);
         var _document = $(document);
@@ -39,7 +41,7 @@
       this.status = function(message) {
       },
       this.queueEvent = function(event, wait) {
-        event.session_id = '#{RubyApp::Session.session_id}';
+        event.session_id = RubyApp.getData('session_id', null);
         event.now = new Date().toString();
         RubyApp.log('RubyApp.queueEvent ENQUEUE event.class=' + event._class + ' wait=' + wait);
         $(window).queue( function() {
@@ -54,8 +56,8 @@
             } )
             .error( function(request, message, exception) {
               RubyApp.log('RubyApp.queueEvent ERROR event.class=' + event._class + ' wait=' + wait);
-              if (#{RubyApp::Session['show_event_error'] || 'false'} == true)
-                RubyApp.confirm_refresh(#{RubyApp::Elements::Base::BasePage.translate.error.to_json});
+              if (RubyApp.getData('event_error', true) == true)
+                RubyApp.confirm_refresh(RubyApp.getData('event_error_message', null));
             } )
             .complete( function() {
               RubyApp.log('RubyApp.queueEvent COMPLETE event.class=' + event._class + ' wait=' + wait);
@@ -108,7 +110,7 @@
         RubyApp._waitCount --;
       },
       this.showDialog = function(id) {
-        request = $.ajax({type:'GET', url:'/#{RubyApp::Language.locale.code}/elements/' + id + '.html', wait:true});
+        request = $.ajax({type:'GET', url:'/' + RubyApp.getData('locale', 'en') + '/elements/' + id + '.html', wait:true});
         request
           .success( function(dialog) {
             var overlay = $('body div.overlay');
@@ -133,7 +135,7 @@
         RubyApp.queueEvent({_class:'RubyApp::Elements::Dialog::HiddenEvent', source_id:id}, false);
       },
       this.updateElement = function(id) {
-        request = $.ajax({type:'GET', url:'/#{RubyApp::Language.locale.code}/elements/' + id + '.html', wait:true});
+        request = $.ajax({type:'GET', url:'/' + RubyApp.getData('locale', 'en') + '/elements/' + id + '.html', wait:true});
         request
           .success( function(content) {
             $('#'+id).replaceWith(content);
@@ -170,15 +172,16 @@
 
     $(window).load(function() {
       RubyApp.queueEvent({_class:'RubyApp::Elements::Page::LoadedEvent', source_id:$('html').attr('id')}, false);
-      if ( RubyApp.interval > 0 ) {
+      interval = parseInt(RubyApp.getData('interval', 0)) * 1000;
+      if ( interval > 0 ) {
         RubyApp._interval = window.setInterval(function() {
           RubyApp.queueEvent({_class:'RubyApp::Elements::Page::TriggeredEvent', source_id:$('html').attr('id')}, false);
-        }, RubyApp.interval);
+        }, interval);
       }
     });
 
     $(window).unload(function() {
-      if ( RubyApp.interval > 0 ) {
+      if ( RubyApp._interval != 0 ) {
         window.clearInterval(RubyApp._interval);
         $(window).clearQueue();
       }

data/lib/ruby_app/elements/base/base_page.rb

@@ -10,8 +10,10 @@ module RubyApp
     module Base
       require 'ruby_app/element'
       require 'ruby_app/language'
+      require 'ruby_app/mixins/hash_mixin'
 
       class BasePage < RubyApp::Element
+        include RubyApp::Mixins::HashMixin
 
         class LoadedEvent < RubyApp::Element::Event
 
@@ -31,14 +33,30 @@ module RubyApp
 
         template_path(:all, File.dirname(__FILE__))
 
-        attr_accessor :interval
+        attr_reader :data
 
         event :loaded
         event :triggered
 
         def initialize
           super
-          @interval = 0
+          @data = {}
+        end
+
+        def [](key)
+          @data[key]
+        end
+
+        def []=(key, value)
+          @data[key] = value
+        end
+
+        def interval
+          return data[:interval]
+        end
+
+        def interval=(value)
+          data[:interval] = value
         end
 
         protected

data/lib/ruby_app/mixins/render_mixin.rb

@@ -22,7 +22,7 @@ module RubyApp
         RubyApp::Request.content_for(self, name, value, &block)
       end
 
-      def render(format)
+      def render(format, write_cache = false)
         cache = self.is_a?(Class) ? self.get_cache(format) : self.class.get_cache(format)
         if File.exists?(cache)
           self.rendered?(cache) do
@@ -50,7 +50,7 @@ module RubyApp
                 end
                 RubyApp::Request.content_for(self, template, content)
               end
-              if cache && RubyApp::Request.cache?
+              if cache && write_cache
                 RubyApp::Log.debug("#{RubyApp::Log.prefix(self, __method__)} File.open(#{cache.inspect}, 'w')")
                 cache_directory = File.dirname(cache)
                 Dir.mkdir(cache_directory) unless File.exists?(cache_directory)

data/lib/ruby_app/request.rb

@@ -14,8 +14,6 @@ module RubyApp
   class Request < ::Rack::Request
     extend RubyApp::Mixins::DelegateMixin
 
-    attr_accessor :cache
-
     def language
       self.fullpath =~ /^\/([^\/\?]+)/
       $1 || RubyApp::Application.options.default_language
@@ -29,10 +27,6 @@ module RubyApp
       self.params
     end
 
-    def cache?
-      return self.cache
-    end
-
     def rendered?(template)
       @rendered.key?(template)
     end

data/lib/ruby_app/session.rb

@@ -3,6 +3,7 @@ module RubyApp
   require 'ruby_app/log'
   require 'ruby_app/mixins/configure_mixin'
   require 'ruby_app/mixins/delegate_mixin'
+  require 'ruby_app/mixins/hash_mixin'
   require 'ruby_app/mixins/translate_mixin'
   require 'ruby_app/request'
 
@@ -22,8 +23,8 @@ module RubyApp
 
     end
 
-    attr_reader :session_id, :pages
-    attr_accessor :identity, :data
+    attr_reader :session_id, :pages, :data
+    attr_accessor :identity
 
     def initialize(session_id, page = nil, data = {})
       require 'ruby_app/elements/pages/default_page'

data/lib/ruby_app/themes/mobile/base/base_page.html.haml

@@ -24,6 +24,21 @@
             :type => 'text/javascript'}
     %title
       = yield(:title) || self.translate.title
+    /
+      RubyApp::Session.data
+    %meta{:name => :session_id, :content => RubyApp::Session.session_id}
+    - RubyApp::Session.data.each do |name, value|
+      %meta{:name => name, :content => value}
+    /
+      RubyApp::Language
+    %meta{:name => :locale, :content => RubyApp::Language.locale.code}
+    /
+      RubyApp::Elements::Base::BasePage#data
+    - self.data.each do |name, value|
+      %meta{:name => name, :content => value}
+    /
+      (other)
+    %meta{:name => :event_error_message, :content => RubyApp::Elements::Base::BasePage.translate.event_error_message}
   %body
     %div.body
       = yield :body

data/lib/ruby_app/translations/en.yml

@@ -5,7 +5,7 @@ ruby_app:
   elements:
     base:
       base_page:
-        error:  An error occurred sending the event.  The page will refresh so you can try again.
+        event_error_message:  An error occurred sending the event.  The page will refresh so you can try again.
     dialogs:
       base:
         base_ok_dialog:

data/lib/ruby_app/version.rb

@@ -1,4 +1,4 @@
 module RubyApp
-  VERSION = "0.0.74"
+  VERSION = "0.0.75"
   ROOT    = File.expand_path(File.dirname(__FILE__))
 end

data/rakefile

@@ -15,7 +15,7 @@ namespace :ruby_app do
   end
 
   desc 'Run'
-  task :run do |task|
+  task :run => ['ruby_app:cache:create'] do |task|
     system("cd ./lib/ruby_app && clear && bundle exec ../../bin/ruby_app run")
   end
 
@@ -25,7 +25,7 @@ namespace :ruby_app do
   end
 
   desc 'Push to master, release, and increment version'
-  task :release do |task|
+  task :release => ['ruby_app:cache:create'] do |task|
       system "git push origin master && rake release"
       version_file = File.join(RubyApp::ROOT, %w[version.rb])
       RubyApp::VERSION =~ /(\d+)\.(\d+)\.(\d+)/
@@ -35,24 +35,9 @@ namespace :ruby_app do
 
   namespace :test do
 
-    namespace :features do
-
-      desc 'Run feature tests generating a failure file'
-      task :all do |task|
-        system("bundle exec cucumber --format rerun --tags ~@broken --require features --out failures_out.txt; cat failures_out.txt")
-      end
-
-      desc 'Rerun failed feature tests'
-      task :failures do |task|
-        system("mv failures_out.txt failures_in.txt; bundle exec cucumber --format rerun --tags ~@broken --require features --out failures_out.txt @failures_in.txt; cat failures_out.txt")
-      end
-
-      desc 'Run feature tests for the given feature file'
-      task :one, :file do |task, arguments|
-        system("bundle exec cucumber --format pretty --tags ~@broken --require features '#{arguments.file}'")
-      end
-
-    end
+    desc 'Run all tests'
+    task :all => ['test:specs',
+                  'test:features']
 
     desc 'Run RSpec tests'
     task :specs, :file, :line do |task, arguments|
@@ -67,17 +52,22 @@ namespace :ruby_app do
       end
     end
 
-    desc 'Run all tests'
-    task :all => ['ruby_app:test:specs',
-                  'ruby_app:test:features:all']
+    desc 'Run feature tests for all features or the given feature file'
+    task :features, :file do |task, arguments|
+      unless arguments.file
+        system("bundle exec cucumber --format pretty --tags ~@broken --require features")
+      else
+        system("bundle exec cucumber --format pretty --tags ~@broken --require features '#{arguments.file}'")
+      end
+    end
 
   end
 
   namespace :cache do
 
     desc 'Create element cache'
-    task :create do |task|
-      RubyApp::Application.create_cache(File.join(File.dirname(__FILE__), %w[lib ruby_app elements]), File.join(File.dirname(__FILE__), %w[lib]))
+    task :create => ['ruby_app:cache:destroy'] do |task|
+      RubyApp::Application.create_cache(File.join(File.dirname(__FILE__), %w[lib ruby_app elements pages]), File.join(File.dirname(__FILE__), %w[lib]))
     end
 
     desc 'Delete element cache'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: RubyApp
 version: !ruby/object:Gem::Version 
-  hash: 139
+  hash: 137
   prerelease: 
   segments: 
   - 0
   - 0
-  - 74
-  version: 0.0.74
+  - 75
+  version: 0.0.75
 platform: ruby
 authors: 
 - Frank G. Ficnar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-18 00:00:00 Z
+date: 2012-01-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false