rrod 1.0.0.alpha.3.1 → 1.0.0.alpha.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4101da6fbe1ed4d4fcf254abdb4acca0728b46d1
-  data.tar.gz: 76b4c7882a859a31c3e79c981b8455a42c03f4a0
+  metadata.gz: 73a47a1b2feaa5f8ca345afab9b483e5755d710b
+  data.tar.gz: 000a4429b93fe6a68df919e3a1295abc27a71a0b
 SHA512:
-  metadata.gz: 8990dc1552f05775cf3e61af09eed0515fdafb5ea19a2eb0c4294fc4090f487e148cb4cdac07778ceccc417a98233f753d1b91362dd5ff565dc66cef683a2e28
-  data.tar.gz: 92366b857caa0a345965b9befaf882f5d57d0896315cdf15e0ec6b54727994dc2c45d31a34dafe48812557c4ce6f3a7f83402f0cc3c88569164809ab87f2daf3
+  metadata.gz: 4267a72e45678a7f60eb7fbd756d7fd88bdfb552a38eb596dcf768d59aa99dece04a297151e31d6dfb70f59c5d231b1d635e2dec80278724d2c930b8ea6ba4d7
+  data.tar.gz: 74ef9e7c3c8d511e080fbc143c62ff6dc9813902cbe427bb6de738672d213ab0eb58f305fa6202f9ba6f33a815ddc9162917d387403e99d6474d084368ce40de

data/lib/rrod/caster/nested_model.rb

@@ -2,12 +2,12 @@ module Rrod
   class Caster
     module NestedModel
 
-      def rrod_cast(values)
+      def rrod_cast(values, model)
         return if values.nil?
-        Rrod::Model::Collection.new(model, values)
+        Rrod::Model::Collection.new(model, model_class, values)
       end
 
-      def model
+      def model_class
         first
       end
 

data/lib/rrod/caster.rb

@@ -5,14 +5,14 @@ module Rrod
       @casting = casting
     end
 
-    def rrod_cast(value)
+    def rrod_cast(value, instance=nil)
       return if value.nil?
       @casting.(value)
     end
             
     module Boolean
       extend self
-      def rrod_cast(value)
+      def rrod_cast(value, instance=nil)
         [nil, false, 'false', 0, '0'].include?(value) ? false : true
       end
     end

data/lib/rrod/model/attribute.rb

@@ -9,6 +9,10 @@ module Rrod
       def self.writer_definition(name)
         ->(value) { write_attribute name, value }
       end
+
+      def self.presence_definition(name)
+        -> { self[name].present? }
+      end
        
       attr_accessor :model, :name, :type, :options, :default, :index
 
@@ -20,7 +24,7 @@ module Rrod
         self.model   = model
         self.name    = name.to_sym
         self.type    = type
-        self.default = options.delete(:default)
+        self.default = options.delete(:default) || nested_default
         self.options = options
         set_index if options.delete(:index)
       end
@@ -33,13 +37,14 @@ module Rrod
       def define
         define_reader
         define_writer
+        define_presence
         apply_validators
         self
       end
 
-      def cast(value)
+      def cast(value, instance)
         caster = type.respond_to?(:rrod_cast) ? type : rrod_caster
-        caster ? caster.rrod_cast(value) : value
+        caster ? caster.rrod_cast(value, instance) : value
       end
 
       private
@@ -57,6 +62,12 @@ module Rrod
         type.is_a?(Array) and type.first.ancestors.include?(Rrod::Model)
       end
 
+      def nested_default
+        return unless nested_model?
+        model_class = type.model_class
+        -> { Rrod::Model::Collection.new(self, model_class) }
+      end
+
       def define_reader
         model.send :define_method, name, self.class.reader_definition(name)
       end
@@ -64,6 +75,10 @@ module Rrod
       def define_writer
         model.send :define_method, "#{name}=", self.class.writer_definition(name)
       end
+
+      def define_presence
+        model.send :define_method, "#{name}?", self.class.presence_definition(name)
+      end
       
       def set_index
         @index = Index.new(self)

data/lib/rrod/model/attribute_methods.rb

@@ -48,9 +48,7 @@ module Rrod
       # @param [Symbol, String] the key of the attribute to write
       # @param the value to write to attributes
       def write_attribute(key, value)
-        @attributes[key.to_s] = self.class.cast_attribute(key, value).tap { |attr| 
-          attr._parent = self if attr.respond_to?(:_parent=) 
-        }
+        @attributes[key.to_s] = self.class.cast_attribute(key, value, self)
       end
       alias :[]= :write_attribute
 

data/lib/rrod/model/collection.rb

@@ -2,14 +2,15 @@ module Rrod
   module Model
     class Collection
       include Enumerable
-      attr_accessor :model
+      attr_accessor :parent, :model
 
       # explicitly declare the public interface to the underlying collection
-      COLLECTION_INTERFACE = %w[clear count each length size [] first last]
+      COLLECTION_INTERFACE = %w[clear count each length size [] first last empty?]
 
       delegate(*COLLECTION_INTERFACE, to: :collection)
 
-      def initialize(model, collection=[])
+      def initialize(parent, model, collection=[])
+        self.parent     = parent
         self.model      = model
         self.collection = collection
       end
@@ -34,7 +35,7 @@ module Rrod
       end
 
       def push(value)
-        instance = model.rrod_cast(value)
+        instance = model.rrod_cast(value, parent)
         raise InvalidMemberTypeError.new unless model === instance
         collection.push(instance)
       end

data/lib/rrod/model/persistence.rb

@@ -17,6 +17,12 @@ module Rrod
       def save
         persist
       end
+
+      def update(attributes)
+        self.attributes = attributes
+        save
+      end
+      alias :update_attributes :update
  
       def persist
         bucket.enable_index!

data/lib/rrod/model/schema.rb

@@ -10,9 +10,9 @@ module Rrod
         attributes[name.to_sym] = Attribute.new(self, name, type, options).define
       end
 
-      def cast_attribute(key, value)
+      def cast_attribute(key, value, instance)
         attribute = attributes[key.to_sym]
-        attribute ? attribute.cast(value) : value
+        attribute ? attribute.cast(value, instance) : value
       end
 
       def nested_in(parent)
@@ -23,11 +23,19 @@ module Rrod
         attributes.any?
       end
 
-      def rrod_cast(value)
-        return       if value.nil?
-        return value if value.is_a?(Rrod::Model)
-        raise UncastableObjectError.new("#{value.inspect} cannot be rrod_cast") unless Hash === value
-        instantiate(nil, value)
+      def rrod_cast(value, parent=nil)
+        return if value.nil?
+
+        cast_model = case value
+        when Rrod::Model
+          value
+        when Hash
+          instantiate(nil, value)
+        else
+          raise UncastableObjectError.new("#{value.inspect} cannot be rrod_cast") unless Hash === value
+        end
+
+        cast_model.tap { |m| m._parent = parent }
       end
 
     end           

data/lib/rrod/test_server/rspec.rb

@@ -13,12 +13,12 @@ module Rrod
         end
 
         ::RSpec.configure do |config|
-          config.before(:each, :integration => true) do
+          config.before(:each, :integration => true) do |example|
             if Rrod::TestServer.fatal
               fail "Test server not working: #{Rrod::TestServer.fatal}" 
             end
 
-            if ::RSpec.current_example.metadata[:test_server] == false
+            if example.metadata[:test_server] == false
               Rrod::TestServer.stop
             else
               Rrod::TestServer.create unless Rrod::TestServer.exist?
@@ -30,12 +30,12 @@ module Rrod
             end
           end
 
-          config.after(:each, :integration => true) do
+          config.after(:each, :integration => true) do |example|
             # i really don't understand this...
             # well the 'example' needs to be accessed another way, Rspec.current_example.
             if !Rrod::TestServer.fatal && 
               Rrod::TestServer.started? && 
