cuttlebone 0.1.3 → 0.1.4

data/spec/rack_middleware_spec.rb

@@ -0,0 +1,68 @@
+# encoding: utf-8
+
+require 'spec_helper'
+require 'rack/test'
+
+describe Cuttlebone::Drivers::Rack::Middleware do
+
+  include Rack::Test::Methods
+
+  let(:id1) { Digest::SHA1.hexdigest((Time.now.usec*rand).to_s) }
+  let(:driver) { Cuttlebone::Drivers::Rack.new }
+
+  let(:null_app) { proc { |env| Rack::Response.new('null').finish } }
+
+  let(:app) { described_class.new(null_app, driver) }
+
+  it "takes a backend and returns a middleware component" do
+    subject = described_class.new(null_app)
+    subject.should respond_to(:call)
+  end
+
+  it "takes an optional Cuttlebone driver as second argument" do
+    subject = described_class.new(null_app, driver)
+    subject.should respond_to(:call)
+  end
+
+  it "raises error when no application was given" do
+    expect{ described_class.new() }.should raise_error
+  end
+
+  it "handles POST '/init' and returns a unique session identifier" do
+    post '/init'
+    last_response.should be_ok
+    last_response.body.should match(/"id":"[0-9a-f]{40}"/)
+  end
+
+  it "handles POST '/prompt' and returns active context's prompt" do
+    driver.sessions.should_receive(:[]).with(id1).and_return(mock("Cuttlebone::Session", :id => id1, :prompt => 'prompt'))
+    post "/prompt/#{id1}"
+    last_response.should be_ok
+    last_response.body.should match(/"prompt":"prompt"/)
+  end
+
+  it "handles POST '/command' and returns active context's current result" do
+    driver.sessions.should_receive(:[]).with(id1).and_return(mock("Cuttlebone::Session", :id => id1, :prompt => 'prompt', :call => [nil,nil,['ok'],nil]))
+    post "/call/#{id1}", 'command' => 'x'
+    last_response.should be_ok
+    last_response.body.should match(/"output":\["ok"\]/)
+  end
+
+  it "handles POST '/command' and returns error when no real command was given" do
+    driver.sessions.should_receive(:[]).with(id1).and_return(mock("Cuttlebone::Session", :id => id1, :prompt => 'prompt'))
+    post "/call/#{id1}"
+    last_response.status.should == 409
+  end
+
+  xit "handles utf-8 strings properly" do
+    s = mock("Cuttlebone::Session", :id => id1, :prompt => 'prompt')
+    s.stub!(:call).and_return { |c| [nil, nil, c.reverse, nil] }
+    driver.sessions.should_receive(:[]).with(id1).and_return(s)
+
+    post "/call/#{id1}", 'command' => 'árvíztűrő tükörfúrógép'
+
+    last_response.should be_ok
+    last_response.body.should match(/"output":"pégórúfröküt őrűtzívrá"/u)
+  end
+
+end

data/spec/{session_base_spec.rb → session_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Cuttlebone::Session::Base do
+describe Cuttlebone::Session do
   let(:valid_context) { 'x' }
   let(:valid_command) { 'y' }
 
@@ -15,13 +15,15 @@ describe Cuttlebone::Session::Base do
     Cuttlebone.stub!(:definitions).and_return([ valid_context_definition ])
   end
 
+  it { should respond_to(:id) }
+
   context "having an active 'x' context" do
-    subject { Cuttlebone::Session::Base.new(valid_context) }
+    subject { Cuttlebone::Session.new(valid_context) }
 
     it { should_not be_terminated }
 
     it "should have no internal error" do
-      subject.internal_error.should be_blank
+      subject.internal_error.should be_nil
     end
 
     it "should evaluate a string command" do
@@ -43,20 +45,20 @@ describe Cuttlebone::Session::Base do
   end
 
   context "having no active contexts" do
-    subject { Cuttlebone::Session::Base.new() }
+    subject { Cuttlebone::Session.new() }
 
     it "should have no internal error" do
-      subject.internal_error.should be_blank
+      subject.internal_error.should be_nil
     end
 
     it { should be_terminated }
   end
 
   context "having 1 context" do
-    subject { Cuttlebone::Session::Base.new(valid_context) }
+    subject { Cuttlebone::Session.new(valid_context) }
 
     it "should have no internal error" do
-      subject.internal_error.should be_blank
+      subject.internal_error.should be_nil
     end
 
     it { should_not be_terminated }
@@ -69,10 +71,11 @@ describe Cuttlebone::Session::Base do
   end
 
   context "given a wrong context" do
-    subject { Cuttlebone::Session::Base.new('invalid_context') }
+    subject { Cuttlebone::Session.new('invalid_context') }
 
     it "should indicate internal error" do
-      subject.internal_error.should_not be_blank
+      subject.internal_error.should_not be_nil
+      subject.internal_error.should_not be_empty
     end
 
     it "should be terminated" do

data/vendor/active_support.rb

@@ -54,3 +54,21 @@ class Module
     end
   end
 end
+
+# (active_support)/lib/active_support/core_ext/array/extract_options.rb (stripped)
+class Hash
+  def extractable_options?
+    instance_of?(Hash)
+  end
+end
+
+class Array
+  def extract_options!
+    if last.is_a?(Hash) && last.extractable_options?
+      pop
+    else
+      {}
+    end
+  end
+end
+

metadata

@@ -2,7 +2,7 @@
 name: cuttlebone
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Bence Golda
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-18 00:00:00 +01:00
+date: 2011-03-26 23:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -68,6 +68,28 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: capybara
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.4.0
+  type: :development
+  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: haml
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 3.0.0
+  type: :development
+  prerelease: false
+  version_requirements: *id007
 description: Cuttlebone helps you creating shell-alike applications.
 email: 
 - bence@golda.me
@@ -86,6 +108,8 @@ files:
 - cuttlebone.gemspec
 - examples/todo.rb
 - features/example.feature
+- features/rack.feature
+- features/step_definitions/rack_steps.rb
 - features/step_definitions/steps.rb
 - features/support/env.rb
 - features/support/test_driver.rb
@@ -93,17 +117,31 @@ files:
 - lib/cuttlebone.rb
 - lib/cuttlebone/controller.rb
 - lib/cuttlebone/definition.rb
+- lib/cuttlebone/drivers/base.rb
+- lib/cuttlebone/drivers/rack.rb
+- lib/cuttlebone/drivers/shell.rb
 - lib/cuttlebone/exceptions.rb
 - lib/cuttlebone/session.rb
-- lib/cuttlebone/session/base.rb
-- lib/cuttlebone/session/rack.rb
-- lib/cuttlebone/session/shell.rb
 - lib/cuttlebone/version.rb
+- public/error.html
+- public/favicon.png
+- public/index.html
+- public/javascripts/cuttlebone.js
+- public/javascripts/jquery-1.5.1.min.js
+- public/javascripts/jquery.min.js
+- public/sources/cuttlebone.sass
+- public/sources/error.html.haml
+- public/sources/index.html.haml
+- public/stylesheets/cuttlebone.css
 - spec/controller_spec.rb
 - spec/cuttlebone_spec.rb
 - spec/definition_spec.rb
+- spec/drivers_base_spec.rb
+- spec/rack_application_spec.rb
+- spec/rack_driver_spec.rb
+- spec/rack_middleware_spec.rb
 - spec/rcov.opts
-- spec/session_base_spec.rb
+- spec/session_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - vendor/active_support.rb
@@ -121,7 +159,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2700429317005123117
+      hash: 836932418591510968
       segments: 
       - 0
       version: "0"
@@ -137,6 +175,6 @@ rubyforge_project: cuttlebone
 rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
-summary: cuttlebone-0.1.3
+summary: cuttlebone-0.1.4
 test_files: []
 

data/lib/cuttlebone/session/base.rb

@@ -1,61 +0,0 @@
-class Cuttlebone::Session::Base
-
-  attr_reader :stack, :internal_error
-
-  def initialize *stack_objects
-    setup_contexts 'cuttlebone.stack_objects' => stack_objects
-  end
-
-  def active_context
-    stack.last
-  end
-
-  delegate :name, :prompt, :to => :active_context
-
-  def setup_contexts env={}
-    @stack ||= (env['cuttlebone.stack_objects'] || []).map{ |o| Cuttlebone::Controller.new(self, o) }
-  rescue Cuttlebone::InvalidContextError => e
-    @internal_error = %{Context initialization failed for #{e.context.inspect}!}
-    @stack = []
-  rescue => e
-    @internal_error = %{Internal error occured: #{e.message} (#{e.class})}
-    @stack = []
-  end
-  private :setup_contexts
-
-  def process command
-    active_context = @stack.pop
-
-    action, next_context, output, error = begin
-                                            a, n, o, e = active_context.process(command)
-                                            raise ArgumentError, "Unknown action: #{a}" unless [ :self, :replace, :add, :drop ].include?(a.to_s.to_sym)
-                                            raise TypeError, "Output must be an instance of String or nil!" unless o.is_a?(Array) or o.nil?
-                                            raise TypeError, "Error must be an instance of String or nil!" unless e.is_a?(String) or e.nil?
-                                            [ a.to_s.to_sym, n, o, e ]
-                                          rescue => e
-                                            [ :self, active_context, nil, %{Cuttlebone::Session: #{e.message} (#{e.class})} ]
-                                          end
-    case action
-    when :self
-      @stack << active_context
-    when :replace
-      @stack << Cuttlebone::Controller.new(self, next_context)
-    when :add
-      @stack << active_context << Cuttlebone::Controller.new(self, next_context)
-    when :drop
-      # noop
-    end
-    [ action, next_context, output, error ]
-  end
-  private :process
-
-  def call command, env={}
-    setup_contexts env
-    process command
-  end
-
-  def terminated?
-    stack.empty?
-  end
-
-end

data/lib/cuttlebone/session/rack.rb

@@ -1,4 +0,0 @@
-class Cuttlebone::Session::Rack < Cuttlebone::Session::Base
-  def run
-  end
-end