wedge 0.1.39 → 0.1.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94ce92466e715398f4986ff8e0ea3566a5d702f8
-  data.tar.gz: b7ded8da8e6c96de01c412046d58b59a279a2faf
+  metadata.gz: ec4e3172720fea802242f439bee76c276d3b7f06
+  data.tar.gz: c57c4df6d97e2d962d88c63a76333780cbfec35b
 SHA512:
-  metadata.gz: 5f1c9de0900362595f228002697f8cecddfd20b4940ac0502b8e0b9c3490d5845bf3c2492fdc7515d677b93677834cf551b8083fdd7905bcb2ec7b0412a07718
-  data.tar.gz: d83feebf9647b56f9252b1b052ffe287caa028190844783fd68b6938a67693255d92a0921eed17907ad28818f9c8b5957e17cfabb540c29ec68f2e6a1eeead27
+  metadata.gz: 290bf061c8f03a73646ca3387dbf3b573154f2d9e4b6c533282054dd113b0c890f682671b51a4d860edbd29c07d54228ed3315f100ecc17c8d72b96d449d4752
+  data.tar.gz: 885545571763dd21b8deb96cbd6b7dfcc84e551defd399b428a5cb7a3d3a6a5d284d15c14dd8fecc630ccabd23081625a50febabb9aa88c6cd4d22d72b655951

data/Gemfile

@@ -11,7 +11,7 @@ gem 'better_errors'
 gem 'slim'
 gem 'sass'
 gem 'thin'
-gem 'roda', '2.4.0'
+gem 'roda', '2.5.0'
 gem 'pry-rescue'
 gem 'pry-stack_explorer'
 # issue: https://github.com/copiousfreetime/hitimes/issues/17

data/Makefile

@@ -1,2 +1,4 @@
 server:
 	cd playground && bundle exec restart -d ../. -i \.bundle$$ -i \.git$$ thin start -p 8080
+console:
+	RACK_ENV=development bundle exec pry -r ./playground/app/config/boot

data/lib/roda/plugins/wedge.rb

@@ -1,8 +1,12 @@
 class Roda
   module RodaPlugins
     class WedgePlugin
-      def self.configure(app, opts = false, &block)
-        app.use Wedge::Middleware, opts || block
+      def self.configure(app, settings = false, &block)
+        if settings[:skip_call_middleware]
+          Wedge.load_settings settings
+        else
+          app.use Wedge::Middleware, opts || block
+        end
       end
 
       module ClassMethods

data/lib/wedge/middleware.rb

@@ -3,28 +3,7 @@ class Wedge
     attr_reader :skip_call
 
     def initialize(app = false, settings = false)
-      if settings
-        case settings
-        when Proc
-          Wedge.config.instance_eval &settings
-        else
-          settings.each { |k, v| Wedge.config.send "#{k}=", v }
-        end
-
-        Wedge.config.opal = { server: Wedge::Opal::Server.new { |s|
-          s.prefix = Wedge.assets_url
-          s.debug  = Wedge.config.debug
-          s.append_path "#{Dir.pwd}/#{Wedge.config.app_dir}"
-        }}
-
-        if Wedge.config.debug
-          Wedge.config.opal[:sprockets]   = Wedge.config.opal[:server].sprockets
-          Wedge.config.opal[:maps_prefix] = "#{Wedge.assets_url}/__OPAL_SOURCE_MAPS__"
-          Wedge.config.opal[:maps_app]    = Opal::SourceMapServer.new Wedge.config.opal[:sprockets], Wedge.config.opal[:maps_prefix]
-
-          Wedge::Opal::Sprockets::SourceMapHeaderPatch.inject! Wedge.config.opal[:maps_prefix]
-        end
-      end
+      Wedge.load_settings settings
 
       @app       = app
       @scope     = self.class.scope

data/lib/wedge/version.rb

@@ -1,3 +1,3 @@
 class Wedge
-  VERSION = '0.1.39'
+  VERSION = '0.1.40'
 end

data/lib/wedge.rb

@@ -36,6 +36,31 @@ class Wedge
 
     delegate [:plugin] => :config
 
+    def load_settings settings
+      return unless settings
+
+      case settings
+      when Proc
+        Wedge.config.instance_eval &settings
+      else
+        settings.each { |k, v| Wedge.config.send "#{k}=", v }
+      end
+
+      Wedge.config.opal = { server: Wedge::Opal::Server.new { |s|
+        s.prefix = Wedge.assets_url
+        s.debug  = Wedge.config.debug
+        s.append_path "#{Dir.pwd}/#{Wedge.config.app_dir}"
+      }}
+
+      if Wedge.config.debug
+        Wedge.config.opal[:sprockets]   = Wedge.config.opal[:server].sprockets
+        Wedge.config.opal[:maps_prefix] = "#{Wedge.assets_url}/__OPAL_SOURCE_MAPS__"
+        Wedge.config.opal[:maps_app]    = Opal::SourceMapServer.new Wedge.config.opal[:sprockets], Wedge.config.opal[:maps_prefix]
+
+        Wedge::Opal::Sprockets::SourceMapHeaderPatch.inject! Wedge.config.opal[:maps_prefix]
+      end
+    end
+
     def assets_url
       url = config.assets_url.gsub(%r{^(http(|s)://[^\/]*\/|\/)}, '/')
       "#{url}#{config.cache_assets ? "/#{config.assets_key}" : ''}"

data/playground/app/app.rb

@@ -44,7 +44,7 @@ class Playground
 
   plugin :assets, {
     path: "#{APP_ROOT}/../", css_dir: '', js_dir: '', group_subdirs: false,
-    # js_opts: { builder: builder }
+    js_opts: { builder: Wedge::Opal::Server.new },
     css: {
       default: [
         'public/vendor/normalize-css/normalize.css',
@@ -55,7 +55,8 @@ class Playground
     js: {
       default: [
         'public/vendor/jquery/jquery.js',
-        'bower_components/fine-uploader/_build/s3.jquery.fine-uploader.js'
+        'bower_components/fine-uploader/_build/s3.jquery.fine-uploader.js',
+        'wedge/wedge.rb'
       ],
     }
   }

data/playground/app/components/layout.rb

@@ -16,7 +16,6 @@ class Playground
 
       head.add_child assets [:css, :default]
       html.add_child assets [:js, :default]
-      html.add_child Wedge.script_tag 'wedge'
 
       inline_tags.each do |tag|
         html.add_child tag

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wedge
 version: !ruby/object:Gem::Version
-  version: 0.1.39
+  version: 0.1.40
 platform: ruby
 authors:
 - cj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal