nested 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 166d069fbce22175e7ed0212140ae0c269484e68
-  data.tar.gz: 64e7a84b68750c89bc54ecc827c4ef35d2c48ede
+  metadata.gz: 27598f96705c4a9b647048ef032121d310fd3646
+  data.tar.gz: cd15467a29499cb6bd1c648a00f0c6455c567372
 SHA512:
-  metadata.gz: 4f7c3dd136ccbfc5a716d68033a87db8a141939779f58b732661e541aaae3a69b29b9952002d4c8106eb0966da4e4e0f9517dfccbd0415262f022cf2875b9a07
-  data.tar.gz: 3ba0d93d82c54adfb4c56b4e09a873c211a95705cacb8bdcf7c396f3625931178255ff2c7800c4081fadf226c859def7b84077d98599f6381544174409b9f5e3
+  metadata.gz: 30ec9775adca2477d587ddead84a29416d7c71f7782a1a5ae66953f4be1ebb58ecab7d5762f34c150b69c7cd598f0fa3257b099bcae821d17a623d79d2bcf46b
+  data.tar.gz: e751dbad8babce5e2fc565293eb6b9351d36d9a7a9745b9c81a3e7a861f2b2c6c2935de72c05822263ea16df5eba85a25f85be643fdbe539f1fc470239715263

data/Gemfile

@@ -3,5 +3,6 @@ ruby "2.0.0"
 source 'https://rubygems.org'
 
 gem "activesupport"
+gem "activerecord"
 gem "mocha"
 gem "json"

data/Gemfile.lock

@@ -1,14 +1,26 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.0.0)
+    activemodel (4.0.1)
+      activesupport (= 4.0.1)
+      builder (~> 3.1.0)
+    activerecord (4.0.1)
+      activemodel (= 4.0.1)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.1)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.1)
       i18n (~> 0.6, >= 0.6.4)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
+    arel (4.0.1)
     atomic (1.1.14)
+    builder (3.1.4)
     i18n (0.6.5)
+    json (1.8.1)
     metaclass (0.0.1)
     minitest (4.7.5)
     mocha (0.14.0)
@@ -22,5 +34,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activerecord
   activesupport
+  json
   mocha

data/lib/nested.rb

@@ -15,18 +15,18 @@ module Nested
   end
 
   class Resource
-    FETCH =  ->(resource, ctrl) do
-      raise "implement fetch for resource #{resource.name}"  unless resource.parent
-      raise "implement fetch for singleton #{resource.name}" if resource.singleton?
+    FETCH = -> do
+      raise "implement fetch for resource #{@__resource.name}"  unless @__resource.parent
+      raise "implement fetch for singleton #{@__resource.name}" if @__resource.singleton?
 
-      parent_resource = resource.parent
-      parent_obj = ctrl.instance_variable_get("@#{parent_resource.instance_variable_name}")
+      parent_resource = @__resource.parent
+      parent_obj = instance_variable_get("@#{parent_resource.instance_variable_name}")
 
-      if resource.name
-        scope = parent_obj.send(resource.name.to_s.pluralize.to_sym)
-        resource.collection? ? scope : scope.where(id: ctrl.params["#{resource.name.to_s.singularize}_id"]).first
+      if @__resource.name
+        scope = parent_obj.send(@__resource.name.to_s.pluralize.to_sym)
+        @__resource.collection? ? scope : scope.where(id: params["#{@__resource.name.to_s.singularize}_id"]).first
       else
-        parent_obj.where(id: ctrl.params["#{parent_resource.name.to_s.singularize}_id"]).first
+        parent_obj.where(id: params["#{parent_resource.name.to_s.singularize}_id"]).first
       end
     end
 
@@ -44,14 +44,14 @@ module Nested
       @resources = []
       @actions = []
 
-      init &->(resource) do
-        fetched = FETCH.call(resource, self)
+      init &-> do
+        fetched = instance_exec(&FETCH)
 
-        puts "set @#{resource.instance_variable_name} to #{fetched.inspect} for #{self}"
-        self.instance_variable_set("@#{resource.instance_variable_name}", fetched)
+        puts "set @#{@__resource.instance_variable_name} to #{fetched.inspect} for #{self}"
+        self.instance_variable_set("@#{@__resource.instance_variable_name}", fetched)
       end
 
