splash 0.0.1.alpha → 0.0.1.beta

data/lib/splash/password.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'digest/sha1'
 require 'securerandom'
 
@@ -28,4 +29,4 @@ class Splash::Password
   end
   
   
-end
+end

data/lib/splash/persister.rb

@@ -1,66 +1,26 @@
-class Splash::Persister
+# -*- encoding : utf-8 -*-
+module Splash
+  module Persister
   
-  RAW_TYPES=[String,NilClass,Numeric,FalseClass,TrueClass,BSON::ObjectID,Time]
-  
-  attr_reader :persisted_class
-  
-  def read(value)
-    return value
-  end
-  
-  def write(value)
-    return value
-  end
-  
-  def self.raw?(value)
-    return true if RAW_TYPES.any? do |type| value.class == type end
-    if value.kind_of?(Hash) || value.kind_of?(Array)
-      value.each do |key,val|
-        return false unless self.raw?(key)
-        return false unless self.raw?(val)
-      end
-      return true
-    elsif value.kind_of?(Array)
-      value.each do |sub|
-        return false unless self.raw?(sub)
+    RAW_TYPES=[String,NilClass,Numeric,FalseClass,TrueClass,BSON::ObjectId,Time,BSON::Code,BSON::DBRef,Symbol]
+    
+    def self.raw?(value)
+      return true if RAW_TYPES.any? do |type| value.class == type end
+      if value.kind_of?(Hash) || value.kind_of?(Array)
+        value.each do |key,val|
+          return false unless self.raw?(key)
+          return false unless self.raw?(val)
+        end
+        return true
+      elsif value.kind_of?(Array)
+        value.each do |sub|
+          return false unless self.raw?(sub)
+        end
+        return true
       end
-      return true
-    end
-    return false
-  end
-  
-  def initialize(config={},&block)
-    self.config= default_config.merge(config)
-    if block_given?
-      instance_eval &block
+      return false
     end
+
   end
-  
-  def persist_class(klass)
-    @persisted_class=klass
-  end
-  
-  def persisted_class()
-    @persisted_class
-  end
-  
-  def bind_to(klass)
-    
-  end
-  
-  def default(object)
-    @config[:default]
-  end
-  
-  def missing(object)
-    nil
-  end
-  
-  protected
-    def default_config
-      {:default=>nil,:read=>nil,:write=>nil}
-    end
-    def config=(conf)
-      @config=conf
-    end
-end
+
+end

data/lib/splash/query_interface.rb

@@ -1,7 +1,8 @@
+# -*- encoding : utf-8 -*-
 module Splash
   module QueryInterface
     
-    %w(preload nopreload limit conditions fieldmode with_id extend_scoped sort).each do |fct|
+    %w(preload nopreload limit conditions fieldmode with_id extend_scoped sort writeback where).each do |fct|
       class_eval <<-CODE, __FILE__,__LINE__
 def #{fct}(*args,&block)
   query(query_#{fct}(*args,&block))
@@ -36,7 +37,7 @@ CODE
       end
       
       def query_conditions(conditions)
-        return {:selector=>conditions}
+        return {:query=>conditions}
       end
       
       def query_default_attributes(values)
@@ -44,13 +45,22 @@ CODE
       end
       
       def query_with_id(*args)
-        ids=args.flatten.map &:to_bson
+        ids=args.flatten.map do |id|
+          if id.kind_of? BSON::ObjectId
+            id
+          elsif id.kind_of? Hash and id['$oid']
+            BSON::ObjectId(id['$oid'])
+          else
+            BSON::ObjectId(id)
+          end
+        end
         if ids.size == 1
-          return {:selector=>{"_id"=>ids.first}}
+          return {:query=>{"_id"=>ids.first}}
         else
-          return {:selector=>{"_id"=>{"$in"=>ids}}}
+          return {:query=>{"_id"=>{"$in"=>ids}}}
         end
       end
+      
       def query_fieldmode(type)
         return {:fieldmode=>type}
       end
@@ -80,5 +90,17 @@ CODE
         
         return {:extend_scoped => modules}
       end
+      
+      def query_where(conditions)
+        return (query_conditions(conditions) + query_writeback(conditions))
+      end
+      
+      def query_writeback(args=nil,&block)
+        if args
+          return {:writeback=>Splash::Writeback.cast(args)}
+        elsif block_given?
+          return {:writeback=>Splash::Writeback.cast(block)}
+        end
+      end
   end
-end
+end

data/lib/splash/saveable.rb

@@ -1,77 +1,28 @@
+# -*- encoding : utf-8 -*-
 module Splash
   module Saveable
-    class Persister < Splash::Persister
-      def write(value)
-        return nil if value.nil?
-        return value._id
-      end
-      
-      def read(value)
-        return nil if value.nil?
-        return persisted_class.with_id(value).first
-      end
-    end
-    
-    class MultiPersister < Splash::Persister
-      def write(value)
-        return nil if value.nil?
-        return BSON::DBRef.new(value.class.collection.name,value._id)
-      end
-      
-      def read(value)
-        return nil if value.nil?
-        return @persisted_class.namespace.dereference(value)
-      end
-    end
-    
-    class EmbedPersister < Splash::Persister
-      def write(value)
-        return nil if value.nil?
-        return Saveable.wrap(value)
-      end
-      
-      def read(value)
-        return nil if value.nil?
-        return Saveable.load(value,persisted_class)
-      end
-    end
-    
-    self.persister= MultiPersister
-    
     
     UPPERCASE=65..90
     
     class << self
-      def included(base)
-        base.extend(ClassMethods)
-        base.persister=Splash::Saveable::Persister
-      end
       
       def unwrap(keys)
         keys.inject({}) do |hsh,(key,val)| hsh[key]=val unless UPPERCASE.include? key[0]; hsh end
       end
       
       def wrap(object)
-        object.to_saveable.merge("Type"=>Saveable.get_class_hierachie(object.class).map(&:to_s))
+        object.to_raw.merge("Type"=>Saveable.get_class_hierachie(object.class).map(&:to_s))
       end
       
       def load(keys,klass=Hash)
         if keys.nil?
           keys={}
         end
+        #puts klass
         if keys["Type"]
           klass = Kernel.eval(keys["Type"].first)
         end
-        k = klass.new()
-        k.attributes.load_raw(self.unwrap(keys))
-        return k
-      end
-      
-      def to_saveable(obj)
-        if obj.respond_to? :to_saveable
-          return obj.to_saveable
-        end
-        return obj
+        return klass.from_raw(self.unwrap(keys))
       end
       
       def get_class_hierachie(klass)
@@ -87,55 +38,5 @@ module Splash
       end
     end
     
-    def namespace
-      self.class.namespace
-    end
-    
-    def storable_id
-      self.attributes["_id"]
-    end
-    
-    def store!
-      self.attributes["_id"]=self.class.store!(self)
-      return self
-    end
-    
-    def remove!
-      return self.class.collection.remove('_id'=>self._id)
-    end
-    
-    def stored?
-      return !storable_id.nil?
-    end
-    
-    def find_self
-      self.class.with_id(self.storable_id)
-    end
-    
-    module ClassMethods
-      
-      def store!(object)
-        return self.collection.save(
-          Saveable.wrap(object)
-        );
-      end
-      
-      def namespace
-        @namespace ||= Splash::NameSpace.default
-      end
-      
-      def collection
-        @collection ||= namespace.collection_for(self)
-      end
-      
-      def [](*args)
-        a=args.flatten
-        if a.length == 1 
-          return with_id(a).first
-        else
-          return with_id(a).finish!
-        end
-      end
-    end
   end
-end
+end

data/lib/splash/scope.rb

@@ -1,8 +1,8 @@
-require "delegate"
+# -*- encoding : utf-8 -*-
 module Splash
   class Scope
     
-    autoload :Options,Splash::DIR+"/splash/scope/options"
+    autoload_all File.join(File.dirname(__FILE__),'scope')
     
     include Splash::ActsAsScope
 
@@ -24,6 +24,19 @@ module Splash
       super
     end
     
+    def new(*args,&block)
+      obj = scope_root.new(*args,&block)
+      @scope_options.writeback(obj)
+      return obj
+    end
+    
+    def create(*args,&block)
+      obj = scope_root.new(*args,&block)
+      @scope_options.writeback(obj)
+      obj.store!
+      return obj
+    end
+    
     private
       def load_scope_extensions!
         unless @scope_extesions_loaded
@@ -43,4 +56,4 @@ module Splash
       end
     
   end
-end
+end

data/lib/splash/scope/map_reduce_interface.rb

@@ -0,0 +1,33 @@
+module Splash
+  
+  module Scope::MapReduceInterface
+    
+    MAP_REDUCE_QUERY_KEYS = [:query,:sort,:limit].to_set
+    
+    
+    def map_reduce(map=nil,reduce=nil,opts={},&block)
+      if MAP_REDUCE_QUERY_KEYS.any?{|k| opts.key? k }
+        return self.query(opts.only(MAP_REDUCE_QUERY_KEYS)).map_reduce(map,reduce,opts.except(MAP_REDUCE_QUERY_KEYS))
+      end
+        
+      if( opts[:out] || opts[:keeptemp] )
+        return Splash::MapReduce::Permanent.from_callback(self.method(:_map_reduce), map, reduce, opts, &block)
+      else
+        return Splash::MapReduce::Temporary.from_callback(self.method(:_map_reduce), map, reduce, opts, &block)
+      end
+    end
+    
+    protected
+    
+    def _map_reduce(map,reduce,opts)
+      opts = opts.dup
+      query, options = self.find_options
+      opts[:query] = query
+      
+      return self.scope_root.collection.map_reduce(map,reduce,opts)
+    end
+    
+  end
+  
+  
+end

data/lib/splash/scope/options.rb

@@ -1,6 +1,7 @@
+# -*- encoding : utf-8 -*-
 class Splash::Scope::Options
   
-  OPTION_KEYS=[:fields,:limit,:sort]
+  OPTION_KEYS=[:fields,:limit,:sort, :skip]
   def self.cast(hsh)
     if hsh.kind_of? self
       return hsh
@@ -9,7 +10,7 @@ class Splash::Scope::Options
   end
   
   def initialize(hsh=nil)
-    @options={:selector=>{},:fieldmode=>:exclude,:extend_scoped=>[],:limit=>0,:sort=>[]}
+    @options={:query=>nil,:fieldmode=>:exclude,:extend_scoped=>[],:limit=>nil,:sort=>[],:writeback=>nil,:skip=>nil}
     @options.merge! hsh if hsh
     @options.freeze
   end
@@ -20,11 +21,13 @@ class Splash::Scope::Options
   
   def self.merge_options(a,b)
     return {
-      :selector => a[:selector].deep_merge(b[:selector]),
+      :query => Splash::Matcher.and(a[:query],b[:query]),
       :fieldmode => (b[:fieldmode] || a[:fieldmode]),
       :extend_scoped => (a[:extend_scoped] + (b[:extend_scoped] || [])),
       :limit => (b[:limit] || a[:limit]),
-      :sort => (a[:sort] + (b[:sort] || []))
+      :sort => (a[:sort] + (b[:sort] || [])),
+      :writeback => Splash::Writeback.merge(a[:writeback],b[:writeback]),
+      :skip => (b[:skip] || a[:skip])
     }
   end
   
@@ -37,7 +40,14 @@ class Splash::Scope::Options
   end
   
   def selector
-    @options[:selector]
+    @options[:query] || Splash::Matcher.new
+  end
+  
+  def writeback(to)
+    if @options[:writeback]
+      @options[:writeback].writeback(to)
+    end
+    return to
   end
   
   def options
@@ -55,4 +65,4 @@ class Splash::Scope::Options
     end
     return opt
   end
-end
+end

data/lib/splash/updated_at.rb

@@ -0,0 +1,15 @@
+module Splash
+  
+  class UpdatedAt < Time
+    
+    def self.initial_value
+      return Time.now
+    end
+    
+    def self.before_write(value)
+      return Time.now
+    end
+    
+  end
+  
+end

data/lib/splash/validates.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require "set"
 module Splash::Validates
   
@@ -15,6 +16,7 @@ module Splash::Validates
   
   class << self
     def included(base)
+      super(base)
       base.instance_eval do
         merged_inheritable_attr :validators,Set.new
       end
@@ -72,4 +74,4 @@ module Splash::Validates
   end
   
   
-end
+end