controll 0.2.0 → 0.3.0

data/spec/controll/notify/base_spec.rb

@@ -51,12 +51,6 @@ describe Controll::Notify::Base do
     end
   end
 
-  describe 'notify_msg - messages map' do
-    specify do
-      subject.send(:notify_msg, :must_sign_in).should == sign_in_msg
-    end
-  end
-
   context 'I18n message' do
     # services:
     #   notice:
@@ -85,13 +79,13 @@ describe Controll::Notify::Base do
   end
 
   context 'Variable substitution' do
-    context 'method calls' do
-      let(:auth_error_msg) { 'Error while authenticating via facebook. The service did not return valid data.' }
+    # context 'method calls' do
+    #   let(:auth_error_msg) { 'Error while authenticating via facebook. The service did not return valid data.' }
 
-      specify do
-        subject.notify('auth_error!').should == auth_error_msg
-      end      
-    end
+    #   specify do
+    #     subject.notify('auth_error!').should == auth_error_msg
+    #   end      
+    # end
 
     context 'Liquid templates with args' do      
       let(:auth_error_msg) { 'Error while authenticating via www.facebook.com/login. The service returned invalid data for the user id.' }

data/spec/controll/notify/message/handler_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe Controll::Notify::Message::Handler do
+  subject { Controll::Notify::Message::Handler.new message }
+
+  let(:message)    { Controll::Notify::Message.new text, options  }
+  let(:text)       { 'Error while authenticating via {{full_route}}. The service returned invalid data for the user id.' }
+  let(:options) do
+    {:full_route => 'the_path'}
+  end
+
+  describe '.initialize message' do
+    its(:message) { should == message } 
+  end
+
+  describe '.handle' do
+    context 'simple text' do
+      let(:text)       { 'simple text' }
+
+      its(:handle) { should == text }
+    end
+
+    context 'with arg replacement' do
+      its(:handle) { should == 'Error while authenticating via the_path. The service returned invalid data for the user id.' }
+    end
+  end
+end

data/spec/controll/notify/message/resolver_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+module Services
+  class NoticeHandler
+  end
+end
+
+describe Controll::Notify::Message::Resolver do
+  subject { Controll::Notify::Message::Resolver.new caller, message }
+
+  let(:caller)     { Services::NoticeHandler.new }
+  let(:message)    { Controll::Notify::Message.new text, options  }
+  let(:text)       { 'Error while authenticating via {{full_route}}. The service returned invalid data for the user id.' }
+  let(:options) do
+    {:full_route => 'the_path', :name => 'kris'}
+  end
+
+  describe '.initialize message' do
+    its(:message) { should == message } 
+  end
+
+  describe '.resolve' do
+    context 'simple text' do
+      let(:text)       { 'simple text' }
+
+      its(:resolve) { should == text }
+    end
+
+    context 'with arg replacement' do
+      its(:resolve) { should == 'Error while authenticating via the_path. The service returned invalid data for the user id.' }
+    end
+
+    context 'translation' do
+      let(:text) { :signed_out }
+      let(:name) { 'kris' }
+
+      before do
+       ::I18n.backend.store_translations :en,
+         :services => {
+           :notice => {
+             :signed_out => "Hey %{name}, you have been signed out!"
+            }
+          }
+      end
+
+      after do
+       ::I18n.backend.reload!
+      end
+
+      its(:resolve) { should == "Hey #{name}, you have been signed out!" }
+    end
+  end
+end

