ohm-contrib 0.0.35 → 0.0.36

data/README.markdown

@@ -2,19 +2,19 @@ ohm-contrib
 ===========
 
 A collection of drop-in modules for Ohm. Read the full documentation at
-[http://labs.sinefunc.com/ohm-contrib](http://labs.sinefunc.com/ohm-contrib).
+[http://cyx.github.com/ohm-contrib](http://cyx.github.com/ohm-contrib).
 
 List of modules
 ---------------
-1. [`Ohm::Boundaries`](http://labs.sinefunc.com/ohm-contrib/doc/Ohm/Boundaries.html)
-2. [`Ohm::Callbacks`](http://labs.sinefunc.com/ohm-contrib/doc/Ohm/Callbacks.html)
-3. [`Ohm::Timestamping`](http://labs.sinefunc.com/ohm-contrib/doc/Ohm/Timestamping.html)
-4. [`Ohm::ToHash`](http://labs.sinefunc.com/ohm-contrib/doc/Ohm/ToHash.html)
-5. [`Ohm::WebValidations`](http://labs.sinefunc.com/ohm-contrib/doc/Ohm/WebValidations.html)
-6. [`Ohm::NumberValidations`](http://labs.sinefunc.com/ohm-contrib/doc/Ohm/NumberValidations.html)
-7. [`Ohm::ExtraValidations`](http://labs.sinefunc.com/ohm-contrib/doc/Ohm/ExtraValidations.html)
-8. [`Ohm::Typecast`](http://labs.sinefunc.com/ohm-contrib/doc/Ohm/Typecast.html)
-9. [`Ohm::Locking`](http://labs.sinefunc.com/ohm-contrib/doc/Ohm/Locking.html)
+1. [`Ohm::Boundaries`](http://cyx.github.com/ohm-contrib/doc/Ohm/Boundaries.html)
+2. [`Ohm::Callbacks`](http://cyx.github.com/ohm-contrib/doc/Ohm/Callbacks.html)
+3. [`Ohm::Timestamping`](http://cyx.github.com/ohm-contrib/doc/Ohm/Timestamping.html)
+4. [`Ohm::ToHash`](http://cyx.github.com/ohm-contrib/doc/Ohm/ToHash.html)
+5. [`Ohm::WebValidations`](http://cyx.github.com/ohm-contrib/doc/Ohm/WebValidations.html)
+6. [`Ohm::NumberValidations`](http://cyx.github.com/ohm-contrib/doc/Ohm/NumberValidations.html)
+7. [`Ohm::ExtraValidations`](http://cyx.github.com/ohm-contrib/doc/Ohm/ExtraValidations.html)
+8. [`Ohm::Typecast`](http://cyx.github.com/ohm-contrib/doc/Ohm/Typecast.html)
+9. [`Ohm::Locking`](http://cyx.github.com/ohm-contrib/doc/Ohm/Locking.html)
 
 Example usage
 -------------

data/lib/ohm/contrib/scope.rb

@@ -0,0 +1,29 @@
+module Ohm
+  module Scope
+    def self.included(base)
+      unless defined?(base::DefinedScopes)
+        base.const_set(:DefinedScopes, Module.new)
+      end
+
+      base.extend Macros
+    end
+
+    module Macros
+      def scope(scope = nil, &block)
+        self::DefinedScopes.module_eval(&block) if block_given?
+        self::DefinedScopes.send(:include, scope) if scope
+      end
+    end
+
+    module OverloadedSet
+      def initialize(*args)
+        super
+
+        extend model::DefinedScopes if defined?(model::DefinedScopes)
+      end
+    end
+
+    Ohm::Model::Set.send :include, OverloadedSet
+  end
+end
+

data/lib/ohm/contrib.rb

@@ -1,6 +1,6 @@
 module Ohm
   module Contrib
-    VERSION = '0.0.35'
+    VERSION = '0.0.36'
   end
 
   autoload :Boundaries,        "ohm/contrib/boundaries"
@@ -15,5 +15,6 @@ module Ohm
   autoload :Callbacks,         "ohm/contrib/callbacks"
   autoload :LunarMacros,       "ohm/contrib/lunar_macros"
   autoload :Slug,              "ohm/contrib/slug"
+  autoload :Scope,             "ohm/contrib/scope"
 end
 

data/test/scope_test.rb

@@ -0,0 +1,76 @@
+# encoding: UTF-8
+
+require File.expand_path("./helper", File.dirname(__FILE__))
+
+class Post < Ohm::Model
+  set :comments, Comment
+end
+
+class Video < Ohm::Model
+  list :comments, Comment
+end
+
+module Finders
+  def rejected
+    find(:status => "rejected")
+  end
+end
+
+class Comment < Ohm::Model
+  include Ohm::Scope
+
+  attribute :status
+  index :status
+
+  scope do
+    def approved
+      find(:status => "approved")
+    end
+  end
+
+  scope Finders
+end
+
+test "has a predefined scope" do
+  assert defined?(Comment::DefinedScopes)
+end
+
+test "allows custom methods for the defined scopes" do
+  post = Post.create
+  comment = Comment.create(:status => "approved")
+  post.comments << comment
+
+  assert post.comments.approved.is_a?(Ohm::Model::Set)
+  assert post.comments.approved.include?(comment)
+end
+
+test "allows custom methods to be included from a module" do
+  post = Post.create
+  comment = Comment.create(:status => "rejected")
+  post.comments << comment
+
+  assert post.comments.rejected.is_a?(Ohm::Model::Set)
+  assert post.comments.rejected.include?(comment)
+end
+
+test "works with the main Comment.all collection as well" do
+  approved = Comment.create(:status => "approved")
+  rejected = Comment.create(:status => "rejected")
+
+
+  assert Comment.all.approved.include?(approved)
+  assert Comment.all.rejected.include?(rejected)
+end
+
+test "isolated from List" do
+  video = Video.create
+
+  assert_raise NoMethodError do
+    video.comments.approved
+  end
+
+  assert_raise NoMethodError do
+    video.comments.rejected
+  end
+end
+

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 35
-  version: 0.0.35
+  - 36
+  version: 0.0.36
 platform: ruby
 authors: 
 - Cyril David
@@ -99,6 +99,7 @@ files:
 - lib/ohm/contrib/locking.rb
 - lib/ohm/contrib/lunar_macros.rb
 - lib/ohm/contrib/number_validations.rb
+- lib/ohm/contrib/scope.rb
 - lib/ohm/contrib/slug.rb
 - lib/ohm/contrib/timestamping.rb
 - lib/ohm/contrib/typecast.rb
@@ -118,6 +119,7 @@ files:
 - test/macro_callbacks_test.rb
 - test/membership_validation_test.rb
 - test/number_validations_test.rb
+- test/scope_test.rb
 - test/slug_test.rb
 - test/timestamping_test.rb
 - test/typecast_array_test.rb