ohm-contrib 2.0.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a52426f91b67c71d40fe30b9349b19523cc2ae49
-  data.tar.gz: b3e078c7c34c4f5936d1674317f71b6607c81f4e
+  metadata.gz: a6d0332468e71364193f8b9101b274b3d68e0506
+  data.tar.gz: e9f7ed58326d36a0a1773590971d34ab4dccabae
 SHA512:
-  metadata.gz: 1bb1072d4f28ea0e59bb49cc0057e950f25cc831da0e4a12cc25b09ed613dba38e455efea60209cf8c8376d34f82afae804c909d437a1b6b83a01901441ead50
-  data.tar.gz: 5842bd888c672735b63919fd819e6bad5f8c75252c104664d445fe60728b7bcb49e2ed5fc8ba4fa6cf810dcdf9b554937c18249b96eef5d710cf259a7b651de7
+  metadata.gz: 3488b53d5c3102d660be34c4af46966e6454feea8e1c4363c05cb5c900e7900880c91d99a0ebd360cb5a4fe3d6ad37d3813c2add6165a7dca6190c3e407ae375
+  data.tar.gz: 829fc7c088742507391e8cbc7bca26ef3582d12f21d0ddd4553a500641c77ee0080fb610ccd83e425bf76a817de0ce91af54a7e94b860d41488632927633cff6

data/.gems

@@ -1,4 +1,4 @@
-cutest -v 1.2.1
 iconv -v 1.0.4
-ohm -v 2.0.0
 override -v 0.0.10
+ohm -v 2.1.0
+cutest -v 1.2.2

data/lib/ohm/scope.rb

@@ -16,32 +16,21 @@ module Ohm
     end
   end
 
-  # In Ohm v1.2, the Set and MultiSet initialize methods
-  # are defined on themselves. Hence the trick of doing a
-  # module OverloadedSet with an initialize method doesn't
-  # work anymore.
+  # In Ohm v1.2, the Set initialize method is defined on
+  # itself. Hence the trick of doing a module OverloadedSet
+  # with an initialize method doesn't work anymore.
   #
   # The simplest way to solve that as of now is to duplicate
-  # and extend the #initialize method for each of these.
+  # and extend the #initialize method for Ohm::Set.
   #
   # Granted it's not the _ideal_ way, the drawbacks are
   # outweighed by the simplicity and performance of this
   # approach versus other monkey-patching techniques.
   class Set
-    def initialize(key, namespace, model)
-      @key = key
-      @namespace = namespace
+    def initialize(model, namespace, key)
       @model = model
-
-      extend model::DefinedScopes if defined?(model::DefinedScopes)
-    end
-  end
-
-  class MultiSet
-    def initialize(namespace, model, command)
       @namespace = namespace
-      @model = model
-      @command = command
+      @key = key
 
       extend model::DefinedScopes if defined?(model::DefinedScopes)
     end

data/lib/ohm/softdelete.rb

@@ -71,7 +71,7 @@ module Ohm
 
     module ClassMethods
       def deleted
-        Set.new(key[:deleted], key, self)
+        Set.new(self, key, key[:deleted])
       end
 
       def exists?(id)

data/ohm-contrib.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "ohm-contrib"
-  s.version = "2.0.1"
+  s.version = "2.2.0"
   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"
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
 
   s.files = `git ls-files`.split("\n")
 
-  s.add_dependency "ohm", "~> 2.0"
+  s.add_dependency "ohm", "~> 2.2"
 
   s.add_development_dependency "cutest", "~> 1.2"
   s.add_development_dependency "iconv", "~> 1.0"

data/test/scope.rb

@@ -35,7 +35,7 @@ test "allows custom methods for the defined scopes" do
   comment = Comment.create(status: "approved")
   post.comments.add(comment)
 
-  assert post.comments.approved.is_a?(Ohm::MultiSet)
+  assert post.comments.approved.is_a?(Ohm::Set)
   assert post.comments.approved.include?(comment)
 end
 
@@ -44,7 +44,7 @@ test "allows custom methods to be included from a module" do
   comment = Comment.create(status: "rejected")
   post.comments.add(comment)
 
-  assert post.comments.rejected.is_a?(Ohm::MultiSet)
+  assert post.comments.rejected.is_a?(Ohm::Set)
   assert post.comments.rejected.include?(comment)
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohm-contrib
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Cyril David
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-17 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ohm
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: cutest
   requirement: !ruby/object:Gem::Requirement
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A collection of decoupled drop-in modules for Ohm.