data/spec/controll/notify/message/translator_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+module Services
+  class NoticeHandler
+  end
+end
+
+describe Controll::Notify::Message::Translator do
+  subject { Controll::Notify::Message::Translator.new caller, message }
+
+  let(:caller)     { Services::NoticeHandler.new }
+  let(:message)    { Controll::Notify::Message.new key, options  }
+  let(:key)        { :signed_out }
+  let(:options) do
+    {:name => 'kris'}
+  end
+
+  describe '.initialize caller, message' do
+    its(:caller)  { should == caller }
+    its(:key)     { should == key }
+    its(:key)     { should == message.text }
+    its(:options) { should == message.options }
+    its(:options) { should == options }
+
+    context 'I18n messages with args' do
+      let(:name)  { 'kris' }
+
+      before do
+       ::I18n.backend.store_translations :en,
+         :services => {
+           :notice => {
+             :signed_out => "Hey %{name}, you have been signed out!"
+            }
+          }
+      end
+
+      after do
+       ::I18n.backend.reload!
+      end
+
+      specify do
+        subject.translate.should == "Hey #{name}, you have been signed out!"
+      end
+    end
+  end
+end

data/spec/controll/notify/message_spec.rb

@@ -0,0 +1,4 @@
+require 'spec_helper'
+
+describe Controll::Notify::Message do
+end

data/spec/controll/notify/{message_handler.rb → services_notifier.rb}

@@ -1,4 +1,4 @@
-module MessageHandler
+module Notifiers
   class Services < Controll::Notify::Typed
     class Base < Controll::Notify::Base
       def provider_name
@@ -14,7 +14,7 @@ module MessageHandler
       end
     end
 
-    class ErrorMsg < Base
+    class ErrorHandler < Base
       type :error
 
       def messages
@@ -42,9 +42,7 @@ You have not been signed in.},
       end
     end
 
-    class NoticeMsg < Base
-      type :notice
-
+    class NoticeHandler < Base
       # for :signed_in and :signed_out - defined in locale file under:
 
       # services:

data/spec/controll/notify/typed_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require 'controll/notify/message_handler'
+require 'controll/notify/services_notifier'
 
 class MyController
   attr_reader :flash
@@ -10,7 +10,7 @@ class MyController
 end
 
 describe Controll::Notify::Typed do
-  subject { MessageHandler::Services.new controller }
+  subject { Notifiers::Services.new controller }
 
   let(:controller) { MyController.new }
 

data/spec/controll_app/app/controll/commanders/services_commander.rb

@@ -0,0 +1,5 @@
+module Commanders
+  class ServicesCommander < Commanders
+    command_method :sign_in
+  end
+end

data/spec/controll_app/app/controll/executors/services_executor.rb

@@ -0,0 +1,4 @@
+module Executors
+  class ServicesExecutor < Executor
+  end
+end

data/spec/controll_app/app/controll/flows/create_services.rb

@@ -0,0 +1,9 @@
+module Flows
+  class CreateServices < Flow
+    renderer :simple do
+    end
+
+    redirecter :complex do
+    end
+  end
+end

data/spec/controll_app/app/controll/notifiers/services_notifier.rb

@@ -0,0 +1,9 @@
+module Notifiers
+  class ServicesNotifier < Typed
+    handler :notice do
+    end
+
+    handler :error do
+    end
+  end
+end

data/spec/{app → controll_app}/app/controllers/application_controller.rb

@@ -2,5 +2,4 @@ require 'action_controller'
 require 'focused_controller'
 
 class ApplicationController < ActionController::Base
-  include FocusedController::Mixin
 end

data/spec/controll_app/app/controllers/services_controller.rb

@@ -0,0 +1,8 @@
+require 'action_controller'
+require 'focused_controller'
+
+module ServicesController
+  class Create < FocusedAction
+    
+  end
+end

data/spec/{app → controll_app}/config/application.rb

@@ -5,7 +5,7 @@ require 'rails/test_unit/railtie'
 
 Bundler.require
 
-module App
+module ControllApp
   class Application < Rails::Application
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"

data/spec/controll_app/config/routes.rb

@@ -0,0 +1,5 @@
+ControllApp::Application.routes.draw do
+  focused_controller_routes do
+    resources :services
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: controll
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-16 00:00:00.000000000 Z
+date: 2012-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -123,7 +123,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.5'
-description: FlowHandler, Executor, Notifier and more, all tied together tool pack
+description: Flow, Executor, Notifier and more, all tied together tool pack
 email: kmandrup@gmail.com
 executables: []
 extensions: []