-      serialize &->(obj, resource) do
+      serialize &->(obj) do
         obj
       end
     end
@@ -71,8 +71,8 @@ module Nested
     def serialize(*args, &block)
       raise "pass either *args or &block" if args.empty? && !block
 
-      @__serialize = ->(obj, resource) do
-        obj = self.instance_exec(obj, resource, &block) if block
+      @__serialize = ->(obj) do
+        obj = self.instance_exec(obj, &block) if block
         obj = obj.attributes if obj.is_a?(ActiveRecord::Base)
         obj = obj.symbolize_keys.slice(*args) unless args.empty?
         obj
@@ -166,30 +166,32 @@ module Nested
     # --------------------------
 
     def sinatra_init(sinatra)
-      sinatra.instance_exec(self, &@__init)
+      sinatra.instance_variable_set("@__resource", self)
+      sinatra.instance_exec(&@__init)
     end
 
     def sinatra_exec_get_block(sinatra, &block)
-      sinatra.instance_exec(self, &block)
+      sinatra.instance_exec(&block)
     end
 
     def sinatra_exec_delete_block(sinatra, &block)
-      sinatra.instance_exec(self, &block)
+      sinatra.instance_exec(&block)
     end
 
-    def sinatra_read_json_body(sinatra)
+    def sinatra_init_data(sinatra, &block)
       sinatra.request.body.rewind
-      HashWithIndifferentAccess.new JSON.parse(sinatra.request.body.read)
+      @__raw_data = HashWithIndifferentAccess.new(JSON.parse(sinatra.request.body.read))
+      @__data = @__raw_data.values_at(*block.parameters.map(&:last))
     end
 
     def sinatra_exec_put_block(sinatra, &block)
-      data = sinatra_read_json_body(sinatra)
-      sinatra.instance_exec(data, self, &block)
+      sinatra_init_data(sinatra, &block)
+      sinatra.instance_exec(*@__data, &block)
     end
 
     def sinatra_exec_post_block(sinatra, &block)
-      data = sinatra_read_json_body(sinatra)
-      res = sinatra.instance_exec(data, self, &block)
+      sinatra_init_data(sinatra, &block)
+      res = sinatra.instance_exec(*@__data, &block)
       sinatra.instance_variable_set("@#{self.instance_variable_name}", res)
     end
 
@@ -209,9 +211,9 @@ module Nested
 
     def sinatra_response_create_data(sinatra, response)
       data = if response && collection?
-        response.to_a.map{|e| sinatra.instance_exec(e, self, &@__serialize) }
+        response.to_a.map{|e| sinatra.instance_exec(e, &@__serialize) }
       else
-        sinatra.instance_exec(response, self, &@__serialize)
+        sinatra.instance_exec(response, &@__serialize)
       end
 
       {data: data, ok: true}

data/nested.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name               = "nested"
-  s.version            = "0.0.8"
+  s.version            = "0.0.9"
 
   s.authors = ["Jan Zimmek"]
   s.email = %q{jan.zimmek@web.de}
@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency "activesupport"
+  s.add_runtime_dependency "activerecord"
   s.add_runtime_dependency "sinatra"
   s.add_runtime_dependency "json"
 end

data/test/nested_test.rb

@@ -74,7 +74,7 @@ class NestedTest < Test::Unit::TestCase
 
     @r.serialize :name
 
-    assert_equal({name: :joe}, @r.instance_variable_get("@__serialize").call({name: :joe, test: true}, {}))
+    assert_equal({name: :joe}, @r.instance_variable_get("@__serialize").call({name: :joe, test: true}))
   end
 
   def test_route
@@ -314,10 +314,10 @@ class NestedTest < Test::Unit::TestCase
     singleton!
     # assert_equal(@r.serializer, Nested::Resource::SERIALIZE)
 
-    ser = ->(obj, resource) { [obj, resource] }
+    ser = ->(obj) { obj }
     @r.serialize &ser
 
-    assert_equal [1, @r], @r.instance_variable_get("@__serialize").call(1, @r)
+    assert_equal 1, @r.instance_variable_get("@__serialize").call(1)
   end
 
   # ----

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nested
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Jan Zimmek
@@ -24,6 +24,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement