wedge 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0bb0fe7c7495477be902553128393527696afe1
-  data.tar.gz: 11a43824c93d96973043520a5429e73bc89f94df
+  metadata.gz: c03ec1090649b719dd845c4167b3c717886cd59a
+  data.tar.gz: d8193a5ffec834680dbe884db02416ccc935805b
 SHA512:
-  metadata.gz: 394f8a1cef109e32f546ea7d9166a67307f11ed6701739ce4feab23b9e7d6033397e0ef90b0e13b57a5311dd2e996ef6189452110f517c092eab5621924b007b
-  data.tar.gz: 49b95ed36fe62f5ab1fe7234e4bac2066d6f027c9dbea69082df961f091e2f5c5d50152fa5f5f4e419f4b05106cadf076078331bfa29d8f31d0fbd5ed8813eeb
+  metadata.gz: c62a5ab5e18f862c9734e2abb8ccfa3422ac5e6d97942283e01cebd2df94bd4ea2ffbf444b27e1e7844e6797688d217608e0edc35b442cbe3df0f4182bf57a88
+  data.tar.gz: 0c3746d9d3074b798bb5dc1836785c2e4b46c8a6bbeffdadeb2ad397b8070dced9bbe358e43cd251582a5e58a96afeb777d9bca59d229d5d8a8c40822d35c928

data/.gitignore

@@ -11,4 +11,8 @@
 *.so
 *.o
 *.a
+.env
 mkmf.log
+bower_components/
+node_modules/
+.sass-cache/

data/Gemfile

@@ -7,5 +7,7 @@ gem 'opal', github: 'opal/opal', path: '~/gems/opal'
 gem 'opal-jquery', github: 'opal/opal-jquery'
 gem 'binding_of_caller'
 gem 'better_errors'
+gem 'slim'
+gem 'sass'
 gem 'thin'
 gem 'roda-bin'

data/lib/roda/plugins/wedge.rb

@@ -33,6 +33,10 @@ class Roda
         def wedge(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
@@ -62,17 +66,23 @@ class Roda
               data = scope.request.params
 
               begin
+                # try json
                 data.merge!(body ? JSON.parse(body) : {})
               rescue
-                # can't be parsed by json
+                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_called)
-              method_args   = data.delete(:wedge_method_args)
+              name          = data.delete(:__wedge_name__)
+              method_called = data.delete(:__wedge_method__)
+              method_args   = data.delete(:__wedge_args__)
 
-              if method_args == 'wedge_data' && data
+              if method_args == '__wedge_data__' && data
                 method_args   = [data]
                 res = scope.wedge(name).send(method_called, *method_args) || ''
               else

data/lib/wedge/component.rb

@@ -16,7 +16,12 @@ class Wedge
           end
         end
 
-        if args.any?
+        obj.config.before_compile.each do |blk|
+          obj.instance_exec &blk
+        end
+
+        if args.length > 0
+          obj.config.initialize_args = args
           obj.send :initialize, *args, &block
         else
           obj.send :initialize, &block
@@ -56,12 +61,12 @@ class Wedge
       end
       alias_method :name, :wedge_name
 
-      def wedge_html(html, &block)
+      def wedge_html(html = '', &block)
         unless RUBY_ENGINE == 'opal'
           wedge_config.html = begin
             File.read html
           rescue
-            html
+            (html.is_a?(HTML::DSL) || html.is_a?(DOM)) ? html.to_html : html
           end.strip
 
           if block_given?
@@ -94,7 +99,6 @@ class Wedge
       alias_method :tmpl, :wedge_tmpl
 
       def wedge_dom &block
-        @wedge_dom ||= DOM.new wedge_config.html
 
         unless RUBY_ENGINE == 'opal'
           if block_given?
@@ -102,7 +106,7 @@ class Wedge
           end
         end
 
-        @wedge_dom
+        @wedge_dom ||= DOM.new wedge_config.html
       end
       alias_method :dom, :wedge_dom
 
@@ -163,9 +167,9 @@ class Wedge
               payload = config.client_data.reject do |k, _|
                 %w(html tmpl requires plugins object_events js_loaded).include? k
               end
-              payload[:wedge_name]          = payload[:name]
-              payload[:wedge_method_called] = meth
-              payload[:wedge_method_args]   = args
+              payload[:__wedge_name__]   = payload[:name]
+              payload[:__wedge_method__] = meth
+              payload[:__wedge_args__]   = args
 
               # we want to remove the assets key from the call so we don't get
               # an error if they assets_key has changed and the user hasn't
