culpa 1.3.3 → 2.0.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YjBjMzRjMTY2YjFiYmM2MTc0MTk0MTBhMzVmNDhmYTZmNzk4OGZkOQ==
-  data.tar.gz: !binary |-
-    YzljY2FjMGFkMzMwMjM4MzIzNmVhMDdlN2U1ODI4YTRiNjdhNjcxOA==
+SHA1:
+  metadata.gz: 501766c60a9c24b890b1b3b7b0ab92dd6d814452
+  data.tar.gz: c03bbfff343038c60600b704d8f609ee2d2ce3e4
 SHA512:
-  metadata.gz: !binary |-
-    ZWE1ZWNkN2ZkZDdkZDYyMmQzZTIzMTc4OGMwMWQ4NWU2ZjRiMDQwYzZhNWVl
-    NjE2ODlmZTYyNDQ1YTNjMTY2OGUwZWEwZWM3MDNkMTFhNjI4ZDJiY2Q1OTMx
-    YzI5MjFmYzYxNTc4MTNmNDAwNmQ2NDYwNzlkODQ1MTVkZWQ5MDU=
-  data.tar.gz: !binary |-
-    YmI4NmE5Y2NkZmQ0MzdhYTdhMmM1YjUxZDQzNGRiN2QyOTUxYjExZGZiZGZl
-    M2M0ZmU2YTIyMWRjNTlmNDE5NDUzODczZWVjZmJlYTFiMzA4YTFiYzk3NzZh
-    YmQyY2Q1NWQzZTQ0MjMwNTczYTYxNzY1ZDQ0ZmQ4NzU4MTllNTQ=
+  metadata.gz: b200ea63a079c6bf033f7f947d15abccc69d72764f05c2ec2ca585d0060a65e57115b497acda8095ff2d40b00789b1eec45a26ed834650014e67e76e12bbe765
+  data.tar.gz: 4cfef48f853cbdedb2f90c05a346cfec87bc034161edb248a8a9cbf89b6451fdf2244f4d45d924c0bfca4b67e7912ffc22712bd9b972bd7eb1bd849843248202

data/lib/culpa/action.rb

@@ -3,6 +3,14 @@ class Action
 
   @@renderers = {}
 
+  def self.renderers_list
+    @@renderers
+  end
+
+  def self.add_renderer(filepath)
+    @@renderers.merge!(RendererDescriber.new(filepath).result)
+  end
+
   def self.load_renderers
     Dir[File.join(File.dirname(__FILE__), 'renderers/*.rb')].each do |renderer|
       @@renderers.merge!(RendererDescriber.new(renderer).result)

data/lib/culpa/brickchain_helpers.rb

@@ -3,6 +3,12 @@ module Culpa
   class BrickchainExecutor
     attr_reader :envelope
 
+    @@injected_keywords = {}
+
+    def self.inject_keyword!(keyword, &call)
+      @@injected_keywords[keyword] = call
+    end
+
     def initialize(envelope, request)
       @envelope = envelope
       @request = request
@@ -18,16 +24,13 @@ module Culpa
       @envelope
     end
 
-    def render_coliseum(file)
-      coliseum = ColiseumDSL.new("./#{COLISEUMS_PATH || 'coliseums'}/#{file}.rb", envelope)
-      raise Action::RenderNow, format: :json,
-                               status: RendererDescriber::RETURN_CODES[coliseum.culpa_status] || 200,
-                               headers: { 'Content-Type' => 'application/json' }.merge(coliseum.culpa_headers),
-                               object: coliseum.dsl_attributes
-    end
-
-    def method_missing(sym)
-      CallHolder.new(sym.to_s, @envelope, @request)
+    def method_missing(sym, *args)
+      if @@injected_keywords.has_key? sym
+        method = @@injected_keywords[sym]
+        instance_exec args, &method
+      else
+        CallHolder.new(sym.to_s, @envelope, @request)
+      end
     end
   end
 

data/lib/culpa/version.rb

@@ -1 +1 @@
-CULPA_VERSION = '1.3.3'.freeze
+CULPA_VERSION = '2.0.0'.freeze

data/templates/culpa/Gemfile

@@ -1,6 +1,9 @@
 source 'https://rubygems.org'
 
-gem 'culpa', '~> 1.3'
+# The MEA framework
+gem 'culpa', '~> 2.0'
+# Coliseum extension to describe JSON in an elegent way
+gem 'culpa-coliseum', '~> 2.0'
 
 # Use rspec to test your project.
 gem 'rspec', '~> 3.4'

data/templates/culpa/config.ru

@@ -1,2 +1,4 @@
-require 'culpa'
+require 'rubygems'
+require 'bundler/setup'
+Bundler.require(:default)
 run Culpa::Application.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: culpa
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 2.0.0
 platform: ruby
 authors:
 - Jérémy SEBAN
@@ -14,56 +14,56 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.12'
 description: Culpa is a framework following MEA principles. Learn more on http://culpaframework.org/.
@@ -77,11 +77,9 @@ files:
 - lib/culpa.rb
 - lib/culpa/action.rb
 - lib/culpa/brickchain_helpers.rb
-- lib/culpa/coliseum_dsl.rb
 - lib/culpa/envelope.rb
 - lib/culpa/path_parser.rb
 - lib/culpa/renderer_describer.rb
-- lib/culpa/renderers/coliseum.rb
 - lib/culpa/renderers/file.rb
 - lib/culpa/renderers/json.rb
 - lib/culpa/renderers/status.rb
@@ -106,12 +104,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ~>
+  - - "~>"
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -119,5 +117,5 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: ! 'Culpa : the MEA framework'
+summary: 'Culpa : the MEA framework'
 test_files: []

data/lib/culpa/coliseum_dsl.rb

@@ -1,71 +0,0 @@
-class ColiseumDSL
-  attr_reader :dsl_attributes, :culpa_status, :culpa_headers
-
-  def initialize(to_eval, envelope, eval_args = nil)
-    @dsl_attributes = {}
-    @culpa_headers = {}
-    @culpa_envelope = envelope
-    if to_eval.is_a? String
-      instance_eval File.read(to_eval), to_eval
-    else
-      instance_exec eval_args, &to_eval
-    end
-  end
-
-  def e
-    @culpa_envelope
-  end
-
-  def set_status_code!(code)
-    @culpa_status = code
-  end
-
-  def add_http_headers!(hdrs = {})
-    @culpa_headers.merge!(hdrs)
-  end
-
-  def array!(opts, &blk)
-    if opts.is_a? Hash
-      sym, items = opts.first
-      @dsl_attributes[sym] = []
-      items.each do |item|
-        @dsl_attributes[sym] << ColiseumDSL.new(blk, @culpa_envelope, item).dsl_attributes
-      end
-    else
-      @dsl_attributes = []
-      opts.each do |item|
-        @dsl_attributes << ColiseumDSL.new(blk, @culpa_envelope, item).dsl_attributes
-      end
-    end
-  end
-
-  def extract!(target, *attrs)
-    attrs.each do |att|
-      @dsl_attributes[att] = if target.is_a? Hash
-                               target[att] if target.key? att
-                             else
-                               begin
-                                 target.send(att)
-                               rescue
-                                 # :nocov:
-                                 nil
-                                 # :nocov:
-                               end
-                             end
-    end
-  end
-
-  def method_missing(sym, *args, &blk)
-    @dsl_attributes[sym] = if ::Kernel.block_given?
-                             ColiseumDSL.new(blk, @culpa_envelope).dsl_attributes
-                           else
-                             if args.count.zero?
-                               nil
-                             elsif args.count == 1
-                               args[0]
-                             else
-                               args
-                             end
-                           end
-  end
-end

data/lib/culpa/renderers/coliseum.rb

@@ -1,19 +0,0 @@
-##
-# This renderer loads the ColiseumDSL to eval the
-# passed file, and renders it as a JSON.
-##
-
-require_relative '../coliseum_dsl'
-
-describe_renderer :coliseum do |options, envelope|
-  coliseum = ColiseumDSL.new("./#{ COLISEUMS_PATH || 'coliseums' }/#{options[:coliseum]}.rb", envelope)
-
-  sent_headers = { 'Content-Type' => 'application/json' }.merge(options[:headers]).merge(coliseum.culpa_headers)
-
-  {
-    format: :json,
-    status: RETURN_CODES[options[:status]] || RETURN_CODES[coliseum.culpa_status] || 200,
-    headers: sent_headers,
-    object: coliseum.dsl_attributes
-  }
-end