oldie_rails_models 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07ec288a256f261e4013f2334c6cd983fb588955
-  data.tar.gz: 25b389ed7f99e8c1987450c5070924adb7108ac0
+  metadata.gz: f3dc34f895b5e9d7ebfb8fe5cddc672ab3b89601
+  data.tar.gz: 039d2056d7e07692f79f222d996bc4a117a6a226
 SHA512:
-  metadata.gz: 8737e710174afeb5b3fc244ec10986ced6da364b8c31db57bb4035e494807a7b65097ed2b24f7282f2c9219ff4c4e9c1db304d64b2e9fa1b97bf082d0fb079f4
-  data.tar.gz: 60046831c1f95f21f1be10f3b319db5053b18a0ea80ed2979c2bc2aed2dbedb95d3a5190f5e1dbcdae51ebbdd451fe1e004cc53c7cccb45306a07250362a2b9e
+  metadata.gz: 8119972886002feaad67d0fb345634d1e4b5c04023ecb909418e3ad5fa89cd829635b55efc2cdb3209e8ba36d02f96c013ee9ae3118e424f3abdadfd721276a0
+  data.tar.gz: 9ddf897c59e455c1592e482175b2eaf3b550e527a5c3ae8f216247d646809f49344392c54d8356ef72291f1b7c860e86909adac04f0541722be33d1e33da5330

data/lib/oldie_rails_models/model.rb

@@ -93,19 +93,21 @@ module OldieRailsModels
     def attr_accessible(*args); end
 
     def has_many(*args)
-      name, opts = args
-      if opts
-        finders = {}
-        [:conditions, :order, :joins, :limit, :include, :offset, :group, :having, :finder_sql].each do |k|
-          if opts[k]
-            finders[k] = opts[k]
-            opts.delete(k)
+      name, opts, block = args
+
+      case opts
+        when Hash
+          finders = {}
+          [:conditions, :order, :joins, :limit, :include, :offset, :group, :having, :finder_sql].each do |k|
+            if opts[k]
+              finders[k] = opts[k]
+              opts.delete(k)
+            end
           end
+          super(name, -> { parent_scoped(finders, self) }, opts)
+        else
+          super
         end
-        super(name, -> { parent_scoped(finders, self) }, opts)
-      else
-        super(name, opts)
-      end
     end
 
     private

data/lib/oldie_rails_models/version.rb

@@ -1,3 +1,3 @@
 module OldieRailsModels
-  VERSION = "0.3.7"
+  VERSION = "0.3.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oldie_rails_models
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Alex Dubovskoy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2014-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails