nested 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21375312d61612409b9426ba1a4821957d9a1ce9
-  data.tar.gz: b1aa3ad4f18032944533d1658a5147c1c582d449
+  metadata.gz: ed79d5543f77277d339837d0746299ca1f718593
+  data.tar.gz: 62e5017a5bc17b1196060c7442c6cc16c5992c73
 SHA512:
-  metadata.gz: f46a9615cb616a07499fb0ddb98d614cc90a1ccebdee00fd7fb80191ca7a8ba6b51e6b18e3c5519ebf0fa8b762f0a100cff44453d47ef2c60b01cdeae97e204a
-  data.tar.gz: 84fe7a451d482e183f00eccba73247bab1b8c376379ec35a84cf461b82d7b7f5e59f5f84d1fd947d187d8394d7553b110b0ca3d64077122c0ac509e3e30b263b
+  metadata.gz: a4e50463dd6b7ccaa6d04a6b70ac150b9c4a39c2191f900568630629d7c0a7b59c6fdb7c7bb817ce223bea86c20f7a48fc4ff90a145a3ee3edeabb83b43ab28c
+  data.tar.gz: 77d2faef6c33c182a3a1a7f626fb34269694107a1e7f74dad68b69b7ea232d91f9c370161170558e25927f0b801221ef2b857f73aae832aaa90e760b91ce2532

data/.gitignore

@@ -16,3 +16,4 @@ tmp
 .yardoc
 _yardoc
 doc/
+.DS_Store

data/lib/nested.rb

@@ -61,21 +61,10 @@ module Nested
       @collection == true
     end
 
-    def fetch(&block)
-      @__fetch = block
-    end
-
-    def serialize(&block)
-      @__serialize = block
-    end
-
-    def serialize_object(obj, ctrl)
-      (@__serialize || SERIALIZE).call(obj, ctrl, self)
-    end
-
-    def fetch_object(ctrl)
-      (@__fetch || FETCH).call(self, ctrl)
-    end
+    def before_fetch(&block);   @__before_fetch = block;  end
+    def fetch(&block);          @__fetch        = block;  end
+    def after_fetch(&block);    @__after_fetch  = block;  end
+    def serialize(&block);      @__serialize    = block;  end
 
     def route(args={}, action=nil)
       "".tap do |r|
@@ -157,6 +146,85 @@ module Nested
       (self.parents + [self]).reverse
     end
 
+    def fetcher
+      @__fetch || FETCH
+    end
+
+    def serializer
+      @__serialize || SERIALIZE
+    end
+
+    # --------------------------
+
+    def sinatra_init(sinatra)
+      @__before_fetch.call(self, sinatra) if @__before_fetch
+      resource_obj = fetcher.call(self, sinatra)
+
+      puts "set @#{self.instance_variable_name} to #{resource_obj.inspect} for #{sinatra}"
+      sinatra.instance_variable_set("@#{self.instance_variable_name}", resource_obj)
+
+      @__after_fetch.call(self, sinatra) if @__after_fetch
+    end
+
+    def sinatra_exec_get_block(sinatra, &block)
+      sinatra.instance_exec(self, &block)
+    end
+
+    def sinatra_exec_delete_block(sinatra, &block)
+      sinatra.instance_exec(self, &block)
+    end
+
+    def sinatra_read_json_body(sinatra)
+      sinatra.request.body.rewind
+      HashWithIndifferentAccess.new JSON.parse(sinatra.request.body.read)
+    end
+
+    def sinatra_exec_put_block(sinatra, &block)
+      data = sinatra_read_json_body(sinatra)
+      instance_exec(data, self, &block)
+    end
+
+    def sinatra_exec_post_block(sinatra, &block)
+      data = sinatra_read_json_body(sinatra)
+      res = instance_exec(data, self, &block)
+      sinatra.instance_variable_set("@#{self.instance_variable_name}", res)
+    end
+
+    def sinatra_response_type(response)
+      (response.is_a?(ActiveModel::Errors) || (response.respond_to?(:errors) && !response.errors.empty?)) ? :error : :data
+    end
+
+    def sinatra_response(sinatra)
+      response = sinatra.instance_variable_get("@#{self.instance_variable_name}")
+      response = self.send(:"sinatra_response_create_#{sinatra_response_type(response)}", sinatra, response)
+
+      case response
+        when String then  response
+        else              response.to_json
+      end
+    end
+
+    def sinatra_response_create_data(sinatra, response)
+      data = if response.respond_to?(:to_a)
+        response.to_a.map{|e| serializer.call(e, sinatra, self)}
+      else
+        serializer(response, sinatra, self)
+      end
+
+      {data: data, ok: true}
+    end
+
+    def sinatra_response_create_error(sinatra, response)
+      errors = response.is_a?(ActiveModel::Errors) ? response : response.errors
+
+      data = errors.to_hash.inject({}) do |memo, e|
+        memo[e[0]] = e[1][0]
+        memo
+      end
+
+      {data: data, ok: false}
+    end
+
     def create_sinatra_route(method, action, &block)
       @actions << {method: method, action: action}
 
