ohm-contrib 1.2 → 2.0.0.alpha2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: bcc41d31e8b5341e8fd904569405b3d9b34117d9
+  data.tar.gz: 106c327eeb443fe0e4231740dad105b9ab18ffa2
+SHA512:
+  metadata.gz: fb14c183b55886fccec06e3178c889b1e8f85d5f7072ee15493bf7cfcc512ae70fa311257b57586e911dfd3cde264208386bb571aecd55860178acda4aa77388
+  data.tar.gz: 43c40485f12e12a49b61e45fb84b0045afa0a42874d16509ffb0c1ff458085ad0a6f9552cfd1e2aa8eb78ce7a690eb6093e348a546e78618ca60a22ef0309781

data/README.markdown

@@ -207,7 +207,7 @@ The following lists the major changes:
     See [scrivener][scrivener] instead.
 5. `Ohm::Boundaries` has been removed.
 6. Ohm::Contrib no longer uses `autoload`. You can either
-   `require 'ohm/contrib', which requires everything, or you
+   `require 'ohm/contrib'`, which requires everything, or you
    can `require ohm/datatypes` for example if you want to cherry
    pick your requires.
 7. `Ohm::Callbacks` no longer provides macro style callbacks, i.e.

data/lib/ohm/callbacks.rb

@@ -22,7 +22,7 @@ module Ohm
   #     end
   #   end
   module Callbacks
-    def save!
+    def save
       is_new = new?
 
       before_create if is_new

data/lib/ohm/datatypes.rb

@@ -10,7 +10,7 @@ module Ohm
       Integer   = lambda { |x| x.to_i }
       Decimal   = lambda { |x| BigDecimal(x.to_s) }
       Float     = lambda { |x| x.to_f }
-      Symbol    = lambda { |x| x.to_sym }
+      Symbol    = lambda { |x| x && x.to_sym }
       Boolean   = lambda { |x| Ohm::DataTypes.bool(x) }
       Time      = lambda { |t| t && (t.kind_of?(::Time) ? t : ::Time.parse(t)) }
       Date      = lambda { |d| d && (d.kind_of?(::Date) ? d : ::Date.parse(d)) }

data/lib/ohm/softdelete.rb

@@ -43,19 +43,29 @@ module Ohm
     end
 
     def delete
-      db.multi do
-        model.all.key.srem(id)
-        model.deleted.key.sadd(id)
-        set :deleted, DELETED_FLAG
-      end
+      redis.queue("MULTI")
+      redis.queue("SREM", model.all.key, id)
+      redis.queue("SADD", model.deleted.key, id)
+      redis.queue("HSET", key, :deleted, DELETED_FLAG)
+      redis.queue("EXEC")
+      redis.commit
+
+      self.deleted = DELETED_FLAG
+
+      return self
     end
 
     def restore
-      db.multi do
-        model.all.key.sadd(id)
-        model.deleted.key.srem(id)
-        set :deleted, nil
-      end
+      redis.queue("MULTI")
+      redis.queue("SADD", model.all.key, id)
+      redis.queue("SREM", model.deleted.key, id)
+      redis.queue("HDEL", key, :deleted)
+      redis.queue("EXEC")
+      redis.commit
+
+      self.deleted = nil
+
+      return self
     end
 
     def deleted?
@@ -68,7 +78,7 @@ module Ohm
       end
 
       def exists?(id)
-        super || key[:deleted].sismember(id)
+        super || redis.call("SISMEMBER", key[:deleted], id) == 1
       end
     end
   end

data/lib/ohm/timestamps.rb

@@ -23,7 +23,7 @@ module Ohm
       model.attribute :updated_at, DataTypes::Type::Timestamp
     end
 
-    def save!
+    def save
       self.created_at = Time.now.utc.to_i if new?
       self.updated_at = Time.now.utc.to_i
 

data/lib/ohm/versioned.rb

@@ -4,20 +4,16 @@ module Ohm
       model.attribute :_version, lambda { |x| x.to_i }
     end
 
-    def save!
-      super do |t|
-        t.read do |store|
-          current_version = key.hget(:_version).to_i
+    def save
+      current_version = new? ? 0 : redis.call("HGET", key, :_version).to_i
 
-          if current_version != _version
-            raise Ohm::VersionConflict.new(attributes)
-          end
+      if current_version != _version
+        raise Ohm::VersionConflict.new(attributes)
+      end
 
-          self._version = current_version + 1
-        end
+      self._version = current_version + 1
 
-        yield t if block_given?
-      end
+      super
     end
   end
 

data/ohm-contrib.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name = "ohm-contrib"
-  s.version = "1.2"
+  s.version = "2.0.0.alpha2"
   s.summary = %{A collection of decoupled drop-in modules for Ohm.}
   s.description = %{Includes a couple of core functions such as callbacks, timestamping, typecasting and lots of generic validation routines.}
   s.author = "Cyril David"
-  s.email = "cyx.ucron@gmail.com"
+  s.email = "cyx@cyx.is"
   s.homepage = "http://github.com/cyx/ohm-contrib"
 
   s.specification_version = 2 if s.respond_to? :specification_version=
@@ -21,9 +21,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = "ohm-contrib"
 
-  s.add_dependency "ohm", "~> 1.2"
+  s.add_dependency "ohm", "2.0.0.alpha2"
 
   s.add_development_dependency "cutest"
-  s.add_development_dependency "redis"
   s.add_development_dependency "override"
 end

data/test/helper.rb

@@ -1,7 +1,6 @@
 $:.unshift(File.expand_path("../lib", File.dirname(__FILE__)))
 
 require "cutest"
-require "redis"
 
 if ENV["SCRIPTED"]
   require "ohm/scripted"
@@ -12,8 +11,6 @@ end
 require "ohm/contrib"
 require "override"
 
-Ohm.connect :host => "localhost", :port => 6379, :db => 1
-
 NOW = Time.utc(2010, 5, 12)
 
 include Override

data/test/plugin.rb

@@ -35,7 +35,7 @@ private
   end
 
   def after_save
-    comments.key.sadd(Comment.create.id)
+    redis.call("SADD", comments.key, Comment.create.id)
   end
 end
 
@@ -185,7 +185,7 @@ scope do
     assert p.bought_at.kind_of?(Time)
     assert_equal time, p.bought_at
 
-    assert_equal "2011-11-22 00:00:00 UTC", p.key.hget(:bought_at)
+    assert_equal "2011-11-22 00:00:00 UTC", p.get(:bought_at)
     assert_equal "2011-11-22 00:00:00 UTC", p.bought_at.to_s
   end
 
@@ -201,7 +201,7 @@ scope do
 
     p = Product[p.id]
     assert_equal Date.new(2011, 11, 22), p.date_released
-    assert_equal "2011-11-22", p.key.hget(:date_released)
+    assert_equal "2011-11-22", p.get(:date_released)
     assert_equal "2011-11-22", p.date_released.to_s
   end
 
@@ -214,7 +214,7 @@ scope do
 
     p = Product[p.id]
     assert_equal sizes, p.sizes
-    assert_equal %Q[{"XS":1,"S":2,"L":3}], p.key.hget(:sizes)
+    assert_equal %Q[{"XS":1,"S":2,"L":3}], p.get(:sizes)
     assert_equal %Q[{"XS":1,"S":2,"L":3}], p.sizes.to_s
   end
 
@@ -227,7 +227,7 @@ scope do
 
     p = Product[p.id]
     assert_equal stores, p.stores
-    assert_equal %Q(["walmart","marshalls","jcpenny"]), p.key.hget(:stores)
+    assert_equal %Q(["walmart","marshalls","jcpenny"]), p.get(:stores)
     assert_equal %Q(["walmart","marshalls","jcpenny"]), p.stores.to_s
   end
 
@@ -243,7 +243,7 @@ scope do
 
     p = Product[p.id]
     assert_equal 0.001, p.price
-    assert_equal "0.1E-2", p.key.hget(:price)
+    assert_equal "0.1E-2", p.get(:price)
   end
 
   test "Type::Float" do
@@ -253,7 +253,7 @@ scope do
     p.save
     p = Product[p.id]
     assert_equal 4.5, p.rating
-    assert_equal "4.5", p.key.hget(:rating)
+    assert_equal "4.5", p.get(:rating)
   end
 
   test "Type::Boolean" do
@@ -269,7 +269,7 @@ scope do
     p.save
 
     p = Product[p.id]
-    assert_equal "false", p.key.hget(:published)
+    assert_equal nil, p.get(:published)
     assert_equal false, p.published
   end
 
@@ -293,7 +293,7 @@ scope do
     p = Product[p.id]
 
     assert_equal comments, p.comments
-    assert_equal %Q(["Awesome!","Good product","Great."]), p.key.hget(:comments)
+    assert_equal %Q(["Awesome!","Good product","Great."]), p.get(:comments)
     assert_equal %Q(["Awesome!","Good product","Great."]), p.comments.to_s
   end
 end

data/test/scope.rb

@@ -34,7 +34,7 @@ end
 test "allows custom methods for the defined scopes" do
   post = Post.create
   comment = Comment.create(:status => "approved")
-  post.comments.key.sadd(comment.id)
+  Post.redis.call("SADD", post.comments.key, comment.id)
 
   assert post.comments.approved.is_a?(Ohm::MultiSet)
   assert post.comments.approved.include?(comment)
@@ -43,7 +43,7 @@ end
 test "allows custom methods to be included from a module" do
   post = Post.create
   comment = Comment.create(:status => "rejected")
-  post.comments.key.sadd(comment.id)
+  Post.redis.call("SADD", post.comments.key, comment.id)
 
   assert post.comments.rejected.is_a?(Ohm::MultiSet)
   assert post.comments.rejected.include?(comment)

metadata

@@ -1,83 +1,60 @@
 --- !ruby/object:Gem::Specification
 name: ohm-contrib
 version: !ruby/object:Gem::Version
-  version: '1.2'
-  prerelease: 
+  version: 2.0.0.alpha2
 platform: ruby
 authors:
 - Cyril David
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-30 00:00:00.000000000 Z
+date: 2013-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ohm
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 2.0.0.alpha2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 2.0.0.alpha2
 - !ruby/object:Gem::Dependency
   name: cutest
   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: override
   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: Includes a couple of core functions such as callbacks, timestamping,
   typecasting and lots of generic validation routines.
-email: cyx.ucron@gmail.com
+email: cyx@cyx.is
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -105,25 +82,24 @@ files:
 - test/versioned.rb
 homepage: http://github.com/cyx/ohm-contrib
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: ohm-contrib
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 2
 summary: A collection of decoupled drop-in modules for Ohm.