uorm 0.0.10 → 0.0.11

data/Gemfile.lock

@@ -1,39 +1,32 @@
 PATH
   remote: .
   specs:
-    uorm (0.0.1)
-      activesupport
+    uorm (0.0.11)
       em-synchrony
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.9)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    bson (1.8.0)
-      activesupport
-    bson_ext (1.8.0)
-      bson (~> 1.8.0)
+    bson (1.8.2)
+    bson_ext (1.8.2)
+      bson (~> 1.8.2)
     columnize (0.3.6)
-    debugger (1.2.3)
+    debugger (1.2.4)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.1.1)
-      debugger-ruby_core_source (~> 1.1.5)
+      debugger-ruby_core_source (~> 1.1.7)
     debugger-linecache (1.1.2)
       debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.1.6)
+    debugger-ruby_core_source (1.1.7)
     diff-lcs (1.1.3)
     em-mongo (0.4.3)
       bson (>= 1.1.3)
       eventmachine (>= 0.12.10)
-    em-synchrony (1.0.2)
+    em-synchrony (1.0.3)
       eventmachine (>= 1.0.0.beta.1)
     eventmachine (1.0.0)
     hiredis (0.4.5)
-    i18n (0.6.1)
-    multi_json (1.5.0)
-    oj (2.0.0)
+    rake (10.0.3)
     redis (3.0.2)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
@@ -52,7 +45,7 @@ DEPENDENCIES
   debugger
   em-mongo
   hiredis
-  oj
+  rake
   redis
   rspec
   uorm!

data/lib/uorm.rb

@@ -1,29 +1,32 @@
 require 'uorm/version'
+require 'time'
 
-require 'active_support/core_ext/hash'
+module Uorm
+  autoload :Model,                'uorm/model'
 
-require 'em-synchrony'
+  autoload :CRUD,                 'uorm/crud'
+  module CRUD
+    autoload :PersistanceHelper,  'uorm/crud/persistance_helper'
+    autoload :Callbacks,          'uorm/crud/callbacks'
+  end
 
-module Uorm
-  autoload :Type,             'uorm/type'
-  autoload :Field,            'uorm/field'
-  autoload :FieldCollection,  'uorm/field_collection'
-  autoload :Attributes,       'uorm/attributes'
-  autoload :DSL,              'uorm/dsl'
-  autoload :Model,            'uorm/model'
-  autoload :Callbacks,        'uorm/callbacks'
+  autoload :Attributes,           'uorm/attributes'
+  module Attributes
+    autoload :Field,              'uorm/attributes/field'
+    autoload :FieldCollection,    'uorm/attributes/field_collection'
+    autoload :Type,               'uorm/attributes/type'
+  end
 
-  autoload :Redis,            'uorm/redis'
+  autoload :Redis,                'uorm/redis'
   module Redis
-    autoload :Persistance,    'uorm/redis/persistance'
-    autoload :DB,             'uorm/redis/db'
+    autoload :Persistance,        'uorm/redis/persistance'
   end
 
-  autoload :Mongo,            'uorm/mongo'
+  autoload :Mongo,                'uorm/mongo'
   module Mongo
     require 'uorm/mongo/object_id'
-
-    autoload :DB,             'uorm/mongo/db'
-    autoload :Persistance,    'uorm/mongo/persistance'
+    autoload :Persistance,        'uorm/mongo/persistance'
   end
+
+  autoload :Hash,                 'uorm/hash'
 end

data/lib/uorm/attributes.rb

@@ -1,9 +1,10 @@
 module Uorm
   module Attributes
+
     def self.included base
       base.instance_eval do
         def field name, options
-          fields << Field.new(name, options[:type])
+          fields << ::Uorm::Attributes::Field.new(name, options[:type])
 
           define_method name do
             get_attribute name
@@ -15,7 +16,7 @@ module Uorm
         end
 
         def fields
-          @fields ||= FieldCollection.new
+          @fields ||= ::Uorm::Attributes::FieldCollection.new
         end
       end
     end
@@ -40,7 +41,7 @@ module Uorm
     end
 
     def initialize_attributes values
-      @attributes = {}
+      @attributes = ::Uorm::Hash.new
       update_attributes values
     end
 

data/lib/uorm/attributes/field.rb

