active_redis_orm 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a3b7f868710c028f3d75dfc45ceed2c744c09fa
-  data.tar.gz: 8416a2080bcf63c28c1fd62c6326f54fcd1e1148
+  metadata.gz: adaa34fbf9013daff3c9f27b6100337ca8e38feb
+  data.tar.gz: bd45e099bdfb924174f2f70f118655c828009d9a
 SHA512:
-  metadata.gz: e21996c2ec2bf8ebf299590cecb579c85838b668a09aac0cb38ee84ebfd33d2b6ff145c00e4d42746c7c43b7be991628a20d06dad8cc7f9a3c5ff53d5c90fea4
-  data.tar.gz: 6602b1f0a98a312f73c5f1f8087526e4c20cff4b442020dac713c2ef5eefefb8e12c26bb5e56c03259a87b495151ad7c35d704da514e8b12241ba82cf01719c6
+  metadata.gz: 229aca3fa5864cdf82b40fdd2ed1d544ea95146ccdd465fb3c2b13dead651965bab35690612f5a53127dc6a76b1dce7efd30cb28e73611f4ddd794e0e2cdd7f4
+  data.tar.gz: 2ad20a7d9ef6114328530a0ea0cfeb166d952c614b0e224ad336598d65ef1a187fca789db877bdd1d1992ae87a4b405e44dd835af2793626e77b50790bd5be5e

data/active_redis_orm.gemspec

@@ -5,7 +5,7 @@ require 'active_redis/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "active_redis_orm"
-  spec.version       = ActiveRedisOrm::VERSION
+  spec.version       = ActiveRedis::VERSION
   spec.authors       = ["Tom Caspy"]
   spec.email         = ["tom@tikalk.com"]
   spec.summary       = %q{ActiveRedis is an ORM for redis written in Ruby.}
@@ -20,4 +20,9 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+  spec.add_dependency "redis"
+  spec.add_dependency "redis-objects"
+  spec.add_dependency "activemodel"
+  spec.add_dependency "activesupport"
 end

data/lib/active_redis/base_extensions.rb

@@ -0,0 +1,13 @@
+class Object
+  def boolean?
+    self.is_a?(TrueClass) || self.is_a?(FalseClass) 
+  end
+end
+
+class String
+  def to_bool
+    return true if ['true', '1', 'yes', 'on', 't'].include? self
+    return false if ['false', '0', 'no', 'off', 'f', 'nil', ''].include? self
+    return nil
+  end
+end

data/lib/active_redis/version.rb

@@ -1,3 +1,3 @@
-module ActiveRedisOrm
-  VERSION = "0.0.1"
+module ActiveRedis
+  VERSION = "0.0.2"
 end

data/lib/active_redis_orm.rb

@@ -1,3 +1,8 @@
+require "active_support/all"
+require "redis"
+require "active_model"
+require "redis-objects"
+require "active_redis/base_extensions"
 require "active_redis/attributes"
 require "active_redis/save"
 require "active_redis/dirty_attributes"

data/spec/lib/active_redis/validation_spec.rb

@@ -0,0 +1,42 @@
+require "active_redis_orm"
+
+class ARValidations < ActiveRedis::Base
+  field :foo
+  field :short
+
+  validates :short, length: { minimum: 5 }
+  validates :foo, presence: true
+
+end
+
+describe "ActiveRedis validations" do
+  it "isn't valid in case foo and short are't present" do
+    foo = ARValidations.new
+    foo.should_not be_valid
+    foo.errors.messages.keys.should =~ [:short, :foo]
+  end
+
+  it "is valid when valid" do
+    foo = ARValidations.new(foo: "bla", short: "I am long enough")
+    foo.should be_valid
+  end
+
+  it "does not save if invalid" do
+    foo = ARValidations.new(foo: "bla", short: "abc")
+    foo.should_not be_valid
+    foo.save.should == false
+    foo.should be_new_record
+  end
+
+  it "saves when valid" do
+    foo = ARValidations.new(foo: "bla", short: "I am long enough")
+    foo.save.should == true
+    foo.should_not be_new_record
+  end
+
+  it "saves when invalid, if we tell it" do
+    foo = ARValidations.new(foo: "bla")
+    foo.save(validate: false).should == true
+    foo.should_not be_new_record
+  end
+end

data/spec/lib/active_redis_spec.rb

@@ -0,0 +1,309 @@
+require "active_redis_orm"
+
+describe ActiveRedis do
+  class ActiveRedisObject < ActiveRedis::Base
+    attr_accessible :foo, :bar, :list, :set, :sorted_set, :hash, :expired_field, :date, :time
+
+    field :foo, type: :string
+    field :bar, finder_field: true
+    field :list, type: :list
+    field :set, type: :set
+    field :sorted_set, type: :sorted_set
+    field :hash, type: :hash
+    field :expired_field, expires_in: 1
+    field :bool, type: :boolean
+    field :date, type: :date
+    field :time, type: :time
+
+    list :all
+    list :all_with_bar, if: lambda{|object| object.bar.present? }
+
+    after_create :afterz_create
+    after_update :afterz_update
+    after_save :afterz_save
+
+    def afterz_save; end
+    def afterz_update; end
+    def afterz_create; end
+  end
+
+  before do
+    ActiveRedis.redis.flushdb
+  end
+
+  context "basics" do
+
+    it "has foo defined" do
+      ActiveRedisObject.attribute_definitions[:foo].should == {type: :string}
+    end
+
+    it "has a redis_namespace" do
+      ActiveRedisObject.redis_namespace.should == "active_redis_object"
+    end
+
+    it "has the foo getter and setter" do
+      ActiveRedisObject.new.should respond_to(:foo)
+      ActiveRedisObject.new.should respond_to(:foo=)
+      ActiveRedisObject.new.should respond_to(:bar)
+    end
+
+    it "gets saved" do
+      id = "12341543154342"
+      object = ActiveRedisObject.new(id)
+      object.foo = "I am foo"
+      Redis.current.get("#{ActiveRedisObject.redis_namespace}:#{id}:foo").should be_blank
+      object.save
+      Redis.current.get("#{ActiveRedisObject.redis_namespace}:#{id}:foo").should == "I am foo"
+    end
+  end
+
+  context "setters" do
+    it "works" do
+      object = ActiveRedisObject.create(bar: "wagamama")
+      object.foo = "bar"
+      object.save
+      object.foo.should == "bar"
+    end
+
+    it "works for boolean" do
+      object = ActiveRedisObject.create(bar: "wagamama")
+      object.bool = false
+      object.bool.should == false
+      object.save
+      object.bool.should == false
+    end
+  end
+
+  context "finder fields" do
+    it "can be found by bar" do
+      object = ActiveRedisObject.new
+      object.bar = "barbar"
+      object.save
+
+      ActiveRedisObject.find_by_bar("barbar").should == object
+    end
+
+    it "should remove old reference to the object when finder field is changed" do
+      object = ActiveRedisObject.create(bar: "barbar")
+      object.bar = "baz"
+      object.save
+      ActiveRedisObject.find_by_bar("barbar").should be_blank
+      ActiveRedisObject.find_by_bar("baz").should == object
+    end
+  end
+
+  context "#dirty?" do
+    it "calls #check_for_changes" do
+      object = ActiveRedisObject.new
+      object.should_receive(:check_for_changes)
+      object.dirty?
+    end
+
+    it "is not dirty if not changed" do
+      object = ActiveRedisObject.new
+      object.bar = "barbar"
+      object.save
+      object.should_not be_dirty
+    end
+
+    it "is dirty when changed" do
+      object = ActiveRedisObject.new
+      object.bar = "barbar"
+      object.should be_dirty
+    end
+
+    it "is dirty when changing a custom dirty object" do
+      object = ActiveRedisObject.new
+      object.hash[:foo] = "bar"
+      object.should be_dirty
+    end
+  end
+
+  context "#save" do
+    it "only saves dirty attributes" do
+      object = ActiveRedisObject.new
+      object.bar = "barbar"
+      object.save
+      object.should_receive(:set_foo).and_call_original
+      object.should_not_receive(:set_bar)
+      object.foo = "foo"
+      object.save
+      object.reload!
+      object.foo.should == "foo"
+      object.bar.should == "barbar"
+    end
+
+    it "saves fields like list, set, etc" do
+      object = ActiveRedisObject.new
+      object.foo = "foo"
+      object.list = [1,2,3]
+      object.set = [1,2,3]
+      object.sorted_set[1] = 1
+      object.hash = {foo: :bar}
+      object.save
+      object.reload!
+      object.list.should == ["1","2","3"]
+      object.set.should =~ ["1","2","3"]
+      object.sorted_set.should == ["1"]
+      object.hash.should == {"foo" => "bar"}
+    end
+
+    it "tracks changes well" do
+      object = ActiveRedisObject.new
+      object.hash = {}
+      object.save
+      object.hash[:foo] = "1"
+      object.save
+      object.reload!
+      object.hash.should == {"foo" => "1"}
+    end
+
+    it "does not keep changes if not saved" do
+      object = ActiveRedisObject.new
+      object.list = [1,2,3]
+      object.save
+      object.reload!
+      object.list.push("4")
+      object.list.should == ["1", "2", "3", "4"]
+      object.reload!
+      object.list.should == ["1", "2", "3"]
+    end
+  end
+
+  context "#new_record?" do
+    it "is a new record when initialized empty" do
+      object = ActiveRedisObject.new
+      object.should be_new_record
+    end
+
+    it "stops being new record when saved" do
+      object = ActiveRedisObject.new
+      object.foo = "foo"
+      object.save
+      object.should_not be_new_record
+    end
+  end
+
+  context "callbacks" do
+    it "calls callbacks on their appropriate times" do
+      object = ActiveRedisObject.new(foo: :foo)
+      object.should_receive(:afterz_save).twice
+      object.should_receive :afterz_create
+      object.save
+      object.foo = "bar"
+      object.should_not_receive :afterz_create
+      object.should_receive :afterz_update
+      object.save
+    end
+  end
+
+  context "#destroy" do
+    it "removes all data" do
+      object = ActiveRedisObject.new(foo: "foo")
+      object.save
+      object.foo_object.get.should == "foo"
+
+      object.destroy
+      object.foo_object.get.should be_nil
+    end
+  end
+
+  context "field expiry" do
+    it "gets expired" do
+      object = ActiveRedisObject.create(expired_field: "foo")
+      object.expired_field.should == "foo"
+      Redis.current.ttl(object.expired_field_redis_key).should > 0
+    end
+  end
+
+  context "list of items" do
+    it "puts the item ids in a list" do
+      object = ActiveRedisObject.create(expired_field: "foo")
+      ActiveRedisObject.all_ids.members.should == [object.id]
+    end
+
+    it "puts the item ids in a list according to the 'if' option" do
+      object = ActiveRedisObject.create(bar: "foo")
+      non_added = ActiveRedisObject.create(foo: "foo")
+      ActiveRedisObject.all_ids.members.should == [object.id, non_added.id]
+      ActiveRedisObject.all_with_bar_ids.members.should == [object.id]
+    end
+
+    it "removes the item on destroy" do
+      object = ActiveRedisObject.create(bar: "foo")
+      non_added = ActiveRedisObject.create(foo: "foo")
+      object.destroy
+      non_added.destroy
+      ActiveRedisObject.all_ids.members.should == []
+      ActiveRedisObject.all_with_bar_ids.members.should == []
+    end
+  end
+
+  context "date and time" do
+    it "saves date" do
+      object = ActiveRedisObject.create(date: Date.today)
+      object.date.should == Date.today
+      object.reload!
+      object.date.should == Date.today
+      object.date=Date.yesterday
+      object.date.should == Date.yesterday
+      object.save
+      object.reload!
+      object.date.should == Date.yesterday
+    end
+
+    it "saves time" do
+      #because we're using timestamps, we need to round the time to the nearest second for the comparison to work
+      time1 = Time.at(Time.now.to_i)
+      time2 = Time.at(10.minutes.ago.to_i)
+      object = ActiveRedisObject.create(time: time1)
+      object.time.should == time1
+      object.reload!
+      object.time.should == time1
+      object.time=time2
+      object.time.should == time2
+      object.save
+      object.reload!
+      object.time.should == time2
+    end
+  end
+
+  context "inheritence" do
+    class InheritedActiveRedis < ActiveRedisObject
+      field :inherited_field
+    end
+
+    it "should have access to all its attribute definitions" do
+      InheritedActiveRedis.attribute_options.keys.should include(:inherited_field)
+      InheritedActiveRedis.attribute_options.keys.should include(:foo)
+      ActiveRedisObject.attribute_options.keys.should_not include(:inherited_field)
+    end
+  end
+
+  context "timestamps" do
+    class TimestampedRedis < ActiveRedis::Base
+      include ActiveRedis::Timestamps
+
+      field :foo
+    end
+
+    it "gets timestamped on creation" do
+      object = TimestampedRedis.create(foo: "foo")
+      (1.second.ago..Time.now).should cover(object.created_at)
+      (1.second.ago..Time.now).should cover(object.updated_at)
+    end
+
+    it "updated the updated_at field on update, does not change the created_at" do
+      created_time = Time.at(12234)
+      updated_at = Time.at(1232356)
+      Time.stub(:now).and_return(created_time)
+      object = TimestampedRedis.create(foo: "foo")
+      object.created_at.should == created_time
+      Time.stub(:now).and_return(updated_at)
+      object.update_attributes(foo: "bar")
+      object.updated_at.should == updated_at
+      object.created_at.should == created_time
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_redis_orm
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Tom Caspy
@@ -38,6 +38,76 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: redis-objects
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ActiveRedis is a Ruby ORM for Redis, using ActiveModel, heavily influenced
   by the ActiveRecord and Mongoid gems
 email:
@@ -54,6 +124,7 @@ files:
 - active_redis_orm.gemspec
 - lib/active_redis/all_list.rb
 - lib/active_redis/attributes.rb
+- lib/active_redis/base_extensions.rb
 - lib/active_redis/dirty_attributes.rb
 - lib/active_redis/dirty_objects/array.rb
 - lib/active_redis/dirty_objects/hash.rb
@@ -62,6 +133,8 @@ files:
 - lib/active_redis/timestamps.rb
 - lib/active_redis/version.rb
 - lib/active_redis_orm.rb
+- spec/lib/active_redis/validation_spec.rb
+- spec/lib/active_redis_spec.rb
 homepage: https://github.com/SpotIM/active_redis_orm
 licenses:
 - MIT
@@ -86,4 +159,6 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: ActiveRedis is an ORM for redis written in Ruby.
-test_files: []
+test_files:
+- spec/lib/active_redis/validation_spec.rb
+- spec/lib/active_redis_spec.rb