@@ -197,12 +201,34 @@ class Wedge
           include m
         end
       end
+
+      def set_dom dom
+        @wedge_dom = dom.is_a?(Wedge::DOM) ? dom : Wedge::DOM.new(dom)
+      end
+
+      def html!(&b)
+        unless RUBY_ENGINE == 'opal'
+          DOM.new HTML::DSL.html(&b).to_html
+        end
+      end
+
+      def store
+        wedge_config.store
+      end
+
+      def before_compile &block
+        wedge_config.before_compile << block unless RUBY_ENGINE == 'opal'
+      end
     end
 
     if RUBY_ENGINE == 'opal'
       def wedge(*args)
         Wedge[*args]
       end
+
+      def wedge_plugin(name, *args, &block)
+        wedge("#{name}_plugin", *args, &block)
+      end
     end
 
     def wedge_scope
@@ -282,7 +308,7 @@ class Wedge
       return unless server?
 
       client_data = config.client_data.dup
-      client_data.merge! method_called: method, method_args: args
+      client_data.merge! method_called: method, method_args: args, initialize_args: config.initialize_args
 
       compiled_opts = Base64.encode64 client_data.to_json
       javascript = <<-JS
@@ -304,6 +330,11 @@ class Wedge
       response
     end
 
+    def wedge_html(&b)
+      DOM.new HTML::DSL.html(&b).to_html
+    end
+    alias_method :html!, :wedge_html
+
     def method_missing(method, *args, &block)
       if config.scope.respond_to?(method, true)
         config.scope.send method, *args, &block

data/lib/wedge/config.rb

@@ -29,6 +29,8 @@ class Wedge
         on_block: [],
         on_block_count: 0,
         server_methods: [],
+        initialize_args: [],
+        before_compile: [],
         plugins: [],
         allowed_client_data: %w(name path method_args method_called store tmpl key cache_assets assets_key assets_url assets_url_with_host)
       }.merge(opts))

data/lib/wedge/dom.rb

@@ -15,6 +15,7 @@ class Wedge
 
     def initialize html
       html = '' if html.nil?
+      html = html.to_html if html.is_a? HTML::DSL
 
       @raw_html = html
 

data/lib/wedge/events.rb

@@ -20,7 +20,7 @@ class Wedge
       # fix: there is a bug in opal where even though it's only including a
       # module once it is loading the class twice. So this stops on events being
       # double added
