riakrest 0.0.4 → 0.1.0

data/spec/resource/jiak_resource_spec.rb

@@ -1,71 +1,48 @@
 require File.dirname(__FILE__) + '/../spec_helper.rb'
 
 describe "JiakResource default" do
-  F1F2 = JiakDataHash.create(:f1,:f2)
   class Rsrc           # :nodoc:
     include JiakResource
     server        'http://localhost:8002/jiak/'
-    group         'group'
-    data_class    F1F2
-    point_of_view
+    jattr_accessor :f1, :f2
   end
 
   before do
     @server = 'http://localhost:8002/jiak/'
-    @group = 'group'
-    @data_class = F1F2
+    @group = 'rsrc'
+    @schema = JiakSchema.new [:f1,:f2]
+    Rsrc.pov
   end
 
   describe "class creation" do
     it "should respond to" do
-      Rsrc.should respond_to(:server,:group,:data_class)
+      Rsrc.should respond_to(:server,:group)
+      Rsrc.should respond_to(:jattr_reader,:jattr,:jattr_writer,:jattr_accessor)
       Rsrc.should respond_to(:params,:auto_update,:schema,:keys)
-      Rsrc.should respond_to(:allowed,:required,:readable,:writable,:readwrite)
       Rsrc.should respond_to(:point_of_view,:pov,:point_of_view?,:pov?)
       Rsrc.should respond_to(:post,:put,:get,:delete)
       Rsrc.should respond_to(:refresh,:update,:exist?)
       Rsrc.should respond_to(:link,:bi_link,:query,:walk)
-      Rsrc.should respond_to(:new,:copy)
-      Rsrc.should respond_to(:auto_post,:auto_update,:auto_post?,:auto_update?)
-
-      Rsrc.jiak.should respond_to(:server,:uri,:group,:data,:bucket,:auto_update)
+      Rsrc.should respond_to(:auto_post,:auto_update,:auto_manage)
+      Rsrc.should respond_to(:auto_post,:auto_update,:auto_manage?)
+      Rsrc.jiak.should respond_to(:server,:uri,:group,:data,:bucket)
     end
     
     it "should have specified settings" do
       Rsrc.params.should be_empty
       Rsrc.auto_update?.should be false
-      Rsrc.schema.should eql F1F2.schema
+      Rsrc.schema.should eql @schema
       
       Rsrc.jiak.should be_a Struct
       Rsrc.jiak.server.should be_a JiakClient
       Rsrc.jiak.uri.should eql @server
       Rsrc.jiak.group.should eql @group
       Rsrc.jiak.data.should include JiakData
-      Rsrc.jiak.data.should == F1F2
       Rsrc.jiak.bucket.should be_a JiakBucket
       Rsrc.jiak.bucket.name.should eql @group
-      Rsrc.jiak.bucket.data_class.should == F1F2
+      Rsrc.jiak.auto_post.should be false
       Rsrc.jiak.auto_update.should be false
     end
-
-    it "should copy with defaults and overrides" do
-      Rsrc_default = Rsrc.copy
-      Rsrc_default.jiak.uri.should eql @server
-      Rsrc_default.jiak.group.should eql @group
-      Rsrc_default.jiak.data.should == F1F2
-      Rsrc_default.auto_post?.should == Rsrc.auto_post?
-      Rsrc_default.auto_update?.should == Rsrc.auto_update?
-
-      DiffData = JiakDataHash.create
-      Rsrc_diff = Rsrc.copy(:server => 'scopy', :group => 'gcopy',
-                            :data_class => DiffData,
-                            :auto_post => true, :auto_update => true)
-      Rsrc_diff.jiak.uri.should eql 'scopy'
-      Rsrc_diff.jiak.group.should eql 'gcopy'
-      Rsrc_diff.jiak.data.should == DiffData
-      Rsrc_diff.auto_post?.should be true
-      Rsrc_diff.auto_update?.should be true
-    end
   end
 
   describe "instance creation" do
@@ -99,7 +76,6 @@ describe "JiakResource default" do
       @rsrc.jiak.object.should be_a JiakObject
       @rsrc.jiak.object.bucket.should be_a JiakBucket
       @rsrc.jiak.object.bucket.name.should eql @group
-      @rsrc.jiak.object.bucket.data_class.should == F1F2
       
       @rsrc.jiak.auto_update.should be_nil
     end
@@ -107,64 +83,62 @@ describe "JiakResource default" do
 end
 
 describe "JiakResource default class-level auto-post/auto-update" do
