wedge 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e3268823a6d3afeb59aaa396b0bb3a50e0419ec
-  data.tar.gz: cd382179d6f4aa7ccf6fca95cfb8d53855548771
+  metadata.gz: 54944284d00e24ca9e6e454c117aba4d64a9af6e
+  data.tar.gz: 77d2c5b902b1554c3603c281c1dd22a61aacc50b
 SHA512:
-  metadata.gz: f00a9fb7b3a39d28a9c3aa0c274555a0c4218b6a8d69de71d854dd060c0d259b928f8ebecd5fc485fcf58011b9df73909df13961fd5dd46d1c600b0c1f9d05f9
-  data.tar.gz: 12d197e7d0716ddb531983d0255b03e7a464ef6b5289433c0545c933488e80e68f96abfbeaabdc2af68ecae1fd4dd8c70a18831eb83ca1c3f630700ff52d8b86
+  metadata.gz: 06d7116b3e7ddef035a3905ddc83f8af1d90f0228f9a679e89747cd9f6b4ddcc1bcefc74c89ba779e60cdbc6849770334b32df7850fcc2de156f303161ae1e22
+  data.tar.gz: b2dcb475ae9ff5b2e03217b0c92b3cc8262a26918538ec9268b3d15df3d50672d4bba32762a0e8a8ba5c83e69eb6f7bdc881d8b40fe8ca56279b687233bf5fd5

data/lib/wedge/opal.rb

