culpa 0.8.0 → 1.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWUzODlkNWE4YTE1OWMxNmQyMGZmODBlNzliZTkwMmNmN2MxMGI0ZA==
+    ZjYwZmMzMzU5N2FkODlkYWZjYTQ5ZTk2OGU1MzY4ZDFmNDVlOWI4MQ==
   data.tar.gz: !binary |-
-    NjdlOGQ4YmY4MDZiNTU1ZWNhZDYyMjY2ZTFjMzAwNGQ3NjY2YjhhYQ==
+    YzhkYWM4M2ZlMDk0ZDFiZDMwOTllMzZkNjQyOWFlODZkMmZkNDllOQ==
 SHA512:
   metadata.gz: !binary |-
-    MjIwYWNkZWMxMDJhMTQwNjU5Yjk0NTJjYTNhMTY3ZDQ3NWZmYWQ2NDJjZjZk
-    NTc5ODM1NGFjYTZhYTAzYTdmN2RlZWRmYWZhMTcxZTdjNzA3MGIzNTU2NTYz
-    ZjA3N2FhNTM1ZjJiNDJkOTQzOWQxMDViOTAyYzI2NzA0YmFlMjI=
+    MDEwYTc1NDcxNjZjNDBlNTMzNWYxYWU0NmY3NmVmMDAxNDRkM2M3ZjY2NGEw
+    YTIyZTJhZjQ0NmY2ZDczYzllNmQ4YjI1M2I2YjkyYTAwYTZlNTI5ZjJmYjUw
+    MmU0MmUyZWJjNmZmZWFkYTU4YmMyOGNjZmQxNTUwZTcwN2QzZTU=
   data.tar.gz: !binary |-
-    M2Y3MjdlZDlhODhlNTgxM2MzOTFmODEyNDFjMGU0ZGY0YTRiNDU1MGQ2Yjlh
-    NGZhYTljMDYwYzFjOTY3NmFmYzQ1ZDNiYmU4YjYxYTE0NDlkNzE5NzM0ZWFi
-    YTc0M2E5MDZhMjFmYmYyYzUwMTdmMzc3OTllYmNiMTllYWIzNmU=
+    N2M4ZTNkOWZiMzQxNTVkYmEwNjljNTNlZDk1ZTZiMTkzMGJjMGU1OTkwOTE3
+    ZmU3MDA1N2FiYTY1YjBhNzBjMDExNTlkYTBhNWQ0OThiNTk2NTcyYmQ3YzYy
+    ZTFhNzAzZTY1MTFkZmRmZjBiOGNkNTU3MTg1MGRjZDhkMDMwOWY=

data/bin/culpa

@@ -19,7 +19,8 @@ def create_project(project_path)
   FileUtils.mkdir "#{project_path}/models"
   FileUtils.touch "#{project_path}/models/.keep"
   FileUtils.mkdir "#{project_path}/config"
-  FileUtils.touch "#{project_path}/config/router.yml"
+  FileUtils.mkdir "#{project_path}/config/brickchains"
+  FileUtils.touch "#{project_path}/config/brickchains/.keep"
   FileUtils.mkdir "#{project_path}/config/initializers"
   FileUtils.touch "#{project_path}/config/initializers/.keep"
 
@@ -65,7 +66,7 @@ def display_help
   puts 'Commands supported :'
   puts '  - new [folder] : Creates a new culpa project on the specified folder'
   puts '  - console : Drops an interactive shell within the running directory'
-  puts '  - server : Starts the web server'
+  puts '  - server : Starts the web server (on the 4748 port)'
   puts '  - generate : '
   puts '    - action [action_name] [brick_a brick_b ...] : Creates an action'
   puts '    - spec : Creates a spec'

data/lib/culpa.rb

@@ -7,7 +7,7 @@ require 'envelope'
 require 'path_parser'
 require 'file_streamer'
 
-CULPA_VERSION='0.8.0'
+CULPA_VERSION='1.0.0'
 
 ACTIONS_PATH ||= './actions/*.rb'
 MODELS_PATH ||= './models/*.rb'
@@ -24,28 +24,34 @@ module Actions
   end
 end
 
-module Models
-  Dir[MODELS_PATH].each do |file|
-    require file
-  end
-end
-
 module Culpa
 
   class UnpredictableSubCallError < StandardError; end
   class NoRenderCalled < StandardError; end
   class UnknownRenderCall < StandardError; end
 
+  Dir[MODELS_PATH].each do |file|
+    require file
+  end
+
   class Application
 
     def initialize(options = {})
-      @router = YAML.load_file(options[:router] || './config/router.yml')
+      @router = {}
+      bc_path = options[:brickchains] || './config/brickchains'
+      Dir["#{bc_path}/*.yml"].map { |bc_file|
+        YAML.load_file(bc_file)
+      }.each{ |bc|
+        @router.merge!(bc)
+      }
       @logger = Logger.new(options[:log_output] || STDOUT)
       @logger.level = case ENV['RACK_ENV']
                         when 'development', 'test'
                           Logger::DEBUG
                         else
+                          # :nocov:
                           Logger::WARN
+                          # :nocov:
                       end
       @logger.info 'Culpa fully initialized'
     end
@@ -66,7 +72,7 @@ module Culpa
         call_options[:input] = env['rack.input']
       end
       # Try the enforced routes
-      if !(route_params = PathParser.parse('/:res_name', env['PATH_INFO'])).nil?
+      if route_params = PathParser.parse('/:res_name', env['PATH_INFO'])
         call_options[:res_name] = route_params[:res_name]
         case call_options[:verb]
           when :get
@@ -76,7 +82,7 @@ module Culpa
           else
             raise UnpredictableSubCallError.new
         end unless call_options.has_key? :sub_call
-      elsif !(route_params = PathParser.parse('/:res_name/:id', env['PATH_INFO'])).nil?
+      elsif route_params = PathParser.parse('/:res_name/:id', env['PATH_INFO'])
         call_options[:res_name] = route_params[:res_name]
         call_options[:id] = route_params[:id]
         case call_options[:verb]
@@ -89,7 +95,7 @@ module Culpa
           else
             raise UnpredictableSubCallError.new
         end unless call_options.has_key? :sub_call
-      elsif !(route_params = PathParser.parse('/:res_name/:id/:sub_call', env['PATH_INFO'])).nil?
+      elsif route_params = PathParser.parse('/:res_name/:id/:sub_call', env['PATH_INFO'])
         call_options[:res_name] = route_params[:res_name]
         call_options[:id] = route_params[:id]
         call_options[:sub_call] = route_params[:sub_call]

data/lib/envelope.rb

@@ -25,6 +25,15 @@ module Culpa
       end
     end
 
+    def ==(other_envelope)
+      return false unless other_envelope.is_a? Envelope
+      return false unless other_envelope.instance_variables.count == instance_variables.count
+      instance_variables.each do |iv|
+        return false unless instance_variable_get(iv) == other_envelope.instance_variable_get(iv)
+      end
+      return true
+    end
+
   end
 
   class EnvelopeRequest
@@ -45,7 +54,3 @@ module Culpa
   end
 
 end
-
-
-
-

data/lib/path_parser.rb

@@ -38,7 +38,6 @@ module Culpa
       returned
     end
 
-
   end
 
-end
+end

data/lib/rspec_helper.rb

@@ -4,38 +4,88 @@ require 'rspec/expectations'
 
 module CulpaHelpers
 
-  class BrickCallMock
-    def initialize(opts)
-      @action, @method = opts.first
-      @action = @action.to_s.split('_').map{|w| w.capitalize}.join
-      @logger = Logger.new STDOUT
-      opts.delete(@action)
-      @envelope = Envelope.new(opts[:envelope]) if opts.has_key? :envelope
-      @request = EnvelopeRequest.new(opts[:request]) if opts.has_key? :request
+  def last_call
+    @@last_call
+  end
+
+  def call_brick(brick_name)
+    @@last_call = BrickCall.new(brick_name)
+  end
+
+  class BrickCall
+
+    def initialize(brick_name)
+      @brick_name = brick_name.to_s
+    end
+
+    def from(action_const)
+      @action_const = action_const
+      @envelope = Culpa::Envelope.new()
+      @params = Culpa::EnvelopeRequest.new({})
+      self
+    end
+
+    # :nocov:
+    def and_with_envelope(envelope)
+      with_envelope(envelope)
+    end
+
+    def and_with_params(params)
+      with_params(params)
+    end
+    # :nocov:
+
+    def with_envelope(envelope)
+      @envelope = Culpa::Envelope.new(envelope)
+      self
+    end
+
+    def with_params(params)
+      @params = Culpa::EnvelopeRequest.new(params)
+      self
     end
 
     def call
-      action_class = Actions.const_get(@action).new(@envelope, @request, @logger)
-      action_class.send @method.to_s
+      return @call_cache if @call_done
+      @call_done = true
+      @action_const.new(@envelope, @params, Logger.new(STDOUT)).send(@brick_name)
+      return @call_cache = { to_render: nil, envelope: @envelope }
     rescue Action::RenderNow => renderer
-      return renderer.to_render
+      return @call_cache = { to_render: renderer.to_render, envelope: @envelope }
     end
+
   end
 
   RSpec::Matchers.define :have_status do |expected|
     match do |actual|
-      actual[:status] == Action::RETURN_CODES[expected]
+      bc = actual.call
+      bc[:to_render][:status] == Action::RETURN_CODES[expected]
     end
   end
 
   RSpec::Matchers.define :have_headers do |expected|
     match do |actual|
       expected.each do |k,v|
-        return false unless actual[:headers].has_key?(k) and
-                            actual[:headers][k] == expected[k]
+        bc = actual.call
+        return false unless bc[:to_render][:headers].has_key?(k) and
+                            bc[:to_render][:headers][k] == expected[k]
       end
       true
     end
   end
 
+  RSpec::Matchers.define :have_body do |expected|
+    match do |actual|
+      bc = actual.call
+      bc[:to_render][:object] == expected
+    end
+  end
+
+  RSpec::Matchers.define :have_envelope do |expected|
+    match do |actual|
+      bc = actual.call
+      bc[:envelope] == Culpa::Envelope.new(expected)
+    end
+  end
+
 end

data/templates/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'culpa', '~> 0.7'
+gem 'culpa', '~> 1.0'
 
 # Use rspec to test your project.
 gem 'rspec', '~> 3.4'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: culpa
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Jérémy SEBAN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-21 00:00:00.000000000 Z
+date: 2016-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -52,7 +52,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.4'
-description: Culpa is a framework following MEA principles. Learn more on https://github.com/HipsterWhale/culpa.
+description: Culpa is a framework following MEA principles. Learn more on http://culpaframework.org/.
 email: jeremy@seban.eu
 executables:
 - culpa
@@ -70,7 +70,7 @@ files:
 - templates/Gemfile
 - templates/config.ru
 - templates/generators/action.tmpl
-homepage: https://github.com/HipsterWhale/culpa
+homepage: http://culpaframework.org/
 licenses:
 - MIT
 metadata: {}