riak-record 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8049ba441ebb2cba652263e32d6df1bd0a828a6
-  data.tar.gz: 1108f270ce115612546ddef1b5311a68a91eb1bc
+  metadata.gz: c748667d6b7ac6f92c336fd09223cd25afc2ed44
+  data.tar.gz: 64f29aeab06a312e6950226069503015872cf7ae
 SHA512:
-  metadata.gz: 2384d583d3f58389b0f85f0324b6303fd7513dced12cbb8d6000545639bd14d748b26d342de605ed2a5cfb2e1dba67201707088ce6ff8e393013e67e90cef871
-  data.tar.gz: 7993a11ea520f4e214f6fa20a3bffe4ac552b6c0eb73d3e918daffb5bb0fecc563599fd6a59284789531407ecfca8971e514a6c0ed5888fcbb7432405a488008
+  metadata.gz: e3871dd3dce55ce6cdc00e7ed8d84cdb35794793be38bdb7b6668c51a6b71d1098ce174c604d85bf45dc30162e69e0b54b6f74b5426cdd45497ff2837740c036
+  data.tar.gz: 08ea68ccb42f6ae571104b9d052b35053914f7674d6c68aec8a7d56d2cdc5679592db0e76703eb6ba84e8be6dd1d25e70b985938e047857138dc88594e18344c

data/README.md

@@ -35,6 +35,7 @@ post.data #> same as record.riak_object.data
 
 post.title = 'My First Post' #> record.riak_object.data['title']=
 post.title #> record.riak_object.data['title']
+post.update_attributes(:title => 'My First Post (revised)')
 
 post.author_id = 99 #> record.riak_object.indexes["author_id_int"] = [99]
 post.category = 'ruby' #> record.riak_object.indexes["category_bin"] = ["ruby"]
@@ -47,9 +48,10 @@ post.reload #> reload the underlying riak_object from the db discarding changes
 Callbacks are called in this order:
 * before_save
 * before_create or before_update
+* ...update_links...
 * ...save...
-* after_save
 * after_create or after_update
+* after_save
 
 
 ### RiakRecord::Finder
@@ -80,7 +82,7 @@ end
 class Comment < RiakRecord::Base
   bucket_name :comments
   data_attribute :comment
-  belongs_to :post, :class_name => 'Post', :foreign_key => "post_id"
+  belongs_to :post, :class_name => 'Post', :foreign_key => "post_id" # optional :link => true to create walkable link on save
 
   index_int_attributes :post_id
 end

data/TODO.md

@@ -1,7 +1,6 @@
 # TODO
 
 * RiakRecord::Base
-  * links_to should create a walkable link
   * id_generator
 * Document methods in classes
 * Validations support

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/lib/riak_record/associations.rb

@@ -1,10 +1,38 @@
 module RiakRecord
   module Associations
 
+    def update_links
+      link_definitions.each_pair do |tag, definition|
+        tag = tag.to_s
+        bucket_name = Object.const_get(definition[:class_name].to_s).bucket_name.to_s
+        key = self.send(definition[:foreign_key].to_sym).first
+
+        # remove links with tag name
+        self.links.delete_if{|l| l.tag.to_s == tag }
+
+        # add link if key is set
+        self.links << Riak::Link.new(bucket_name.to_s, key.to_s, tag.to_s) unless key.nil?
+      end
+    end
+
+    def link_definitions
+      self.class.link_definitions
+    end
+
     module ClassMethods
+      def link_definitions
+        @link_definitions ||= {}
+      end
+
       def belongs_to_riak(association_name, options = {})
         class_name = options[:class_name] ||= association_name.to_s.split("_").collect(&:capitalize).join
         foreign_key = options[:foreign_key] || "#{association_name}_id"
+
+        if options[:link]
+          raise ArgumentError, "link option only available for instances of RiakRecord" unless self < RiakRecord::Base
+          link_definitions[association_name.to_sym] = {:class_name => class_name, :foreign_key => foreign_key}
+        end
+
         method_def = <<-END_OF_RUBY
 
         def #{association_name}

