wedge 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e446e1a51f9cf2ef4a91336a092939ee4e1031d2
-  data.tar.gz: cff121115b103c3090b08164345de1411364cf50
+  metadata.gz: 6fb91ba6f48ff314e8120d9801d34e37e42c3a88
+  data.tar.gz: f707f6009257bee3fde947a44b45f68ce3e16e1e
 SHA512:
-  metadata.gz: 780c0d077e650463bba52ee2469c3cb2aef65a07e82f6366899e5177a2ce7941998a1c8c3b15d6ff25ba4ca53afbc60b6ee7c801a0d9d81bcf5a3866658cdff6
-  data.tar.gz: 1f18c8282f0775d1914977d0d3fae1e05a7f6281ed0c39f9381baaa204d4667e05afccdfa7b7f02af3bfdfa01730060e12f4b1c1dc7a0c0ebf57574855affd72
+  metadata.gz: 80e9fe36fb884a334c750c722963a5c943a7a1e84d6fda4437b20d117d350d273eb3287ab6bc0751093cb18943af605c5a714bc8867820ae5262f7563da5cbd3
+  data.tar.gz: 5c60d643b530fe070eb08f805462a8e26b58305551fe59158bbb20b996d1f0db31f86c13efc0ecc0d4a9202e69707e7cb9d1441ed344ff5c60373934de2c7772

data/lib/wedge.rb

@@ -155,7 +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_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
 
@@ -199,7 +199,7 @@ class Wedge
         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_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

data/lib/wedge/component.rb

@@ -17,7 +17,7 @@ class Wedge
         end
 
         unless RUBY_ENGINE == 'opal'
-          obj.config.before_compile.each do |blk|
+          obj.config.on_compile.each do |blk|
             obj.instance_exec &blk
           end
         end
@@ -118,11 +118,14 @@ class Wedge
       alias_method :config, :wedge_config
 
       def wedge_on(*args, &block)
-        if args.first.to_s != 'server'
+        case args.first.to_s
+        when 'server'
+          wedge_on_server(&block)
+        when 'compile'
+          wedge_config.on_compile << block unless RUBY_ENGINE == 'opal'
+        else
           @wedge_on_count += 1
           Wedge.events.add config.name, *args, &block
-        else
-          wedge_on_server(&block)
         end
       end
       alias_method :on, :wedge_on
@@ -217,10 +220,6 @@ class Wedge
       def store
         wedge_config.store
       end
-
-      def before_compile &block
-        wedge_config.before_compile << block unless RUBY_ENGINE == 'opal'
-      end
     end
 
     if RUBY_ENGINE == 'opal'

data/lib/wedge/config.rb

@@ -27,10 +27,10 @@ class Wedge
         settings: IndifferentHash.new,
         tmpl: IndifferentHash.new,
         on_block: [],
+        on_compile: [],
         on_block_count: 0,
         server_methods: [],
         initialize_args: [],
-        before_compile: [],
         plugins: [],
         allowed_client_data: %w(name path method_args method_called store tmpl key cache_assets assets_key assets_url assets_url_with_host)
       }.merge(opts))

data/lib/wedge/plugins/uploader.rb

@@ -2,7 +2,8 @@ class Wedge
   module Plugins
     class Uploader < Component
       name :uploader, :uploader_plugin
-      before_compile do
+
+      on :compile do
         settings = Wedge.config.settings[:uploader]
         store[:settings] = settings.select do |k, v|
           client? ? %w(aws_access_key_id bucket).include?(k) : true

data/lib/wedge/version.rb

@@ -1,3 +1,3 @@
 class Wedge
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

data/spec/wedge/plugins/uploader_spec.rb

@@ -21,8 +21,9 @@ describe Wedge::Plugins::Uploader do
       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'
+        # settings are nil client side as the class on :compile would need to be
+        # ran server side first.
+        expect(settings).to be_nil
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wedge
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - cj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2015-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -283,7 +283,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Components for the Browser and Server