ohm 0.1.5 → 1.0.0.alpha1

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: ohm
 version: !ruby/object:Gem::Version
-  version: 0.1.5
-  prerelease: 
+  version: 1.0.0.alpha1
+  prerelease: 6
 platform: ruby
 authors:
 - Michel Martens
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-10 00:00:00.000000000 Z
+date: 2012-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nest
-  requirement: &70360766634860 !ruby/object:Gem::Requirement
+  requirement: &2156510860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,21 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70360766634860
+  version_requirements: *2156510860
+- !ruby/object:Gem::Dependency
+  name: scrivener
+  requirement: &2156526680 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: *2156526680
 - !ruby/object:Gem::Dependency
   name: cutest
-  requirement: &70360766633980 !ruby/object:Gem::Requirement
+  requirement: &2156526220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +44,10 @@ dependencies:
         version: '0.1'
   type: :development
   prerelease: false
-  version_requirements: *70360766633980
+  version_requirements: *2156526220
 - !ruby/object:Gem::Dependency
   name: batch
-  requirement: &70360766633360 !ruby/object:Gem::Requirement
+  requirement: &2156525700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +55,7 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *70360766633360
+  version_requirements: *2156525700
 description: Ohm is a library that allows to store an object in Redis, a persistent
   key-value database. It includes an extensible list of validations and has very good
   performance.
@@ -55,30 +66,34 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/ohm/compat-1.8.6.rb
-- lib/ohm/key.rb
-- lib/ohm/pattern.rb
+- lib/ohm/transaction.rb
 - lib/ohm/utils/upgrade.rb
-- lib/ohm/validations.rb
-- lib/ohm/version.rb
 - lib/ohm.rb
 - README.markdown
 - LICENSE
 - Rakefile
 - test/1.8.6_test.rb
-- test/associations_test.rb
-- test/connection_test.rb
-- test/errors_test.rb
-- test/hash_key_test.rb
+- test/association.rb
+- test/connection.rb
+- test/core.rb
+- test/counters.rb
+- test/extensibility.rb
+- test/filtering.rb
+- test/hash_key.rb
 - test/helper.rb
-- test/indices_test.rb
-- test/json_test.rb
-- test/model_test.rb
-- test/mutex_test.rb
-- test/pattern_test.rb
-- test/upgrade_script_test.rb
-- test/validations_test.rb
-- test/wrapper_test.rb
+- test/indices.rb
+- test/json.rb
+- test/lua-save.rb
+- test/lua.rb
+- test/model.rb
+- test/pipeline-performance.rb
+- test/transactions.rb
+- test/uniques.rb
+- test/unused/associations_test.rb
+- test/unused/pattern_test.rb
+- test/unused/upgrade_script_test.rb
+- test/unused/wrapper_test.rb
+- test/validations.rb
 - test/test.conf
 homepage: http://github.com/soveran/ohm
 licenses: []
@@ -95,12 +110,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: ohm
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Object-hash mapping library for Redis.

data/lib/ohm/compat-1.8.6.rb

@@ -1,39 +0,0 @@
-unless "".respond_to?(:lines)
-  class String
-
-    # This version of String#lines is almost fully compatible with that
-    # of Ruby 1.9. If a zero-length record separator is supplied in Ruby
-    # 1.9, the string is split into paragraphs delimited by multiple
-    # successive newlines. This replacement ignores that feature in
-    # favor of code simplicity.
-    def lines(separator = $/)
-      result = split(separator).map { |part| "#{part}#{separator}" }
-      result.each { |r| yield r } if block_given?
-      result
-    end
-  end
-end
-
-unless respond_to?(:tap)
-  class Object
-    def tap
-      yield(self)
-      self
-    end
-  end
-end
-
-module Ohm
-  if defined?(BasicObject)
-    BasicObject = ::BasicObject
-  elsif defined?(BlankSlate)
-    BasicObject = ::BlankSlate
-  else
-
-    # If neither BasicObject (Ruby 1.9) nor BlankSlate (typically provided by Builder)
-    # are present, define our simple implementation inside the Ohm module.
-    class BasicObject
-      instance_methods.each { |meth| undef_method(meth) unless meth =~ /\A(__|instance_eval)/ }
-    end
-  end
-end

data/lib/ohm/key.rb