@@ -0,0 +1,30 @@
+module Uorm
+  module Attributes
+    class Field
+      attr_reader :name, :type
+
+      def initialize name, type
+        @name = name.to_sym
+        @type = parse_type type
+      end
+
+      def convert value
+        type.convert value if value
+      end
+
+      def as_json value
+        type.as_json value if value
+      end
+
+      private
+
+      def parse_type type
+        if ::Uorm::Attributes::Type.const_defined? type
+          return ::Uorm::Attributes::Type.const_get type
+        else
+          raise Attributes::Type::NotFound.new "Unknown type: #{type}"
+        end
+      end
+    end
+  end
+end

data/lib/uorm/attributes/field_collection.rb

@@ -0,0 +1,9 @@
+module Uorm
+  module Attributes
+    class FieldCollection < ::Array
+      def get name
+        self.find { |f| f.name.to_s == name.to_s }
+      end
+    end
+  end
+end

data/lib/uorm/attributes/type.rb

@@ -0,0 +1,68 @@
+module Uorm
+  module Attributes
+    module Type
+
+      class Integer
+        class << self
+          def convert value
+            value.to_i
+          end
+
+          def as_json value
+            convert value
+          end
+        end
+      end
+
+      class Boolean
+        class << self
+          def convert value
+            value ? true : false
+          end
+
+          def as_json value
+            convert value
+          end
+        end
+      end
+
+      class Float
+        class << self
+          def convert value
+            value.to_f
+          end
+
+          def as_json value
+            convert value
+          end
+        end
+      end
+
+      class Time
+        class << self
+          def convert value
+            ::Time.parse value.to_s
+          rescue
+            ::Time.utc(value.to_i)
+          end
+
+          def as_json value
+            value.to_i
+          end
+        end
+      end
+
+      class String
+        class << self
+          def convert value
+            value.to_s
+          end
+
+          def as_json value
+            convert value
+          end
+        end
+      end
+    end
+  end
+end

data/lib/uorm/crud.rb

@@ -0,0 +1,72 @@
+module Uorm
+  module CRUD
+
+    def self.included base
+      base.class_eval do
+        include ::Uorm::CRUD::PersistanceHelper
+      end
+
+      base.instance_eval do
+        def all args = {}, &block
+          if block_given?
+            persistance.all(args) { |attrs| yield new(attrs) if attrs }
+          else
+            persistance.all(args).map { |attrs| new(attrs) }
+          end
+        end
+
+        def find id, &block
+          if block_given?
+            persistance.find(id) { |attrs| yield new(attrs) if attrs }
+          else
+            new persistance.find(id)
+          end
+        end
+
+        def create attrs, &block
+          obj = new(attrs)
+          (block_given?) ? obj.save(&block) : obj.save
+        end
+      end
+    end
+
+    def save &block
+      if id
+        if block_given?
+          cb = ::Uorm::CRUD::Callbacks::Update.new
+          cb.callback(&block)
+          persistance.update self, cb
+        else
+          persistance.update self
+        end
+      else
+        if block_given?
+          cb = ::Uorm::CRUD::Callbacks::Create.new
+          cb.callback(&block)
+          persistance.create self, cb
+        else
+          persistance.create self
+        end
+      end
+
+      self
+    end
+
+    def update attrs, &block
+      update_attributes attrs
+      if block_given?
+        cb = ::Uorm::CRUD::Callbacks::Update.new
+        cb.callback(&block) if block_given?
+        persistance.update self, cb
+      else
+        persistance.update self
+      end
+      self
+    end
+
+    def delete
+      persistance.delete self
+      self
+    end
+  end
+end

data/lib/uorm/crud/callbacks.rb

@@ -0,0 +1,13 @@
+module Uorm
+  module CRUD
+    module Callbacks
+      class Create
+        include ::EM::Deferrable
+      end
+
+      class Update
+        include ::EM::Deferrable
+      end
+    end
+  end
+end

data/lib/uorm/crud/persistance_helper.rb

@@ -0,0 +1,21 @@
+module Uorm
+  module CRUD
+    module PersistanceHelper
+      def self.included base
+        base.instance_eval do
+          def persistance= value
+            @@persistance = value
+          end
+
+          def persistance
+            @@persistance
+          end
+        end
+      end
+
+      def persistance
+        self.class.persistance
+      end
+    end
+  end
+end

data/lib/uorm/hash.rb

