couchbase-jruby-model 0.1.1-java → 0.1.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e2345b2e7a2ccbf80591d61f657c9f177ab1e3f
-  data.tar.gz: 5fd51b30461a58bef0e65b16fad0882d8e436246
+  metadata.gz: df785ec9171f5f4ec0ba4e594097301d7eba54de
+  data.tar.gz: d029ce0fd61ad35cdbea0b6f9f6b88c6ebfd752d
 SHA512:
-  metadata.gz: d3cf894a10e755286545346a532fe3a237932b7cc499b9113fe1a145d1eed27d85e8e4bab2014b2a66cc96854aeddd4733007ae3be18748668a582fb6a4df231
-  data.tar.gz: 3524ce4467da9db06adca8d32e739ed1809f920edbb7dc02520da217225516ea1c72d17640b4d2c61564cc874e0c9feb9e1c6b14cd14fdfdf8bd6672132d01df
+  metadata.gz: ad3527b5db0327bb5320e1e1d3e5ffe4ea980a89adccc937ed893b405e3cc513c1ccee02022bd6b2dfa5df30cebf7bbc8fe1b1fb389b776370541e1484706514
+  data.tar.gz: c1180f1e1a60061921dd6c256993a75fdde68224876eefba770bfec45f80beb12fa81be67ec967aadc96e6a1b80370d467672eb882ffed852b415e53ce1da9d9

data/lib/couchbase/model.rb

@@ -393,7 +393,7 @@ module Couchbase
     def self.belongs_to(name, options = {})
       ref = "#{name}_id"
       attribute(ref)
-      assoc = name.to_s.camelize.constantize
+      assoc = (options[:class_name] || name).to_s.camelize.constantize
       define_method(name) do
         assoc.find(self.send(ref))
       end

data/lib/couchbase/model/version.rb

@@ -19,7 +19,7 @@ module Couchbase
 
   class Model
 
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
 
   end
 

data/test/test_model.rb

@@ -41,6 +41,11 @@ class Beer < Couchbase::Model
   belongs_to :brewery
 end
 
+class Wine < Couchbase::Model
+  attribute :name
+  belongs_to :winery, :class_name => :Brewery
+end
+
 class Attachment < Couchbase::Model
   defaults :format => :plain
 end
@@ -59,7 +64,7 @@ class TestModel < MiniTest::Unit::TestCase
   def setup
     @mock = start_mock
     bucket = Couchbase.connect(:hostname => @mock.host, :port => @mock.port)
-    [Post, ValidPost, Brewery, Beer, Attachment].each do |model|
+    [Post, ValidPost, Brewery, Beer, Attachment, Wine].each do |model|
       model.bucket = bucket
     end
   end
@@ -217,6 +222,16 @@ class TestModel < MiniTest::Unit::TestCase
     end
   end
 
+  def test_belongs_to_with_class_name_assoc
+    brewery = Brewery.create(:name => "R Wines")
+    assert_includes Wine.attributes.keys, :winery_id
+    wine = Wine.create(:name => "Classy", :winery_id => brewery.id)
+    assert_respond_to wine, :winery
+    assoc = wine.winery
+    assert_instance_of Brewery, assoc
+    assert_equal "R Wines", assoc.name
+  end
+
   def test_fails_to_delete_model_without_id
     post = Post.new(:title => 'Hello')
     refute post.id

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: couchbase-jruby-model
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: java
 authors:
 - Couchbase
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-12-24 00:00:00.000000000 Z
+date: 2014-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchbase-jruby-client