@@ -1,35 +0,0 @@
-module Ohm
-
-  # Represents a key in Redis. Much of the heavylifting is done using the
-  # Nest library.
-  #
-  # The most important change added by {Ohm::Key} to Nest is the concept of
-  # volatile keys, which are used heavily when doing {Ohm::Model::Set#find} or
-  # {Ohm::Model::Set#except} operations.
-  #
-  # A volatile key is simply a key prefixed with `~`. This gives you the
-  # benefit if quickly seeing which keys are temporary keys by doing something
-  # like:
-  #
-  #     $ redis-cli keys "~*"
-  #
-  # @see http://github.com/soveran/nest
-  class Key < Nest
-    def volatile
-      self.index("~") == 0 ? self : self.class.new("~", redis)[self]
-    end
-
-    # Produces a key with `other` suffixed with itself. This is primarily
-    # used for storing SINTERSTORE results.
-    def +(other)
-      self.class.new("#{self}+#{other}", redis)
-    end
-
-    # Produces a key with `other` suffixed with itself. This is primarily
-    # used for storing SDIFFSTORE results.
-    def -(other)
-      self.class.new("#{self}-#{other}", redis)
-    end
-  end
-end
-

data/lib/ohm/pattern.rb

@@ -1,37 +0,0 @@
-# Pattern extends Array with case equality to provide meaningful semantics in
-# case statements.
-#
-# After this change, pattern matching-like behavior is possible with
-# Arrays:
-#
-#     Pattern[Fixnum, String] === [1, "foo"]
-#     Pattern[Symbol, Array] === [:foo, [1, 2]]
-#
-# When used in a case statement, it provides a functionality close to that of
-# languages with proper pattern matching. It becomes useful when implementing
-# a polymorphic method:
-#
-#     def [](index, limit = nil)
-#       case [index, limit]
-#       when Pattern[Fixnum, Fixnum] then
-#         key.lrange(index, limit).collect { |id| model[id] }
-#       when Pattern[Range, nil] then
-#         key.lrange(index.first, index.last).collect { |id| model[id] }
-#       when Pattern[Fixnum, nil] then
-#         model[key.lindex(index)]
-#       end
-#     end
-#
-module Ohm
-  class Pattern < Array
-    def ===(other)
-      return false if size != other.size
-
-      each_with_index do |item, index|
-        return false unless item === other[index]
-      end
-
-      true
-    end
-  end
-end

data/lib/ohm/validations.rb

