rrod 1.0.0.alpha.1 → 1.0.0.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54fca12a0dd242e700196f2689c7e0c10b20f238
-  data.tar.gz: a218efee402307b755b0e681d1872d231d619771
+  metadata.gz: 95ae98b20d5fcbe473c9a350fad0b168d599c4e0
+  data.tar.gz: 454c37cfe3682918c89e72c69e586c30e261dd9c
 SHA512:
-  metadata.gz: e4d07847ef76659034a92ca8dcc2711dd47af332dd8e525a411a226885df9fc6de90542fb155d289a941fd89236d6d14bf7466a852db9f5d347d0c8096584abc
-  data.tar.gz: 48e8aca8812277c91321f8120785d399a2c9d3a8c4cbca7732c24ad8a0cff4abab4a9a75af0f395b1414af69f813c7ebf2f1d88faf9ad46663e9fef84223b9e4
+  metadata.gz: 01f3c763fb67f2b88bb8ca2f1d1d1aa2c6ba240fb1b64f0e419bdc2fac9bf2e60778dff971152e6730dba2f68e40ebe0e851704249bc734944978e4d4fe5c781
+  data.tar.gz: 919a75a3101a49e1bcebc69a822925ce59b39fe5da96c8785665d9a1b9072bbc1d21e58d8da2a122fb210b752da37059a43c19f8c6371bb6f0fee4f7984249c6

data/Gemfile

@@ -2,3 +2,8 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in rrod.gemspec
 gemspec
+
+platforms :mri do
+  gem 'oj'
+end
+

data/README.md

@@ -9,7 +9,7 @@ First, you must make sure you
 [have Riak installed](http://docs.basho.com/riak/latest/quickstart/#Install-Riak).
 These guys have extremely good docs and will usually answer your questions 
 in freenode IRC #riak.  You must also make sure you have 
-[enabled search](http://docs.basho.com/riak/latest/ops/advanced/configs/search/) 
+[enabled Secondary Indexing](http://docs.basho.com/riak/latest/ops/advanced/configs/secondary-index/) 
 for your Riak installation.  
 
 ## Rrod Installation
@@ -36,11 +36,16 @@ This will set you up with an pry environment with `Rrod` loaded.
 Next you will wave your magic wand and enter the following incantations:
 
 ```ruby
-Car = Class.new { include Rrod::Model }
-car = Car.new(wheels: 5, color: 'black', make: 'Jeep')
-car.save
-@car = Car.find_first_by make: 'Jeep'
-@car.wheels # => 5
+class Person
+  attribute :name, String,  index: true
+  attribute :age,  Integer, index: true
+end
+
+hank = Person.new(name: "Hank", age: 40)
+hank.save
+
+@hank = Person.find_by name: "Hank"
+@hank.age # => 40
 ```
 
 `Rrod` lets you have arbitrary attributes on your ruby objects and persist and

data/lib/rrod/all.rb

@@ -15,10 +15,14 @@ require 'rrod/caster'
 require 'rrod/caster/nested_model'
 require 'rrod/model/attribute'
 require 'rrod/model/attribute_methods'
+require 'rrod/model/callbacks'
 require 'rrod/model/collection'
 require 'rrod/model/finders'
 require 'rrod/model/persistence'
 require 'rrod/model/schema'
 require 'rrod/model/serialization'
+require 'rrod/model/timestamps'
+require 'rrod/model/validations'
+require 'rrod/model/validations/associated_validator'
 require 'rrod/model'
 require 'rrod/query'

data/lib/rrod/caster/nested_model.rb

@@ -4,7 +4,7 @@ module Rrod
 
       def rrod_cast(values)
         return if values.nil?
-        Rrod::Model::Collection.new(values.map { |value| model.rrod_cast(value) })
+        Rrod::Model::Collection.new(model, values)
       end
 
       def model

data/lib/rrod/configuration.rb

@@ -38,3 +38,5 @@ module Rrod
     end
   end
 end
+
+I18n.enforce_available_locales = true

data/lib/rrod/model.rb

@@ -5,9 +5,11 @@ module Rrod
     include AttributeMethods
     include Persistence
     include Serialization
-    include ActiveModel::Serializers::JSON
-    include ActiveModel::Serializers::Xml
-    include ActiveModel::Validations
+
+    include Validations
+
+    include Callbacks
+    include Timestamps
 
     module ClassMethods
       include Finders

data/lib/rrod/model/attribute.rb

@@ -10,7 +10,7 @@ module Rrod
         ->(value) { write_attribute name, value }
       end
        
-      attr_accessor :model, :name, :type, :options, :default
+      attr_accessor :model, :name, :type, :options, :default, :index
 
       # @param [Class] The class that is declaring the attribute
       # @param [Symbol] The name of the attribute
@@ -22,11 +22,12 @@ module Rrod
         self.type    = type
         self.default = options.delete(:default)
         self.options = options
+        set_index if options.delete(:index)
       end
 
       # @return [Object] default value or result of call on default value
-      def default
-        @default.respond_to?(:call) ? @default.call : @default
+      def default(instance)
+        @default.respond_to?(:call) ? instance.instance_exec(&@default) : @default
       end
 
       def define
@@ -63,6 +64,10 @@ module Rrod
       def define_writer
         model.send :define_method, "#{name}=", self.class.writer_definition(name)
       end
+      
+      def set_index
+        @index = Index.new(self)
+      end
 
       def apply_validators
         model.validates name, options if options.present?

data/lib/rrod/model/attribute_methods.rb

@@ -1,6 +1,9 @@
 module Rrod
   module Model
     module AttributeMethods
+      extend ActiveSupport::Concern
+
+      attr_accessor :_parent
 
       def initialize(attributes = {})
         @attributes        = {}
@@ -36,7 +39,8 @@ module Rrod
       # @param [Symbol, String] the key of the attribute to read
       # @return the attribute at the given key
       def read_attribute(key)
-        @attributes[key.to_s]
+        @attributes[key.to_s] || 
+          write_attribute(key, self.class.attributes[key.to_sym].try(:default, self))
       end
       alias :[] :read_attribute
 
@@ -44,7 +48,9 @@ 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)
+        @attributes[key.to_s] = self.class.cast_attribute(key, value).tap { |attr| 
+          attr._parent = self if attr.respond_to?(:_parent=) 
+        }
       end
       alias :[]= :write_attribute
 
@@ -70,7 +76,6 @@ module Rrod
       def method_missing(method_id, *args, &block)
         method = method_id.to_s
         return super unless magic_methods.include?(method)
-
         accessor = method.ends_with?('=') ? :writer : :reader
         send "define_singleton_#{accessor}", method.chomp('=')
         send method_id, *args

data/lib/rrod/model/callbacks.rb

@@ -0,0 +1,26 @@
+module Rrod
+  module Model
+    module Callbacks
+      extend ActiveSupport::Concern
+
+      included do
+        extend ActiveModel::Callbacks
+        define_model_callbacks :assignment, :validation, :save, :create, :update
+      end
+
+      def attributes=(*)
+        run_callbacks(:assignment) { super }
+      end
+
+      def valid?
+        run_callbacks(:validation) { super }
+      end
+
+      def save(*)
+        run_callbacks(:create) if new?
+        run_callbacks(:update) if persisted?
+        run_callbacks(:save) { super }
+      end
+    end
+  end
+end

data/lib/rrod/model/collection.rb

@@ -2,13 +2,22 @@ module Rrod
   module Model
     class Collection
       include Enumerable
+      attr_accessor :model
 
-      delegate(*%w[clear count each length size], to: :collection)
+      # explicitly declare the public interface to the underlying collection
+      COLLECTION_INTERFACE = %w[clear count each length size [] first last]
 
-      def initialize(collection=[])
+      delegate(*COLLECTION_INTERFACE, to: :collection)
+
+      def initialize(model, collection=[])
+        self.model      = model
         self.collection = collection
       end
 
+      def _parent=(value)
+        each { |member| member._parent = value }
+      end
+
       def collection=(collection)
         raise InvalidCollectionTypeError.new unless collection.respond_to?(:each)
         collection.map { |member| push member }
@@ -20,15 +29,24 @@ module Rrod
         @collection ||= []
       end
 
+      def build(attributes={})
+        push attributes
+      end
+
       def push(value)
-        raise InvalidMemberTypeError.new unless Rrod::Model === (value)
-        collection.push(value)
+        instance = model.rrod_cast(value)
+        raise InvalidMemberTypeError.new unless model === instance
+        collection.push(instance)
       end
       alias :<< :push
 
       def serializable_hash(*)
         collection.map(&:serializable_hash)
       end
+      
+      def valid?
+        collection.all?(&:valid?)
+      end
 
       InvalidCollectionTypeError = Class.new(StandardError)
       InvalidMemberTypeError     = Class.new(StandardError)

data/lib/rrod/model/finders.rb

@@ -2,8 +2,12 @@ module Rrod
   module Model
     module Finders
 
-      def find(id)
-        find_one(id).tap { |found| raise NotFound.new if found.nil? }
+      def find(*ids)
+        if ids.length == 1
+          find_one(ids.first).tap { |found| raise NotFound.new if found.nil? }
+        else
+          find_many(ids) 
+        end 
       end
 
       def find_one(id)
@@ -13,45 +17,52 @@ module Rrod
         raise e unless e.not_found?
       end
 
-      def find_first_by(attributes)
-        query = Query.new(attributes)
-
-        if query.using_id?
-          find_one(query.id)
-        else
-          docs = search(query)
-          docs.any? ? found(nil, docs.first) : nil
-        end
+      def find_by(query)
+        find_by!(query) 
+      rescue Rrod::Model::NotFound
+        nil
       end
-
-      def find_first_by!(attributes)
-        find_first_by(attributes).tap { |model| raise NotFound.new if model.nil? }
+ 
+      def find_by!(query)
+        return find(query[:id]) if query[:id]
+        find_all_by!(query).first
       end
-
-      def find_all_by(attributes)
-        query = Query.new(attributes)
-        raise ArgumentError.new('Cannot pass id to find_all_by') if query.using_id?
-        search(query).map { |doc| found(nil, doc) }
+      
+      def find_all_by(query)
+        find_all_by!(query)
+      rescue Rrod::Model::NotFound
+        []   
       end
 
       def find_all_by!(attributes)
-        find_all_by(attributes).tap { |models| raise NotFound.new if models.empty? }
+        query = Query.new(attributes)
+        raise ArgumentError.new("Cannot search by id") if query.using_id?
+        search(query).map{ |doc| found(nil, doc) } 
       end
-
-      private
-
+        
+      private 
+  
       def search(query)
-        client.search(bucket_name, query.to_s)['docs']
+        records = client.search(bucket_name, query.to_s)['docs']
+        raise ArgumentError.new("NO RES ULTS") unless records.any?
+        records
+      end
+
+      def find_many(ids)  
+        bucket.get_many(ids).map{|doc| found(doc.first, doc.last.data) }
       end
 
       def found(key, data, robject=nil)
-        new(data).tap { |instance| 
-          instance.id      = key
+        instantiate(key, data).tap { |instance|
           instance.robject = robject
           instance.instance_variable_set(:@persisted, true)
         }
       end
 
+      def instantiate(key, data)
+        new(data).tap { |instance| instance.id = key if key }
+      end
+
     end
 
     NotFound = Class.new(StandardError)

data/lib/rrod/model/persistence.rb

@@ -1,6 +1,8 @@
 module Rrod
   module Model
     module Persistence
+      extend ActiveSupport::Concern # so we can override save
+
       attr_accessor :robject
 
       def persisted?
@@ -12,11 +14,10 @@ module Rrod
       end
       alias :new_record? :new?
 
-      def save(options={})
-        options.fetch(:validate, true) ? 
-          (valid? and persist) : persist
+      def save
+        persist
       end
-
+ 
       def persist
         bucket.enable_index!
         robject.raw_data = to_json

data/lib/rrod/model/schema.rb

@@ -5,7 +5,7 @@ module Rrod
       def attributes
         @attributes ||= {}
       end
-
+     
       def attribute(name, type, options={})
         attributes[name.to_sym] = Attribute.new(self, name, type, options).define
       end
@@ -15,6 +15,10 @@ module Rrod
         attribute ? attribute.cast(value) : value
       end
 
+      def nested_in(parent)
+        define_method(parent) { @_parent }
+      end
+
       def schema?
         attributes.any?
       end
@@ -22,9 +26,11 @@ module Rrod
       def rrod_cast(value)
         return       if value.nil?
         return value if value.is_a?(Rrod::Model)
-        found(nil, value)
+        raise UncastableObjectError.new("#{value.inspect} cannot be rrod_cast") unless Hash === value
+        instantiate(nil, value)
       end
 
-    end
+    end           
+    UncastableObjectError = Class.new(StandardError)
   end
 end

data/lib/rrod/model/serialization.rb

@@ -2,10 +2,19 @@ module Rrod
   module Model
     module Serialization
 
+      def self.included(base)
+        base.send :include, ActiveModel::Serializers::JSON
+        base.send :include, ActiveModel::Serializers::Xml
+      end
+
       def read_attribute_for_serialization(key)
         value = read_attribute(key)
         value.respond_to?(:serializable_hash) ? value.serializable_hash : value
       end
+     
+      def to_json(options={})
+        MultiJson.dump serializable_hash(options) 
+      end
 
     end
   end

data/lib/rrod/model/timestamps.rb

@@ -0,0 +1,19 @@
+module Rrod
+  module Model
+    module Timestamps
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        def timestamps!
+          attribute :created_at, Time, default: -> { Time.now }
+          attribute :updated_at, Time, default: -> { Time.now }
+          before_save :touch
+        end
+      end
+
+      def touch
+        tap { self.updated_at = Time.now }
+      end
+    end
+  end
+end