-  PersonData = JiakDataHash.create(:name,:age)
-  PersonData.keygen :name
-  class Person           # :nodoc:
+  class People           # :nodoc:
     include JiakResource
     server         'http://localhost:8002/jiak'
     group          'people'
-    data_class     PersonData
+    jattr_accessor  :name, :age
+    keygen { name }
     point_of_view
   end
 
   before do
     @name = 'p default'
-    @p = Person.new(:name => @name, :age => 10)
+    @p = People.new(:name => @name, :age => 10)
   end
 
   it "should create instance without posting" do
-    Person.auto_post?.should be false
+    People.auto_post?.should be false
     
-    Person.exist?(@name).should be false
+    People.exist?(@name).should be false
     @p.local?.should be true
     @p.post
-    Person.get(@name).name.should eql @name
+    People.get(@name).name.should eql @name
     @p.local?.should be false
     @p.delete
   end
 
   it "should change local data without updating" do
     @p.post
-    Person.get(@name).age.should eql 10
+    People.get(@name).age.should eql 10
     @p.age = 12
-    Person.get(@name).age.should eql 10
+    People.get(@name).age.should eql 10
     @p.update
-    Person.get(@name).age.should eql 12
+    People.get(@name).age.should eql 12
     @p.delete
   end
 
   it "should check if resource is local and if it exists on server" do
     name = 'p local'
-    p = Person.new(:name => name)
+    p = People.new(:name => name)
     p.local?.should be true
-    Person.exist?(name).should be false
+    People.exist?(name).should be false
 
     p.post
     p.local?.should be false
-    Person.exist?(name).should be true
+    People.exist?(name).should be true
 
     p.delete
   end
 end
 
 describe "JiakResource class auto-post" do
-  PersonData = JiakDataHash.create(:name,:age)
-  PersonData.keygen :name
-  class Person           # :nodoc:
+  class People           # :nodoc:
     include JiakResource
     server         'http://localhost:8002/jiak'
     group          'people'
-    data_class     PersonData
+    jattr_accessor  :name, :age
+    keygen { name }
     point_of_view
   end
 
@@ -174,21 +148,21 @@ describe "JiakResource class auto-post" do
 
   describe "false" do
     before do
-      Person.auto_post false
+      People.auto_post false
     end
 
     it "should not auto-post, or auto-update a local object" do
-      Person.auto_post?.should be false
+      People.auto_post?.should be false
 
-      Person.exist?(@name).should be false
+      People.exist?(@name).should be false
 
-      Person.auto_update true
-      p = Person.new(:name => @name, :age => 10)
+      People.auto_update true
+      p = People.new(:name => @name, :age => 10)
       p.local?.should be true
       p.age = 12
       p.local?.should be true
 
-      q = Person.new(:name => 'q', :age => 20)
+      q = People.new(:name => 'q', :age => 20)
 
       link_to_local = lambda {p.link(q,'link')}
       link_to_local.should raise_error(JiakResourceException,/local/)
@@ -203,11 +177,11 @@ describe "JiakResource class auto-post" do
       p.post
       p.local?.should be false
       p.age.should be 12
-      Person.get(@name).age.should be 12
-      p.query(Person,'link')[0].should eql q
+      People.get(@name).age.should be 12
+      p.query(People,'link')[0].should eql q
       
       p.age = 10
-      Person.get(@name).age.should be 10
+      People.get(@name).age.should be 10
 
       p.delete
       q.delete
@@ -216,21 +190,21 @@ describe "JiakResource class auto-post" do
 
   describe "true" do
     before do
-      Person.auto_post true
+      People.auto_post true
     end
 
     it "should auto-post a new instance" do
-      Person.auto_post?.should be true
+      People.auto_post?.should be true
       
-      Person.exist?(@name).should be false
-      p = Person.new(:name => @name, :age => 10)
-      Person.get(@name).name.should eql @name
+      People.exist?(@name).should be false
+      p = People.new(:name => @name, :age => 10)
+      People.get(@name).name.should eql @name
       p.delete
     end
 
     it "should reject auto-post of a new instance with an existing key" do
-      p = Person.new(:name => @name, :age => 10)
-      duplicate_key = lambda {Person.new(:name => p.name, :age => 0)}
+      p = People.new(:name => @name, :age => 10)
+      duplicate_key = lambda {People.new(:name => p.name, :age => 0)}
       duplicate_key.should raise_error(JiakResourceException,/exist/)
       p.delete
     end
