nested 0.0.25 → 0.0.26

data/test/nested_test.rb

@@ -14,39 +14,6 @@ class NestedTest < Test::Unit::TestCase
     @sinatra = mock
   end
 
-  def test_initialize_name
-    assert_raise Nested::NameMissingError do
-      Nested::Resource.new({}, nil, true, false, nil, nil)
-    end
-
-    assert_raise Nested::NameMissingError do
-      Nested::Resource.new({}, nil, false, true, nil, nil)
-    end
-  end
-
-  def test_is_singleton
-    assert_equal true, singleton(:project).singleton?
-    assert_equal false, many(:projects).singleton?
-    assert_equal false, many(:projects).one.singleton?
-  end
-
-  def test_is_collection
-    assert_equal true, many(:projects).collection?
-    assert_equal false, many(:projects).one.collection?
-    assert_equal false, singleton(:project).collection?
-  end
-
-  def test_is_member
-    assert_equal true, many(:projects).one.member?
-    assert_equal false, many(:projects).member?
-    assert_equal false, singleton(:project).member?
-  end
-
-  # def test_init
-  #   init = ->{ }
-  #   assert_equal init, singleton(:project).init(&init).instance_variable_get("@__init")
-  # end
-
   def test_serialize
     serializer = mock()
 
@@ -98,89 +65,86 @@ class NestedTest < Test::Unit::TestCase
 
   def test_singleton
     resource = singleton(:project)
-    resource.expects(:child_resource).with(:statistic, true, false, nil)
+    resource.expects(:child_resource).with(:statistic, Nested::Singleton, Nested::PROC_TRUE, nil)
     resource.singleton(:statistic)
 
     resource = many(:projects)
-    resource.expects(:child_resource).with(:statistic, true, false, nil)
+    resource.expects(:child_resource).with(:statistic, Nested::Singleton, Nested::PROC_TRUE, nil)
     resource.singleton(:statistic)
 
     resource = many(:projects).one
-    resource.expects(:child_resource).with(:statistic, true, false, nil)
+    resource.expects(:child_resource).with(:statistic, Nested::Singleton, Nested::PROC_TRUE, nil)
     resource.singleton(:statistic)
   end
 
   def test_one
     resource = many(:projects)
-    resource.expects(:child_resource).with(:project, false, false, nil)
+    resource.expects(:child_resource).with(:project, Nested::One, Nested::PROC_TRUE, nil)
     resource.one
   end
 
   def test_many
     resource = singleton(:project)
-    resource.expects(:child_resource).with(:statistics, false, true, nil)
+    resource.expects(:child_resource).with(:statistics, Nested::Many, Nested::PROC_TRUE, nil)
     resource.many(:statistics)
 
     resource = singleton(:project).many(:statistics).one
-    resource.expects(:child_resource).with(:entries, false, true, nil)
+    resource.expects(:child_resource).with(:entries, Nested::Many, Nested::PROC_TRUE, nil)
     resource.many(:entries)
   end
 
   def test_get
     resource = singleton(:project)
 
-    resource.expects(:create_sinatra_route).with(:get, nil)
+    resource.expects(:create_sinatra_route).with(:get, nil, Nested::PROC_TRUE)
     resource.get
 
-    resource.expects(:create_sinatra_route).with(:get, :action)
+    resource.expects(:create_sinatra_route).with(:get, :action, Nested::PROC_TRUE)
     resource.get :action
   end
 
   def test_post
     resource = singleton(:project)
 
-    resource.expects(:create_sinatra_route).with(:post, nil)
+    resource.expects(:create_sinatra_route).with(:post, nil, Nested::PROC_TRUE)
     resource.post
 
-    resource.expects(:create_sinatra_route).with(:post, :action)
+    resource.expects(:create_sinatra_route).with(:post, :action, Nested::PROC_TRUE)
     resource.post :action
   end
 
   def test_put
     resource = singleton(:project)
 
-    resource.expects(:create_sinatra_route).with(:put, nil)
+    resource.expects(:create_sinatra_route).with(:put, nil, Nested::PROC_TRUE)
     resource.put
 
-    resource.expects(:create_sinatra_route).with(:put, :action)
+    resource.expects(:create_sinatra_route).with(:put, :action, Nested::PROC_TRUE)
     resource.put :action
   end
 
   def test_delete
     resource = singleton(:project)
 
-    resource.expects(:create_sinatra_route).with(:delete, nil)
+    resource.expects(:create_sinatra_route).with(:delete, nil, Nested::PROC_TRUE)
     resource.delete
 
-    resource.expects(:create_sinatra_route).with(:delete, :action)
+    resource.expects(:create_sinatra_route).with(:delete, :action, Nested::PROC_TRUE)
     resource.delete :action
   end
 
   def test_child_resource
-    resource = singleton(:project).child_resource(:statistic, false, false, nil) { }
+    resource = many(:projects).child_resource(:statistic, Nested::One, Proc.new{ true}, nil) { }
     assert_equal :statistic, resource.name
-    assert_equal false, resource.instance_variable_get("@singleton")
-    assert_equal false, resource.instance_variable_get("@collection")
+    assert_equal true, resource.is_a?(Nested::One)
 
-    resource = singleton(:project).child_resource(:statistic, true, false, nil) { }
+    resource = singleton(:project).child_resource(:statistic, Nested::Singleton, Proc.new{ true}, nil) { }
     assert_equal :statistic, resource.name
-    assert_equal true, resource.instance_variable_get("@singleton")
-    assert_equal false, resource.instance_variable_get("@collection")
+    assert_equal true, resource.is_a?(Nested::Singleton)
 
-    resource = singleton(:project).child_resource(:statistic, false, true, nil) { }
+    resource = singleton(:project).child_resource(:statistic, Nested::Many, Proc.new{ true}, nil) { }
     assert_equal :statistic, resource.name
-    assert_equal false, resource.instance_variable_get("@singleton")
-    assert_equal true, resource.instance_variable_get("@collection")
+    assert_equal true, resource.is_a?(Nested::Many)
   end
 
   def test_instance_variable_name
@@ -278,81 +242,81 @@ class NestedTest < Test::Unit::TestCase
   def test_function_name
     resource = singleton(:project)
 
-    assert_equal "project", Nested::JsUtil::generate_function_name(resource, :get, nil)
-    assert_equal "updateProject", Nested::JsUtil::generate_function_name(resource, :put, nil)
-    assert_equal "createProject", Nested::JsUtil::generate_function_name(resource, :post, nil)
-    assert_equal "destroyProject", Nested::JsUtil::generate_function_name(resource, :delete, nil)
+    assert_equal "project", Nested::Js::generate_function_name(resource, :get, nil)
+    assert_equal "updateProject", Nested::Js::generate_function_name(resource, :put, nil)
+    assert_equal "createProject", Nested::Js::generate_function_name(resource, :post, nil)
+    assert_equal "destroyProject", Nested::Js::generate_function_name(resource, :delete, nil)
 
-    assert_equal "projectAction", Nested::JsUtil::generate_function_name(resource, :get, :action)
-    assert_equal "updateProjectAction", Nested::JsUtil::generate_function_name(resource, :put, :action)
-    assert_equal "createProjectAction", Nested::JsUtil::generate_function_name(resource, :post, :action)
-    assert_equal "destroyProjectAction", Nested::JsUtil::generate_function_name(resource, :delete, :action)
+    assert_equal "projectAction", Nested::Js::generate_function_name(resource, :get, :action)
+    assert_equal "updateProjectAction", Nested::Js::generate_function_name(resource, :put, :action)
+    assert_equal "createProjectAction", Nested::Js::generate_function_name(resource, :post, :action)
+    assert_equal "destroyProjectAction", Nested::Js::generate_function_name(resource, :delete, :action)
 
     resource = many(:projects)
 
-    assert_equal "projects", Nested::JsUtil::generate_function_name(resource, :get, nil)
-    assert_equal "updateProjects", Nested::JsUtil::generate_function_name(resource, :put, nil)
-    assert_equal "createProject", Nested::JsUtil::generate_function_name(resource, :post, nil)
-    assert_equal "destroyProjects", Nested::JsUtil::generate_function_name(resource, :delete, nil)
+    assert_equal "projects", Nested::Js::generate_function_name(resource, :get, nil)
+    assert_equal "updateProjects", Nested::Js::generate_function_name(resource, :put, nil)
+    assert_equal "createProject", Nested::Js::generate_function_name(resource, :post, nil)
+    assert_equal "destroyProjects", Nested::Js::generate_function_name(resource, :delete, nil)
 
-    assert_equal "projectsAction", Nested::JsUtil::generate_function_name(resource, :get, :action)
-    assert_equal "updateProjectsAction", Nested::JsUtil::generate_function_name(resource, :put, :action)
-    assert_equal "createProjectAction", Nested::JsUtil::generate_function_name(resource, :post, :action)
-    assert_equal "destroyProjectsAction", Nested::JsUtil::generate_function_name(resource, :delete, :action)
+    assert_equal "projectsAction", Nested::Js::generate_function_name(resource, :get, :action)
+    assert_equal "updateProjectsAction", Nested::Js::generate_function_name(resource, :put, :action)
+    assert_equal "createProjectAction", Nested::Js::generate_function_name(resource, :post, :action)
+    assert_equal "destroyProjectsAction", Nested::Js::generate_function_name(resource, :delete, :action)
 
     resource = many(:projects).one
 