-      return if events[:on_count] >= Wedge[wedge_name].class.wedge_on_count
+      return if events[:on_count] >= Wedge.config.component_class[wedge_name].wedge_on_count
       events[:on_count] += 1
 
       event = {

data/lib/wedge/html.rb

@@ -2,6 +2,8 @@ class Wedge
   module HTML
     include Methods
 
+    INDENT = '  '
+
     class << self
       # Parse HTML into a Nokogiri object
       # @param raw_html [String]
@@ -25,5 +27,42 @@ class Wedge
         end
       end
     end
+
+    # http://erikonrails.snowedin.net/?p=379
+    class DSL
+      def initialize(tag, *args, &block)
+        @tag = tag
+        @content = args.find {|a| a.instance_of? String}
+        @attributes = args.find{|a| a.instance_of? Hash}
+        @attr_string = []
+        self.instance_eval &block if block_given?
+      end
+
+      def to_html
+        @attr_string << " #{@attributes.map {|k,v| "#{k}=#{v.to_s.inspect}" }.join(" ")}" if @attributes
+        "<#{@tag}#{@attr_string.join}>#{@content}#{children.map(&:to_html).join}</#{@tag}>"
+      end
+
+      def children
+        @children ||= []
+      end
+
+      # Some of these are Kernel or Object methods or whatever that we need to explicitly override
+      [:p, :select].each do |name|  
+        define_method name do |*args, &block|
+          send :method_missing, name, *args, &block
+        end
+      end
+
+      def method_missing(tag, *args, &block)
+        child = DSL.new(tag.to_s, *args, &block)
+        children << child
+        child
+      end
+
+      def self.method_missing(tag, *args, &block)
+        DSL.new(tag.to_s, *args, &block)
+      end
+    end
   end
 end

data/lib/wedge/middleware.rb

@@ -28,20 +28,20 @@ class Wedge
 
           case extension
           when 'map'
-            ::Wedge.source_map wedge_path
+            body << ::Wedge.source_map(wedge_path)
           when 'rb'
             if wedge_path =~ /^wedge/
               path = ::Wedge.config.path.gsub(/\/wedge.rb$/, '')
-              File.read("#{path}/#{wedge_path}.rb")
+              body << File.read("#{path}/#{wedge_path}.rb")
             else
-              File.read("#{ROOT_PATH}/#{wedge_path}.rb")
+              body << File.read("#{ROOT_PATH}/#{wedge_path}.rb")
             end if Wedge.config.debug
           when 'call'
-            body = scope.request.body.read
-            data = scope.request.params
+            body_data = scope.request.body.read
+            data      = scope.request.params
 
             begin
-              data.merge!(body ? JSON.parse(body) : {})
+              data.merge!(body_data ? JSON.parse(body_data) : {})
             rescue
               # can't be parsed by json
             end
@@ -53,18 +53,21 @@ class Wedge
 
             if method_args == 'wedge_data' && data
               method_args   = [data]
-              res = Wedge.scope!(app)[name].send(method_called, *method_args) || ''
+              body << Wedge.scope!(app)[name].send(method_called, *method_args) || ''
             else
-              res = Wedge.scope!(app)[name, data].send(method_called, *method_args) || ''
+              # 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) || ''
+              body << Wedge.scope!(app)[name].send(method_called, *method_args) || ''
             end
 
-            headers["WEDGE-CSRF-TOKEN"] = scope.csrf_token if scope.methods.include? :csrf_token
+            # headers["WEDGE-CSRF-TOKEN"] = scope.csrf_token if scope.methods.include? :csrf_token
 
             if res.is_a? Hash
               headers["Content-Type"] = 'application/json; charset=UTF-8'
-              body = res.to_json
+              body << res.to_json
             else
-              body = res.to_s
+              body << res.to_s
             end
           else
             headers['Content-Type'] = 'application/javascript; charset=UTF-8'
@@ -72,7 +75,6 @@ class Wedge
             if Wedge.config.debug
               body << "#{Wedge.javascript(wedge_path)}\n//# sourceMappingURL=#{Wedge.assets_url}/#{wedge_path}.map"
             else
-              binding.pry
               body << Wedge.javascript(wedge_path)
             end
           end

data/lib/wedge/plugins/uploader.rb

@@ -0,0 +1,287 @@
+class Wedge
+  module Plugins
+    class Uploader < Component
+      name :uploader, :uploader_plugin
+      before_compile do
+        settings = Wedge.config.settings[:uploader]
+        store[:settings] = settings.select do |k, v|
+          client?? %w(aws_access_key_id bucket).include?(k) : true
+        end if settings
+      end
+
+      class S3Signature < Struct.new(:policy_data, :settings)
+        def policy
+          Base64.encode64(policy_data.to_json).gsub("\n", "")
+        end
+
+        def signature
+          # The presence of the “headers” property in the JSON request alerts your server to the fact that this is a request to sign a REST/multipart request and not a policy document.
+          # Your server only needs to return the following in the body of an “application/json” response:
+          encode_string = policy_data["headers"].present? ? policy_data["headers"] : policy
+
+          Base64.encode64(
+            OpenSSL::HMAC.digest(
+              OpenSSL::Digest.new('sha1'),
+              settings[:aws_secret_access_key], encode_string
+            )
+          ).gsub("\n", "")
+        end
+      end
+
+      def signature policy_data
+        s3 = S3Signature.new policy_data, settings
+
+        {
+          policy: s3.policy,
+          signature: s3.signature
+        }.to_json
+      end
+
+      def success options = {}
+        options      = options.indifferent
+        wedge_name   = options.delete :wedge_name
+        wedge_method = options.delete :wedge_method
+
+        if wedge_name
+          response.headers["Content-Type"] = 'application/json; charset=UTF-8'
+          {
+            success: true,
+            wedge_name: wedge_name,
+            wedge_method: wedge_method,
+            wedge_response: wedge(wedge_name).to_js(wedge_method, options),
+            dom_file_id: options[:dom_file_id]
+          }.to_json
+        end
+      end
+
+      def delete options = {}
+        options     = options.indifferent
+        wedge_name   = options.delete :wedge_name
+        wedge_method = options.delete :delete_method
+
+        if wedge_name
+          response.headers["Content-Type"] = 'application/json; charset=UTF-8'
+          {
+            success: true,
+            wedge_name: wedge_name,
+            wedge_method: wedge_method,
+            wedge_response: wedge(wedge_name).to_js(wedge_method, options)
+          }.to_json
+        end
+      end
+
+      def button el, options = {}
+        options = { multiple: false }.merge options
+        drag_n_drop el, options
+      end
+
+      def drag_n_drop el, options = {}
+        id            = el.attr 'id'
+        container_id  = "#{id}-container"
+        template_id   = "#{id}-tmpl"
+        key           = options.delete(:aws_name) || '{name}-{uuid}'
+
+        # add s3 container
+        el.after drag_n_drop_tmpl template_id
+        el.after "<div id='#{container_id}'></div>"
+
+        container = dom.find("##{container_id}")
+
+        uploader = el.fine_uploader_dnd({
+          classes: {
+            dropActive: "cssClassToAddToDropZoneOnEnter"
+          }
+        })
+
+        uploader.on('processingDroppedFiles') do |event|
+          # todo: display some sort of a "processing" or spinner graphic
+        end
+
+        uploader.on('processingDroppedFilesComplete') do |event, files, dropTarget|
+          # todo: hide spinner/processing graphic
+          container.fine_uploader_s3('addFiles', files)
+        end
+
+        uploader_settings = {
+            objectProperties: {
+              key: function { |key_id|
+                promise = Native(`new qq.Promise()`)
+                @this.setName(key_id, @this.getName(key_id).gsub(/[^0-9A-Za-z_\.\s-]/, '').gsub(/\s{1,}/,'_'));
+                uuid = @this.getUuid(key_id).split('-').last
+                ext = @this.getName(key_id).split('.').last
+                promise.success(key.gsub('{uuid}', uuid).gsub('{name}', @this.getName(key_id)).gsub('{ext}',ext));
+                promise.to_n
+              }
+            },
+            request: {
+              # // REQUIRED: We are using a custom domain
+              # // for our S3 bucket, in this case.  You can
+              # // use any valid URL that points to your bucket.
+              endpoint: "https://#{settings[:bucket]}.s3.amazonaws.com",
+              # // REQUIRED: The AWS public key for the client-side user
+              # // we provisioned.
+              accessKey: settings[:aws_access_key_id]
+            },
+
+            template: template_id,
+
+            # // REQUIRED: Path to our local server where requests
+            # // can be signed.
+            signature: {
+              endpoint: "#{Wedge.assets_url}/wedge/plugins/uploader.call?__wedge_method__=signature&__wedge_args__=__wedge_data__&__wedge_name__=uploader_plugin",
+              customHeaders: {'X-CSRF-Token' => Element.find('head > meta[name="_csrf"]').attr('content') }
+            },
+
+            # // OPTIONAL: An endopint for Fine Uploader to POST to
+            # // after the file has been successfully uploaded.
+            # // Server-side, we can declare this upload a failure
+            # // if something is wrong with the file.
+            uploadSuccess: {
+              endpoint: "#{Wedge.assets_url}/wedge/plugins/uploader.call?__wedge_method__=success&__wedge_args__=__wedge_data__&__wedge_name__=uploader_plugin",
+              customHeaders: {'X-CSRF-Token' => Element.find('head > meta[name="_csrf"]').attr('content') }
+            },
+
+            # // optional feature
+            chunking: {
+                enabled: true
+            },
+
+            # // optional feature
+            resume: {
+                enabled: true
+            },
+
+            thumbnails: {
+                placeholders: {
+                    # notAvailablePath: "assets/not_available-generic.png",
+                    # waitingPath: "assets/waiting-generic.png"
+                }
+            },
+
+            callbacks: {
+              onSubmitted: function { |fu_id|
+                params             = options
+                button             = Native(@this._buttons[0])
+                el                 = Element.find(button.getInput).closest('.s3-uploader');
+                params[:dom_id]      = el.attr('id')
+                params[:dom_file_id] = fu_id
+
+                if `qq.supportedFeatures.canDetermineSize`
+                  size = @this.getSize(fu_id)
+                  params[:size] = size
+                end
+
+                @this.setUploadSuccessParams(params, fu_id)
+              }
+            }
+        }
+
+        if options[:delete_method]
+          uploader_settings[:deleteFile] = {
+            enabled: true,
+            forceConfirm: true,
+            endpoint: "#{Wedge.assets_url}/wedge/plugins/uploader.call?__wedge_method__=delete&__wedge_args__=__wedge_data__&__wedge_name__=uploader_plugin",
+            params: options,
+            customHeaders: {
+              'X-CSRF-Token' => Element.find('head > meta[name="_csrf"]').attr('content'),
+              'Accept' => '*/*;q=0.5, text/javascript, application/javascript, application/ecmascript, application/x-ecmascript'
+            }
+          }
+        end
+
+        if options[:accept_files]
+          uploader_settings[:validation] = {
+            acceptFiles: options[:accept_files]
+          }
+        end
+
+        # if options[:resume_method]
+        #   uploader_settings[:session] = {
+        #     endpoint: "#{Wedge.assets_url}/app/components/#{options[:wedge_name]}.call?wedge_method=#{options[:resume_method]}&wedge_method_args=wedge_data&wedge_name=registration",
+        #     params: options
+        #   }
+        # end
+        if !options[:multiple].nil?
+          uploader_settings[:multiple] = options.delete(:multiple)
+        end
+        fine_uploader = container.fine_uploader_s3(uploader_settings)
+
+        fine_uploader.on('complete') do |event, _, name, response|
+          return unless response
+
+          name          = `response.wedge_name`
+          dom_file_id   = `response.dom_file_id`
+          method_called = `response.wedge_method`
+          # fix: we should be able to get the object better than this
+          data          = JSON.parse(`JSON.stringify(response.wedge_response)`)
+
+          wedge(name).send(method_called, data)
+
+          dom.find(".qq-file-id-#{dom_file_id}").remove unless options[:preserve_upload]
+        end
+      end
+
+      def drag_n_drop_tmpl id
+        <<-EOF
+        <script type="text/template" id="#{id}">
+          <div class="qq-uploader-selector qq-uploader">
+            <div class="qq-upload-button-selector qq-upload-button">
+              <div>Upload a file</div>
+            </div>
+            <div class="qq-upload-drop-area-selector qq-upload-drop-area" qq-hide-dropzone>
+                <span>Drop file here to upload</span> </div>
+            <span class="qq-drop-processing-selector qq-drop-processing">
+              <span>Processing dropped files...</span>
+              <span class="qq-drop-processing-spinner-selector qq-drop-processing-spinner"></span>
+            </span>
+              <ul class="qq-upload-list-selector qq-upload-list">
+                  <li>
+                      <div class="qq-progress-bar-container-selector">
+                          <div class="qq-progress-bar-selector qq-progress-bar"></div>
+                      </div>
+                      <span class="qq-upload-spinner-selector qq-upload-spinner"></span>
+                      <img class="qq-thumbnail-selector" qq-max-size="100" qq-server-scale>
+                      <span class="qq-edit-filename-icon-selector qq-edit-filename-icon"></span>
+                      <span class="qq-upload-file-selector qq-upload-file"></span>
+                      <input class="qq-edit-filename-selector qq-edit-filename" tabindex="0" type="text">
+                      <span class="qq-upload-size-selector qq-upload-size"></span>
+                      <a class="qq-upload-cancel-selector btn-small btn-warning" href="#">Cancel</a>
+                      <a class="qq-upload-retry-selector btn-small btn-info" href="#">Retry</a>
+                      <a class="qq-upload-delete-selector btn-small btn-warning" href="#">Delete</a>
+                      <a class="qq-upload-pause-selector btn-small btn-info" href="#">Pause</a>
+                      <a class="qq-upload-continue-selector btn-small btn-info" href="#">Continue</a>
+                      <span class="qq-upload-status-text-selector qq-upload-status-text"></span>
+                      <a class="view-btn btn-small btn-info hide" target="_blank">View</a>
+                  </li>
+              </ul>
+          </div>
+        </script>
+        EOF
+      end
+
+      def settings
+        @settings ||= store[:settings].dup
+      end
+    end
+  end
+end
+
+if RUBY_ENGINE == 'opal'
+  class Element
+    alias_native :fine_uploader, :fineUploader
+
+    def fine_uploader_dnd options = {}
+      options = options.to_n
+      `self.fineUploaderDnd(options)`
+    end
+
+    def fine_uploader_s3 type, options = false
+      if !options
+        options = type.to_n
+        `self.fineUploaderS3(options)`
+      else
+        `self.fineUploaderS3(type, options)`
+      end
+    end
+  end
+end