wedge 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af418ce6886e6fa3eee260087428493516a32f0f
-  data.tar.gz: 839e40d9c95003e142ac074f11b5af0a68c1a4b4
+  metadata.gz: 3d5cba344b9b2d2cb5555b9eaf30132afd576c85
+  data.tar.gz: 3f13558b89e8a9d960b417f7e792b96385e56992
 SHA512:
-  metadata.gz: a449dcbb6616c22a21b98aef2097970910d8be80fb257a220b6ff6c14636d2611034102a29859f8b756edade7784a35b9543eed598528c2b5ed4acd56ca15e24
-  data.tar.gz: 73e9ac6539b6949cb1f44dd639b671d8ead67ed6bdc3874086231b5dd207ec3b124d03b9f2ed2d5d2fcdd8bec9ee55f80b58cd343157270444f7f1bce37105e8
+  metadata.gz: 9d5d9ebb80b5aaf32d7bf2fa688176e34b45cfadb39eabdd58c5863351abbd0b5bfc1918ebf98dcd021d47a640742bac0c63fe566b7446fee3e55ea9c79e387b
+  data.tar.gz: 428783e6058d34db64e503538d29851d04274570db989afa3775daf5b8d48148aa74bb2e229eab776102b99b06be09c89e0e35fb8e1e50b9c773834886b1d3bc

data/Gemfile

@@ -5,10 +5,17 @@ gemspec
 
 gem 'opal', github: 'opal/opal'
 gem 'opal-jquery', github: 'opal/opal-jquery'
-gem 'opal-rspec', github: 'opal/opal-rspec'
+gem 'opal-rspec-cj'
 gem 'binding_of_caller'
 gem 'better_errors'
 gem 'slim'
 gem 'sass'
 gem 'thin'
+gem 'roda', '2.4.0'
+gem 'pry-rescue'
+gem 'pry-stack_explorer'
+# issue: https://github.com/copiousfreetime/hitimes/issues/17
+gem 'hitimes', '1.2.1'
+gem 'restart'
+gem 'rack_csrf', '2.5.0'
 gem 'roda-bin'

data/Makefile

@@ -0,0 +1,2 @@
+server:
+	cd playground && bundle exec restart -d ../. -i \.bundle$$ -i \.git$$ thin start -p 8080

data/Rakefile

@@ -1,19 +1,23 @@
 $:.unshift(File.expand_path('./lib'))
 $:.unshift(File.expand_path("./playground/app"))
 
+current_task = Rake.application.top_level_tasks.first
+
+ENV['RACK_ENV'] ||= (current_task['default'] || current_task[/(rspec|test)\z/]) ? 'test' : 'development'
+
 require 'bundler'
 require 'bundler/gem_tasks'
 require 'bundler/setup'
 
 require 'config/boot'
-require 'opal'
+require 'tilt/erubis'
 require 'opal/rspec/rake_task'
 
 Opal.append_path File.expand_path('../lib', __FILE__)
 Opal.append_path File.expand_path('../playground/app', __FILE__)
 Opal.append_path File.expand_path('../playground/public', __FILE__)
 
-Opal::RSpec::RakeTask.new('opal:rspec') do |s|
+Opal::RSpec::RakeTask.new('opal:rspec', Playground) do |s|
   s.index_path = 'spec/index.html.erb'
 end
 
@@ -23,8 +27,8 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new('ruby:rspec')
 
 task :test do
+  puts "--------------------------\nRun specs in Ruby\n--------------------------"
+  Rake::Task['ruby:rspec'].invoke
   puts "--------------------------\nRun specs in Opal\n--------------------------"
   Rake::Task['opal:rspec'].invoke
-  puts "--------------------------\nRun specs in normal ruby\n--------------------------"
-  Rake::Task['ruby:rspec'].invoke
 end

data/TODO.md

@@ -0,0 +1,4 @@
+### Todo
+- Cleanup plugin settings and make a plugin\_setting/settings method
+- Make it so the wedge config isn't passed down to all new components
+- more tests!

data/lib/roda/plugins/wedge.rb

@@ -1,121 +1,39 @@
 class Roda
   module RodaPlugins
-    class Wedge
-      def self.configure(app, opts = {})
-        if app.opts[:wedge]
-          app.opts[:wedge].merge!(opts)
+    class WedgePlugin
+      def self.configure(app, opts = false, &block)
+        if !opts || !opts.delete(:disable_middleware)
+          app.use Wedge::Middleware, opts || block
         else