data/lib/riak_record/base.rb

@@ -35,12 +35,19 @@ module RiakRecord
       riak_object.indexes
     end
 
+    def links
+      riak_object.links
+    end
+
     def save
       creating = new_record?
 
       before_save!
       creating ? before_create! : before_update!
+
+      update_links
       riak_object.store(:returnbody => false)
+
       creating ? after_create! : after_update!
       after_save!
 
@@ -84,6 +91,14 @@ module RiakRecord
       self
     end
 
+    def update_attributes(attributes)
+      attributes.each_pair do |k,v|
+        setter = "#{k}=".to_sym
+        self.send(setter, v) if respond_to?(setter)
+      end
+      save
+    end
+
     def self.bucket_name(name = :not_a_name)
       @bucket_name = name.to_s unless name == :not_a_name
       namespace.present? ? namespace_prefixed+@bucket_name : @bucket_name

data/riak-record.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: riak-record 0.3.1 ruby lib
+# stub: riak-record 0.4.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "riak-record"
-  s.version = "0.3.1"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Robert Graff"]
-  s.date = "2014-09-27"
+  s.date = "2014-09-29"
   s.description = "RiakRecord is a thin and immature wrapper around riak-ruby-client. It creates a bucket for\n  each class, provides a simple finder, and creates attribute reader."
   s.email = "robert_graff@yahoo.com"
   s.extra_rdoc_files = [

data/spec/riak_record/associations_spec.rb

@@ -29,7 +29,9 @@ class Comment < RiakRecord::Base
   bucket_name "comments"
   data_attributes :comment
 
-  index_int_attributes :post_id
+  belongs_to :linked_author, :class_name => 'Author', :foreign_key => :author_id, :link => true
+
+  index_int_attributes :post_id, :author_id
 end
 
 describe RiakRecord::Associations do
@@ -64,6 +66,40 @@ describe RiakRecord::Associations do
 
   end
 
+  describe "linked belongs_to" do
+    let(:comment){ Comment.new("1") }
+    let(:author){ Author.new("2") }
+
+    it "should add links" do
+      expect{
+        comment.update_attributes(:author_id => 'a2')
+      }.to change{ comment.links.count }.from(0).to(1)
+    end
+
+    it "should link to the related object" do
+      comment.update_attributes(:author_id => 2)
+
+      link = comment.links.first
+      expect(link.tag).to eq("linked_author")
+      expect(link.key).to eq("2")
+      expect(link.bucket).to eq(Author.bucket_name)
+    end
+
+    it "should update when changed" do
+      comment.update_attributes(:author_id => 2)
+      expect{
+        comment.update_attributes(:author_id => 3)
+      }.to change{comment.links.first.key}.from("2").to("3")
+    end
+
+    it "should delete with nil'd" do
+      comment.update_attributes(:author_id => 2)
+      expect{
+        comment.update_attributes(:author_id => nil)
+      }.to change{comment.links.count}.from(1).to(0)
+    end
+  end
+
   describe "has_many_riak" do
     before :each do
       @comment = Comment.new("1")

data/spec/riak_record/base_spec.rb

@@ -67,6 +67,19 @@ describe RiakRecord::Base do
     end
   end
 
+  describe "update_attributes" do
+    let(:record){ ExampleA.new("1234") }
+    it "should set the values" do
+      expect{
+        record.update_attributes(:attribute1 => 'here')
+      }.to change{ record.attribute1 }.to('here')
+    end
+    it "should call save" do
+      expect(record).to receive(:save)
+      record.update_attributes({})
+    end
+  end
+
   describe "new_record?" do
     let(:record){ ExampleA.new("1") }
     it "should be true for a new record" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riak-record
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Robert Graff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-27 00:00:00.000000000 Z
+date: 2014-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riak-client