-    assert_equal "project", Nested::JsUtil::generate_function_name(resource, :get, nil)
-    assert_equal "updateProject", Nested::JsUtil::generate_function_name(resource, :put, nil)
-    assert_equal "createProject", Nested::JsUtil::generate_function_name(resource, :post, nil)
-    assert_equal "destroyProject", Nested::JsUtil::generate_function_name(resource, :delete, nil)
+    assert_equal "project", Nested::Js::generate_function_name(resource, :get, nil)
+    assert_equal "updateProject", Nested::Js::generate_function_name(resource, :put, nil)
+    assert_equal "createProject", Nested::Js::generate_function_name(resource, :post, nil)
+    assert_equal "destroyProject", Nested::Js::generate_function_name(resource, :delete, nil)
 
-    assert_equal "projectAction", Nested::JsUtil::generate_function_name(resource, :get, :action)
-    assert_equal "updateProjectAction", Nested::JsUtil::generate_function_name(resource, :put, :action)
-    assert_equal "createProjectAction", Nested::JsUtil::generate_function_name(resource, :post, :action)
-    assert_equal "destroyProjectAction", Nested::JsUtil::generate_function_name(resource, :delete, :action)
+    assert_equal "projectAction", Nested::Js::generate_function_name(resource, :get, :action)
+    assert_equal "updateProjectAction", Nested::Js::generate_function_name(resource, :put, :action)
+    assert_equal "createProjectAction", Nested::Js::generate_function_name(resource, :post, :action)
+    assert_equal "destroyProjectAction", Nested::Js::generate_function_name(resource, :delete, :action)
 
     resource = singleton(:project).many(:statistics)
 
-    assert_equal "projectStatistics", Nested::JsUtil::generate_function_name(resource, :get, nil)
-    assert_equal "updateProjectStatistics", Nested::JsUtil::generate_function_name(resource, :put, nil)
-    assert_equal "createProjectStatistic", Nested::JsUtil::generate_function_name(resource, :post, nil)
-    assert_equal "destroyProjectStatistics", Nested::JsUtil::generate_function_name(resource, :delete, nil)
+    assert_equal "projectStatistics", Nested::Js::generate_function_name(resource, :get, nil)
+    assert_equal "updateProjectStatistics", Nested::Js::generate_function_name(resource, :put, nil)
+    assert_equal "createProjectStatistic", Nested::Js::generate_function_name(resource, :post, nil)
+    assert_equal "destroyProjectStatistics", Nested::Js::generate_function_name(resource, :delete, nil)
 
-    assert_equal "projectStatisticsAction", Nested::JsUtil::generate_function_name(resource, :get, :action)
-    assert_equal "updateProjectStatisticsAction", Nested::JsUtil::generate_function_name(resource, :put, :action)
-    assert_equal "createProjectStatisticAction", Nested::JsUtil::generate_function_name(resource, :post, :action)
-    assert_equal "destroyProjectStatisticsAction", Nested::JsUtil::generate_function_name(resource, :delete, :action)
+    assert_equal "projectStatisticsAction", Nested::Js::generate_function_name(resource, :get, :action)
+    assert_equal "updateProjectStatisticsAction", Nested::Js::generate_function_name(resource, :put, :action)
+    assert_equal "createProjectStatisticAction", Nested::Js::generate_function_name(resource, :post, :action)
+    assert_equal "destroyProjectStatisticsAction", Nested::Js::generate_function_name(resource, :delete, :action)
 
     resource = singleton(:project).many(:statistics).one
 
-    assert_equal "projectStatistic", Nested::JsUtil::generate_function_name(resource, :get, nil)
-    assert_equal "updateProjectStatistic", Nested::JsUtil::generate_function_name(resource, :put, nil)
-    assert_equal "createProjectStatistic", Nested::JsUtil::generate_function_name(resource, :post, nil)
-    assert_equal "destroyProjectStatistic", Nested::JsUtil::generate_function_name(resource, :delete, nil)
+    assert_equal "projectStatistic", Nested::Js::generate_function_name(resource, :get, nil)
+    assert_equal "updateProjectStatistic", Nested::Js::generate_function_name(resource, :put, nil)
+    assert_equal "createProjectStatistic", Nested::Js::generate_function_name(resource, :post, nil)
+    assert_equal "destroyProjectStatistic", Nested::Js::generate_function_name(resource, :delete, nil)
 