-          app.opts[:wedge] = opts.dup
+          opts.each { |k, v| Wedge.config.send "#{k}=", v }
         end
+      end
 
-        opts = app.opts[:wedge]
-
-        opts.each do |k, v|
-          case k.to_s
-          when 'plugins'
-            v.each { |p| ::Wedge.config.plugin p }
-          when 'scope'
-            begin
-              ::Wedge.config.scope = v.new
-            rescue
-              ::Wedge.config.scope = v.new({})
-            end
-          else
-            ::Wedge.config.send "#{k}=", v
-          end
+      module ClassMethods
+        def wedge_plugin name, settings = {}, &block
+          Wedge.plugin name, settings, &block
         end
-
-        # cache the javascript on load
-        ::Wedge.javascript if opts[:cache_assets]
       end
 
       module InstanceMethods
         def wedge(name, *args, &block)
-          ::Wedge.scope!(self)[name, *args, &block]
+          Wedge.scope!(self)[name, *args, &block]
         end
 
         def wedge_plugin(name, *args, &block)
-          ::Wedge.scope!(self)["#{name}_plugin", *args, &block]
-        end
-      end
-
-      module RequestClassMethods
-        def wedge_route_regex
-          assets_url = ::Wedge.assets_url.gsub(%r{^\/}, '')
-          # # We also allow for no assets key so when we post server methods there
-          # # isn't an error if the key has been changed since a browser refresh.
-          %r{(?:#{assets_url}|#{assets_url.sub("#{::Wedge.config.assets_key}/", '')})/(.*)\.(.*)$}
+          Wedge.scope!(self)["#{name}_plugin", *args, &block]
         end
       end
 
       module RequestMethods
         def wedge_assets
-          on self.class.wedge_route_regex do |component, ext|
-            case ext
-            when 'map'
-              ::Wedge.source_map component
-            when 'rb'
-              if component =~ /^wedge/
-                path = ::Wedge.config.path.gsub(/\/wedge.rb$/, '')
-                File.read("#{path}/#{component}.rb")
-              else
-                File.read("#{component}.rb")
-              end
-            when 'call'
-              body = scope.request.body.read
-              data = scope.request.params
-
-              begin
-                # try json
-                data.merge!(body ? JSON.parse(body) : {})
-              rescue
-                begin
-                  # try form data
-                  data.merge!(body ? Rack::Utils.parse_query(body) : {})
-                rescue
-                  # no data
-                end
-              end
-
-              data          = data.indifferent
-              name          = data.delete(:__wedge_name__)
-              method_called = data.delete(:__wedge_method__)
-              method_args   = data.delete(:__wedge_args__)
-
-              if method_args == '__wedge_data__' && data
-                method_args   = [data]
-                res = scope.wedge(name).send(method_called, *method_args) || ''
-              else
-                # This used to send things like init, we need a better way to
-                # send client config data to the server
-                # res = scope.wedge(name, data).send(method_called, *method_args) || ''
-                res = scope.wedge(name).send(method_called, *method_args) || ''
-              end
-
-              scope.response.headers["WEDGE-CSRF-TOKEN"] = scope.csrf_token if scope.methods.include? :csrf_token
-
-              if res.is_a? Hash
-                scope.response.headers["Content-Type"] = 'application/json; charset=UTF-8'
-                res = res.to_json
-              else
-                res = res.to_s
-              end
-
-              res
-            else
-              scope.response.headers['Content-Type'] = 'application/javascript; charset=UTF-8'
-
-              if ::Wedge.config.debug
-                "#{::Wedge.javascript(component)}\n//# sourceMappingURL=/assets/wedge/#{component}.map"
-              else
-                ::Wedge.javascript(component)
-              end
-            end
+          on Wedge.assets_url_regex do
+            run @@__wedge_middleware__ ||= Wedge::Middleware.scope!(scope).new
           end
         end
       end
     end
 
-    register_plugin(:wedge, Wedge)
+    register_plugin(:wedge, WedgePlugin)
   end
 end

data/lib/wedge.rb

@@ -8,6 +8,7 @@ require 'wedge/utilis/try'
 require 'wedge/utilis/titleize'
 require 'wedge/utilis/element'
 require 'base64'
+require 'forwardable'
 unless RUBY_ENGINE == 'opal'
   require 'nokogiri'
   require 'wedge/utilis/nokogiri'
@@ -23,10 +24,14 @@ class Wedge
   include Methods
 
   class << self
+    extend Forwardable
+
     ATTR_ACCESSORS = %i{scope store config events}
 
     attr_accessor(*ATTR_ACCESSORS)
 
+    delegate [:plugin] => :config
+
     def assets_url
       url = config.assets_url.gsub(%r{^(http(|s)://[^\/]*\/|\/)}, '/')
       "#{url}#{config.cache_assets ? "/#{config.assets_key}" : ''}"
@@ -91,17 +96,17 @@ class Wedge
     #
     # @param name [String, Symbol, #to_s] The unique name given to a component.
     # @return [Wedge::Component#method] Last line of the method called.
-    def [](name, *args, &block)
-      config.component_class[name].wedge_new self, *args, &block
+    def [](*args, &block)
+      config.component_class[args.shift].wedge_new self, *args, &block
     end
 
     %w(store scope).each do |meth|
       define_method "#{meth}!" do |value|
         klass = Class.new(self)
         ATTR_ACCESSORS.each do |name|
-          klass.instance_variable_set(:"@#{name}", Wedge.instance_variable_get(:"@#{name}"))
+          klass.instance_variable_set(:"@#{name}", Wedge.instance_variable_get(:"@#{name}").deep_dup)
         end
-        klass.instance_variable_set(:"@#{meth}", value)
+        klass.instance_variable_set(:"@#{meth}", value.deep_dup)
         klass
       end
     end

data/lib/wedge/component.rb

@@ -32,6 +32,10 @@ class Wedge
         obj
       end
 
+      def plugin *args
+        Wedge.plugin *args
+      end
+
       alias_method :original_name, :name
       def wedge_name(*args)
         if args.any?
@@ -113,7 +117,7 @@ class Wedge
       alias_method :dom, :wedge_dom
 
       def wedge_config
-        @wedge_config ||= Config.new Wedge.config.data.dup.merge(klass: self)
+        @wedge_config ||= Config.new klass: self, scope: Wedge.config.scope
       end
       alias_method :config, :wedge_config
 
@@ -181,25 +185,50 @@ class Wedge
               # refreshed the browser yet.
               call_url = "#{Wedge.assets_url.sub("#{Wedge.config.assets_key}/",'')}/#{path_name}.call"
 
-              HTTP.post(call_url,
-                headers: {
-                  'X-CSRF-TOKEN' => Element.find('meta[name=_csrf]').attr('content'),
-                  'X-WEDGE-METHOD-REQUEST' => true
-                },
-                payload: payload) do |response|
-
-                  # We set the new csrf token
-                  xhr  = Native(response.xhr)
-                  csrf = xhr.getResponseHeader('WEDGE-CSRF-TOKEN')
-                  Element.find('meta[name=_csrf]').attr 'content', csrf
-                  ###########################
-
-                  res = JSON.from_object(`response`)
-
-                  blk.call res[:body], res
+              if block_given?
+                HTTP.post(call_url,
+                  headers: {
+                    'X-CSRF-TOKEN' => Element.find('meta[name=_csrf]').attr('content'),
+                    'X-WEDGE-METHOD-REQUEST' => meth
+                  },
+                  async: false,
+                  payload: payload) do |response|
+
+                    # We set the new csrf token
+                    xhr  = Native(response.xhr)
+                    # discuss: I don't think we should update the csrf token every ajax call
+                    # csrf = xhr.getResponseHeader('WEDGE-CSRF-TOKEN')
+                    # Element.find('meta[name=_csrf]').attr 'content', csrf
+                    ###########################
+
+                    res = JSON.from_object(`response`)
+
+                    blk.call res[:body], res
+                end
+              else
+                data = {
+                  headers: {
+                   'X-CSRF-TOKEN' => "#{Element.find('meta[name=_csrf]').attr('content')}",
+                   'X-WEDGE-METHOD-REQUEST' => meth
+                  },
+                  dataType: 'json',
+                  type: 'POST',
+                  url: call_url,
+                  data: payload,
+                  async: false
+                }.to_n
+
+                response = `$.ajax(data).responseText`
+                begin
+                  JSON.parse response
+                rescue
+                  if response.empty?
+                    raise "Ajax response to #{call_url} was empty."
+                  else
+                    puts response
+                  end
+                end
               end
-
-              true
             end
           end
 
@@ -220,14 +249,17 @@ class Wedge
       end
     end
 
-    if RUBY_ENGINE == 'opal'
-      def wedge(*args)
-        Wedge[*args]
-      end
+    # We want the scope to override this method if defined
+    def wedge(*args, &block)
+      # fix: can't pass block to Wedge, opal error:
+      # https://github.com/opal/opal/issues/959
+      # scope.respond_to?(:wedge) ? scope.wedge(*args, &block) : Wedge[*args, &block]
+      scope.respond_to?(:wedge) ? scope.wedge(*args, &block) : Wedge[*args]
+    end
 
-      def wedge_plugin(name, *args, &block)
-        wedge("#{name}_plugin", *args, &block)
-      end
+    # We want the scope to override this method if defined
+    def wedge_plugin(name, *args, &block)
+      scope.respond_to?(:wedge_plugin) ? scope.wedge_plugin(*args, &block) : wedge("#{name}_plugin", *args, &block)
     end
 
     def wedge_scope
@@ -240,10 +272,15 @@ class Wedge
     end
     alias_method :store, :wedge_store
 
+    def wedge_class_store
+      self.class.wedge_config.store
+    end
+    alias_method :class_store, :wedge_class_store
+
     # Duplicate of class condig [Config]
     # @return config [Config]
     def wedge_config
-      @wedge_config ||= Config.new(self.class.wedge_config.data.dup)
+      @wedge_config ||= Config.new(self.class.wedge_config.data.deep_dup)
     end
     alias_method :config, :wedge_config
 
@@ -294,12 +331,16 @@ class Wedge
     alias_method :function, :wedge_function
 
     def wedge_from_server?
-      !scope.respond_to?(:request) || (request && !request.env.include?('HTTP_X_WEDGE_METHOD_REQUEST'))
+      begin; !request.try(:env).include?('HTTP_X_WEDGE_METHOD_REQUEST'); rescue; true end
     end
     alias_method :from_server?, :wedge_from_server?
 
     def wedge_from_client?
-      !wedge_from_server?
+      begin
+        caller_locations(1,1)[0].label == request.try(:env)['HTTP_X_WEDGE_METHOD_REQUEST']
+      rescue
+        false
+      end
     end
     alias_method :from_client?, :wedge_from_client?
 

data/lib/wedge/config.rb

@@ -16,12 +16,14 @@ class Wedge
         path: nil,
         html: nil,
         scope: nil,
+        block: nil,
         debug: false,
         app_dir: 'app',
         assets_url: '/assets/wedge',
         assets_key: nil,
         cache_assets: false,
         is_plugin: false,
+        compile_str: false,
         requires: IndifferentHash.new,
         triggered_browser_events: false,
         store: IndifferentHash.new,
@@ -41,17 +43,45 @@ class Wedge
       @data.dup.select {|k, v| allowed_client_data.include? k }
     end
 
-    def plugin(name)
+    def plugin(name, settings = {}, &block)
+      plugin_name = "#{name}_plugin"
+
+      Wedge.config.settings[plugin_name] = settings
+
       unless RUBY_ENGINE == 'opal'
         require "wedge/plugins/#{name}"
       end
 
-      klass = Wedge.config.component_class[:"#{name}_plugin"]
-      plugins << klass.config.path unless plugins.include? klass.config.path
+      klass = Wedge.config.component_class[plugin_name]
+
+      unless plugins.include? klass.config.path
+        klass.config.settings  = settings
+        klass.config.block     = block
+        klass.config.is_plugin = true
 
-      # Merge in instance/class methods
-      Wedge::Component.send(:include, klass::InstanceMethods) if defined?(klass::InstanceMethods)
-      Wedge::Component.extend(klass::ClassMethods) if defined?(klass::ClassMethods)
+        plugins << klass.config.path
+        plugins.uniq!
+
+        # Merge in instance/class methods
+        Wedge::Component.send(:include, klass::InstanceMethods) if defined?(klass::InstanceMethods)
+        Wedge::Component.extend(klass::ClassMethods) if defined?(klass::ClassMethods)
+      end
+    end
+
+    def plugins= plugins
+      plugins.each { |p| plugin(p.to_s) }
+    end
+
+    def scope= value
+      if value.respond_to? :new
+        begin
+          @data.scope = value.new
+        rescue
+          @data.scope = value.new({})
+        end
+      else
+        @data.scope = value
+      end
     end
 
     def method_missing(method, *args, &block)