-              ::RSpec.current_example.metadata[:test_server] != false
+              example.metadata[:test_server] != false
               Rrod::TestServer.drop
             end
           end

data/lib/rrod/version.rb

@@ -1,2 +1,2 @@
 Rrod = Module.new unless defined? Rrod
-Rrod::VERSION = '1.0.0.alpha.3.1'
+Rrod::VERSION = '1.0.0.alpha.4'

data/rrod.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "pry",  "~> 0.9"
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rspec",   "~> 2.14"
+  spec.add_development_dependency "rspec",   "~> 3.1.0"
 
   spec.add_development_dependency "rake"
 end

data/spec/rrod/model/attribute_spec.rb

@@ -73,12 +73,18 @@ describe Rrod::Model::Attribute do
         expect(instance).to respond_to("#{name}=")
       end
     end
+
+    describe "presence" do
+      it "checks for presence" do
+        expect(instance).to respond_to("#{name}?")
+      end
+    end
   end
 
   describe "casting" do
     it "will use the types rrod_cast method if available" do
       type = Class.new {
-        def self.rrod_cast(value)
+        def self.rrod_cast(value, instance)
           value.to_s.upcase
         end
       }

data/spec/rrod/model/collection_spec.rb

@@ -2,8 +2,12 @@ require 'spec_helper'
 require 'support/models/person'
 
 describe Rrod::Model::Collection do
+  let(:owner)      { Person.new }
   let(:array)      { [Pet.new] }
-  let(:collection) { described_class.new(Pet, array) }
+  let(:collection) {
+    owner.pets = array
+    owner.pets
+  }
 
   describe "initialization" do
     it "takes a collection" do
@@ -11,7 +15,7 @@ describe Rrod::Model::Collection do
     end
 
     it "defaults to an empty collection" do
-      expect(described_class.new(Pet).collection).to be_an Array
+      expect(described_class.new(owner, Pet).collection).to be_an Array
     end
 
     describe "#build" do 
@@ -25,6 +29,11 @@ describe Rrod::Model::Collection do
         object = collection.build(name: 'Molle')
         expect(object).to be_a(Pet)
       end
+
+      it "assigns the _parent to the built object" do
+        pet = collection.build(name: 'Molle')
+        expect(pet.owner).to eq(owner)
+      end
     end
 
 
@@ -43,7 +52,7 @@ describe Rrod::Model::Collection do
         end
 
         it "clears the collection" do
-          collection = described_class.new(Pet)
+          collection = described_class.new(owner, Pet)
           begin; collection.collection = array; rescue; end
           expect(collection.collection).to be_empty
         end

data/spec/rrod/model/persistence_spec.rb

@@ -39,5 +39,18 @@ describe Rrod::Model::Persistence, integration: true do
         expect(instance.id).not_to be_nil
       end
     end
+
+    describe "update models" do
+      before :each do
+        instance.save
+      end
+
+      it "updates attributes" do 
+        instance.update wheels: 6
+        expect(instance.wheels).to eq 6
+      end
+
+
+    end
   end
 end

data/spec/rrod/model/schema_spec.rb

@@ -64,6 +64,14 @@ describe Rrod::Model::Schema do
       expect(instance.pets.first.owner).to eq(instance)
     end
 
+    it "returns an empty collection when referencing an empty association" do
+      expect(instance.pets).to be_empty
+    end
+
+    it "allows building a nested model on an empty collection" do
+      expect { instance.pets.build(name: 'Molle') }.not_to raise_error
+    end
+
   end
 
   it "raises an UncastableObjectError if object is not castable" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rrod
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.3.1
+  version: 1.0.0.alpha.4
 platform: ruby
 authors:
 - Adam Hunter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-14 00:00:00.000000000 Z
+date: 2015-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riak-client
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement