uorm 0.0.1 → 0.0.2

data/Gemfile.lock

@@ -15,6 +15,14 @@ GEM
       activesupport
     bson_ext (1.8.0)
       bson (~> 1.8.0)
+    columnize (0.3.6)
+    debugger (1.2.3)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.1.1)
+      debugger-ruby_core_source (~> 1.1.5)
+    debugger-linecache (1.1.2)
+      debugger-ruby_core_source (>= 1.1.1)
+    debugger-ruby_core_source (1.1.6)
     diff-lcs (1.1.3)
     em-mongo (0.4.3)
       bson (>= 1.1.3)
@@ -22,8 +30,11 @@ GEM
     em-synchrony (1.0.2)
       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)
+    redis (3.0.2)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)
@@ -38,6 +49,10 @@ PLATFORMS
 
 DEPENDENCIES
   bson_ext
+  debugger
   em-mongo
+  hiredis
+  oj
+  redis
   rspec
   uorm!

data/lib/uorm/redis/persistance.rb

@@ -0,0 +1,46 @@
+module Uorm
+  module Redis
+    class Persistance
+      attr_reader :collection, :model
+
+      def initialize model
+        @model = model
+        @collection = ::Redis.new driver: :synchrony
+      end
+
+      def new? object
+        object.id ? false : true
+      end
+
+      def all options = {}
+        keys = collection.keys
+        collection.mget(keys).map do |val|
+          MultiJson.load val if val
+        end
+      end
+
+      def find id
+        MultiJson.load collection.get id
+      end
+
+      def create object
+        object.id = SecureRandom.uuid
+        write object
+      end
+
+      def update object
+        write object
+      end
+
+      def delete object
+        collection.del object.id
+      end
+
+      private
+
+      def write object
+        collection.set object.id, MultiJson.dump(object)
+      end
+    end
+  end
+end

data/lib/uorm/redis.rb

@@ -0,0 +1,27 @@
+module Uorm
+  module Redis
+    def self.included base
+      base.instance_eval do
+        field :id, type: Type::String
+
+        def persistance
+          @persistance ||= Persistance.new self
+        end
+
+        def collection
+          persistance.collection
+        end
+      end
+
+      def initialize values = {}
+        values[:id] ||= nil
+        super values
+      end
+
+      def persistance
+        self.class.persistance
+      end
+    end
+  end
+end
+

data/lib/uorm/type.rb

@@ -40,6 +40,8 @@ module Uorm
       class << self
         def convert value
           ::Time.parse value.to_s
+        rescue
+          ::Time.utc(value.to_i)
         end
 
         def as_json value

data/lib/uorm/version.rb

@@ -1,3 +1,3 @@
 module Uorm
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/lib/uorm.rb

@@ -3,6 +3,7 @@ require 'uorm/version'
 require 'active_support/callbacks'
 require 'active_support/core_ext/hash'
 
+
 module Uorm
   autoload :Type,             'uorm/type'
   autoload :Field,            'uorm/field'
@@ -11,8 +12,14 @@ module Uorm
   autoload :DSL,              'uorm/dsl'
   autoload :Callbacks,        'uorm/callbacks'
 
+  autoload :Redis,            'uorm/redis'
+  module Redis
+    autoload :Persistance,    'uorm/redis/persistance'
+    require 'multi_json'
+  end
+
   module EM
-    autoload :Mongo,         'uorm/em-mongo'
+    autoload :Mongo,          'uorm/em-mongo'
 
     module Mongo
       require 'uorm/em-mongo/object_id'
@@ -20,4 +27,5 @@ module Uorm
       autoload :Persistance,  'uorm/em-mongo/persistance'
     end
   end
+
 end

data/spec/{urm_spec.rb → em-mongo_spec.rb}

@@ -1,22 +1,14 @@
 require 'spec_helper'
 
-class CallbackTester
-  class << self
-    def after_create model
-      model.id.to_s.should_not == ''
-    end
+require 'em-mongo'
+require 'em-synchrony/em-mongo'
 
-    def after_save model
-      model.is_a?(AModel).should == true
-    end
-  end
-end
+Uorm::EM::Mongo::DB.name = 'uorm_test'
 
-class AModel
+class AMongoModel
   include Uorm::DSL
   include Uorm::Attributes
   include Uorm::EM::Mongo
-  include Uorm::Callbacks
 
   field :reference, type: Uorm::Type::ObjectId
   field :name,      type: Uorm::Type::String
@@ -24,13 +16,10 @@ class AModel
   field :dollars,   type: Uorm::Type::Float
   field :favorite,  type: Uorm::Type::Boolean
   field :created,   type: Uorm::Type::Time
-
-  set_callback :save,   :after, CallbackTester
-  set_callback :create, :after, CallbackTester
 end
 
-describe AModel do
-  after { AModel.collection.remove }
+describe AMongoModel do
+  after { AMongoModel.collection.remove }
 
   let(:attributes) do
     {
@@ -44,7 +33,7 @@ describe AModel do
   end
 
   describe '.new' do
-    subject { AModel.new attributes }
+    subject { AMongoModel.new attributes }
 
     its(:reference) { should == BSON::ObjectId('50995b8c15529d4676000001') }
     its(:name)      { should == 'whatever' }
@@ -68,93 +57,93 @@ describe AModel do
 
   describe '.all' do
     it 'returns a collection of all objects' do
-      AModel.collection.insert name: 'findme'
+      AMongoModel.collection.insert name: 'findme'
 
-      AModel.all.should be_collection_of AModel
+      AMongoModel.all.should be_collection_of AMongoModel
     end
 
     it 'returns a collection of objects with the query' do
-      AModel.collection.insert name: 'findme'
+      AMongoModel.collection.insert name: 'findme'
 
-      AModel.all(name: 'findme').should be_collection_of AModel
+      AMongoModel.all(name: 'findme').should be_collection_of AMongoModel
     end
 
     it 'converts time strings into time objects' do
-      AModel.collection.insert created: Time.parse('2001-01-02')
+      AMongoModel.collection.insert created: Time.parse('2001-01-02')
 
-      AModel.all(created: { '$gt' => '2001-01-01' }).
-        should be_collection_of AModel
+      AMongoModel.all(created: { '$gt' => '2001-01-01' }).
+        should be_collection_of AMongoModel
 
-      AModel.all(created: { '$lt' => Time.parse('2001-01-01')}).
+      AMongoModel.all(created: { '$lt' => Time.parse('2001-01-01')}).
         should be_empty
     end
 
     it 'converts reference strings into BSON::ObjectId objects' do
-      AModel.collection.insert reference: BSON::ObjectId('50995b8c15529d4676000001')
+      AMongoModel.collection.insert reference: BSON::ObjectId('50995b8c15529d4676000001')
 
-      AModel.all(reference: '50995b8c15529d4676000001').
-        should be_collection_of AModel
+      AMongoModel.all(reference: '50995b8c15529d4676000001').
+        should be_collection_of AMongoModel
     end
 
     it 'converts multiple query parameters' do
-      AModel.collection.insert reference: BSON::ObjectId('50995b8c15529d4676000001'), created: Time.parse('2003-01-01')
+      AMongoModel.collection.insert reference: BSON::ObjectId('50995b8c15529d4676000001'), created: Time.parse('2003-01-01')
 
-      AModel.all(reference: '50995b8c15529d4676000001', created: '2003-01-01').
-        should be_collection_of AModel
+      AMongoModel.all(reference: '50995b8c15529d4676000001', created: '2003-01-01').
+        should be_collection_of AMongoModel
     end
   end
 
   describe '.find' do
     it 'returns the first object with the given id' do
-      model = AModel.create attributes
-      AModel.find(model.id).should be_instance_of AModel
+      model = AMongoModel.create attributes
+      AMongoModel.find(model.id).should be_instance_of AMongoModel
     end
 
     it 'converts id BSON::ObjectId' do
-      model = AModel.create attributes
-      AModel.find(model.id.to_s).should be_instance_of AModel
+      model = AMongoModel.create attributes
+      AMongoModel.find(model.id.to_s).should be_instance_of AMongoModel
     end
   end
 
   describe '.create' do
     it 'adds the object to the collection' do
-      expect { AModel.create attributes }.to change { AModel.collection.count }
+      expect { AMongoModel.create attributes }.to change { AMongoModel.collection.count }
     end
 
     it 'returns an object with the newly created attributes' do
-      AModel.create(attributes).should be_instance_of AModel
+      AMongoModel.create(attributes).should be_instance_of AMongoModel
     end
   end
 
   describe '#save' do
     it 'creates the object if it does not have an id' do
-      model = AModel.new attributes
+      model = AMongoModel.new attributes
       expect { model.save }.to change { model.id }
     end
 
     it 'updates the object if it does exist' do
-      model = AModel.create attributes
+      model = AMongoModel.create attributes
       expect { model.save }.to_not change { model.id }
     end
   end
 
   describe '#update' do
     it 'updates the object with the given attributes' do
-      model = AModel.create attributes
+      model = AMongoModel.create attributes
       expect { model.update name: 'new' }.to change { model.name }
     end
 
     it 'updates the collection with the given attributes' do
-      model = AModel.create attributes
+      model = AMongoModel.create attributes
       expect { model.update name: 'another' }.
-        to change { AModel.collection.find(name: 'another').count }
+        to change { AMongoModel.collection.find(name: 'another').count }
     end
   end
 
   describe '#delete' do
     it 'removes the object from the collection' do
-      model = AModel.create attributes
-      expect { model.delete }.to change { AModel.collection.count }
+      model = AMongoModel.create attributes
+      expect { model.delete }.to change { AMongoModel.collection.count }
     end
   end
 end

data/spec/redis_synchrony_spec.rb

@@ -0,0 +1,112 @@
+require 'spec_helper'
+
+require 'redis'
+require 'hiredis'
+
+class ARedisModel
+  include Uorm::DSL
+  include Uorm::Attributes
+  include Uorm::Redis
+
+  field :reference, type: Uorm::Type::String
+  field :name,      type: Uorm::Type::String
+  field :count,     type: Uorm::Type::Integer
+  field :dollars,   type: Uorm::Type::Float
+  field :favorite,  type: Uorm::Type::Boolean
+  field :created,   type: Uorm::Type::Time
+end
+
+describe ARedisModel do
+  after { ARedisModel.collection.flushdb }
+
+  let(:attributes) do
+    {
+      reference: '2d931510-d99f-494a-8c67-87feb05e1594',
+      name: 'whatever',
+      count: 5.to_s,
+      dollars: 2.3.to_s,
+      favorite: true.to_s,
+      created: Time.utc(0).to_s
+    }
+  end
+
+  describe '.new' do
+    subject { ARedisModel.new attributes }
+
+    its(:reference) { should == '2d931510-d99f-494a-8c67-87feb05e1594' }
+    its(:name)      { should == 'whatever' }
+    its(:count)     { should == 5 }
+    its(:dollars)   { should == 2.3 }
+    its(:favorite)  { should be_true }
+    its(:created)   { should == Time.utc(0) }
+
+    its(:as_json) do
+      should == {
+        reference: '2d931510-d99f-494a-8c67-87feb05e1594',
+        name: "whatever",
+        count: 5,
+        dollars: 2.3,
+        favorite: true,
+        created: Time.utc(0).to_i,
+        id: nil
+      }
+    end
+  end
+
+
+  describe '.all' do
+    it 'returns a collection of all objects' do
+      ARedisModel.create attributes
+      ARedisModel.all.should be_collection_of ARedisModel
+    end
+  end
+
+  describe '.find' do
+    it 'returns the first object with the given id' do
+      model = ARedisModel.create attributes
+      ARedisModel.find(model.id).should be_instance_of ARedisModel
+    end
+  end
+
+  describe '.create' do
+    it 'adds the object to the collection' do
+      expect { ARedisModel.create attributes }.to change { ARedisModel.collection.dbsize }
+    end
+
+    it 'returns an object with the newly created attributes' do
+      ARedisModel.create(attributes).should be_instance_of ARedisModel
+    end
+  end
+
+  describe '#save' do
+    it 'creates the object if it does not have an id' do
+      model = ARedisModel.new attributes
+      expect { model.save }.to change { model.id }
+    end
+
+    it 'updates the object if it does exist' do
+      model = ARedisModel.create attributes
+      expect { model.save }.to_not change { model.id }
+    end
+  end
+
+  describe '#update' do
+    it 'updates the object with the given attributes' do
+      model = ARedisModel.create attributes
+      expect { model.update name: 'new' }.to change { model.name }
+    end
+
+    it 'updates the collection with the given attributes' do
+      model = ARedisModel.create attributes
+      expect { model.update name: 'another' }.
+        to change { ARedisModel.find(model.id).name }
+    end
+  end
+
+  describe '#delete' do
+    it 'removes the object from the collection' do
+      model = ARedisModel.create attributes
+      expect { model.delete }.to change { ARedisModel.collection.dbsize }
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,21 +1,14 @@
+require 'support/be_collection_of'
 require 'uorm'
 
-require 'em-mongo'
 require 'em-synchrony'
-require 'em-synchrony/em-mongo'
-
-Uorm::EM::Mongo::DB.name = 'uorm_test'
-
-require 'support/be_collection_of'
 
 # 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

data/uorm.gemspec

@@ -6,11 +6,11 @@ require 'uorm/version'
 Gem::Specification.new do |gem|
   gem.name          = "uorm"
   gem.version       = Uorm::VERSION
-  gem.authors       = ["Dennis Rogenius"]
-  gem.email         = ["denro03@gmail.com"]
+  gem.authors       = ['Dennis Rogenius']
+  gem.email         = ['denro03@gmail.com']
   gem.description   = %q{A modular, flexible and lightweight ORM}
   gem.summary       = %q{A small ORM for ruby with focus on weight and modularity}
-  gem.homepage      = ""
+  gem.homepage      = 'https://github.com/denro/uorm'
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -21,6 +21,10 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'em-synchrony'
 
   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.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: debugger
+  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: em-mongo
   requirement: !ruby/object:Gem::Requirement
@@ -91,6 +107,54 @@ 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
+    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: hiredis
+  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'
 description: A modular, flexible and lightweight ORM
 email:
 - denro03@gmail.com
@@ -114,13 +178,16 @@ files:
 - lib/uorm/em-mongo/persistance.rb
 - lib/uorm/field.rb
 - lib/uorm/field_collection.rb
+- lib/uorm/redis.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/spec_helper.rb
 - spec/support/be_collection_of.rb
-- spec/urm_spec.rb
 - uorm.gemspec
-homepage: ''
+homepage: https://github.com/denro/uorm
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -145,6 +212,7 @@ 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/spec_helper.rb
 - spec/support/be_collection_of.rb
-- spec/urm_spec.rb