@@ -1,213 +0,0 @@
-# encoding: UTF-8
-
-module Ohm
-  # Provides a base implementation for extensible validation routines.
-  # {Ohm::Validations} currently only provides the following assertions:
-  #
-  # * assert
-  # * assert_present
-  # * assert_format
-  # * assert_numeric
-  #
-  # The core tenets that Ohm::Validations advocates can be summed up in a
-  # few bullet points:
-  #
-  # 1. Validations are much simpler and better done using composition rather
-  #    than macros.
-  # 2. Error messages should be kept separate and possibly in the view or
-  #    presenter layer.
-  # 3. It should be easy to write your own validation routine.
-  #
-  # Since Ohm's philosophy is to keep the core code small, other validations
-  # are simply added on a per-model or per-project basis.
-  #
-  # If you want other validations you may want to take a peek at Ohm::Contrib
-  # and all of the validation modules it provides.
-  #
-  # @see http://cyx.github.com/ohm-contrib/doc/Ohm/WebValidations.html
-  # @see http://cyx.github.com/ohm-contrib/doc/Ohm/NumberValidations.html
-  # @see http://cyx.github.com/ohm-contrib/doc/Ohm/ExtraValidations.html
-  #
-  # @example
-  #
-  #   class Product < Ohm::Model
-  #     attribute :title
-  #     attribute :price
-  #     attribute :date
-  #
-  #     def validate
-  #       assert_present :title
-  #       assert_numeric :price
-  #       assert_format  :date, /\A[\d]{4}-[\d]{1,2}-[\d]{1,2}\z
-  #     end
-  #   end
-  #
-  #   product = Product.new
-  #   product.valid? == false
-  #   # => true
-  #
-  #   product.errors == [[:title, :not_present], [:price, :not_numeric],
-  #                      [:date, :format]]
-  #   # => true
-  #
-  module Validations
-    # Provides a simple implementation using the Presenter Pattern. When
-    # presenting errors, you have to properly catch all errors generated, or
-    # else you'll get an {Ohm::Validations::Presenter::UnhandledErrors}
-    # exception.
-    class Presenter
-      class UnhandledErrors < StandardError
-        attr :errors
-
-        def initialize(errors)
-          @errors = errors
-        end
-
-        def message
-          "Unhandled errors: #{errors.inspect}"
-        end
-      end
-
-      def initialize(errors)
-        @errors = errors
-        @unhandled = errors.dup
-        @output = []
-      end
-
-      def on(error, message = (block_given? ? yield : raise(ArgumentError)))
-        handle(error) do
-          @output << message
-        end
-      end
-
-      def ignore(error)
-        handle(error)
-      end
-
-      def present
-        yield(self)
-        raise UnhandledErrors.new(@unhandled) unless @unhandled.empty?
-        @output
-      end
-
-    protected
-
-      def handle(error)
-        if (errors = @errors.select {|e| error === e }).any?
-          @unhandled -= errors
-          yield(errors) if block_given?
-        end
-      end
-    end
-
-    # A simple class for storing all errors. Since {Ohm::Validations::Errors}
-    # extends Array, you can expect all array methods to work on it.
-    class Errors < Array
-      attr_accessor :model
-
-      def initialize(model)
-        @model = model
-      end
-
-      def present(presenter = Presenter, &block)
-        presenter.new(model.errors).present(&block)
-      end
-    end
-
-    # Check if the current model state is valid. Each call to {#valid?} will
-    # reset the {#errors} array.
-    #
-    # All model validations should be declared in a `validate` method.
-    #
-    # @example
-    #
-    #   class Post < Ohm::Model
-    #     attribute :title
-    #
-    #     def validate
-    #       assert_present :title
-    #     end
-    #   end
-    #
-    def valid?
-      errors.clear
-      validate
-      errors.empty?
-    end
-
-    # Base validate implementation.
-    def validate
-    end
-
-    # All errors for this model.
-    def errors
-      @errors ||= Errors.new(self)
-    end
-
-  protected
-
-    # Allows you to do a validation check against a regular expression.
-    # It's important to note that this internally calls {#assert_present},
-    # therefore you need not structure your regular expression to check
-    # for a non-empty value.
-    #
-    # @param [Symbol] att The attribute you want to verify the format of.
-    # @param [Regexp] format The regular expression with which to compare
-    #                 the value of att with.
-    # @param [Array<Symbol, Symbol>] error The error that should be returned
-    #                                when the validation fails.
-    def assert_format(att, format, error = [att, :format])
-      if assert_present(att, error)
-        assert(send(att).to_s.match(format), error)
-      end
-    end
-
-    # The most basic and highly useful assertion. Simply checks if the
-    # value of the attribute is empty.
-    #
-    # @param [Symbol] att The attribute you wish to verify the presence of.
-    # @param [Array<Symbol, Symbol>] error The error that should be returned
-    #                                when the validation fails.
-    def assert_present(att, error = [att, :not_present])
-      assert(!send(att).to_s.empty?, error)
-    end
-
-    # Checks if all the characters of an attribute is a digit. If you want to
-    # verify that a value is a decimal, try looking at Ohm::Contrib's
-    # assert_decimal assertion.
-    #
-    # @param [Symbol] att The attribute you wish to verify the numeric format.
-    # @param [Array<Symbol, Symbol>] error The error that should be returned
-    #                                when the validation fails.
-    # @see http://cyx.github.com/ohm-contrib/doc/Ohm/NumberValidations.html
-    def assert_numeric(att, error = [att, :not_numeric])
-      if assert_present(att, error)
-        assert_format(att, /^\d+$/, error)
-      end
-    end
-
-    # The grand daddy of all assertions. If you want to build custom
-    # assertions, or even quick and dirty ones, you can simply use this method.
-    #
-    # @example
-    #
-    #   class Post < Ohm::Model
-    #     attribute :slug
-    #     attribute :votes
-    #
-    #     def validate
-    #       assert_slug :slug
-    #       assert votes.to_i > 0, [:votes, :not_valid]
-    #     end
-    #
-    #   protected
-    #     def assert_slug(att, error = [att, :not_slug])
-    #       assert send(att).to_s =~ /\A[a-z\-0-9]+\z/, error
-    #     end
-    #   end
-    def assert(value, error)
-      value or errors.push(error) && false
-    end
-  end
-end
-