wedge 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c03ec1090649b719dd845c4167b3c717886cd59a
-  data.tar.gz: d8193a5ffec834680dbe884db02416ccc935805b
+  metadata.gz: bec19fa97267952287dd19eb59c0ef60ea1ec798
+  data.tar.gz: 99539718ec725a14caada41cb292ebc2d607c706
 SHA512:
-  metadata.gz: c62a5ab5e18f862c9734e2abb8ccfa3422ac5e6d97942283e01cebd2df94bd4ea2ffbf444b27e1e7844e6797688d217608e0edc35b442cbe3df0f4182bf57a88
-  data.tar.gz: 0c3746d9d3074b798bb5dc1836785c2e4b46c8a6bbeffdadeb2ad397b8070dced9bbe358e43cd251582a5e58a96afeb777d9bca59d229d5d8a8c40822d35c928
+  metadata.gz: b6291df78a9eb3c351d65013afb6719f59a4d08f7b5edffc674aeb7fd53ebf8481020977d47dcb36588c17760398c7d28b6e978fa875a861d062c8a0dfebe0fc
+  data.tar.gz: d27efe62f63e0f26e833541ae466042f81fb20dfbbd8f7f83441ea97d658d458b50e0aa3d66b1f8443b356365b700e8ae2a8b911c7cb6972dc38db9477ba7360

data/Gemfile

@@ -3,8 +3,9 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in BrowserIO.gemspec
 gemspec
 
-gem 'opal', github: 'opal/opal', path: '~/gems/opal'
+gem 'opal', github: 'opal/opal'
 gem 'opal-jquery', github: 'opal/opal-jquery'
+gem 'opal-rspec', github: 'opal/opal-rspec'
 gem 'binding_of_caller'
 gem 'better_errors'
 gem 'slim'

data/Rakefile

@@ -1,9 +1,23 @@
+require 'bundler'
 require 'bundler/gem_tasks'
-require 'rake/testtask'
+Bundler.require
 
-Rake::TestTask.new do |task|
-  task.libs << %w(test lib)
-  task.pattern = 'test/**/test_*.rb'
+Opal.append_path File.expand_path('../lib', __FILE__)
+Opal.append_path File.expand_path('../playground', __FILE__)
+
+require 'opal/rspec/rake_task'
+Opal::RSpec::RakeTask.new('opal:rspec') do |s|
+  s.index_path = 'spec/index.html.erb'
 end
 
-task default: :test
+task default: [:test]
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new('ruby:rspec')
+
+task :test do
+  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/lib/wedge/component.rb

@@ -126,8 +126,8 @@ class Wedge
       alias_method :on, :wedge_on
 
       def method_missing(method, *args, &block)
-        if config.scope.respond_to?(method, true)
-          config.scope.send method, *args, &block
+        if wedge_config.scope.respond_to?(method, true)
+          wedge_config.scope.send method, *args, &block
         else
           super
         end
@@ -208,7 +208,7 @@ class Wedge
 
       def html!(&b)
         unless RUBY_ENGINE == 'opal'
-          DOM.new HTML::DSL.html(&b).to_html
+          Wedge.html!(&b)
         end
       end
 
@@ -331,7 +331,7 @@ class Wedge
     end
 
     def wedge_html(&b)
-      DOM.new HTML::DSL.html(&b).to_html
+      Wedge.html!(&b)
     end
     alias_method :html!, :wedge_html
 

data/lib/wedge/middleware.rb

@@ -37,21 +37,28 @@ class Wedge
               body << File.read("#{ROOT_PATH}/#{wedge_path}.rb")
             end if Wedge.config.debug
           when 'call'
-            body_data = scope.request.body.read
-            data      = scope.request.params
-
-            begin
-              data.merge!(body_data ? JSON.parse(body_data) : {})
-            rescue
-              # can't be parsed by json
-            end
-
-            data          = data.indifferent
-            name          = data.delete(:wedge_name)
-            method_called = data.delete(:wedge_method_called)
-            method_args   = data.delete(:wedge_method_args)
-
-            if method_args == 'wedge_data' && data
+              body_data = request.body.read
+              data      = request.params
+
+              begin
+                # try json
+                data.merge!(body_data ? JSON.parse(body_data) : {})
+              rescue
+                begin
+                  # try form data
+                  data.merge!(body_data ? Rack::Utils.parse_query(body_data) : {})
+                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__)
+
+            binding.pry
+            if method_args == '__wedge_data__' && data
               method_args   = [data]
               body << Wedge.scope!(app)[name].send(method_called, *method_args) || ''
             else

data/lib/wedge/plugins/uploader.rb

@@ -260,7 +260,10 @@ class Wedge
       end
 
       def settings
-        @settings ||= store[:settings].dup
+        @settings ||= {
+          aws_access_key_id: 123456,
+          bucket: 'wedge'
+        }
       end
     end
   end

data/lib/wedge/version.rb

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

data/lib/wedge.rb

@@ -45,6 +45,10 @@ class Wedge
       "#{config.assets_url}#{config.cache_assets ? "/#{config.assets_key}" : ''}"
     end
 
+    def html!(&b)
+      DOM.new HTML::DSL.html(&b).to_html
+    end
+
     def script_tag
       "<script src='#{assets_url}/wedge.js'></script>"
     end

data/playground/app/config/boot.rb

