nested 0.0.28 → 0.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 530eebbefcb6b3078c4e10362b44bb5f86a18d3a
-  data.tar.gz: 782cad01102d3b0af2baf4f63ce0413228afec18
+  metadata.gz: 238405f893ac3d421bb7847af4cf7e9b7193d60b
+  data.tar.gz: c69edcdd615637531b1b590f3f724d233b366c37
 SHA512:
-  metadata.gz: 7895a40cc84bc8068daea8d4c01b253dea34aac7e84bb0b94519003e9aa5c537261c7cdcfc28df839a8f55c674276076f89a62bf43b44ebde52af096196c591c
-  data.tar.gz: 55aa216d43349384134b38cbe7a6087610ca6508c3621d0075e40c2e1406bd801eac897104721048606f1857fbce6c8f6131e87895cdf82771954f013e19d0cb
+  metadata.gz: bcc98a9dddd3ad23d069cd5247beea3a72e68a2f59907c6362b772952b04e608bd14d77afa592babdc4c026d701202d0c60cdebcc2b549fd5d6135324568f183
+  data.tar.gz: be247d2bb96f5b2b8518b6b2da5070cbdc006c37664b8573818f47e6e9c84e350870907a22b24fee088d6ee1cb48a8d244f563b07039d7a4838aa8c3f8f4acb7

data/lib/nested/app.rb

@@ -2,23 +2,31 @@ module Nested
   class App
     def self.inherited(clazz)
       (class << clazz; self; end).instance_eval do
-        attr_accessor :sinatra
+        attr_accessor :sinatra, :behaviors
       end
       clazz.sinatra = Class.new(Sinatra::Base)
       clazz.instance_variable_set("@config", {})
+      clazz.instance_variable_set("@behaviors", {})
+    end
+
+    def self.behavior(name, &block)
+      @behaviors[name] = block
+      self
     end
 
     def self.child_resource(name, clazz, resource_if_block, model_block, &block)
-       clazz.new(sinatra, name, nil, resource_if_block, model_block)
+       clazz.new(self, sinatra, name, nil, resource_if_block, model_block)
             .tap{|r| r.instance_eval(&(block||Proc.new{ }))}
     end
 
     def self.before(&block)
       sinatra.before(&block)
+      self
     end
 
     def self.after(&block)
       sinatra.after(&block)
+      self
     end
 
     def self.config(opts={})

data/lib/nested/resource.rb

@@ -4,9 +4,10 @@ module Nested
 
     include WithSingleton
 
-    def initialize(sinatra, name, parent, resource_if_block, model_block)
+    def initialize(app, sinatra, name, parent, resource_if_block, model_block)
       raise "resource must be given a name" unless name
 
+      @app = app
       @sinatra = sinatra
       @name = name
       @parent = parent
@@ -32,12 +33,16 @@ module Nested
       @serializer = initialize_serializer_factory
     end
 
+    def behave(name)
+      instance_exec(&@app.behaviors[name])
+    end
+
     def initialize_serializer_factory
       Serializer.new([])
     end
 
     def child_resource(name, clazz, resource_if_block, model_block, &block)
-       clazz.new(@sinatra, name, self, resource_if_block, model_block)
+       clazz.new(@app, @sinatra, name, self, resource_if_block, model_block)
         .tap{|r| r.instance_eval(&(block||Proc.new{ }))}
         .tap{|r| @resources << r}
     end

data/nested.gemspec

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

data/test/app_test.rb

@@ -0,0 +1,55 @@
+require "test/unit"
+require "mocha/setup"
+require "active_support/all"
+require "active_model/errors"
+require "active_record"
+require "nested"
+require "./test/test_helper"
+
+class NestedTest < Test::Unit::TestCase
+
+  include TestHelper
+
+  def app
+    Class.new(Nested::App)
+  end
+
+  def test_inherited
+    a = app
+
+    assert_equal ({}), a.instance_variable_get("@config")
+    assert_equal ({}), a.instance_variable_get("@behaviors")
+    assert_equal true, a.sinatra < Sinatra::Base
+  end
+
+  def test_behavior
+    b = ->{}
+    assert_equal ({:test => b}), app.behavior(:test, &b).instance_variable_get("@behaviors")
+  end
+
+  def test__before
+    a = app
+
+    sinatra = mock
+    sinatra.expects(:before)
+
+    a.instance_variable_set("@sinatra", sinatra)
+    assert_equal a, a.before(&->{})
+  end
+
+  def test__after
+    a = app
+
+    sinatra = mock
+    sinatra.expects(:after)
+
+    a.instance_variable_set("@sinatra", sinatra)
+    assert_equal a, a.after(&->{})
+  end
+
+  def test_config
+    a = app
+    assert_equal ({key1: true}), a.config(key1: true)
+    assert_equal ({key1: true}), a.instance_variable_get("@config")
+  end
+end

data/test/nested_test.rb

@@ -30,6 +30,18 @@ class NestedTest < Test::Unit::TestCase
     assert_equal Nested::Singleton::MODEL_BLOCK, singleton(:project, nil).model_block
     assert_equal Nested::Many::MODEL_BLOCK, many(:projects, nil).model_block
     assert_equal Nested::One::MODEL_BLOCK, many(:projects, nil).one.model_block
+
+    assert_equal true, r.instance_variable_get("@app") <= Nested::App
+  end
+
+  def test_behave
+    r = singleton(:project)
+    a = r.instance_variable_get("@app")
+    a.behavior :mybehavior do
+      get
+    end
+    @sinatra.expects(:get)
+    r.behave :mybehavior
   end
 
   def test_serialize

data/test/test_helper.rb

@@ -1,9 +1,9 @@
 module TestHelper
   def singleton(name, model_block=Nested::PROC_NIL)
-    Nested::Singleton.new(@sinatra, name, nil, Nested::PROC_TRUE, model_block)
+    Nested::Singleton.new(Class.new(Nested::App), @sinatra, name, nil, Nested::PROC_TRUE, model_block)
   end
 
   def many(name, model_block=Nested::PROC_NIL)
-    Nested::Many.new(@sinatra, name, nil, Nested::PROC_TRUE, model_block)
+    Nested::Many.new(Class.new(Nested::App), @sinatra, name, nil, Nested::PROC_TRUE, model_block)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nested
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.29
 platform: ruby
 authors:
 - Jan Zimmek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2014-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -93,6 +93,7 @@ files:
 - lib/nested/with_model_block.rb
 - lib/nested/with_singleton.rb
 - nested.gemspec
+- test/app_test.rb
 - test/nested_test.rb
 - test/serializer_field_test.rb
 - test/serializer_test.rb
@@ -121,6 +122,7 @@ signing_key:
 specification_version: 4
 summary: a nestable dsl to create a restful api
 test_files:
+- test/app_test.rb
 - test/nested_test.rb
 - test/serializer_field_test.rb
 - test/serializer_test.rb