@@ -142,109 +142,146 @@ files:
 - controll.gemspec
 - lib/controll.rb
 - lib/controll/assistant.rb
+- lib/controll/assistant/param_assistant.rb
+- lib/controll/assistant/session_assistant.rb
 - lib/controll/command.rb
 - lib/controll/commander.rb
+- lib/controll/enabler.rb
+- lib/controll/enabler/macros.rb
+- lib/controll/enabler/maps.rb
+- lib/controll/enabler/notify.rb
+- lib/controll/enabler/path_handler.rb
+- lib/controll/enabler/path_resolver.rb
+- lib/controll/engine.rb
 - lib/controll/errors.rb
+- lib/controll/event.rb
+- lib/controll/event/helper.rb
+- lib/controll/event/matcher.rb
+- lib/controll/events.rb
 - lib/controll/executor.rb
 - lib/controll/executor/base.rb
-- lib/controll/executor/notificator.rb
-- lib/controll/flow_handler.rb
-- lib/controll/flow_handler/base.rb
-- lib/controll/flow_handler/control.rb
-- lib/controll/flow_handler/errors.rb
-- lib/controll/flow_handler/event_helper.rb
-- lib/controll/flow_handler/redirect.rb
-- lib/controll/flow_handler/redirect/action.rb
-- lib/controll/flow_handler/redirect/mapper.rb
-- lib/controll/flow_handler/render.rb
+- lib/controll/executor/controlled.rb
+- lib/controll/executor/delegator.rb
+- lib/controll/flow.rb
+- lib/controll/flow/action.rb
+- lib/controll/flow/action/base.rb
+- lib/controll/flow/action/fallback.rb
+- lib/controll/flow/action/path_action.rb
+- lib/controll/flow/action_mapper.rb
+- lib/controll/flow/action_mapper/base.rb
+- lib/controll/flow/action_mapper/complex.rb
+- lib/controll/flow/action_mapper/simple.rb
+- lib/controll/flow/errors.rb
+- lib/controll/flow/event_mapper.rb
+- lib/controll/flow/event_mapper/path_finder.rb
+- lib/controll/flow/event_mapper/util.rb
+- lib/controll/flow/master.rb
+- lib/controll/flow/master/executor.rb
+- lib/controll/flow/master/macros.rb
+- lib/controll/focused/enabler.rb
 - lib/controll/helper.rb
-- lib/controll/helper/event_matcher.rb
 - lib/controll/helper/hash_access.rb
-- lib/controll/helper/notify.rb
 - lib/controll/helper/params.rb
-- lib/controll/helper/path_resolver.rb
 - lib/controll/helper/session.rb
+- lib/controll/macros.rb
 - lib/controll/notify.rb
 - lib/controll/notify/base.rb
 - lib/controll/notify/flash.rb
+- lib/controll/notify/macros.rb
+- lib/controll/notify/message.rb
+- lib/controll/notify/message/handler.rb
+- lib/controll/notify/message/resolver.rb
+- lib/controll/notify/message/translator.rb
 - lib/controll/notify/typed.rb
+- lib/generators/controll/assistant_generator.rb
+- lib/generators/controll/executor_generator.rb
+- lib/generators/controll/flow_handler_generator.rb
+- lib/generators/controll/notifier_generator.rb
+- lib/generators/controll/setup_generator.rb
+- lib/generators/controll/templates/assistant.tt
+- lib/generators/controll/templates/commander.tt
+- lib/generators/controll/templates/executor.tt
+- lib/generators/controll/templates/flow_handler.tt
+- lib/generators/controll/templates/notifier.tt
 - spec/acceptance/app_test.rb
