uorm 0.0.10 → 0.0.11

data/spec/spec_helper.rb

@@ -1,26 +1,14 @@
+Bundler.require
+
 require 'support/be_collection_of'
+require 'support/test_persistance'
+
 require 'uorm'
 
-# monkey patch to wrap all tests in the reactor
-module RSpec
-  module Core
-    class ExampleGroup
-      class << self
-        alias_method :run_alias, :run
-        def run(reporter)
-          if EM.reactor_running?
-            run_alias reporter
-          else
-            out = nil
-            EM.synchrony do
-              out = run_alias reporter
-              EM.next_tick { EM.stop }
-            end
-            out
-          end
-        end
-      end
-    end
+def fail_in sec
+  fail_proc = proc do
+    raise "Callback not reached in #{Time.now-start} sec"
+    EM.stop
   end
+  EM.add_timer sec, fail_proc
 end
-

data/spec/support/test_persistance.rb

@@ -0,0 +1,51 @@
+module Uorm
+  module Mongo
+    class TestPerstistance
+      class << self
+        def collection= value
+          @@collection=value
+        end
+
+        def collection
+          @@collection
+        end
+
+        def flush
+          @@collection = []
+        end
+
+        def size
+          @@collection.size
+        end
+      end
+
+      def initialize *args
+        self.class.flush
+      end
+
+      def all options = {}
+        self.class.collection.map(&:attributes)
+      end
+
+      def find id
+        find = self.class.collection.select { |object| object.id == id }.first
+        find ? find.attributes : {}
+      end
+
+      def create object
+        self.class.collection << object
+      end
+
+      def update object
+      end
+
+      def delete object
+        self.class.collection.delete object
+      end
+
+      def size
+        self.class.size
+      end
+    end
+  end
+end

data/uorm.gemspec

@@ -1,11 +1,10 @@
 # -*- encoding: utf-8 -*-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'uorm/version'
 
 Gem::Specification.new do |gem|
-  gem.name          = "uorm"
-  gem.version       = Uorm::VERSION
+  gem.name          = 'uorm'
+  gem.version       = '0.0.11'
   gem.authors       = ['Dennis Rogenius']
   gem.email         = ['denro03@gmail.com']
   gem.description   = %q{A modular, flexible and lightweight ORM}
@@ -15,16 +14,15 @@ Gem::Specification.new do |gem|
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
+  gem.require_paths = ['lib']
 
-  gem.add_dependency 'activesupport'
   gem.add_dependency 'em-synchrony'
 
+  gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'debugger'
   gem.add_development_dependency 'em-mongo'
   gem.add_development_dependency 'bson_ext'
-  gem.add_development_dependency 'oj'
   gem.add_development_dependency 'redis'
   gem.add_development_dependency 'hiredis'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uorm
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-30 00:00:00.000000000 Z
+date: 2013-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: em-synchrony
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -28,14 +28,14 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: em-synchrony
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -107,22 +107,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: oj
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -170,24 +154,25 @@ files:
 - Rakefile
 - lib/uorm.rb
 - lib/uorm/attributes.rb
-- lib/uorm/callbacks.rb
-- lib/uorm/dsl.rb
-- lib/uorm/field.rb
-- lib/uorm/field_collection.rb
+- lib/uorm/attributes/field.rb
+- lib/uorm/attributes/field_collection.rb
+- lib/uorm/attributes/type.rb
+- lib/uorm/crud.rb
+- lib/uorm/crud/callbacks.rb
+- lib/uorm/crud/persistance_helper.rb
+- lib/uorm/hash.rb
 - lib/uorm/model.rb
 - lib/uorm/mongo.rb
-- lib/uorm/mongo/db.rb
 - lib/uorm/mongo/object_id.rb
 - lib/uorm/mongo/persistance.rb
 - lib/uorm/redis.rb
-- lib/uorm/redis/db.rb
+- lib/uorm/redis/adapter.rb
 - lib/uorm/redis/persistance.rb
-- lib/uorm/type.rb
-- lib/uorm/version.rb
-- spec/em-mongo_spec.rb
-- spec/redis_synchrony_spec.rb
+- spec/mongo_spec.rb
+- spec/redis_spec.rb
 - spec/spec_helper.rb
 - spec/support/be_collection_of.rb
+- spec/support/test_persistance.rb
 - uorm.gemspec
 homepage: https://github.com/denro/uorm
 licenses: []
@@ -201,12 +186,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4044526249498249411
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4044526249498249411
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -214,7 +205,8 @@ signing_key:
 specification_version: 3
 summary: A small ORM for ruby with focus on weight and modularity
 test_files:
-- spec/em-mongo_spec.rb
-- spec/redis_synchrony_spec.rb
+- spec/mongo_spec.rb
+- spec/redis_spec.rb
 - spec/spec_helper.rb
 - spec/support/be_collection_of.rb
+- spec/support/test_persistance.rb

data/lib/uorm/callbacks.rb

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

data/lib/uorm/dsl.rb

@@ -1,51 +0,0 @@
-module Uorm
-  module DSL
-    def self.included base
-      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
-          if block_given?
-            new(attrs).save &block
-          else
-            new(attrs).save
-          end
-        end
-      end
-    end
-
-    def new?
-      persistance.new? self
-    end
-
-    def save &block
-      new? ? persistance.create(self, &block) : persistance.update(self, &block)
-      self
-    end
-
-    def update attrs
-      update_attributes attrs
-      persistance.update self
-      self
-    end
-
-    def delete
-      persistance.delete self
-      self
-    end
-  end
-end

data/lib/uorm/field.rb

@@ -1,13 +0,0 @@
-module Uorm
-  class Field < Struct.new :name, :type
-    def convert value
-      return unless value
-      type.convert value
-    end
-
-    def as_json value
-      return unless value
-      type.as_json value
-    end
-  end
-end

data/lib/uorm/field_collection.rb

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

data/lib/uorm/mongo/db.rb

@@ -1,27 +0,0 @@
-module Uorm
-  module Mongo
-    class DB
-      class << self
-        attr_accessor :name, :pool_size
-
-        def collection coll
-          db.collection coll
-        end
-
-        def db
-          connection.db name
-        end
-
-        def pool_size
-          @pool_size ||= 2
-        end
-
-        def connection
-          @connection ||= ::EM::Synchrony::ConnectionPool.new(size: pool_size) do
-            ::EM::Mongo::Connection.new
-          end
-        end
-      end
-    end
-  end
-end

data/lib/uorm/redis/db.rb

@@ -1,19 +0,0 @@
-module Uorm
-  module Redis
-    class DB
-      class << self
-        attr_accessor :nr, :pool_size
-
-        def pool_size
-          @pool_size ||= 2
-        end
-
-        def client
-          @client ||= ::EM::Synchrony::ConnectionPool.new(size: pool_size) do
-            ::Redis.new driver: :synchrony, db: nr
-          end
-        end
-      end
-    end
-  end
-end

data/lib/uorm/type.rb

@@ -1,65 +0,0 @@
-module Uorm
-  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