@@ -238,122 +212,118 @@ describe "JiakResource class auto-post" do
 end
 
 describe "JiakResource class auto-update" do
-  DogData = JiakDataHash.create(:name,:age)
-  DogData.keygen :name
-  class Dog           # :nodoc:
+  class Dogs           # :nodoc:
     include JiakResource
     server         'http://localhost:8002/jiak'
     group          'dogs'
-    data_class     DogData
+    jattr_accessor  :name, :age
+    keygen { name }
     point_of_view
-    auto_post      true
-    auto_update    true
+    auto_manage
   end
 
   before do
     @pname = 'p auto-update'
     @c1name = 'c1 auto-update'
     @c2name = 'c2 auto-update'
-    @p = Dog.new(:name => @pname, :age => 10)
-    @c1 = Dog.new(:name => @cname, :age => 4)
-    @c2 = Dog.new(:name => @cname, :age => 4)
+    @p = Dogs.new(:name => @pname, :age => 10)
+    @c1 = Dogs.new(:name => @cname, :age => 4)
+    @c2 = Dogs.new(:name => @cname, :age => 4)
   end
   
   after do
     @p.delete
     @c1.delete
     @c2.delete
-    Dog.auto_update true
+    Dogs.auto_update true
   end
 
   it "should auto-update local changes" do
-    Dog.get(@pname).age.should eql 10
+    Dogs.get(@pname).age.should eql 10
     @p.age = 12
-    Dog.get(@pname).age.should eql 12
+    Dogs.get(@pname).age.should eql 12
 
-    Dog.get(@pname).name.should eql @pname
+    Dogs.get(@pname).name.should eql @pname
     @p.name = @pname.upcase
-    Dog.get(@pname).name.should eql @pname.upcase
+    Dogs.get(@pname).name.should eql @pname.upcase
 
-    @p.query(Dog,'pup').size.should eql 0
+    @p.query(Dogs,'pup').size.should eql 0
     @p.link(@c1,'pup')
-    @p.query(Dog,'pup').size.should eql 1
+    @p.query(Dogs,'pup').size.should eql 1
 
-    [@c1,@c2].each {|c| c.query(Dog,'sibling').size.should eql 0}
+    [@c1,@c2].each {|c| c.query(Dogs,'sibling').size.should eql 0}
     @c1.bi_link(@c2,'sibling')
-    [@c1,@c2].each {|c| c.query(Dog,'sibling').size.should eql 1}
+    [@c1,@c2].each {|c| c.query(Dogs,'sibling').size.should eql 1}
   end
 
   it "should allow instance level override of class level auto-update true" do
     @p.auto_update?.should be nil
     
-    Dog.get(@pname).age.should eql 10
+    Dogs.get(@pname).age.should eql 10
     @p.auto_update = false
     @p.auto_update?.should be false
     @p.age = 12
-    Dog.get(@pname).age.should eql 10
+    Dogs.get(@pname).age.should eql 10
     @p.update
-    Dog.get(@pname).age.should eql 12
+    Dogs.get(@pname).age.should eql 12
     
-    [@c1,@c2].each {|c| c.query(Dog,'sibling').size.should eql 0}
+    [@c1,@c2].each {|c| c.query(Dogs,'sibling').size.should eql 0}
     @c2.auto_update = false
     @c1.bi_link(@c2,'sibling')
-    @c1.query(Dog,'sibling').size.should eql 1
-    @c2.query(Dog,'sibling').size.should eql 0
+    @c1.query(Dogs,'sibling').size.should eql 1
+    @c2.query(Dogs,'sibling').size.should eql 0
   end
 
   it "should allow instance level override of class level auto-update false" do
-    Dog.auto_update false
+    Dogs.auto_update false
     
-    Dog.get(@pname).age.should eql 10
+    Dogs.get(@pname).age.should eql 10
     @p.auto_update = true
     @p.auto_update?.should be true
     @p.age = 12
-    Dog.get(@pname).age.should eql 12
+    Dogs.get(@pname).age.should eql 12
     
-    [@c1,@c2].each {|c| c.query(Dog,'sibling').size.should eql 0}
+    [@c1,@c2].each {|c| c.query(Dogs,'sibling').size.should eql 0}
     @c2.auto_update = true
     @c1.bi_link(@c2,'sibling')
-    @c1.query(Dog,'sibling').size.should eql 0
-    @c2.query(Dog,'sibling').size.should eql 1
+    @c1.query(Dogs,'sibling').size.should eql 0
+    @c2.query(Dogs,'sibling').size.should eql 1
   end
 
   it "should allow instance level deferring back to class level" do