-    assert_equal "projectStatisticAction", Nested::JsUtil::generate_function_name(resource, :get, :action)
-    assert_equal "updateProjectStatisticAction", Nested::JsUtil::generate_function_name(resource, :put, :action)
-    assert_equal "createProjectStatisticAction", Nested::JsUtil::generate_function_name(resource, :post, :action)
-    assert_equal "destroyProjectStatisticAction", Nested::JsUtil::generate_function_name(resource, :delete, :action)
+    assert_equal "projectStatisticAction", Nested::Js::generate_function_name(resource, :get, :action)
+    assert_equal "updateProjectStatisticAction", Nested::Js::generate_function_name(resource, :put, :action)
+    assert_equal "createProjectStatisticAction", Nested::Js::generate_function_name(resource, :post, :action)
+    assert_equal "destroyProjectStatisticAction", Nested::Js::generate_function_name(resource, :delete, :action)
 
     resource = singleton(:project).many(:statistics).one.many(:entries)
-    assert_equal "projectStatisticEntries", Nested::JsUtil::generate_function_name(resource, :get, nil)
+    assert_equal "projectStatisticEntries", Nested::Js::generate_function_name(resource, :get, nil)
   end
 
   def test_function_arguments
-    assert_equal [], Nested::JsUtil.function_arguments(singleton(:project))
-    assert_equal [], Nested::JsUtil.function_arguments(singleton(:project).singleton(:statistic))
-    assert_equal [], Nested::JsUtil.function_arguments(singleton(:project).many(:statistics))
-    assert_equal ["statistic"], Nested::JsUtil.function_arguments(singleton(:project).many(:statistics).one)
-
-    assert_equal [], Nested::JsUtil.function_arguments(many(:projects))
-    assert_equal [], Nested::JsUtil.function_arguments(many(:projects).singleton(:statistic))
-    assert_equal ["project"], Nested::JsUtil.function_arguments(many(:projects).one)
-
-    assert_equal ["project"], Nested::JsUtil.function_arguments(many(:projects).one.singleton(:today))
-    assert_equal [], Nested::JsUtil.function_arguments(many(:projects).singleton(:statistic).singleton(:today))
-    assert_equal ["project", "entry"], Nested::JsUtil.function_arguments(many(:projects).one.many(:entries).one)
+    assert_equal [], Nested::Js.function_arguments(singleton(:project))
+    assert_equal [], Nested::Js.function_arguments(singleton(:project).singleton(:statistic))
+    assert_equal [], Nested::Js.function_arguments(singleton(:project).many(:statistics))
+    assert_equal ["statistic"], Nested::Js.function_arguments(singleton(:project).many(:statistics).one)
+
+    assert_equal [], Nested::Js.function_arguments(many(:projects))
+    assert_equal [], Nested::Js.function_arguments(many(:projects).singleton(:statistic))
+    assert_equal ["project"], Nested::Js.function_arguments(many(:projects).one)
+
+    assert_equal ["project"], Nested::Js.function_arguments(many(:projects).one.singleton(:today))
+    assert_equal [], Nested::Js.function_arguments(many(:projects).singleton(:statistic).singleton(:today))
+    assert_equal ["project", "entry"], Nested::Js.function_arguments(many(:projects).one.many(:entries).one)
   end
 
 end

data/test/test_helper.rb

@@ -1,9 +1,9 @@
 module TestHelper
   def singleton(name)
-    Nested::Resource.new(@sinatra, name, true, false, nil, nil)
+    Nested::Singleton.new(@sinatra, name, nil, Nested::PROC_TRUE, nil)
   end
 
   def many(name)
-    Nested::Resource.new(@sinatra, name, false, true, nil, nil)
+    Nested::Many.new(@sinatra, name, nil, Nested::PROC_TRUE, nil)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nested
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.26
 platform: ruby
 authors:
 - Jan Zimmek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-31 00:00:00.000000000 Z
+date: 2014-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -79,6 +79,18 @@ files:
 - README.md
 - Rakefile
 - lib/nested.rb
+- lib/nested/app.rb
+- lib/nested/integration/angular.rb
+- lib/nested/js.rb
+- lib/nested/many.rb
+- lib/nested/one.rb
+- lib/nested/redirect.rb
+- lib/nested/resource.rb
+- lib/nested/serializer.rb
+- lib/nested/serializer_field.rb
+- lib/nested/singleton.rb
+- lib/nested/with_many.rb
+- lib/nested/with_singleton.rb
 - nested.gemspec
 - test/nested_test.rb
 - test/serializer_field_test.rb