rtml 2.0.3 → 2.0.4

data/spec/widgets/screens_spec.rb

@@ -35,6 +35,28 @@ describe Rtml::Widgets::Screens do
     @doc.screens.should have(2).items
   end
 
+  it "should never build a screen tag without a body (TML has issues with it)" do
+    xml = Hpricot::XML(@doc.screen(:main).to_tml).root
+    (xml.children || []).reject { |i| !i.kind_of?(Hpricot::Elem) }.should_not be_empty
+    #.should match(/<screen\sid=['"]main['"]\s*>\s*<\/screen>/)
+  end
+
+  it "should never build an screen tag without a <next> element (TML issues)" do
+    xml = Hpricot::XML(@doc.screen(:main).to_tml).root
+    (xml.children || []).reject { |i| !i.kind_of?(Hpricot::Elem) }.should_not be_empty
+#    @doc.screen(:main, :another).to_tml.should match(/<screen\sid=['"]main['"]\s*>\s*<next/)
+  end
+
+  it "should be able to find a screen or return nil" do
+    # build a few screens
+    @doc.screen :init, :main, :timeout => 3
+    @doc.screen :main
+    
+    @doc.screen?(:init).should_not be_nil
+    @doc.screen?(:main).should_not be_nil
+    @doc.screen?(:none).should be_nil
+  end
+
   it "should allow subelements for screens" do
     # build a few screens
     @doc.screen :init, :main, :timeout => 3 do

data/spec/widgets/simulator_post_processors/card_parsers_spec.rb

@@ -0,0 +1,70 @@
+require 'spec_helper'
+
+describe Rtml::Test::SimulatorPostProcessors::CardParsers do
+  def tml_for(parser, params)
+  <<-end_tml
+    <tml>
+      <screen id='setup' next='#first'>
+        #{setup_tml_for(parser)}
+      </screen>          
+
+      <screen id='alt_first'>
+        <next uri='#second'>
+          <variant uri='#first' key='1' />
+        </next>
+        #{setup_tml_for(parser)}
+      </screen>
+
+      <screen id='first' next='#second'><tform><card parser='#{parser}' parser_params='#{params}' /></tform></screen>
+      <screen id='second'><display>done</display></screen>
+    </tml>
+  end_tml
+  end
+
+  def setup_tml_for(parser)
+    case parser.to_s
+      when 'mag'
+      <<-end_tml
+        <tform>
+          <card parser="mag" parser_params="read_data" />
+        </tform>
+      end_tml
+      else raise 'no setup code for '+parser.to_s
+    end
+  end
+
+  subject do
+    Rtml::Test::Simulator.new
+  end
+
+  context "with a 'mag' parser" do
+    context "and 'risk_mgmt' params" do
+      before(:each) do
+        subject.load_tml! tml_for("mag", "risk_mgmt")
+      end
+
+      it "should set 'card.parser.verdict' to 'online'" do
+        subject.swipe_card(:visa)
+        subject.variables['card.parser.verdict'].should == 'online'
+      end
+
+      it "should move to the next screen" do
+        subject.swipe_card(:visa)
+        subject.current_screen_id.should_not == "first"
+        subject.current_screen_id.should_not be_nil
+      end
+      
+      context "given a next element with false variants" do
+        it "should follow the next uri" do
+          subject.visit("#alt_first")
+          subject.current_screen_id.should == "alt_first"
+          subject.swipe_card(:visa)
+          subject.current_screen_id.should_not == "first"
+          subject.current_screen_id.should_not be_nil
+        end
+      end
+    end
+  end
+
+  it "with an 'emv' reader"
+end