@@ -1,156 +1,157 @@
-unless RUBY_ENGINE == 'opal'
-  module Opal
-    class Builder
-      # @return [String] Compiled javascript.
-      def javascript
-        to_s
-      end
-    end
-
-    def self.original_compile(source, options = {})
-      Compiler.new(source, options).original_compile
-    end
-
-    class Compiler
-      alias_method :original_compile, :compile
-      def compile
-        @result = original_compile
-
-        if defined? Wedge
-          logical_path = self.file
-          classes    = Wedge.config.component_class
-          comp_class = classes["#{Wedge.config.app_dir}/#{logical_path}".gsub(/\//, '__')] || classes[logical_path.gsub(/\//, '__')]
-
-          if logical_path == 'wedge'
-            compiled_data = Base64.encode64 Wedge.config.client_data.to_json
-            # We need to merge in some data that is only set on the server.
-            # i.e. path, assets_key etc....
-            @result << Opal.original_compile("require '#{self.file}'; Wedge.config.data = HashObject.new(Wedge.config.data.to_h.merge JSON.parse(Base64.decode64('#{compiled_data}')))")
-            # load all global plugins into wedge
-            Wedge.config.plugins.each do |path|
-              @result << Builder.build(path).to_s
-            end
-          elsif comp_class
-            comp_class.config.on_compile.each { |blk| comp_class.instance_exec(true, &blk) }
-            comp_name     = comp_class.config.name
-            compiled_data = Base64.encode64 comp_class.config.client_data.to_json
-            js            = ''
+class Wedge
+  # Create our own opal instance.
+  Opal = ::Opal.dup
 
-            js << "require '#{self.file}'; 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}')))"
-            # todo: discuss: pass plugin settings that were set server side?
-            js << "; Wedge.plugin(:#{comp_name.to_s.gsub(/_plugin$/, '')})" if comp_class.config.is_plugin
+  unless RUBY_ENGINE == 'opal'
+    module Opal
+      class Builder
+        # @return [String] Compiled javascript.
+        def javascript
+          to_s
+        end
+      end
 
-            @result << Opal.original_compile(js)
+      def self.original_compile(source, options = {})
+        Compiler.new(source, options).original_compile
+      end
 
-            if compile_str = comp_class.config.compile_str
-              @result << compile_str
+      class Compiler
+        alias_method :original_compile, :compile
+        def compile
+          @result = original_compile
+
+          if defined? Wedge
+            logical_path = self.file
+            classes    = Wedge.config.component_class
+            comp_class = classes["#{Wedge.config.app_dir}/#{logical_path}".gsub(/\//, '__')] || classes[logical_path.gsub(/\//, '__')]
+
+            if logical_path == 'wedge'
+              compiled_data = Base64.encode64 Wedge.config.client_data.to_json
+              # We need to merge in some data that is only set on the server.
+              # i.e. path, assets_key etc....
+              @result << Opal.original_compile("require '#{self.file}'; Wedge.config.data = HashObject.new(Wedge.config.data.to_h.merge JSON.parse(Base64.decode64('#{compiled_data}')))")
+              # load all global plugins into wedge
+              Wedge.config.plugins.each do |path|
+                @result << Builder.build(path).to_s
+              end
+            elsif comp_class
+              comp_class.config.on_compile.each { |blk| comp_class.instance_exec(true, &blk) }
+              comp_name     = comp_class.config.name
+              compiled_data = Base64.encode64 comp_class.config.client_data.to_json
+              js            = ''
+
+              js << "require '#{self.file}'; 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}')))"
+              # todo: discuss: pass plugin settings that were set server side?
+              js << "; Wedge.plugin(:#{comp_name.to_s.gsub(/_plugin$/, '')})" if comp_class.config.is_plugin
+
+              @result << Opal.original_compile(js)
+
+              if compile_str = comp_class.config.compile_str
+                @result << compile_str
+              end
+
+              load_requires logical_path
             end
-
-            load_requires logical_path
           end
-        end
 
-        @result
-      end
+          @result
+        end
 
-      def load_requires path_name
-        if requires = Wedge.config.requires[path_name.gsub(/\//, '__')]
-          requires.each do |path|
-            next unless comp_class = Wedge.config.component_class[path]
+        def load_requires path_name
+          if requires = Wedge.config.requires[path_name.gsub(/\//, '__')]
+            requires.each do |path|
+              next unless comp_class = Wedge.config.component_class[path]
 
-            comp_class.config.on_compile.each { |blk| comp_class.instance_eval(&blk) }
+              comp_class.config.on_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
+              comp_name     = comp_class.config.name
+              compiled_data = Base64.encode64 comp_class.config.client_data.to_json
 
-            load_requires path
+              load_requires path
 
-            @result << Opal.original_compile("require '#{path}'; 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}')))")
+              @result << Opal.original_compile("require '#{path}'; 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
       end
-    end
 
-    class Server
-      attr_accessor :headers, :gzip
+      class Server
+        attr_accessor :headers, :gzip
 
-      def initialize debug_or_options = {}
-        unless Hash === debug_or_options
-          warn "passing a boolean to control debug is deprecated.\n"+
-            "Please pass an Hash instead: Server.new(debug: true)"
-          options = {:debug => debug_or_options}
-        else
-          options = debug_or_options
-        end
+        def initialize debug_or_options = {}
+          unless Hash === debug_or_options
+            warn "passing a boolean to control debug is deprecated.\n"+
+              "Please pass an Hash instead: Server.new(debug: true)"
+            options = {:debug => debug_or_options}
+          else
+            options = debug_or_options
+          end
 
-        @headers     = {}
-        @gzip        = false
-        @use_index   = true
-        @public_root = nil
-        @public_urls = ['/']
-        @sprockets   = options.fetch(:sprockets, ::Sprockets::Environment.new)
-        @debug       = options.fetch(:debug, true)
-        @prefix      = options.fetch(:prefix, '/assets')
+          @headers     = {}
+          @gzip        = false
+          @use_index   = true
+          @public_root = nil
+          @public_urls = ['/']
+          @sprockets   = options.fetch(:sprockets, ::Sprockets::Environment.new)
+          @debug       = options.fetch(:debug, true)
+          @prefix      = options.fetch(:prefix, '/assets')
 
-        Opal.paths.each { |p| @sprockets.append_path(p) }
+          Opal.paths.each { |p| @sprockets.append_path(p) }
 
-        yield self if block_given?
-        create_app
-      end
-
-      def create_app
-        server, sprockets, prefix, headers = self, @sprockets, self.prefix, @headers
-        sprockets.logger.level ||= Logger::DEBUG
-        source_map_enabled = self.source_map_enabled
-        if source_map_enabled
-          maps_prefix = SOURCE_MAPS_PREFIX_PATH
-          maps_app = SourceMapServer.new(sprockets, maps_prefix)
-          ::Opal::Sprockets::SourceMapHeaderPatch.inject!(maps_prefix)
+          yield self if block_given?
+          create_app
         end
 
-        @app = Rack::Builder.app do
-          not_found = lambda { |env| [404, {}, []] }
-          use Rack::Deflater
-          use Rack::ShowExceptions
-          use Index, server if server.use_index
-          use Headers, server
+        def create_app
+          server, sprockets, prefix, headers = self, @sprockets, self.prefix, @headers
+          sprockets.logger.level ||= Logger::DEBUG
+          source_map_enabled = self.source_map_enabled
           if source_map_enabled
-            map(maps_prefix) do
-              require 'rack/conditionalget'
-              require 'rack/etag'
-              use Rack::ConditionalGet
-              use Rack::ETag
-              run maps_app
+            maps_prefix = SOURCE_MAPS_PREFIX_PATH
+            maps_app = SourceMapServer.new(sprockets, maps_prefix)
+            ::Opal::Sprockets::SourceMapHeaderPatch.inject!(maps_prefix)
+          end
+
+          @app = Rack::Builder.app do
+            not_found = lambda { |env| [404, {}, []] }
+            use Rack::Deflater
+            use Rack::ShowExceptions
+            use Index, server if server.use_index
+            use Headers, server
+            if source_map_enabled
+              map(maps_prefix) do
+                require 'rack/conditionalget'
+                require 'rack/etag'
+                use Rack::ConditionalGet
+                use Rack::ETag
+                run maps_app
+              end
             end
+            map(prefix) { run sprockets }
+            run Rack::Static.new(not_found, root: server.public_root, urls: server.public_urls)
           end
-          map(prefix) { run sprockets }
-          run Rack::Static.new(not_found, root: server.public_root, urls: server.public_urls)
         end
-      end
 
-      class Headers
-        def initialize(app, server)
-          @app    = app
-          @server = server
-        end
+        class Headers
+          def initialize(app, server)
+            @app    = app
+            @server = server
+          end
 
-        def call(env)
-          if env['PATH_INFO'][@server.prefix]
-            status, headers, body = @app.call env
+          def call(env)
+            if env['PATH_INFO'][@server.prefix]
+              status, headers, body = @app.call env
 
-            [status, headers.merge(@server.headers), [body]]
-          else
-            @app.call env
+              [status, headers.merge(@server.headers), [body]]
+            else
+              @app.call env
+            end
           end
         end
       end
     end
   end
-end
 
-class Wedge
-  # Create our own opal instance.
-  Opal = ::Opal.dup
 
   def self.version
     Wedge::VERSION

data/lib/wedge/version.rb

@@ -1,3 +1,3 @@
 class Wedge
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

data/wedge.gemspec

@@ -18,8 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "opal-wedge", '>= 0.8.0'
-  spec.add_runtime_dependency "opal-jquery", '~> 0.4.0'
+  spec.add_runtime_dependency "opal-jquery", '~> 0.4.1'
   spec.add_runtime_dependency "nokogiri"
 
   spec.add_development_dependency 'rspec'

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: wedge
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - cj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-04 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: opal-wedge
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: opal-jquery
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement