couch_potato 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8581d86c34cc798e082cfd4e02bb53f042fa7751
-  data.tar.gz: b2f1a4996b05581a519706cb0efb10db43aa942f
+  metadata.gz: 838a4fbf0f5af5fd3306a1cc2284d9c077397de1
+  data.tar.gz: 76306355648a9447a58c24b0e802f2f79bcc86e7
 SHA512:
-  metadata.gz: aead6991131097d92510834befd4feb441c477a761472d43b72c3422cf0371eef35c7acfd52e2711483812c48f508ed706a72c8194875d00ebdd233fad774c38
-  data.tar.gz: f15626c508f062dbfd99d6672e0ed94b8364ec85d5030b77935656a42e3d27923b9bbc2e2bb8028f8f985de8c3967e55ff7754a410d97844f6836b410b8d05ba
+  metadata.gz: a914b059c4f92b4141eea0b8278d308a8101ba555f76db3fd83d11020f03605bc71553a99889cc0260da27b7421c347c7ebbca76bafe30843b18e2cd852ef9df
+  data.tar.gz: 13eae7928a7a82b7102cf2d9b47da78352d225e01b28192015a18b63232afe410c29b220ed8012aabe8b1f09ab2dc33a90d5bbf120a129dd3516eb3944de9a5c

data/lib/couch_potato/persistence/properties.rb

@@ -25,7 +25,7 @@ module CouchPotato
         end
 
         def find_property(name)
-          @hash[name]
+          @hash[name] || @clazz.superclass.properties.find_property(name)
         end
 
         # XXX

data/lib/couch_potato/version.rb

@@ -1,4 +1,4 @@
 module CouchPotato
-  VERSION = '1.6.3'
+  VERSION = '1.6.4'
   RSPEC_VERSION = '3.0.0'
 end

data/spec/unit/attributes_spec.rb

@@ -6,54 +6,61 @@ class Branch
   property :leafs
 end
 
-
 class Plant
   include CouchPotato::Persistence
   property :leaf_count
-  property :typed_leaf_count, :type => Fixnum
-  property :typed_leaf_size,  :type => Float
-  property :branch, :type => Branch
+  property :typed_leaf_count, type: Fixnum
+  property :typed_leaf_size,  type: Float
+  property :branch, type: Branch
+end
+
+class SpecialPlant < Plant
 end
 
 
-describe "attributes" do
+describe 'attributes' do
   context 'attributes=' do
-    it "should assign the attributes" do
+    it 'assigns the attributes' do
       plant = Plant.new
-      plant.attributes = {:leaf_count => 1}
+      plant.attributes = {leaf_count: 1}
+
       expect(plant.leaf_count).to eq(1)
     end
 
-    it "should assign the attributes via []=" do
+    it 'assigns the attributes via []=' do
       plant = Plant.new
       plant[:leaf_count] = 1
+
       expect(plant.leaf_count).to eq(1)
     end
   end
 
-  context "attributes" do
-    it "should return the attributes" do
-      plant = Plant.new(:leaf_count => 1)
-      expect(plant.attributes).to eq({'leaf_count' => 1, 'created_at' => nil, 'updated_at' => nil,
-                                  'typed_leaf_count' => nil, 'typed_leaf_size' => nil, 'branch' => nil})
+  context 'attributes' do
+    it 'returns the attributes' do
+      plant = Plant.new(leaf_count: 1)
+
+      expect(plant.attributes).to eq('leaf_count' => 1, 'created_at' => nil,
+        'updated_at' => nil, 'typed_leaf_count' => nil,
+        'typed_leaf_size' => nil, 'branch' => nil)
     end
 
-    it "should return the attributes via [symbol]" do
-      plant = Plant.new(:leaf_count => 1)
+    it 'returns the attributes via [symbol]' do
+      plant = Plant.new(leaf_count: 1)
+
       expect(plant.attributes[:leaf_count]).to eql(plant[:leaf_count])
       expect(plant.attributes[:leaf_count]).to eql(1)
     end
 
-    it "should return the attributes via [string]" do
+    it 'returns the attributes via [string]' do
       plant = Plant.new(leaf_count: 1)
 
-      expect(plant.attributes["leaf_count"]).to eql(plant[:leaf_count])
-      expect(plant.attributes["leaf_count"]).to eql(1)
+      expect(plant.attributes['leaf_count']).to eql(plant[:leaf_count])
+      expect(plant.attributes['leaf_count']).to eql(1)
     end
   end
 
-  context "has_key?" do
-    it 'should respond to has_key?' do
+  context 'has_key?' do
+    it 'responds to has_key?' do
       plant = Plant.new(leaf_count: 1)
 
       expect(plant.has_key?(:leaf_count)).to be_truthy
@@ -61,20 +68,21 @@ describe "attributes" do
   end
 
   # useful when loading models from custom views
-  context "accessing ghost attributes" do
-    it "should allow me to access attributes that are in the couchdb document but not defined as a property" do
-      plant = Plant.json_create({JSON.create_id => "Plant", "color" => "red", "leaf_count" => 1})
+  context 'accessing ghost attributes' do
+    it 'allows me to access attributes that are in the couchdb document but not defined as a property' do
+      plant = Plant.json_create(JSON.create_id => 'Plant', 'color' => 'red', 'leaf_count' => 1)
+
       expect(plant.color).to eq('red')
     end
 
-    it "should raise a no method error when trying to read attributes that are not in the document" do
-      plant = Plant.json_create({JSON.create_id => "Plant", "leaf_count" => 1})
+    it 'raises a no method error when trying to read attributes that are not in the document' do
+      plant = Plant.json_create(JSON.create_id => 'Plant', 'leaf_count' => 1)
       expect do
         plant.length
       end.to raise_error(NoMethodError)
     end
 
-    it "should raise a no method error if the document hasn't been loaded from the database" do
+    it "raises a no method error if the document hasn't been loaded from the database" do
       plant = Plant.new
       expect do
         plant.length
@@ -82,6 +90,14 @@ describe "attributes" do
     end
   end
 
+  context 'inherited attributes' do
+    it 'returns inherited attributes' do
+      plant = SpecialPlant.new _document: {leaf_count: 1}
+
+      expect(plant.leaf_count).to eq(1)
+    end
+  end
+
   context 'typed attributes' do
     before(:each) do
       @plant = Plant.new
@@ -89,90 +105,106 @@ describe "attributes" do
 
     context 'nested objects' do
       it 'assigns the attributes of nested objects' do
-        expect(Plant.new(:branch => {:leafs => 3}).branch.leafs).to eq(3)
+        expect(Plant.new(branch: {leafs: 3}).branch.leafs).to eq(3)
       end
     end
 
-    describe "fixnum" do
+    describe 'fixnum' do
       it 'rounds a float to a fixnum' do
         @plant.typed_leaf_count = 4.5
+
         expect(@plant.typed_leaf_count).to eq(5)
       end
 
-      it "converts a string into a fixnum" do
+      it 'converts a string into a fixnum' do
         @plant.typed_leaf_count = '4'
+
         expect(@plant.typed_leaf_count).to eq(4)
       end
 
-      it "converts a string into a negative fixnum" do
+      it 'converts a string into a negative fixnum' do
         @plant.typed_leaf_count = '-4'
+
         expect(@plant.typed_leaf_count).to eq(-4)
       end
 
-      it "leaves a fixnum as is" do
+      it 'leaves a fixnum as is' do
         @plant.typed_leaf_count = 4
+
         expect(@plant.typed_leaf_count).to eq(4)
       end
 
-      it "leaves nil as is" do
+      it 'leaves nil as is' do
         @plant.typed_leaf_count = nil
+
         expect(@plant.typed_leaf_count).to be_nil
       end
 
-      it "sets the attributes to zero if a string given" do
+      it 'sets the attributes to zero if a string given' do
         @plant.typed_leaf_count = 'x'
+
         expect(@plant.typed_leaf_count).to eq(0)
       end
 
-      it "parses numbers out of a string" do
+      it 'parses numbers out of a string' do
         @plant.typed_leaf_count = 'x123'
+
         expect(@plant.typed_leaf_count).to eq(123)
       end
 
-      it "set the attributes to nil if given a blank string" do
+      it 'sets the attributes to nil if given a blank string' do
         @plant.typed_leaf_count = ''
+
         expect(@plant.typed_leaf_count).to be_nil
       end
     end
 
-    context "float" do
-      it "should convert a number in a string with a decimal place" do
+    context 'float' do
+      it 'converts a number in a string with a decimal place' do
         @plant.typed_leaf_size = '0.5001'
+
         expect(@plant.typed_leaf_size).to eq(0.5001)
       end
 
-      it "should convert a number in a string without a decimal place" do
+      it 'converts a number in a string without a decimal place' do
         @plant.typed_leaf_size = '5'
+
         expect(@plant.typed_leaf_size).to eq(5.0)
       end
 
-      it "should convert a negative number in a string" do
+      it 'converts a negative number in a string' do
         @plant.typed_leaf_size = '-5.0'
+
         expect(@plant.typed_leaf_size).to eq(-5.0)
       end
 
-      it "should leave a float as it is" do
+      it 'leaves a float as it is' do
         @plant.typed_leaf_size = 0.5
+
         expect(@plant.typed_leaf_size).to eq(0.5)
       end
 
-      it "should leave nil as is" do
+      it 'leaves nil as is' do
         @plant.typed_leaf_size = nil
+
         expect(@plant.typed_leaf_size).to be_nil
       end
 
-      it "should set the attributes to zero if a string given" do
+      it 'sets the attributes to zero if a string given' do
         @plant.typed_leaf_size = 'x'
+
         expect(@plant.typed_leaf_size).to eq(0)
       end
 
-      it "should parse numbers out of a string" do
+      it 'parses numbers out of a string' do
         @plant.typed_leaf_size = 'x00.123'
+
         expect(@plant.typed_leaf_size).to eq(0.123)
       end
 
-      it "should set the attributes to nil if given a blank string" do
+      it 'sets the attributes to nil if given a blank string' do
         @plant.typed_leaf_size = ''
+
         expect(@plant.typed_leaf_size).to be_nil
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: couch_potato
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - Alexander Lang