wedge 0.1.20 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 164e8c7334f161e44b6a9770b12ed5a8e5d6be0d
-  data.tar.gz: b7db45c79f2c49cc7238742a66623ddd141bd2ff
+  metadata.gz: a265e4fa793983ef66765457cb162508d1c1a5a4
+  data.tar.gz: e0da79dfdac85063881710ecd1266d8d8a5129c2
 SHA512:
-  metadata.gz: 5e478d89243b932942747ed53637b06d2e821475cf7d167b3d7efb109dfe1290a791a44db4fa9bfabed2ff00791cad6195bef947c07ceb6dfb8f500d62dbf7ef
-  data.tar.gz: e81c3747ba066a1365ee620dcd703a7a54a6ce39cce2b37b24bd04eaece714b0cf55d688fa4319893b1fa432fcf72cbcb033379f74534c46f9cce3285298ca7a
+  metadata.gz: 03b94e2207a5dc52b91187cb66e89dbff0ce902ffb33f3f7558e4614c9d94635f3260d7c940b12e60977b53b076f01bbca7d2eeb1c01c602005997497df59f58
+  data.tar.gz: 9d80870d1c844e4753daa99e198ca1c80bb58d1649485926b976d4effc7609af976c6868e8553485a0851eb1ba6d4b9897e54961437a2afa0b2a30c1565ac5d5

data/lib/roda/plugins/wedge.rb

@@ -2,11 +2,7 @@ class Roda
   module RodaPlugins
     class WedgePlugin
       def self.configure(app, opts = false, &block)
-        if !opts || !opts.delete(:disable_middleware)
-          app.use Wedge::Middleware, opts || block
-        else
-          opts.each { |k, v| Wedge.config.send "#{k}=", v }
-        end
+        app.use Wedge::Middleware, opts || block, true
       end
 
       module ClassMethods
@@ -28,7 +24,7 @@ class Roda
       module RequestMethods
         def wedge_assets
           on Wedge.assets_url_regex do
-            run @@__wedge_middleware__ ||= Wedge::Middleware.scope!(scope).new
+            run Wedge::Middleware.scope!(scope)
           end
         end
       end

data/lib/wedge/middleware.rb

@@ -1,29 +1,43 @@
 class Wedge
   class Middleware
-    def initialize(app = false, settings = {}, scope = false)
-      @app   = app
-      @scope = scope || self.class.scope
-      @opal  = Wedge::Opal::Server.new { |s|
-        s.prefix = Wedge.config.assets_url
-        s.debug  = Wedge.config.debug
-        s.append_path "#{Dir.pwd}/#{Wedge.config.app_dir}"
-      }
-
-      case settings
-      when Proc
-        Wedge.config.instance_eval &settings
-      else
-        settings.each { |k, v| Wedge.config.send "#{k}=", v }
+    attr_reader :skip_call
+
+    def initialize(app = false, settings = false, skip_call = false)
+      if settings
+        case settings
+        when Proc
+          Wedge.config.instance_eval &settings
+        else
+          settings.each { |k, v| Wedge.config.send "#{k}=", v }
+        end
+
+        @opal  = { server: Wedge::Opal::Server.new { |s|
+          s.prefix = Wedge.config.assets_url
+          s.debug  = Wedge.config.debug
+          s.append_path "#{Dir.pwd}/#{Wedge.config.app_dir}"
+        }}
+
+        if Wedge.config.debug
+          @opal[:sprockets]   = @opal[:server].sprockets
+          @opal[:maps_prefix] = "#{Wedge.config.assets_url}/__OPAL_SOURCE_MAPS__"
+          @opal[:maps_app]    = Opal::SourceMapServer.new @opal[:sprockets], @opal[:maps_prefix]
+
+          Wedge::Opal::Sprockets::SourceMapHeaderPatch.inject! @opal[:maps_prefix]
+        end
       end
+
+      @app       = app
+      @scope     = self.class.scope
+      @skip_call = skip_call
     end
 
     def call(env)