-    Dog.get(@pname).age.should eql 10
+    Dogs.get(@pname).age.should eql 10
     @p.auto_update = false
     @p.age = 12
-    Dog.get(@pname).age.should eql 10
+    Dogs.get(@pname).age.should eql 10
     @p.update
-    Dog.get(@pname).age.should eql 12
+    Dogs.get(@pname).age.should eql 12
     
     @p.auto_update = nil
     @p.auto_update?.should be nil
     @p.age = 10
-    Dog.get(@pname).age.should eql 10
+    Dogs.get(@pname).age.should eql 10
   end
 
 end
 
 describe "JiakResource simple" do
-  DogData = JiakDataHash.create(:name,:age)
-  DogData.keygen :name
-  class Dog           # :nodoc:
+  class Dogs           # :nodoc:
     include JiakResource
     server         'http://localhost:8002/jiak'
     group          'dogs'
-    data_class     DogData
+    jattr_accessor  :name, :age
+    keygen { name }
     point_of_view
-    auto_post      true
-    auto_update    true
+    auto_manage
   end
 
   before do
     @pname = 'p'
     @c1name = 'c1'
     @c2name = 'c2'
-    @p = Dog.new(:name => @pname, :age => 10)
-    @c1 = Dog.new(:name => @c1name, :age => 4)
-    @c2 = Dog.new(:name => @c2name, :age => 4)
+    @p = Dogs.new(:name => @pname, :age => 10)
+    @c1 = Dogs.new(:name => @c1name, :age => 4)
+    @c2 = Dogs.new(:name => @c2name, :age => 4)
   end
   
   after do
@@ -363,54 +333,51 @@ describe "JiakResource simple" do
   end
 
   it "should do basic interaction and single-step relationships" do
-    Dog.exist?(@pname).should be true
-    Dog.get(@pname).should eql @p
+    Dogs.exist?(@pname).should be true
+    Dogs.get(@pname).should eql @p
 
     @p.name.should eql @pname
     @p.age.should eql 10
     
     @p.age = 11
-    @p = Dog.get(@pname)
+    @p = Dogs.get(@pname)
     @p.age.should eql 11
 
     [@c1,@c2].each {|c| @p.link(c,'pup')}
-    pups = @p.query(Dog,'pup')
+    pups = @p.query(Dogs,'pup')
     pups.size.should eql 2
     same_elements = pups.map {|c| c.name}.same_elements?([@c1.name,@c2.name])
     same_elements.should be true
 
     @c1.bi_link(@c2,'sibling')
-    [@c1,@c2].each {|c| c.query(Dog,'sibling').size.should eql 1}
-    @c1.query(Dog,'sibling')[0].should eql @c2
-    @c2.query(Dog,'sibling')[0].should eql @c1
+    [@c1,@c2].each {|c| c.query(Dogs,'sibling').size.should eql 1}
+    @c1.query(Dogs,'sibling')[0].should eql @c2
+    @c2.query(Dogs,'sibling')[0].should eql @c1
 
     @c1.remove_link(@c2,'sibling')
-    @c1.query(Dog,'sibling').size.should eql 0
-    @c2.query(Dog,'sibling').size.should eql 1
+    @c1.query(Dogs,'sibling').size.should eql 0
+    @c2.query(Dogs,'sibling').size.should eql 1
 
     [@c1,@c2].each {|c| c.link(@p,'parent')}
 
-    @c1.query(Dog).size.should eql 1
-    @c2.query(Dog).size.should eql 2
-    @c2.query(Dog,'sibling').size.should eql 1
-    @c2.query(Dog,'parent').size.should eql 1
+    @c1.query(Dogs).size.should eql 1
+    @c2.query(Dogs).size.should eql 2
+    @c2.query(Dogs,'sibling').size.should eql 1
+    @c2.query(Dogs,'parent').size.should eql 1
   end
 end
 
 describe "JiakResource complex" do
-  PersonData = JiakDataHash.create(:name)
-  PersonData.keygen :name
-
-  class Parent           # :nodoc:
+  class Parents           # :nodoc:
     include JiakResource
-    
     server        'http://localhost:8002/jiak'
-    group         'parents'
-    data_class    PersonData
+    jattr_accessor :name
+    keygen { name }
     point_of_view
   end
 
-  Child = Parent.copy(:group => 'children')
+  Children = Parents.dup
+  Children.group 'children'
 
   it "should do multi-step relationships" do
     # relationships
