wedge 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bec19fa97267952287dd19eb59c0ef60ea1ec798
-  data.tar.gz: 99539718ec725a14caada41cb292ebc2d607c706
+  metadata.gz: ac3731821b07863c0126576d57b06874e3bfec63
+  data.tar.gz: b0d87766926902c7b17e26cd5e1ac007efed2a91
 SHA512:
-  metadata.gz: b6291df78a9eb3c351d65013afb6719f59a4d08f7b5edffc674aeb7fd53ebf8481020977d47dcb36588c17760398c7d28b6e978fa875a861d062c8a0dfebe0fc
-  data.tar.gz: d27efe62f63e0f26e833541ae466042f81fb20dfbbd8f7f83441ea97d658d458b50e0aa3d66b1f8443b356365b700e8ae2a8b911c7cb6972dc38db9477ba7360
+  metadata.gz: 13daa53b74eb6a37c688d24c74612519deea48f08a4fe89a87bebb90f538914e5735bdc9d59d6876a68c2eaae06ddd862d5827a491db9a8a153adf096abb98d7
+  data.tar.gz: 0f86a4b29929e42e6efc10907d5fc9b2ae856e7e80be843e1fd629fb2585bc05dfc5236156374141230efc0ae8bbdbd84b4d6615d05b65119681d890265018c6

data/lib/wedge.rb

@@ -45,8 +45,12 @@ class Wedge
       "#{config.assets_url}#{config.cache_assets ? "/#{config.assets_key}" : ''}"
     end
 
-    def html!(&b)
-      DOM.new HTML::DSL.html(&b).to_html
+    def html!(scope = false, &block)
+      if !block_given?
+        DOM.new HTML::DSL.html(&scope).to_html
+      else
+        DOM.new HTML::DSL.scope!(scope).html(&block).to_html
+      end
     end
 
     def script_tag
@@ -139,7 +143,7 @@ class Wedge
 
       if server?
         javascript_cache[path_name] ||= begin
-          js = build(path_name, options).javascript
+          js = options.delete(:js) || build(path_name, options).javascript
 
           if path_name == 'wedge'
             compiled_data = Base64.encode64 config.client_data.to_json