data/spec/widgets/simulator_post_processors/submit_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe Rtml::Test::SimulatorPostProcessors::Submit do
+  def tml
+  <<-end_tml
+    <tml>
+      <screen id='setup'>
+        <setvar name="payment.amount" lo="100" />
+      </screen>
+
+      <screen id='do_submit'>
+        <submit tgt='test_location'>
+          <getvar name='payment.amount' />
+        </submit>
+      </screen>
+    </tml>
+  end_tml
+  end
+
+  def mock_response
+    resp = Rack::Response.new
+    resp.body = "<tml><screen/></tml>"
+    resp
+  end
+
+  subject do
+    Rtml::Test::Simulator.new()
+  end
+
+  before(:each) do
+    subject.load_tml! tml
+  end
+
+  it "should have payment amount assigned" do
+    subject.variables['payment.amount'].should == 100
+  end
+
+  it "should dispatch a request" do
+    subject.should_receive(:response).at_least(1).and_return(mock_response)
+    subject.should_receive(:post).with("test_location", {'payment.amount' => 100}, {})
+
+    subject.visit "#do_submit"
+  end
+end

data/tasks/stats.rake

@@ -0,0 +1,10 @@
+desc "Code Statistics"
+task :stats do
+  require 'code_statistics'
+  CodeStatistics.new(['RubyTML Libraries', './lib'],
+                     ['Built-in', './builtin'],
+                     ['App Generators', './app_generators'],
+                     ['Rails Generators', './rails_generators'],
+                     ['Unit tests', './spec']).to_s
+  CodeStatistics.new(['Entire Project', '.']).to_s
+end

data/test/test_rtml_generator.rb

@@ -49,6 +49,9 @@ class TestRtmlGenerator < Test::Unit::TestCase
     assert_generated_file "db/migrate/20100127173146_add_parent_type_to_rtml_dom_elements.rb"
     assert_generated_file "db/migrate/20100208114234_create_rtml_states.rb"
     assert_generated_file "db/migrate/20100303021609_add_x_and_y_to_rtml_instructions.rb"
+    assert_generated_file "db/migrate/20100513165226_add_options_to_rtml_documents.rb"
+    assert_generated_file "db/migrate/20100513165242_remove_dom_elements_mirror.rb"
+    assert_generated_file "db/migrate/20100513165249_remove_dom_properties_mirror.rb"
   end
 
   private

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 0
-  - 3
-  version: 2.0.3
+  - 4
+  version: 2.0.4
 platform: ruby
 authors: 
 - Colin MacKenzie IV
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-19 00:00:00 -04:00
+date: 2010-07-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -129,39 +129,7 @@ dependencies:
         version: 2.5.0
   type: :development
   version_requirements: *id008
