wedge 0.1.1 → 0.1.2

data/lib/wedge/require.rb

@@ -1,47 +1,35 @@
 unless RUBY_ENGINE == 'opal'
-  module Kernel
-    # make an alias of the original require
-    alias_method :wedge_original_require, :require
+  # rewrite require
+  def require(name)
+    Kernel.require name
 
-    # rewrite require
-    def require(name)
-      return wedge_original_require(name) unless defined?(Wedge)
+    return unless defined?(Wedge) && Wedge.respond_to?(:config)
 
-      result = wedge_original_require name
+    if name[/\Awedge/] || name[Dir.pwd]
+      name       = name.sub("#{Dir.pwd}/", '').gsub(/\.rb$/, '').gsub(/\//, '__')
+      caller_str = "#{caller[0]}".gsub(/(#{Dir.pwd}\/|.*(?=wedge))/, '').gsub(/:.+$/, '').gsub(/\.rb$/, '').gsub(/\//, '__')
 
-      if name[/\Awedge/] || name[Dir.pwd]
-        name       = name.sub("#{Dir.pwd}/", '').gsub(/\.rb$/, '').gsub(/\//, '__')
-        caller_str = "#{caller[0]}".gsub(/(#{Dir.pwd}\/|.*(?=wedge))/, '').gsub(/:.+$/, '').gsub(/\.rb$/, '').gsub(/\//, '__')
-
-        if !caller_str['.'] && !(Wedge.config.requires[caller_str] ||= []).include?(name)
-          Wedge.config.requires[caller_str] << name
-        end
+      if !caller_str['.'] && !(Wedge.config.requires[caller_str] ||= []).include?(name)
+        Wedge.config.requires[caller_str] << name
       end
-
-      result
     end
+  end
 
-    # make an alias of the original require
-    alias_method :wedge_original_require_relative, :require_relative
-
-    # rewrite require_relative
-    def require_relative(name)
-      return wedge_original_require_relative(name) unless defined?(Wedge)
-
-      caller_str       = "#{caller[0]}".gsub(/:.+$/, '').gsub(/\.rb$/, '')
-      caller_path_name = caller_str.gsub(%r{(#{Dir.pwd}/|.*wedge)}, '').gsub(/:.+$/, '').gsub(/^\//, '')
-
-      path_name = caller_path_name.gsub(/(?<=\/)([^\/]*)$/, "#{name}")
-      path_name = File.expand_path(path_name).sub("#{Dir.pwd}/", '') if path_name['..']
-      path_name = path_name.gsub(/\//, '__')
-      file      = caller_str.gsub(/(?<=\/)([^\/]*)$/, "#{name}")
-      caller_path_name = caller_path_name.gsub(/\//, '__')
+  # rewrite require_relative
+  def require_relative(name)
+    caller_str       = "#{caller[0]}".gsub(/:.+$/, '').gsub(/\.rb$/, '')
+    caller_path_name = caller_str.gsub(%r{(#{Dir.pwd}/|.*wedge)}, '').gsub(/:.+$/, '').gsub(/^\//, '')
 
-      if !caller_path_name['.'] && !(Wedge.config.requires[caller_path_name] ||= []).include?(path_name)
-        Wedge.config.requires[caller_path_name] << path_name
-      end
+    path_name = caller_path_name.gsub(/(?<=\/)([^\/]*)$/, "#{name}")
+    path_name = File.expand_path(path_name).sub("#{Dir.pwd}/", '') if path_name['..']
+    path_name = path_name.gsub(/\//, '__')
+    file      = caller_str.gsub(/(?<=\/)([^\/]*)$/, "#{name}")
+    caller_path_name = caller_path_name.gsub(/\//, '__')
 
-      wedge_original_require file
+    if !caller_path_name['.'] && !(Wedge.config.requires[caller_path_name] ||= []).include?(path_name)
+      Wedge.config.requires[caller_path_name] << path_name
     end
+
+    Kernel.require file
   end
 end

data/lib/wedge/version.rb

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

data/lib/wedge.rb

@@ -32,10 +32,6 @@ class Wedge
       "#{url}#{config.cache_assets ? "/#{config.assets_key}" : ''}"
     end
 
-    def requires
-      @requires ||= IndifferentHash.new
-    end
-
     def assets_url_regex
       @assets_url_regex ||= begin
         assets_url = ::Wedge.assets_url.gsub(%r{^\/}, '')
@@ -123,6 +119,9 @@ class Wedge
           gems_dir = ::Opal.gem_dir.gsub(/(?<=gems)\/opal-.*/, '')
           Wedge::Opal.append_path file
           Wedge::Opal.append_path Dir.pwd
+          # fix: make this a config option i.e.
+          # gems: [:ability_list]
+          # then grab that path and add it to the opal path list
           Dir["#{gems_dir}/**/"].sort.each do |folder|
             Wedge::Opal.append_path "#{folder}/lib"
           end
@@ -132,6 +131,8 @@ class Wedge
 
     # Return the opal javascript.
     def javascript(path_name = 'wedge', options = {})
+      path_name = path_name.to_s
+
       if server?
         javascript_cache[path_name] ||= begin
           js = build(path_name, options).javascript
@@ -151,17 +152,7 @@ class Wedge
 
             js << Opal.compile("Wedge.config.component_class[:#{comp_name}].config.data = HashObject.new(Wedge.config.component_class[:#{comp_name}].config.data.to_h.merge JSON.parse(Base64.decode64('#{compiled_data}')))")
 
-            if requires = config.requires[path_name.gsub(/\//, '__')]
-
-              requires.each do |path|
-                next unless comp_class = Wedge.config.component_class[path]
-
-                comp_name     = comp_class.config.name
-                compiled_data = Base64.encode64 comp_class.config.client_data.to_json
-
-                js << Opal.compile("Wedge.config.component_class[:#{comp_name}].config.data = HashObject.new(Wedge.config.component_class[:#{comp_name}].config.data.to_h.merge JSON.parse(Base64.decode64('#{compiled_data}')))")
-              end
-            end
+            load_requires path_name, js
           end
 
           js
@@ -171,7 +162,11 @@ class Wedge
         cache = options[:cache_assets]
 
         `jQuery.ajax({ url: url, dataType: "script", cache: cache }).done(function() {`
-          comp = Wedge.store!(options[:store].indifferent)[options[:name]]
+          if initialize_args = options.delete(:initialize_args)
+            comp = Wedge.store!(options[:store].indifferent)[options[:name], *initialize_args]
+          else
+            comp = Wedge.store!(options[:store].indifferent)[options[:name]]
+          end
 
           if options[:method_args].any?
             comp.send(options[:method_called], options[:method_args])
@@ -185,12 +180,28 @@ class Wedge
       end
     end
 
+    def load_requires path_name, js
+      if requires = config.requires[path_name.gsub(/\//, '__')]
+        requires.each do |path|
+          next unless comp_class = Wedge.config.component_class[path]
+
+          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
+
+          load_requires path, js
+
+          js << Opal.compile("Wedge.config.component_class[:#{comp_name}].config.data = HashObject.new(Wedge.config.component_class[:#{comp_name}].config.data.to_h.merge JSON.parse(Base64.decode64('#{compiled_data}')))")
+        end
+      end
+    end
+
     def config
       @config ||= begin
-        args = { klass: self, component_class: IndifferentHash.new }
+        args = { component_class: IndifferentHash.new }
 
         unless RUBY_ENGINE == 'opal'
-          # args[:path]       = caller.first.gsub(/(?<=\.rb):.*/, '')
           args[:assets_key] = begin
             if defined?(PlatformAPI) && ENV['HEROKU_TOKEN'] && ENV['HEROKU_APP']
               heroku = PlatformAPI.connect_oauth(ENV['HEROKU_TOKEN'], default_headers: {'Range' => 'version ..; order=desc'})

data/playground/Gruntfile.coffee

@@ -0,0 +1,99 @@
+module.exports = (grunt) ->
+
+  # configuration
+  grunt.initConfig
+
+    # grunt sass
+    sass:
+      compile:
+        options:
+          style: 'expanded'
+          sourcemap: 'none'
+        files: [
+          expand: true
+          cwd: 'src'
+          src: ['**/*.sass', '**/*.scss']
+          dest: 'public'
+          ext: '.css'
+        ]
+
+    # grunt coffee
+    coffee:
+      compile:
+        expand: true
+        cwd: 'src'
+        src: ['**/*.coffee']
+        dest: 'public'
+        ext: '.js'
+        options:
+          bare: true
+          # preserve_dirs: true
+
+    # grunt slim
+    slim:
+      dist:
+        options:
+          pretty: true
+        files: [{
+          cwd: 'src'
+          dest: 'public'
+          expand: true
+          src: ['**/*.slim']
+          ext: '.html'
+        }]
+
+    bake:
+      build:
+        files: [{
+          cwd: 'public'
+          src: ['**/*.html']
+          dest: 'public'
+          expand: true
+        }]
+
+    bowercopy:
+      options:
+        srcPrefix: 'bower_components'
+      scripts:
+        options:
+          destPrefix: 'public/vendor'
+        files:
+          'jquery/jquery.js': 'jquery/dist/jquery.js'
+          'font-awesome/fonts': 'font-awesome/fonts'
+          'normalize-css/normalize.css': 'normalize-css/normalize.css'
+
+    # grunt watch (or simply grunt)
+    watch:
+      html:
+        files: ['src/**/*.html']
+      sass:
+        files: ['src/**/*.sass', 'src/**/*.scss']
+        tasks: ['sass']
+      coffee:
+        files: ['src/**/*.coffee']
+        tasks: ['coffee']
+      slim:
+        files: ['src/**/*.slim']
+        tasks: ['slim', 'bake:build']
+      options:
+        livereload: true
+
+    # grunt connect
+    connect:
+      server:
+        options:
+          base: 'public'
+          open: true
+          port: 8082
+
+  # load plugins
+  grunt.loadNpmTasks 'grunt-contrib-sass'
+  grunt.loadNpmTasks 'grunt-contrib-coffee'
+  grunt.loadNpmTasks 'grunt-contrib-watch'
+  grunt.loadNpmTasks 'grunt-slim'
+  grunt.loadNpmTasks 'grunt-bake'
+  grunt.loadNpmTasks 'grunt-bowercopy'
+  grunt.loadNpmTasks 'grunt-contrib-connect'
+
+  # tasks
+  grunt.registerTask 'default', ['bowercopy', 'sass', 'coffee', 'slim', 'bake', 'connect', 'watch']

data/playground/app/app.rb

@@ -0,0 +1,57 @@
+class Playground
+  use Rack::Session::Cookie, secret: APP_SECRET
+
+  plugin :environments
+
+  configure :development do
+    require 'better_errors'
+
+    use BetterErrors::Middleware if defined? BetterErrors
+    use Rack::Static, urls: ["/public"]
+
+    BetterErrors::Middleware.allow_ip! "0.0.0.0/0"
+    BetterErrors.application_root = Dir.pwd
+  end
+
+  plugin :wedge, {
+    scope: self,
+    plugins: [:form],
+    settings: {
+      uploader: {
+        aws_access_key_id: AWS_ACCESS_KEY_ID,
+        aws_secret_access_key: AWS_SECRET_ACCESS_KEY,
+        bucket: AWS_BUCKET
+      }
+    }
+  }
+
+  plugin :assets, {
+    path: "#{APP_ROOT}/../", css_dir: '', js_dir: '', group_subdirs: false,
+    css: {
+      default: [
+        'public/vendor/normalize-css/normalize.css',
+        'public/css/styles.css',
+        'bower_components/fine-uploader/_build/fine-uploader.css'
+      ],
+    },
+    js: {
+      default: [
+        'public/vendor/jquery/jquery.js',
+        'bower_components/fine-uploader/_build/s3.jquery.fine-uploader.js'
+      ],
+    }
+  }
+
+  route do |r|
+    r.wedge_assets
+    r.assets
+
+    r.root do
+      wedge(:index).to_js :display
+    end
+
+    r.on 'uploader' do
+      wedge(:uploader).to_js :display
+    end
+  end
+end

data/playground/app/components/index.rb

@@ -0,0 +1,12 @@
+class Playground
+  class IndexComponent < Wedge::Component
+    name :index
+    html 'public/index.html' do
+      set_dom dom.find('body').html
+    end
+
+    def display
+      wedge(:layout).display { dom }
+    end
+  end
+end

data/playground/app/components/layout.rb

@@ -0,0 +1,38 @@
+class Playground
+  class LayoutComponent < Wedge::Component
+    name :layout
+    html 'public/index.html' do
+      head = dom.find('head')
+      html = dom.find('html')
+
+      inline_tags = []
+
+      head.css('script, link').each do |tag|
+        if (%w(src href) & tag.attributes.keys).empty?
+          inline_tags << tag
+        end
+        tag.remove
+      end
+
+      head.add_child assets [:css, :default]
+      html.add_child assets [:js, :default]
+      html.add_child Wedge.script_tag
+
+      inline_tags.each do |tag|
+        html.add_child tag
+      end
+
+      # Clear out the body
+      dom.find('body').html ''
+    end
+
+    def display options = {}, &block
+      return unless server?
+
+      body_dom = dom.find('body')
+      body_dom << block.call if block_given?
+
+      dom
+    end
+  end
+end

data/playground/app/components/uploader.rb

@@ -0,0 +1,32 @@
+require_relative 'layout'
+require 'wedge/plugins/uploader'
+
+class Playground
+  class UploaderComponent < Wedge::Component
+    name :uploader
+    html 'public/uploader.html' do
+      set_dom dom.find('body').html
+    end
+
+    def display
+      wedge(:layout).display { dom }
+    end
+
+    def add_file data = {}
+      if server?
+        puts 'uploaded to s3'
+      else
+        puts 'uploaded to s3'
+      end
+    end
+
+    on :ready do
+      button = dom.find("button")
+      button.hide
+      wedge_plugin(:uploader).button button, {
+        wedge_name: :uploader,
+        wedge_method: :add_file
+      }
+    end
+  end
+end

data/playground/app/config/boot.rb

@@ -0,0 +1,14 @@
+require File.expand_path '../variables', __FILE__
+
+require 'roda'
+require 'wedge'
+
+require 'pry'
+require 'awesome_print'
+
+class Playground < Roda; end
+
+require_relative '../app'
+
+Dir["#{APP_ROOT}/forms/*.rb"].sort.each { |file| require file }
+Dir["#{APP_ROOT}/components/*.rb"].sort.each { |file| require file }

data/playground/app/config/variables.rb

@@ -0,0 +1,16 @@
+Encoding.default_external = 'UTF-8'
+
+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|
+    key, value = line.split "=", 2; ENV[key] = value.gsub('\n', '').strip
+  end if File.file? file
+end if %w{development test}.include? RACK_ENV
+
+APP_SECRET            = ENV.fetch('APP_SECRET').freeze
+AWS_ACCESS_KEY_ID     = ENV.fetch('AWS_ACCESS_KEY_ID').freeze
+AWS_SECRET_ACCESS_KEY = ENV.fetch('AWS_SECRET_ACCESS_KEY').freeze
+AWS_BUCKET            = ENV.fetch('AWS_BUCKET').freeze

data/{test/dummy → playground/backup}/components/root.rb

@@ -6,7 +6,9 @@ require_relative '../forms/foo'
 class DummyApp
   class RootComponent < BaseComponent
     name :root
-    html "<div id='foo'>bar</div>"
+    html html! {
+      div 'bar', id: 'foo'
+    }
 
     def display
       if server?
@@ -14,9 +16,15 @@ class DummyApp
           dom.to_html
         end
       else
-        el = Element['<div>']
-        el.html 'foo'
-        dom.find('#foo').before el
+        html! do
+          div class: 'control-group fake optional' do
+            label 'Profile Picture', class: 'fake optional control-label'
+            div id: 'profile_picture'
+          end
+        end
+        dom.find('#foo').before html! {
+          div 'foo'
+        }
       end
     end
 

data/playground/backup/html/layout.html

@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <script src="//code.jquery.com/jquery-1.11.2.js"></script>
+  </head>
+  <body>
+    <div id='template'>Template</div>
+  </body>
+</html>

data/playground/bower.json

@@ -0,0 +1,25 @@
+{
+  "name": "wedge",
+  "version": "0.0.0",
+  "authors": [
+    "cj <cjlazell@gmail.com>"
+  ],
+  "license": "MIT",
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests"
+  ],
+  "dependencies": {
+    "bourbon": "~4.2.3",
+    "neat": "~1.7.2",
+    "normalize-css": "~3.0.3",
+    "bitters": "~1.0.0",
+    "font-awesome": "~4.3.0",
+    "jquery": "~2.1.4",
+    "froala": "~1.2.7",
+    "fine-uploader": "~5.2.1"
+  }
+}

data/playground/config.ru

@@ -0,0 +1,5 @@
+ENV['LC_ALL'] ||= 'en_US.utf8'
+
+require File.expand_path '../app/config/boot', __FILE__
+
+run Playground

data/playground/package.json

@@ -0,0 +1,19 @@
+{
+  "name": "wedge",
+  "description": "",
+  "author": "CJ Lazell <cjlazell@gmail.com>",
+  "version": "0.0.1",
+  "devDependencies": {
+    "bower": "~1.4.1",
+    "coffee-script": "~1.9.2",
+    "grunt": "~0.4.5",
+    "grunt-bake": "^0.3.13",
+    "grunt-bowercopy": "^1.2.0",
+    "grunt-contrib-coffee": "~0.13.0",
+    "grunt-contrib-connect": "^0.10.1",
+    "grunt-contrib-sass": "~0.9.2",
+    "grunt-contrib-watch": "~0.6.1",
+    "grunt-slim": "^0.1.0"
+  },
+  "license": "MIT"
+}