@@ -169,46 +237,12 @@ module Nested
         content_type :json
 
         resource.self_and_parents.reverse.each do |res|
-          resource_obj = res.fetch_object(self)
-
-          puts "set @#{res.instance_variable_name} to #{resource_obj.inspect} for #{self}"
-          instance_variable_set("@#{res.instance_variable_name}", resource_obj)
-        end
-
-        if [:get, :delete].include?(method)
-          instance_exec(resource, &block)
-        else [:put, :post].include?(method)
-          request.body.rewind
-          data = HashWithIndifferentAccess.new JSON.parse(request.body.read)
-          instance_exec(data, resource, &block) if method == :put
-          instance_variable_set("@#{resource.instance_variable_name}", instance_exec(data, resource, &block)) if method == :post
+          res.sinatra_init(self)
         end
 
-        response = instance_variable_get("@#{resource.instance_variable_name}")
-
-        if response.is_a?(ActiveModel::Errors) || response.respond_to?(:errors) && !response.errors.empty?
-          errors = response.is_a?(ActiveModel::Errors) ? response : response.errors
-
-          data = errors.to_hash.inject({}) do |memo, e|
-            memo[e[0]] = e[1][0]
-            memo
-          end
-
-          response = {data: data, ok: false}
-        else
-          data = if response.respond_to?(:to_a)
-            response.to_a.map{|e| resource.serialize_object(e, self)}
-          else
-            resource.serialize_object(response, self)
-          end
+        resource.send(:"sinatra_exec_#{method}_block", self, &block)
 
-          response = {data: data, ok: true}
-        end
-
-        case response
-          when String then  response
-          else              response.to_json
-        end
+        resource.sinatra_response(self)
       end
     end
   end

data/nested.gemspec

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

data/test/nested_test.rb

@@ -1,6 +1,7 @@
 require "test/unit"
 require "mocha/setup"
 require "active_support/all"
+require "active_model/errors"
 require "nested"
 
 class NestedTest < Test::Unit::TestCase
@@ -76,31 +77,31 @@ class NestedTest < Test::Unit::TestCase
     assert_equal(serialize, @r.instance_variable_get("@__serialize"))
   end
 
-  def test_fetch_object
-    singleton!
+  # def test_fetch_object
+  #   singleton!
 
-    Nested::Resource::FETCH.expects(:call).with(@r, {})
-    @r.fetch_object({})
+  #   Nested::Resource::FETCH.expects(:call).with(@r, {})
+  #   @r.fetch_object({})
 
-    fetch = -> { }
-    @r.fetch &fetch
+  #   fetch = -> { }
+  #   @r.fetch &fetch
 
-    fetch.expects(:call).with(@r, {})
-    @r.fetch_object({})
-  end
+  #   fetch.expects(:call).with(@r, {})
+  #   @r.fetch_object({})
+  # end
 
-  def test_serialize_object
-    singleton!
+  # def test_serialize_object
+  #   singleton!
 
-    Nested::Resource::SERIALIZE.expects(:call).with({name: :joe}, {}, @r)
-    @r.serialize_object({name: :joe}, {})
+  #   Nested::Resource::SERIALIZE.expects(:call).with({name: :joe}, {}, @r)
+  #   @r.serialize_object({name: :joe}, {})
 
-    serialize = -> { }
-    @r.serialize &serialize
+  #   serialize = -> { }
+  #   @r.serialize &serialize
 
-    serialize.expects(:call).with({name: :joe}, {}, @r)
-    @r.serialize_object({name: :joe}, {})
-  end
+  #   serialize.expects(:call).with({name: :joe}, {}, @r)
+  #   @r.serialize_object({name: :joe}, {})
+  # end
 
   def test_route
     # no parent
@@ -335,6 +336,37 @@ class NestedTest < Test::Unit::TestCase
     assert_equal [{method: :post, action: :action}], @r.actions
   end
 
+  def test_fetcher
+    singleton!
+    assert_equal(@r.fetcher, Nested::Resource::FETCH)
+    @r.instance_variable_set("@__fetch", 123)
+    assert_equal(@r.fetcher, 123)
+  end
+
+  def test_serializer
+    singleton!
+    assert_equal(@r.serializer, Nested::Resource::SERIALIZE)
+    @r.instance_variable_set("@__serialize", 123)
+    assert_equal(@r.serializer, 123)
+  end
+
+  # ----
+
+  def test_sinatra_response_type
+    singleton!
+    assert_equal :error, @r.sinatra_response_type(ActiveModel::Errors.new({}))
+
+    obj = OpenStruct.new(errors: ActiveModel::Errors.new({}))
+    assert_equal :data, @r.sinatra_response_type(obj)
+
+    obj.errors.add(:somefield, "some error")
+    assert_equal :error, @r.sinatra_response_type(obj)
+
+    assert_equal :data, @r.sinatra_response_type(nil)
+    assert_equal :data, @r.sinatra_response_type(123)
+  end
+
+
   # ----
 
 

metadata

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