@@ -151,6 +155,7 @@ class Wedge
               js << Wedge.javascript(path)
             end
           elsif comp_class = Wedge.config.component_class[path_name.gsub(/\//, '__')]
+            comp_class.config.before_compile.each { |blk| comp_class.instance_eval(&blk) }
             comp_name     = comp_class.config.name
             compiled_data = Base64.encode64 comp_class.config.client_data.to_json
 
@@ -166,10 +171,15 @@ class Wedge
         cache = options[:cache_assets]
 
         `jQuery.ajax({ url: url, dataType: "script", cache: cache }).done(function() {`
+          # fix: at the moment to_js called from the server will set the class
+          # store for whatever method it calls.  we need to think of a better idea
+          # for global and local data store.
+          Wedge.config.component_class[options[:name]].config.store = options[:store].indifferent
+
           if initialize_args = options.delete(:initialize_args)
-            comp = Wedge.store!(options[:store].indifferent)[options[:name], *initialize_args]
+            comp = Wedge[options[:name], *initialize_args]
           else
-            comp = Wedge.store!(options[:store].indifferent)[options[:name]]
+            comp = Wedge[options[:name]]
           end
 
           if options[:method_args].any?

data/lib/wedge/component.rb

@@ -16,8 +16,10 @@ class Wedge
           end
         end
 
-        obj.config.before_compile.each do |blk|
-          obj.instance_exec &blk
+        unless RUBY_ENGINE == 'opal'
+          obj.config.before_compile.each do |blk|
+            obj.instance_exec &blk
+          end
         end
 
         if args.length > 0
@@ -208,7 +210,7 @@ class Wedge
 
       def html!(&b)
         unless RUBY_ENGINE == 'opal'
-          Wedge.html!(&b)
+          Wedge.html!(self, &b)
         end
       end
 
@@ -308,7 +310,11 @@ class Wedge
       return unless server?
 
       client_data = config.client_data.dup
-      client_data.merge! method_called: method, method_args: args, initialize_args: config.initialize_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
@@ -331,7 +337,7 @@ class Wedge
     end
 
     def wedge_html(&b)
-      Wedge.html!(&b)
+      Wedge.html!(self, &b)
     end
     alias_method :html!, :wedge_html
 

data/lib/wedge/html.rb

@@ -28,6 +28,15 @@ class Wedge
       end
     end
 
+    TAGS = %w{a button abbr acronym address applet area article aside audio b base basefont bdi
+bdo big blockquote body br canvas caption center cite code col colgroup command
+datalist dd del details dfn dialog dir div dl dt em embed fieldset figcaption
+figure font footer form frame frameset h1 head header hgroup hr html i iframe
+img input ins kbd keygen label legend li link map mark menu meta meter nav noframes
+noscript object ol optgroup option output p param pre progress q rp rt ruby s samp
+script section select small source span strike strong style sub summary sup table tbody
+td textarea tfoot th thead time title tr track tt u ul var video wbr}
+
     # http://erikonrails.snowedin.net/?p=379
     class DSL
       def initialize(tag, *args, &block)
@@ -55,13 +64,31 @@ class Wedge
       end
 
       def method_missing(tag, *args, &block)
-        child = DSL.new(tag.to_s, *args, &block)
-        children << child
-        child
+        if !TAGS.include?(tag.to_s) && scope.respond_to?(tag, true)
+          scope.send(tag, *args, &block)
+        else
+          child = DSL.scope!(scope).new(tag.to_s, *args, &block)
+          children << child
+          child
+        end
+      end
+
+      def scope
+        self.class.scope
       end
 
       def self.method_missing(tag, *args, &block)
-        DSL.new(tag.to_s, *args, &block)
+        DSL.scope!(scope).new(tag.to_s, *args, &block)
+      end
+
+      class << self
+        attr_accessor :scope
+
+        def scope! scope
+          klass = Class.new(self)
+          klass.instance_variable_set(:@scope, scope)
+          klass
+        end
       end
     end
   end

data/lib/wedge/middleware.rb

@@ -37,35 +37,34 @@ class Wedge
               body << File.read("#{ROOT_PATH}/#{wedge_path}.rb")
             end if Wedge.config.debug
           when 'call'
-              body_data = request.body.read
-              data      = request.params
+            body_data = request.body.read
+            data      = request.params
 
+            begin
+              # try json
+              data.merge!(body_data ? JSON.parse(body_data) : {})
+            rescue
               begin
-                # try json
-                data.merge!(body_data ? JSON.parse(body_data) : {})
+                # try form data
+                data.merge!(body_data ? Rack::Utils.parse_query(body_data) : {})
               rescue
-                begin
-                  # try form data
-                  data.merge!(body_data ? Rack::Utils.parse_query(body_data) : {})
-                rescue
-                  # no data
-                end
+                # no data
               end
+            end
 
-              data          = data.indifferent
-              name          = data.delete(:__wedge_name__)
-              method_called = data.delete(:__wedge_method__)
-              method_args   = data.delete(:__wedge_args__)
+            data          = data.indifferent
+            name          = data.delete(:__wedge_name__)
+            method_called = data.delete(:__wedge_method__)
+            method_args   = data.delete(:__wedge_args__)
 
-            binding.pry
             if method_args == '__wedge_data__' && data
               method_args   = [data]
-              body << Wedge.scope!(app)[name].send(method_called, *method_args) || ''
+              res = Wedge.scope!(self)[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) || ''
-              body << Wedge.scope!(app)[name].send(method_called, *method_args) || ''
+              res = Wedge.scope!(self)[name].send(method_called, *method_args) || ''
             end
 
             # headers["WEDGE-CSRF-TOKEN"] = scope.csrf_token if scope.methods.include? :csrf_token
@@ -92,6 +91,10 @@ class Wedge
         end
       end
 
+      def wedge(*args, &block)
+        Wedge[*args, &block]
+      end
+
       private
 
       def path

data/lib/wedge/plugins/uploader.rb

@@ -5,7 +5,7 @@ class Wedge
       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
+          client? ? %w(aws_access_key_id bucket).include?(k) : true
         end if settings
       end
 
@@ -82,7 +82,7 @@ class Wedge
         key           = options.delete(:aws_name) || '{name}-{uuid}'
 
         # add s3 container
-        el.after drag_n_drop_tmpl template_id
+        el.after drag_n_drop_tmpl template_id, options
         el.after "<div id='#{container_id}'></div>"
 
         container = dom.find("##{container_id}")
@@ -221,12 +221,12 @@ class Wedge
         end
       end
 
-      def drag_n_drop_tmpl id
+      def drag_n_drop_tmpl id, options = {}
         <<-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>#{options.delete(:button_name) || '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>
@@ -260,10 +260,7 @@ class Wedge
       end
 
       def settings
-        @settings ||= {
-          aws_access_key_id: 123456,
-          bucket: 'wedge'
-        }
+        @settings ||= store[:settings]
       end
     end
   end

data/lib/wedge/version.rb

@@ -1,3 +1,3 @@
 class Wedge
-  VERSION = '0.1.3'
+  VERSION = '0.1.5'
 end

data/playground/app/components/uploader.rb

@@ -8,7 +8,17 @@ class Playground
       set_dom dom.find('body').html
     end
 
+    def initialize
+      store[:foo] = 'bar' if server?
+    end
+
     def display
+      # todo: make a test for this:
+      # puts html! {
+      #   if foo = store[:foo]
+      #     div foo
+      #   end
+      # }.to_html
       wedge(:layout).display { dom }
     end
 

data/spec/playground/uploader_spec.rb

@@ -18,7 +18,7 @@ describe Playground::UploaderComponent do
 
   context 'browser_events' do
     before do
-      Wedge::Plugins::Uploader.any_instance.stub(:settings).and_return({
+      allow_any_instance_of(Wedge::Plugins::Uploader).to receive(:settings).and_return({
         aws_access_key_id: 123456,
         bucket: 'wedge'
       })

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ if RUBY_ENGINE == 'opal'
   require 'opal/jquery'
   require 'opal/jquery/rspec'
 else
+
   ENV['RACK_ENV'] ||= 'test'
 
   $:.unshift(File.expand_path("../lib", File.dirname(__FILE__)))

data/spec/wedge/plugins/uploader_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+require 'wedge/plugins/uploader'
+
+describe Wedge::Plugins::Uploader do
+  before do
+    allow(Wedge.config).to receive(:settings).and_return(
+      uploader: {
+        aws_access_key_id: 123456,
+        aws_secret_access_key: 654321,
+        bucket: 'wedge'
+      }
+    )
+  end
+
+  subject(:uploader) { Wedge[:uploader_plugin] }
+
+  context 'store#settings' do
+    it 'should have the correct settings' do
+      settings = uploader.config.store[:settings]
+
+      if Wedge.server?
+        expect(settings.keys).to include *%w'aws_access_key_id aws_secret_access_key bucket'
+      else
+        # expect(settings.keys).to include *%w'aws_access_key_id bucket'
+        # expect(settings.keys).not_to include *%w'aws_secret_access_key'
+      end
+    end
+  end
+end

data/wedge.gemspec

@@ -24,7 +24,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'minitest-line'
   spec.add_development_dependency 'minitest-reporters'
-  spec.add_development_dependency 'opal-rspec'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency "pry"
   spec.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wedge
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - cj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-20 00:00:00.000000000 Z
+date: 2015-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -80,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: opal-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -271,7 +257,7 @@ files:
 - spec/playground/layout_spec.rb
 - spec/playground/uploader_spec.rb
 - spec/spec_helper.rb
-- test.rb
+- spec/wedge/plugins/uploader_spec.rb
 - test/test.js
 - test/test_basic_component.rb
 - test/test_browserio.rb
@@ -306,6 +292,7 @@ test_files:
 - spec/playground/layout_spec.rb
 - spec/playground/uploader_spec.rb
 - spec/spec_helper.rb
+- spec/wedge/plugins/uploader_spec.rb
 - test/test.js
 - test/test_basic_component.rb
 - test/test_browserio.rb

data/test.rb

@@ -1,44 +0,0 @@
-require 'awesome_print'
-
-requires = {
-  form_plugin: [],
-  list: [
-    {
-      name: 'claim',
-      requires: [
-        {name: 'filter_form', requires: [{ name: 'form_plugin', requires: [] }]},
-        {name: 'claim_form', requires: []}
-      ],
-    },
-    {
-      name: 'claim_form',
-      requires: [
-        {name: 'form_plugin', requires: []},
-        {name: 'address_form', requires: [{ name: 'form_plugin', requires: [] }]}
-      ],
-    }
-  ]
-}
-
-$loaded_requires = []
-
-def get_requires reqs, requires_array = []
-  new_reqs = []
-
-  reqs.each do |r|
-    if r[:requires].any?
-      get_requires(r[:requires], requires_array)
-    end
-
-    unless $loaded_requires.include? r[:name]
-      $loaded_requires << r[:name]
-      new_reqs         << r[:name]
-    end
-  end
-
-  requires_array << new_reqs if new_reqs.any?
-
-  requires_array
-end
-
-ap get_requires requires[:list]