-description: |-
-  RubyTML (or just RTML) is a Ruby framework for communicating with Ingenico's Incendo-based payment devices.
-  
-  To really understand what RTML is about, you first have to understand what TML is. TML is an XML-like language called
-  the "Terminal Markup Language" (yeah, we're really creative with our naming conventions around here). Essentially, it
-  allows developers to write terminal applications using a syntax that is essentially XML. This is a step forward for
-  terminal developers, who are used to writing their applications in embedded C.
-  
-  The Incendo architecture that runs all of this provides a gateway between an application server, which houses the TML,
-  and the terminal. The TML is translated to byte code and then sent to the terminal via SSL. The terminal then executes
-  this byte code, and only reconnects when it's ready to download a new TML application. This is another step forward
-  from embedded C, because there's no longer any need to manually compile and then download applications to the terminal.
-  
-  However, at the end of the day it's still TML, and someone has to write that TML code. That's where I come in. I was
-  brought into Ingenico to write this TML, and I found the task nothing less than daunting. I came from a Java
-  background, so of course the first thing I did was start looking at ways to write Java and have it generate TML.
-  Unfortunately, that was like drilling a hole with a sledgehammer, and it didn't work out too well. I quickly realized
-  that I was going to spend more time writing the supporting Java code than I would on the TML itself, and given fairly
-  ambitious deadlines, that just wasn't going to be an option.
-  
-  So I turned to Ruby. I'd been experimenting with Ruby on Rails over the past month or two, and was amazed at how
-  brain-dead-simple it made standard Web development. I began to think -- what is a TML application except for a bunch of
-  glorified Web services? What if Rails could do to TML and XML what it has already done to HTML?
-  
-  The biggest difference between HTML and TML is that the former is purely (or, in a Web 2.0 world, _almost_ purely) View
-  oriented. That is, HTML is designed for marking up and displaying content, not for transforming it. TML is a bit of a
-  misnomer in that respect, because it is very much about the transforming of data. It takes care of receiving and
-  processing the swipe of magnetic cards, amounts, and so on. In fact, the only thing it doesn't really handle is
-  actually processing a payment, which is a job left for the remote server.
-  
-  So the short answer to just what _is_ RTML? It's a giant DSL (Domain Specific Language), basically, designed for
-  generating TML with a vast reduction in keystrokes and lines-of-code. Check out the RTML web site at www.rubytml.com
-  for more information -- from tutorials to my RTML blog.
+description: RubyTML (or just RTML) is a Ruby framework for communicating with Ingenico's Incendo-based payment devices.
 email: 
 - colin.mackenzie4@ingenico.com
 executables: 
@@ -184,6 +152,9 @@ files:
 - bin/rtml
 - builtin/controllers/rtml_controller.rb
 - builtin/models/rtml/document.rb
+- builtin/models/rtml/document_model_object.rb
+- builtin/models/rtml/dom/collections/element_set.rb
+- builtin/models/rtml/dom/collections/property_set.rb
 - builtin/models/rtml/dom/element.rb
 - builtin/models/rtml/dom/frontend_element.rb
 - builtin/models/rtml/dom/property.rb
@@ -208,7 +179,7 @@ files:
 - builtin/widgets/screens.rb
 - builtin/widgets/shorthand.rb
 - builtin/widgets/static_content.rb
-- builtin/widgets/subroutine.rb
+- do_profile.rb
 - generators/rtml_widget/USAGE
 - generators/rtml_widget/rtml_widget_generator.rb
 - generators/rtml_widget/templates/default_widget.erb
@@ -222,6 +193,7 @@ files:
 - lib/extensions/hpricot/elem.rb
 - lib/extensions/string.rb
 - lib/rtml.rb
+- lib/rtml/assigns.rb
 - lib/rtml/configuration.rb
 - lib/rtml/controller/before_filters.rb
 - lib/rtml/controller/cache_helpers.rb
@@ -235,6 +207,7 @@ files:
 - lib/rtml/dependencies.rb
 - lib/rtml/dsl.rb
 - lib/rtml/environment.rb
+- lib/rtml/errors/application_error.rb
 - lib/rtml/errors/invalid_format.rb
 - lib/rtml/errors/invalid_operation.rb
 - lib/rtml/errors/invalid_option_error.rb
@@ -245,25 +218,33 @@ files:
 - lib/rtml/errors/rules_violation_error.rb
 - lib/rtml/errors/screen_not_found.rb
 - lib/rtml/errors/screen_variant_error.rb
+- lib/rtml/errors/simulation_error.rb
 - lib/rtml/errors/sti_type_error.rb
 - lib/rtml/errors/subprocessing_not_supported.rb
 - lib/rtml/errors/unknown_rtml_action.rb
+- lib/rtml/errors/variable_error.rb
 - lib/rtml/high_level/managed_variable.rb
-- lib/rtml/high_level/subroutine.rb
 - lib/rtml/high_level/variable_manager.rb
 - lib/rtml/inherited_instance_variables.rb
 - lib/rtml/init.rb
-- lib/rtml/reverse_engineering/crawler.rb
-- lib/rtml/reverse_engineering/simulator.rb
-- lib/rtml/reverse_engineering/simulator/casting.rb
-- lib/rtml/reverse_engineering/simulator/snapshot.rb
-- lib/rtml/reverse_engineering/simulator/variable_lookup.rb
-- lib/rtml/reverse_engineering/simulator/variable_value.rb
+- lib/rtml/links.rb
 - lib/rtml/rules/dom_ruleset.rb
 - lib/rtml/rules/dom_tag.rb
 - lib/rtml/rules/dom_validation.rb
 - lib/rtml/rules/tml_param_parser.rb
+- lib/rtml/test/builtin_variables.rb
+- lib/rtml/test/resemblance_test.rb
+- lib/rtml/test/screen.rb
+- lib/rtml/test/simulator.rb
+- lib/rtml/test/simulator_post_processors/base.rb
+- lib/rtml/test/simulator_post_processors/card_parsers.rb
+- lib/rtml/test/simulator_post_processors/receipt.rb
+- lib/rtml/test/simulator_post_processors/submit.rb
 - lib/rtml/test/spec.rb
+- lib/rtml/test/spec/matchers.rb
+- lib/rtml/test/tml_application.rb
+- lib/rtml/test/unit.rb
+- lib/rtml/test/variable_scope.rb
 - lib/rtml/tmlized_conditions.rb
 - lib/rtml/version.rb
 - lib/rtml/widget.rb
@@ -288,6 +269,9 @@ files:
 - rails_generators/rtml/templates/db/migrate/20100127173146_add_parent_type_to_rtml_dom_elements.rb
 - rails_generators/rtml/templates/db/migrate/20100208114234_create_rtml_states.rb
 - rails_generators/rtml/templates/db/migrate/20100303021609_add_x_and_y_to_rtml_instructions.rb
+- rails_generators/rtml/templates/db/migrate/20100513165226_add_options_to_rtml_documents.rb
+- rails_generators/rtml/templates/db/migrate/20100513165242_remove_dom_elements_mirror.rb
+- rails_generators/rtml/templates/db/migrate/20100513165249_remove_dom_properties_mirror.rb
 - rails_generators/rtml/templates/doc/io_tml-application-development-guidelines.pdf
 - rails_generators/rtml/templates/lib/tasks/rtml.rake
 - rails_generators/rtml_action/USAGE
@@ -300,22 +284,26 @@ files:
 - rails_generators/widget/templates/default_widget_spec.erb
 - rails_generators/widget/templates/default_widget_test.erb
 - rails_generators/widget/widget_generator.rb
+- rtml.gemspec
 - script/console
 - script/destroy
 - script/generate
 - script/server
 - spec/controllers/inherited_controller_spec.rb
 - spec/controllers/rtml_controller_spec.rb
+- spec/integration/post_tests_spec.rb
 - spec/lib/extensions/hpricot/doc_spec.rb
 - spec/lib/extensions/hpricot/elem_spec.rb
 - spec/lib/extensions/string_spec.rb
 - spec/lib/rtml/extensions_spec.rb
-- spec/lib/rtml/reverse_engineering/crawler_spec.rb
-- spec/lib/rtml/reverse_engineering/simulator/variable_value_spec.rb
-- spec/lib/rtml/reverse_engineering/simulator_spec.rb
+- spec/lib/rtml/high_level/variable_manager_spec.rb
 - spec/lib/rtml/routes_spec.rb
 - spec/lib/rtml/rules/dom_ruleset_spec.rb
 - spec/lib/rtml/rules/dom_validation_spec.rb
+- spec/lib/rtml/test/simulator/receipt_spec.rb
+- spec/lib/rtml/test/simulator_spec.rb
+- spec/lib/rtml/test/tml_application_spec.rb
+- spec/lib/rtml/test/variable_scope_spec.rb
 - spec/lib/rtml/widget_core/generic_widget_consumer_spec.rb
 - spec/lib/rtml/widget_core/gui_configuration_spec.rb
 - spec/lib/rtml/widget_core/widget_proxy_spec.rb
@@ -330,29 +318,45 @@ files:
 - spec/models/rtml/state/variable_mapping_spec.rb
 - spec/models/rtml/state_spec.rb
 - spec/rcov.opts
+- spec/rtml_action_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/app/controllers/application_controller.rb
 - spec/support/app/controllers/inherited_controller.rb
+- spec/support/app/controllers/post_tests_controller.rb
 - spec/support/app/rtml_helpers/inherited/index.rb
 - spec/support/app/rtml_helpers/rtml/index.rb
 - spec/support/app/views/README.txt
+- spec/support/app/views/inherited/instance_variables_test/display.rtml.erb
 - spec/support/app/views/layouts/layout.rtml.erb
 - spec/support/app/views/magcard/_partial.erb
 - spec/support/app/views/magcard/main.rtml.erb
 - spec/support/app/views/rtml/index.html.erb
 - spec/support/app/views/rtml/index/main.rtml.erb
+- spec/support/config/boot.rb
 - spec/support/config/database.yml
 - spec/support/config/environment.rb
 - spec/support/config/environments/development.rb
 - spec/support/config/initializers/rtml.rb
 - spec/support/config/routes.rb
-- spec/support/config/tml_dom_ruleset.rb
 - spec/support/db/rtml_test_db.sqlite3
 - spec/support/db/schema.rb
 - spec/support/lib/rtml/widgets/test_widget1.rb
 - spec/support/lib/rtml/widgets/test_widget2.rb
 - spec/support/rails.rb
+- spec/support/raw_tml/avs.tml
+- spec/support/raw_tml/document_level_events.tml
+- spec/support/raw_tml/empty_screen.tml
+- spec/support/raw_tml/enter_amount.tml
+- spec/support/raw_tml/foreign_receiver.tml
+- spec/support/raw_tml/foreign_reference.tml
+- spec/support/raw_tml/hello_world.tml
+- spec/support/raw_tml/loop_x_times.tml
+- spec/support/raw_tml/one_screen_with_setvar.tml
+- spec/support/raw_tml/receipt.tml
+- spec/support/raw_tml/simulator.tml
+- spec/support/raw_tml/tmlvar_reference.tml
+- spec/support/raw_tml/user_input.tml
 - spec/support/raw_tml/valid_document.tml
 - spec/support/rspec/example_groups.rb
 - spec/support/rspec/matchers.rb
@@ -367,11 +371,13 @@ files:
 - spec/widgets/screen_variable_processing_spec.rb
 - spec/widgets/screen_variants_spec.rb
 - spec/widgets/screens_spec.rb
+- spec/widgets/simulator_post_processors/card_parsers_spec.rb
+- spec/widgets/simulator_post_processors/submit_spec.rb
 - spec/widgets/static_content_spec.rb
-- spec/widgets/subroutine_spec.rb
 - tasks/db.rake
 - tasks/rspec.rake
 - tasks/rtml.rake
+- tasks/stats.rake
 - test/test_generator_helper.rb
 - test/test_helper.rb
 - test/test_rtml_action_generator.rb

data/builtin/widgets/subroutine.rb

@@ -1,54 +0,0 @@
-# Subroutines allow you to build reusable blocks of TML code that return some result back to
-# your main TML source.
-#
-# If you are able to make use of Subroutines to fill a role that Widgets don't already fill,
-# let me know so that I have a reason to keep this code around, because I'm considering removing
-# this from RTML.
-#
-class Rtml::Widgets::Subroutine < Rtml::Widget
-  affects :document, :element
-  entry_point :subroutine, :call, :subroutine?
-  disable_subprocessing!
-  shared :subroutines => HashWithIndifferentAccess
-
-  def subroutine(name, options = { }, &block)
-    #return document.subroutine(name, options, &block) if document != parent
-
-    subroutines[name] = Rtml::HighLevel::Subroutine.new(name, parent, options, &block)
-  end
-
-  def subroutine?(name)
-    name = name.to_s if name.kind_of?(Symbol)
-    return true if subroutines.key?(name)
-    return true if parent != document && parent.parent.subroutine?(name)
-    false
-  end
-
-  def call(name, arguments = {})
-    raise Rtml::Errors::ProcessingError, "Can only call a subroutine from within a screen" unless parent.name == 'screen'
-    #return document.call(name, arguments) if document != parent
-    name = name.to_s if name.kind_of?(Symbol)
-    doc = document
-    p = parent
-    document.string :rtml_sub_return_val
-    while p == doc || p.respond_to?(:parent)
-      #unless p.subroutines
-      #  raise "No subroutines hash for #{p.inspect}"
-      #end
-      if p.subroutines && p.subroutines.key?(name)
-        return_value = p.subroutines[name].call(parent, arguments)
-        begin
-          parent.set :rtml_sub_return_val => return_value
-        rescue ArgumentError
-          parent.set :rtml_sub_return_val => ''
-        end
-        return parent.terminal_variables[:rtml_sub_return_val]
-      end
-      raise NoMethodError, "Subroutine does not exist: #{name}" if p == doc
-      raise Rtml::Errors::ProcessingError, "Parent of #{p.inspect} is nil" unless p.parent
-      p = p.parent
-    end
-
-    raise Rtml::Errors::ProcessingError, "Found a parent that is not a parent...? (this shouldn't happen)"
-  end
-end