-      responder = Responder.new(@app, @opal, @scope, env)
+      responder = Responder.new(@app, @opal, @scope, @skip_call, env)
       responder.respond
     end
 
     class << self
-      attr_accessor :scope
+      attr_accessor :scope, :skip_call
 
       def scope! scope
         klass = Class.new(self)
@@ -37,19 +51,22 @@ class Wedge
     end
 
     class Responder
-      attr_reader :opal, :scope
+      attr_reader :opal, :scope, :skip_call
       attr_accessor :app, :env, :wedge_path, :extension
 
-      def initialize(app, opal, scope, env)
-        @app = app; @opal = opal; @scope = (scope || self); @env = env
+      def initialize(app, opal, scope, skip_call, env)
+        @app = app; @opal = opal; @scope = (scope || self); @skip_call = skip_call; @env = env
       end
 
       def respond
         if path =~ Wedge.assets_url_regex
           @wedge_path, @extension = $1, $2
-          body, headers, status = [], {}, 200
 
           if extension == 'call'
+            return response.finish if skip_call
+
+            body, headers, status = [], {}, 200
+
             body_data = request.body.read
             data      = request.params
 
@@ -92,7 +109,17 @@ class Wedge
 
             [status, headers, body]
           else
-            @opal.call env
+            if Wedge.config.debug
+              if path[@opal[:maps_prefix]]
+                @opal[:maps_app].call env
+              else
+                e = env.deep_dup
+                e['PATH_INFO'] = env['PATH_INFO'].sub "#{Wedge.config.assets_url}/", ''
+                @opal[:sprockets].call e
+              end
+            else
+              @opal[:server].call env
+            end
           end
         else
           response.finish

data/lib/wedge/plugins/form.rb

@@ -171,7 +171,7 @@ class Wedge
             else
               # issue: OPAL is not using the alias method original_attr_reader
               # correctly.  It's still somehow getting in here when called below.
-              next if %w'_atts _options'.include? att.to_s
+              next if %w'_atts _options _atts_keys'.include? att.to_s
               ###################################################################
 
               # set empty options if need be
@@ -205,7 +205,8 @@ class Wedge
         alias alias_model model_alias
       end
 
-      original_attr_reader :_atts, :_options
+      original_attr_reader :_atts, :_atts_keys, :_options
+
 
       # Initialize with a hash of attributes and values.
       # Extra attributes are discarded.
@@ -245,6 +246,7 @@ class Wedge
         atts.each do |key, val|
           # grab the original key if alias is given
           key = _aliases.invert[key] || key
+          (@_atts_keys ||= []) << key
 
           next if (_accessor_options[key] || {})[:form]
 
@@ -256,6 +258,18 @@ class Wedge
         end
       end
 
+      def _with_atts
+        _accessor_options[:with_atts] || []
+      end
+
+      def _without_atts
+        _accessor_options[:without_atts] || []
+      end
+
+      def _keys
+        (_atts_keys + _with_atts).reject { |k| _without_atts.include? k }
+      end
+
       def _accessors
         @_accessors ||= (self.class._accessors || IndifferentHash.new).deep_dup
       end
@@ -286,7 +300,7 @@ class Wedge
           _options[:_attributes]       = true
           _options[:_model_attributes] = for_model
 
-          _accessors.each do |att|
+          _keys.each do |att|
             opts = _accessor_options[att]
             if _atts.can_read?(att) && (!opts[:hidden] || opts[:hidden].is_a?(Proc) && !self.instance_exec(&opts[:hidden]))
               is_form   = opts[:form]

data/lib/wedge/plugins/render.rb

@@ -102,7 +102,7 @@ class Wedge
         when :not_equal
           'Password does not match.'
         else
-          !error[/\s/] ? error.to_s.gsub(/_/, ' ').titleize : error
+          !error.to_s[/\s/] ? error.to_s.gsub(/_/, ' ').titleize : error
         end
       end
     end

data/lib/wedge/version.rb

@@ -1,3 +1,3 @@
 class Wedge
-  VERSION = '0.1.20'
+  VERSION = '0.1.21'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wedge
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.21
 platform: ruby
 authors:
 - cj