@@ -0,0 +1,13 @@
+module Uorm
+  class Hash < ::Hash
+
+    def except keys
+      self.dup.except! keys
+    end
+
+    def except! keys
+      Array(keys).each{ |key| self.delete(key) }
+      self
+    end
+  end
+end

data/lib/uorm/model.rb

@@ -2,8 +2,8 @@ module Uorm
   module Model
     def self.included base
       base.class_eval do
-        include Uorm::DSL
-        include Uorm::Attributes
+        include ::Uorm::Attributes
+        include ::Uorm::CRUD
       end
     end
   end

data/lib/uorm/mongo.rb

@@ -1,28 +1,18 @@
+require 'em-mongo'
+require 'em-synchrony'
 require 'em-synchrony/em-mongo'
 
 module Uorm
   module Mongo
     def self.included base
       base.instance_eval do
-        field :id, type: Type::ObjectId
-
-        def persistance
-          @persistance ||= Persistance.new self, "#{self.to_s.downcase}s"
-        end
-
-        def collection
-          persistance.collection
-        end
+        field :id, type: :ObjectId
       end
 
       def initialize values = {}
         values[:id] ||= values.delete('_id') || values.delete(:_id)
         super values
       end
-
-      def persistance
-        self.class.persistance
-      end
     end
   end
 end

data/lib/uorm/mongo/object_id.rb

@@ -1,13 +1,15 @@
 module Uorm
-  module Type
-    class ObjectId
-      class << self
-        def convert value
-          BSON::ObjectId value.to_s
-        end
+  module Attributes
+    module Type
+      class ObjectId
+        class << self
+          def convert value
+            ::BSON::ObjectId value.to_s
+          end
 
-        def as_json value
-          value.to_s
+          def as_json value
+            value.to_s
+          end
         end
       end
     end

data/lib/uorm/mongo/persistance.rb

@@ -1,47 +1,48 @@
 module Uorm
   module Mongo
-    class Persistance
-      attr_reader :collection, :model
-
-      def initialize model, collection_name
-        @model = model
-        @collection = DB.collection collection_name
-      end
-
-      def new? object
-        object.id ? false : true
-      end
-
+    class Persistance < Struct.new :model, :client
       def all query = {}, &block
         formatted = format_query(query)
-
         if block_given?
-          collection.afind(formatted).each &block
+          client.afind(formatted).each(&block)
         else
-          collection.find formatted
+          client.find(formatted)
         end
       end
 
       def find id, &block
-        object_id = BSON::ObjectId(id.to_s)
+        object_id = ::BSON::ObjectId(id.to_s)
         if block_given?
-          collection.afirst(_id: object_id).callback &block
+          client.afirst(_id: object_id).callback(&block)
         else
-          collection.first(_id: object_id)
+          client.first(_id: object_id)
         end
       end
 
-      def create object, &block
-        object.id = EM::Synchrony.sync collection.safe_insert(object.attributes.except(:id))
-        yield object if block_given?
+      def create object, cb = nil
+        if cb
+          safe_insert = client.safe_insert attributes_without_id object
+          safe_insert.callback do |object_id|
+            object.id = object_id
+            cb.succeed object
+          end
+        else
+          object.id = ::EM::Synchrony.sync client.safe_insert attributes_without_id object
+        end
       end
 
-      def update object
-        EventMachine::Synchrony.sync collection.safe_update({_id: object.id}, object.attributes.except(:id))
+      def update object, cb = nil
+        if cb
+          safe_update = client.safe_update({ _id: object.id }, attributes_without_id(object))
+          safe_update.callback { cb.succeed object }
+        else
+          ::EM::Synchrony.sync client.safe_update({ _id: object.id }, attributes_without_id(object))
+        end
       end
 
       def delete object
-        collection.remove _id: object.id
+        # wont return a deferrable :/
+        client.remove _id: object.id
       end
 
       private
@@ -49,11 +50,14 @@ module Uorm
       def format_query hash, field = nil
         hash.inject({}) do |memo, (key, value)|
           raise "#{key} field unknown" unless current = field || model.fields.get(key)
-
-          memo[key] = value.is_a?(Hash) ? format_query(value, current) : current.convert(value)
+          memo[key] = value.respond_to?(:to_hash) ? format_query(value.to_hash, current) : current.convert(value)
           memo
         end
       end
+
+      def attributes_without_id object
+        object.attributes.except(:id)
+      end
     end
   end
 end