@@ -431,12 +398,12 @@ describe "JiakResource complex" do
 
     # store data and relationships
     parent_children.each do |pname,cnames|
-      p = Parent.new(:name => pname).post
+      p = Parents.new(:name => pname).post
       cnames.each do |cname|
         begin
-          c = Child.get(cname)
+          c = Children.get(cname)
         rescue
-          c = Child.new(:name => cname)
+          c = Children.new(:name => cname)
         end
         c.link(p,'parent')
         c.put
@@ -445,13 +412,13 @@ describe "JiakResource complex" do
       p.update
     end
 
-    parents  = parent_children.keys.map {|p| Parent.get(p)}
-    children = child_parents.keys.map {|c| Child.get(c)}
+    parents  = parent_children.keys.map {|p| Parents.get(p)}
+    children = child_parents.keys.map {|c| Children.get(c)}
     c0,c1,c2,c3,c4 = children
 
     # siblings
     c0s,c1s,c2s,c3s,c4s = children.map do |c|
-      c.query(Parent,'parent',Child,'child').delete_if{|s| s.eql?(c)}
+      c.query(Parents,'parent',Children,'child').delete_if{|s| s.eql?(c)}
     end
     c0s.size.should eql 2
     c1s.size.should eql 2
@@ -465,21 +432,21 @@ describe "JiakResource complex" do
     same_elements.should be true
 
     # c3's step-sibling's other parent?
-    c3sp = c3.query(Parent,'parent',Child,'child',Parent,'parent')
-    c3.query(Parent,'parent').each {|p| c3sp.delete_if{|sp| p.eql?(sp)}}
+    c3sp = c3.query(Parents,'parent',Children,'child',Parents,'parent')
+    c3.query(Parents,'parent').each {|p| c3sp.delete_if{|sp| p.eql?(sp)}}
     c3sp[0].name.should eql parents[1].name
 
     # add sibling links
-    Child.auto_update true
+    Children.auto_update true
     children.each do |c|
-      siblings = c.query(Parent,'parent',Child,'child').delete_if{|s| s.eql?(c)}
+      siblings = c.query(Parents,'parent',Children,'child').delete_if{|s| s.eql?(c)}
       siblings.each {|s| c.link(s,'sibling')}
     end
-    c0.query(Child,'sibling').size.should eql 2
-    c1.query(Child,'sibling').size.should eql 2
-    c2.query(Child,'sibling').size.should eql 3
-    c3.query(Child,'sibling').size.should eql 1
-    c4.query(Child,'sibling').size.should eql 0
+    c0.query(Children,'sibling').size.should eql 2
+    c1.query(Children,'sibling').size.should eql 2
+    c2.query(Children,'sibling').size.should eql 3
+    c3.query(Children,'sibling').size.should eql 1
+    c4.query(Children,'sibling').size.should eql 0
 
     parents.each {|p| p.delete}
     children.each {|c| c.delete}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: riakrest
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors: 
 - Paul Rogers
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-10 00:00:00 -08:00
+date: 2009-11-17 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,11 +71,11 @@ files:
 - lib/riakrest/core/jiak_bucket.rb
 - lib/riakrest/core/jiak_client.rb
 - lib/riakrest/core/jiak_data.rb
+- lib/riakrest/core/jiak_data_fields.rb
 - lib/riakrest/core/jiak_link.rb
 - lib/riakrest/core/jiak_object.rb
 - lib/riakrest/core/jiak_schema.rb
 - lib/riakrest/core/query_link.rb
-- lib/riakrest/data/jiak_data_hash.rb
 - lib/riakrest/resource/jiak_resource.rb
 - spec/core/exceptions_spec.rb
 - spec/core/jiak_bucket_spec.rb
@@ -84,7 +84,6 @@ files:
 - spec/core/jiak_object_spec.rb
 - spec/core/jiak_schema_spec.rb
 - spec/core/query_link_spec.rb
-- spec/data/jiak_data_hash_spec.rb
 - spec/resource/jiak_resource_spec.rb
 - spec/riakrest_spec.rb
 - spec/spec.opts
@@ -125,7 +124,6 @@ test_files:
 - spec/core/jiak_object_spec.rb
 - spec/core/jiak_schema_spec.rb
 - spec/core/query_link_spec.rb
-- spec/data/jiak_data_hash_spec.rb
 - spec/resource/jiak_resource_spec.rb
 - spec/riakrest_spec.rb
 - spec/spec_helper.rb