wedge 0.1.18 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d5cba344b9b2d2cb5555b9eaf30132afd576c85
-  data.tar.gz: 3f13558b89e8a9d960b417f7e792b96385e56992
+  metadata.gz: 743fe18c109f6fc6b16b080ed8513410c3a858d7
+  data.tar.gz: 80dd49ce133ea492f59f2984153312677e0b50a0
 SHA512:
-  metadata.gz: 9d5d9ebb80b5aaf32d7bf2fa688176e34b45cfadb39eabdd58c5863351abbd0b5bfc1918ebf98dcd021d47a640742bac0c63fe566b7446fee3e55ea9c79e387b
-  data.tar.gz: 428783e6058d34db64e503538d29851d04274570db989afa3775daf5b8d48148aa74bb2e229eab776102b99b06be09c89e0e35fb8e1e50b9c773834886b1d3bc
+  metadata.gz: eae83cd5489b454594342920755d20fe11d8bc7f6720875276668d022f086c36cb3511949c5173a9a1f75d91ef104caf1ccfd9cc441c5d525d423c4f0c1d9cea
+  data.tar.gz: 37db72b69386af0096898d6370d12d6a2ed6a78c2c97f9d35420d80c831bcc0d91c16ba21465a54a824457c7489d4deacd268a2d4ac1793275f1db35d5e0a7d2

data/TODO.md

@@ -2,3 +2,4 @@
 - Cleanup plugin settings and make a plugin\_setting/settings method
 - Make it so the wedge config isn't passed down to all new components
 - more tests!
+- Think of something better than Wedge.method_called / wedge_method_called

data/lib/wedge.rb

@@ -26,7 +26,7 @@ class Wedge
   class << self
     extend Forwardable
 
-    ATTR_ACCESSORS = %i{scope store config events}
+    ATTR_ACCESSORS = %i{scope store config events method_called}
 
     attr_accessor(*ATTR_ACCESSORS)
 
@@ -101,12 +101,13 @@ class Wedge
     end
 
     %w(store scope).each do |meth|
-      define_method "#{meth}!" do |value|
+      define_method "#{meth}!" do |value, method_called = nil|
         klass = Class.new(self)
         ATTR_ACCESSORS.each do |name|
           klass.instance_variable_set(:"@#{name}", Wedge.instance_variable_get(:"@#{name}").deep_dup)
         end
         klass.instance_variable_set(:"@#{meth}", value.deep_dup)
+        klass.instance_variable_set(:"@method_called", method_called) if meth.to_s == 'scope'
         klass
       end
     end

data/lib/wedge/component.rb

@@ -4,12 +4,17 @@ class Wedge
   class Component
     include Methods
 
+    attr_accessor :wedge_method_called
+
     class << self
       attr_accessor :wedge_on_count
 
       def wedge_new(klass, *args, &block)
         obj = allocate
 
+        # discuss: come up with something better
+        obj.wedge_method_called = klass.method_called
+
         %w(store scope).each do |meth|
           if value = klass.send(meth)
             obj.config.send "#{meth}=", value
@@ -331,13 +336,19 @@ class Wedge
     alias_method :function, :wedge_function
 
     def wedge_from_server?
-      begin; !request.try(:env).include?('HTTP_X_WEDGE_METHOD_REQUEST'); rescue; true end
+      begin
+        !(wedge_method_called == caller_locations(1,1)[0].label)
+      rescue
+        true
+      end
     end
     alias_method :from_server?, :wedge_from_server?
 
+    alias_method :method_called, :wedge_method_called
+
     def wedge_from_client?
       begin
-        caller_locations(1,1)[0].label == request.try(:env)['HTTP_X_WEDGE_METHOD_REQUEST']
+        wedge_method_called == caller_locations(1,1)[0].label
       rescue
         false
       end

data/lib/wedge/middleware.rb

@@ -72,12 +72,12 @@ class Wedge
 
             if method_args == '__wedge_data__' && data
               method_args = [data]
-              res         = Wedge.scope!(scope)[name].send(method_called, *method_args) || ''
+              res         = Wedge.scope!(scope, method_called)[name].send(method_called, *method_args) || ''
             else
               # This used to send things like init, we need a better way to
               # send client config data to the server
               # res = scope.wedge(name, data).send(method_called, *method_args) || ''
-              res = Wedge.scope!(scope)[name].send(method_called, *method_args) || ''
+              res = Wedge.scope!(scope, method_called)[name].send(method_called, *method_args) || ''
             end
 
             # discuss: I don't think we should update the csrf token # every ajax call

data/lib/wedge/version.rb

@@ -1,3 +1,3 @@
 class Wedge
-  VERSION = '0.1.18'
+  VERSION = '0.1.19'
 end

metadata

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