rezource 0.0.6 → 0.0.7

data/lib/rezource.rb

@@ -175,7 +175,7 @@ module Rezource
   def parent_ivar;              parent_class.name.split("::").last.underscore; end
   def parent_ivar_set(value);   instance_variable_set("@#{parent_ivar}", value); value; end
   def parent_ivar_get;          instance_variable_get "@#{parent_ivar}"; end
-  def parent;                   parent_ivar_get; end
+  def parent;                   parent_ivar_get || find_parent; end
 
 
   # -----------
@@ -233,7 +233,7 @@ module Rezource
   def resources_ivar;             resource_class.name.split("::").last.pluralize.underscore; end
   def resources_ivar_set(value);  instance_variable_set("@#{resources_ivar}", value); value; end
   def resources_ivar_get;         instance_variable_get "@#{resources_ivar}"; end
-  def resources;                  resources_ivar_get; end
+  def resources;                  resources_ivar_get || find_resources; end
 
   def before_create(resource); end
   def before_update(resource); end

data/rezource.gemspec

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

data/test/test_rezource.rb

@@ -450,9 +450,15 @@ class RezourceTest < Test::Unit::TestCase
     assert_equal 123, c.resources_ivar_get
   end
 
-  def test_resources
+  def test_resources__without_existing_ivar
     c = SamplesController.new
-    c.expects(:resources_ivar_get)
+    c.expects(:find_resources)
+    c.resources
+  end
+
+  def test_resources__existing_ivar
+    c = SamplesController.new
+    c.expects(:resources_ivar_get).returns 1
     c.resources
   end
 
@@ -480,7 +486,7 @@ class RezourceTest < Test::Unit::TestCase
     assert_equal SampleParent, c.parent_class
   end
 
-  def find_parent
+  def test_find_parent
     c = SamplesController.resource(belongs_to: SampleParent).new
 
     scope = mock()
@@ -511,9 +517,15 @@ class RezourceTest < Test::Unit::TestCase
     assert_equal 123, c.parent_ivar_get
   end
 
-  def parent
+  def test_parent__existing_ivar
+    c = SamplesController.resource(belongs_to: SampleParent).new
+    c.expects(:parent_ivar_get).returns 1
+    c.parent
+  end
+
+  def test_parent__without_existing_ivar
     c = SamplesController.resource(belongs_to: SampleParent).new
-    c.expects(:parent_ivar_get)
+    c.expects(:find_parent)
     c.parent
   end
 
@@ -566,7 +578,24 @@ class RezourceTest < Test::Unit::TestCase
     c.resource_update m, attributes
   end
 
- def test_resource_update__invalid
+  def test_resource_update__valid_and_singleton
+    c = SamplesController.resource(singleton: true).new
+    attributes = {name: "joe"}
+
+    m = mock()
+    e = mock()
+
+    c.expects(:before_update).with(m)
+    m.expects(:errors).returns e
+    e.expects(:any?).returns false
+    m.expects(:update_attributes).with(attributes)
+    c.expects(:after_update).with(m)
+    c.expects(:respond_with).with(*(c.namespace + [m]))
+
+    c.resource_update m, attributes
+  end
+
+  def test_resource_update__invalid
     c = SamplesController.new
     attributes = {name: "joe"}
     m = mock()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rezource
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-21 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies: []
 description: Make Rails restful controller even more simple
 email: jan.zimmek@web.de