-- spec/app/.gitignore
-- spec/app/Gemfile
-- spec/app/Gemfile.lock
-- spec/app/README.rdoc
-- spec/app/Rakefile
-- spec/app/app/controllers/application_controller.rb
-- spec/app/app/controllers/posts_controller.rb
-- spec/app/app/models/.gitkeep
-- spec/app/app/models/post.rb
-- spec/app/app/views/layouts/application.html.erb
-- spec/app/app/views/posts/_form.html.erb
-- spec/app/app/views/posts/edit.html.erb
-- spec/app/app/views/posts/index.html.erb
-- spec/app/app/views/posts/new.html.erb
-- spec/app/app/views/posts/show.html.erb
-- spec/app/config.ru
-- spec/app/config/application.rb
-- spec/app/config/boot.rb
-- spec/app/config/environment.rb
-- spec/app/config/environments/development.rb
-- spec/app/config/environments/test.rb
-- spec/app/config/initializers/backtrace_silencers.rb
-- spec/app/config/initializers/inflections.rb
-- spec/app/config/initializers/mime_types.rb
-- spec/app/config/initializers/secret_token.rb
-- spec/app/config/initializers/session_store.rb
-- spec/app/config/locales/en.yml
-- spec/app/config/routes.rb
-- spec/app/db/seeds.rb
-- spec/app/lib/assets/.gitkeep
-- spec/app/lib/tasks/.gitkeep
-- spec/app/log/.gitkeep
-- spec/app/public/404.html
-- spec/app/public/422.html
-- spec/app/public/500.html
-- spec/app/public/favicon.ico
-- spec/app/public/index.html
-- spec/app/public/javascripts/application.js
-- spec/app/public/robots.txt
-- spec/app/public/stylesheets/application.css
-- spec/app/script/rails
-- spec/app/spec/controllers/posts_controller_spec.rb
-- spec/app/spec/isolated_spec_helper.rb
-- spec/app/spec/spec_helper.rb
-- spec/app/spec/unit/controllers/posts_controller_isolated_spec.rb
-- spec/app/spec/unit/controllers/posts_controller_spec.rb
-- spec/app/test/functional/.gitkeep
-- spec/app/test/functional/posts_controller_test.rb
-- spec/app/test/isolated_test_helper.rb
-- spec/app/test/test_helper.rb
-- spec/app/test/unit/.gitkeep
-- spec/app/test/unit/controllers/posts_controller_isolated_test.rb
-- spec/app/test/unit/controllers/posts_controller_test.rb
-- spec/app/vendor/assets/javascripts/.gitkeep
-- spec/app/vendor/assets/stylesheets/.gitkeep
-- spec/app/vendor/plugins/.gitkeep
-- spec/controll/asssistant_spec.rb
+- spec/controll/assistant/param_assistant_spec.rb
+- spec/controll/assistant/session_assistant_spec.rb
+- spec/controll/assistant_spec.rb
 - spec/controll/command_spec.rb
 - spec/controll/commander_spec.rb
-- spec/controll/executor/notificator_spec.rb
-- spec/controll/flow_handler/control_spec.rb
-- spec/controll/flow_handler/redirect/action_spec.rb
-- spec/controll/flow_handler/redirect/mapper_spec.rb
-- spec/controll/flow_handler/redirect_spec.rb
-- spec/controll/flow_handler/render_spec.rb
-- spec/controll/helper/event_matcher_spec.rb
+- spec/controll/enabler/macros_spec.rb
+- spec/controll/enabler/maps_spec.rb
+- spec/controll/enabler/notify_spec.rb
+- spec/controll/enabler/path_handler_spec.rb
+- spec/controll/enabler/path_resolver_spec.rb
+- spec/controll/enabler_spec.rb
+- spec/controll/event/helper_spec.rb
+- spec/controll/event/matcher_spec.rb
+- spec/controll/event_spec.rb
+- spec/controll/events_spec.rb
+- spec/controll/executor/controlled_spec.rb
+- spec/controll/executor/delegator_spec.rb
+- spec/controll/flow/action_mapper/complex_spec.rb
+- spec/controll/flow/action_mapper/fallback_spec.rb
+- spec/controll/flow/action_mapper/simple_spec.rb
+- spec/controll/flow/event_mapper/path_finder_spec.rb
+- spec/controll/flow/event_mapper/util_spec.rb
+- spec/controll/flow/master/executor_spec.rb
+- spec/controll/flow/master/macros_spec.rb
+- spec/controll/flow/master_spec.rb
 - spec/controll/helper/hash_access_spec.rb
-- spec/controll/helper/notify_spec.rb
 - spec/controll/helper/params_spec.rb
-- spec/controll/helper/path_resolver_spec.rb
 - spec/controll/helper/session_spec.rb
-- spec/controll/helper_spec.rb
 - spec/controll/notify/base_spec.rb
 - spec/controll/notify/flash_spec.rb
-- spec/controll/notify/message_handler.rb
+- spec/controll/notify/message/handler_spec.rb
+- spec/controll/notify/message/resolver_spec.rb
+- spec/controll/notify/message/translator_spec.rb
+- spec/controll/notify/message_spec.rb
+- spec/controll/notify/services_notifier.rb
 - spec/controll/notify/typed_spec.rb
+- spec/controll_app/.gitignore
+- spec/controll_app/Gemfile
+- spec/controll_app/Gemfile.lock
+- spec/controll_app/README.rdoc
+- spec/controll_app/Rakefile
+- spec/controll_app/app/controll/commanders/services_commander.rb
+- spec/controll_app/app/controll/executors/services_executor.rb
+- spec/controll_app/app/controll/flows/create_services.rb
+- spec/controll_app/app/controll/notifiers/services_notifier.rb
+- spec/controll_app/app/controllers/application_controller.rb
+- spec/controll_app/app/controllers/services_controller.rb
+- spec/controll_app/app/models/.gitkeep
+- spec/controll_app/app/models/post.rb
+- spec/controll_app/app/views/layouts/application.html.erb
+- spec/controll_app/app/views/posts/_form.html.erb
+- spec/controll_app/app/views/posts/edit.html.erb
+- spec/controll_app/app/views/posts/index.html.erb
+- spec/controll_app/app/views/posts/new.html.erb
+- spec/controll_app/app/views/posts/show.html.erb
+- spec/controll_app/config.ru
+- spec/controll_app/config/application.rb
+- spec/controll_app/config/boot.rb
+- spec/controll_app/config/environment.rb
+- spec/controll_app/config/environments/development.rb
+- spec/controll_app/config/environments/test.rb
+- spec/controll_app/config/initializers/backtrace_silencers.rb
+- spec/controll_app/config/initializers/inflections.rb
+- spec/controll_app/config/initializers/mime_types.rb
+- spec/controll_app/config/initializers/secret_token.rb
+- spec/controll_app/config/initializers/session_store.rb
+- spec/controll_app/config/locales/en.yml
+- spec/controll_app/config/routes.rb
+- spec/controll_app/db/seeds.rb
+- spec/controll_app/log/.gitkeep
+- spec/controll_app/public/404.html
+- spec/controll_app/public/422.html
+- spec/controll_app/public/500.html
+- spec/controll_app/public/favicon.ico
+- spec/controll_app/public/index.html
+- spec/controll_app/public/javascripts/application.js
+- spec/controll_app/public/robots.txt
+- spec/controll_app/public/stylesheets/application.css
 - spec/functional_test_helper.rb
 - spec/helper.rb
 - spec/rspec_controller_class.rb
@@ -273,7 +310,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2872567126894970398
+      hash: 532525956414190300
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/controll/executor/notificator.rb

@@ -1,12 +0,0 @@
-require 'controll/executor/base'
-
-module Controll::Executor
-  class Notificator < Base
-
-    # return last notification or :success as result
-    # Hashie::Mash.new(name: name, type: type, options: options)
-    def result
-      main_event
-    end
-  end
-end