@@ -1,5 +1,14 @@
 require File.expand_path '../variables', __FILE__
 
+begin
+  # use `bundle install --standalone --binstubs .bundle/bin' to get this...
+  require_relative '../.bundle/bundler/setup'
+rescue LoadError
+  # fall back to regular bundler if the developer hasn't bundled standalone
+  require 'bundler'
+  Bundler.setup :default, RACK_ENV
+end
+
 require 'roda'
 require 'wedge'
 

data/playground/app/config/variables.rb

@@ -1,13 +1,14 @@
 Encoding.default_external = 'UTF-8'
 
-APP_ROOT              = File.expand_path '../../', __FILE__ unless defined?(APP_ROOT)
-RACK_ENV              = ENV.fetch('RACK_ENV') { 'development' }.freeze
+APP_ROOT = File.expand_path '../../', __FILE__ unless defined?(APP_ROOT)
+RACK_ENV = ENV.fetch('RACK_ENV') { 'development' }.freeze
 
 # Load environment variables
 %W{.env .env.#{ENV['RACK_ENV']}}.each do |file|
-  File.foreach file do |line|
+  file_path = "#{APP_ROOT}/../#{file}"
+  File.foreach file_path do |line|
     key, value = line.split "=", 2; ENV[key] = value.gsub('\n', '').strip
-  end if File.file? file
+  end if File.file? file_path
 end if %w{development test}.include? RACK_ENV
 
 APP_SECRET            = ENV.fetch('APP_SECRET').freeze

data/spec/index.html.erb

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+  <%= javascript_include_tag 'public/vendor/jquery/jquery' %>
+  <%= javascript_include_tag 'bower_components/fine-uploader/_build/s3.jquery.fine-uploader' %>
+  <%= javascript_include_tag @server.main %>
+</body>
+</html>

data/spec/playground/layout_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+require 'app/components/layout'
+
+describe Playground::LayoutComponent do
+  subject(:layout) { Wedge[:layout] }
+
+  context '#display' do
+    subject { layout.display }
+
+    if Wedge.server?
+      it { is_expected.to be_a Wedge::DOM }
+    else
+      it { is_expected.to be_nil }
+    end
+  end
+end

data/spec/playground/uploader_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+require 'app/components/uploader'
+
+describe Playground::UploaderComponent do
+  subject(:uploader) { Wedge[:uploader] }
+
+  html Wedge.html! { button 'Upload' }.to_html
+
+  context '#display' do
+    subject { uploader.display }
+
+    if Wedge.server?
+      it { is_expected.to be_a Wedge::DOM }
+    else
+      it { is_expected.to be_nil }
+    end
+  end
+
+  context 'browser_events' do
+    before do
+      Wedge::Plugins::Uploader.any_instance.stub(:settings).and_return({
+        aws_access_key_id: 123456,
+        bucket: 'wedge'
+      })
+      uploader.trigger :browser_events
+    end
+
+    it 'should have fine uploader button' do
+      expect(uploader.dom.find('.qq-uploader').to_html).not_to be_empty
+    end
+  end if Wedge.client?
+end

data/spec/spec_helper.rb

@@ -0,0 +1,23 @@
+if RUBY_ENGINE == 'opal'
+  require 'wedge'
+  require 'opal-rspec'
+  require 'opal/jquery'
+  require 'opal/jquery/rspec'
+else
+  ENV['RACK_ENV'] ||= 'test'
+
+  $:.unshift(File.expand_path("../lib", File.dirname(__FILE__)))
+  $:.unshift(File.expand_path("../playground", File.dirname(__FILE__)))
+
+  # this is so it doesn't throw an error because we use opal/jquery/rspec which
+  # adds an html method client side.
+  module RSpecHelpers
+    def html(_); end
+  end
+
+  RSpec.configure do |config|
+    config.extend RSpecHelpers
+  end
+
+  require 'app/config/boot'
+end

data/wedge.gemspec

@@ -22,11 +22,15 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "opal-jquery"
   spec.add_runtime_dependency "nokogiri"
 
+  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"
   spec.add_development_dependency "awesome_print"
   spec.add_development_dependency "yard"
   spec.add_development_dependency "phantomjs.rb"
-  spec.add_development_dependency 'minitest-line'
-  spec.add_development_dependency 'minitest-reporters'
   spec.add_development_dependency 'roda'
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wedge
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - cj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-19 00:00:00.000000000 Z
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: minitest-line
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: awesome_print
+  name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: opal-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: phantomjs.rb
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-line
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-reporters
+  name: rake
+  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: awesome_print
+  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: yard
+  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: phantomjs.rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -225,6 +267,10 @@ files:
 - playground/src/includes/_head.slim
 - playground/src/index.slim
 - playground/src/uploader.slim
+- spec/index.html.erb
+- spec/playground/layout_spec.rb
+- spec/playground/uploader_spec.rb
+- spec/spec_helper.rb
 - test.rb
 - test/test.js
 - test/test_basic_component.rb
@@ -256,6 +302,10 @@ signing_key:
 specification_version: 4
 summary: Components for the Browser and Server
 test_files:
+- spec/index.html.erb
+- spec/playground/layout_spec.rb
+- spec/playground/uploader_spec.rb
+- spec/spec_helper.rb
 - test/test.js
 - test/test_basic_component.rb
 - test/test_browserio.rb