shaf 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6502c5b061eb5e2420e621d91a12866f4d5c8a2a295c8d2b129df12a71d6668
-  data.tar.gz: 19b4fa57c6b99c69b084b493769dd7291253a9f62e7d0607c5ffdcf8f24f8549
+  metadata.gz: 2b68c64b495d1413c70562c4deb0796113c93c4e3c4e269899d31a93baaa7574
+  data.tar.gz: ee75b02c4006994eb0f1ea1da93114687d0a5ee5dd64d1dcf62d5dc647210301
 SHA512:
-  metadata.gz: d7c299b50eb8b8b62c7dd1ab4b5ebff9f85f1dc286a858ce7a0925e1a7ef30fd4639303b9293c79971118b7a80c2582f0142f063ef131511ab645138bf0c7b44
-  data.tar.gz: 93b4102fb1b5efd7fe020eab71522ff314a343ee3e67ed19b7a2cdad6b9243188c60b7d56a5ce1c0bb10746045e8f8a2842247880717e8951eae47c622ea806a
+  metadata.gz: 0f84860a9c7442d473378ecbd2ca61325bf71f848af65f1e742e01888a37ecb52e0c8bca9e8938eb9b70d5d167501616ce46096cdcba1f87e31299aa47184100
+  data.tar.gz: 7ed67fe1fe15cc5300b658eb3e0cfb3c79325829eb2969308a0f31ef06d26bcb5365b8600f716c1e75b85c2fcabdee4b7e17f5b16c999c8fdf6d0d9cfbc1f597

data/lib/shaf/command/base.rb

@@ -31,9 +31,9 @@ module Shaf
         def options(option_parser, options); end
       end
 
-      def initialize(*args)
+      def initialize(*args, **options)
         @args = args.dup
-        @options = {}
+        @options = options
         parse_options!
       end
 

data/lib/shaf/extensions/controller_hooks.rb

@@ -3,11 +3,11 @@ require 'sinatra/base'
 module Shaf
   module ControllerHooks
     def before_action(method_name = nil, **options, &block)
-      __action_hook(:before, method_name, block, options)
+      __action_hook(:before, method_name, block, **options)
     end
 
     def after_action(method_name = nil, **options, &block)
-      __action_hook(:after, method_name, block, options)
+      __action_hook(:after, method_name, block, **options)
     end
 
     private
@@ -15,7 +15,7 @@ module Shaf
     def __action_hook(hook, method_name, block, **options)
       only = Array(options[:only]) if options.key? :only
       except = Array(options[:except]) if options.key? :except
-      validate_symbols(hook: hook, only: only, except: except)
+      __validate_symbols(hook: hook, only: only, except: except)
 
       path_helpers.each do |helper|
         next if only && !only.include?(helper)
@@ -43,7 +43,7 @@ module Shaf
       Regexp.new("#{str}/?")
     end
 
-    def validate_symbols(hook:, only: [], except: [])
+    def __validate_symbols(hook:, only: [], except: [])
       s = "\n\n\"%s\" given as :%s keyword arg to %s hook. Must be a symbol!\n"
       Array(only).each do |value|
         next if value.is_a? Symbol
@@ -56,6 +56,4 @@ module Shaf
       end
     end
   end
-
-  Sinatra.register ControllerHooks
 end

data/lib/shaf/registrable_factory.rb

@@ -39,12 +39,12 @@ module Shaf
       end
     end
 
-    def create(*params)
+    def create(*params, **options)
       clazz = lookup(*params)
       raise NotFoundError.new(%Q(Command '#{ARGV}' is not supported)) unless clazz
 
       args = init_args(clazz, params)
-      clazz.new(*args)
+      clazz.new(*args, **options)
     end
 
     private

data/lib/shaf/responder/hal.rb

@@ -17,6 +17,8 @@ module Shaf
       end
 
       def profile
+        return unless serializer
+
         @profile ||= options[:profile] || serializer.semantic_profile
       end
     end

data/lib/shaf/router.rb

@@ -45,7 +45,7 @@ module Shaf
 
       def init_routes
         @routes = Hash.new do |hash, key|
-          hash[key] = Hash.new { |hash, key| hash[key] = Set.new }
+          hash[key] = Hash.new { |h, k| h[k] = Set.new }
         end
         controllers.each { |controller| init_routes_for(controller) }
       end

data/lib/shaf/utils.rb

@@ -4,7 +4,6 @@ require 'erb'
 require 'forwardable'
 require 'yaml'
 require 'shaf/version'
-require 'sinatra/base'
 
 module Shaf
   module Utils
@@ -45,6 +44,7 @@ module Shaf
       end
 
       def environment
+        require 'sinatra/base'
         Sinatra::Application.settings.environment
       end
 

data/lib/shaf/version.rb

@@ -1,3 +1,3 @@
 module Shaf
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shaf
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Sammy Henningsson
@@ -30,7 +30,7 @@ cert_chain:
   ZMhjYR7sRczGJx+GxGU2EaR0bjRsPVlC4ywtFxoOfRG3WaJcpWGEoAoMJX6Z0bRv
   M40=
   -----END CERTIFICATE-----
-date: 2019-11-10 00:00:00.000000000 Z
+date: 2019-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -150,6 +150,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.17'
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 description: A framework for building hypermedia driven APIs with sinatra and sequel.
 email: sammy.henningsson@gmail.com
 executables:
@@ -321,7 +349,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Sinatra Hypermedia Api Framework

metadata.gz.sig

@@ -1,2 +1 @@
-(4���3/C�%�r��Spe�w��DuG��b���I%����ν
-�s�R.���%�y��W�7�)��[����㶃�>D����/e|�D@��S�\�,S}��[�9\��
+ra��TNݚ�Fѫ����T$�>+"�>..��S�J�d�tJ0/�Ȝ&N�gޡ"���&T&���.�ph�b���?Y�W;.)����Ns`ҟ�б�43�6�������
�P��J��8�{��`��e9?��e�⹾GkFk9��S����(��D��1J��l"-��G*�����]
\���s4���L�����x����w�~�P5�G��Q����S��`
q�x��=C���ln�j�%�R3ߑ[a