nested 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55bc0e32ebd2026fff78d9f51d3442b566644d8c
-  data.tar.gz: 258a00be59fff86245c67a1a229de723e94b28e3
+  metadata.gz: 7063cd0594194d6e5f4036d64efe0bc45f6ed93c
+  data.tar.gz: 4c9f893b97e071121ac3b48e8e75e650f72b75ef
 SHA512:
-  metadata.gz: d6059be129db9adc1bd3d1b97590427029c19e15852570875cfa460577fd9421ece0ab5ece5c57edff733f3e11af10d96661278383eddeabf03b716003b772df
-  data.tar.gz: f70c325da379d55242d92ca7cd06f3bf9f2abfc3c86fe87514b01b4d125e5e1edce99e5e1e27b0c2843eb10e0a2d7b0952c830f1389f179aeddb2f2bd4314bee
+  metadata.gz: f5cb48d77b00da7a4289cb9ea3d0ac6da5a78f035cb801d370e2830044bd540e8ecc7eff38f0c9946c299ef258156e0b54570b6d8559c3378c8ecb275864135b
+  data.tar.gz: 84d5537846238eb86517ad44145134a423112b572659689f6eaf28341bce9530e936b34806d1acbbede9ece32b6c4310c711e4e266f26610a1912ba69ad31073

data/lib/nested.rb

@@ -179,28 +179,36 @@ module Nested
     end
 
     def sinatra_exec_get_block(sinatra, &block)
-      sinatra.instance_exec(&block)
+      sinatra_init_data(:get, sinatra, &block)
+      sinatra.instance_exec(*sinatra.instance_variable_get("@__data"), &block)
     end
 
     def sinatra_exec_delete_block(sinatra, &block)
-      sinatra.instance_exec(&block)
+      sinatra_init_data(:delete, sinatra, &block)
+      sinatra.instance_exec(*sinatra.instance_variable_get("@__data"), &block)
     end
 
-    def sinatra_init_data(sinatra, &block)
-      sinatra.request.body.rewind
-      raw_data = HashWithIndifferentAccess.new(JSON.parse(sinatra.request.body.read))
+    def sinatra_init_data(method, sinatra, &block)
+      raw_data = if [:put, :post].include?(method)
+        sinatra.request.body.rewind
+        HashWithIndifferentAccess.new(JSON.parse(sinatra.request.body.read))
+      elsif [:get, :delete].include?(method)
+        sinatra.params
+      else
+        {}
+      end
 
       sinatra.instance_variable_set("@__raw_data", raw_data)
       sinatra.instance_variable_set("@__data", raw_data.values_at(*block.parameters.map(&:last)))
     end
 
     def sinatra_exec_put_block(sinatra, &block)
-      sinatra_init_data(sinatra, &block)
+      sinatra_init_data(:put, sinatra, &block)
       sinatra.instance_exec(*sinatra.instance_variable_get("@__data"), &block)
     end
 
     def sinatra_exec_post_block(sinatra, &block)
-      sinatra_init_data(sinatra, &block)
+      sinatra_init_data(:post, sinatra, &block)
       res = sinatra.instance_exec(*sinatra.instance_variable_get("@__data"), &block)
       sinatra.instance_variable_set("@#{self.instance_variable_name}", res)
     end
@@ -241,7 +249,7 @@ module Nested
     end
 
     def create_sinatra_route(method, action, &block)
-      @actions << {method: method, action: action}
+      @actions << {method: method, action: action, block: block}
 
       resource = self
 
@@ -285,7 +293,8 @@ module Nested
 
     def angular_add_functions(js, resource)
       resource.actions.each do |e|
-        method, action = e.values_at :method, :action
+        method, action, block = e.values_at :method, :action, :block
+        block_args = block.parameters.map(&:last)
 
         fun_name = Nested::JsUtil::generate_function_name(resource, method, action)
 
@@ -300,10 +309,16 @@ module Nested
         when_args = args.map{|a| "$q.when(#{a})"}
 
         if [:get, :delete].include?(method)
+          args << "data" if !block_args.empty?
+
           js << "  impl.#{fun_name} = function(#{args.join(',')}){"
           js << "    var deferred = $q.defer()"
           js << "    $q.all([#{when_args.join(',')}]).then(function(values){"
-          js << "      $http({method: '#{method}', url: '#{route}'})"
+          js << "      $http({"
+          js << "         method: '#{method}', "
+          js << ("         url: '#{route}'" + (block_args.empty? ? "" : ","))
+          js << "         params: data" unless block_args.empty?
+          js << "      })"
           js << "        .success(function(responseData){"
           js << "           deferred[responseData.ok ? 'resolve' : 'reject'](responseData.data)"
           js << "        })"
@@ -324,7 +339,7 @@ module Nested
           js << "    return deferred.promise"
           js << "  }"
         elsif method == :put
-          args << "data" if args.empty?
+          args << "data" if args.empty? || !block_args.empty?
 
           js << "  impl.#{fun_name} = function(#{args.join(',')}){"
           js << "    var deferred = $q.defer()"

data/nested.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name               = "nested"
-  s.version            = "0.0.13"
+  s.version            = "0.0.14"
 
   s.authors = ["Jan Zimmek"]
   s.email = %q{jan.zimmek@web.de}

data/test/nested_test.rb

@@ -294,20 +294,21 @@ class NestedTest < Test::Unit::TestCase
     singleton!
 
     @sinatra.expects(:send).with(:get, "/project")
-    @r.create_sinatra_route(:get, nil) { }
-    assert_equal [{method: :get, action: nil}], @r.actions
+    block = ->{ }
+    @r.create_sinatra_route(:get, nil, &block)
+    assert_equal [{method: :get, action: nil, block: block}], @r.actions
 
     singleton!
 
     @sinatra.expects(:send).with(:post, "/project")
-    @r.create_sinatra_route(:post, nil) { }
-    assert_equal [{method: :post, action: nil}], @r.actions
+    @r.create_sinatra_route(:post, nil, &block)
+    assert_equal [{method: :post, action: nil, block: block}], @r.actions
 
     singleton!
 
     @sinatra.expects(:send).with(:post, "/project/action")
-    @r.create_sinatra_route(:post, :action) { }
-    assert_equal [{method: :post, action: :action}], @r.actions
+    @r.create_sinatra_route(:post, :action, &block)
+    assert_equal [{method: :post, action: :action, block: block}], @r.actions
   end
 
   def test_serializer

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nested
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Jan Zimmek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-20 00:00:00.000000000 Z
+date: 2013-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport