dao-repository 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5827809fbc98f7ff12dcab61273ac7df59a68e71
-  data.tar.gz: 2b3e041c27dbdaccb320c7696be119bb73dd52f2
+  metadata.gz: 4ddd25f7645a1099f8d52290266af25994908fc5
+  data.tar.gz: 350a8ddd28bf0e82e88150be053437f5f18e9d27
 SHA512:
-  metadata.gz: c4bfb63202fc6817d44f1ff7df626b3ca78c1e7c1d5185d4e507d7e2761821a29cc81129c4d8b691fed469e5c5995a502e318e3a3f7128c680595bbf560a2d2a
-  data.tar.gz: 444d7a536adc80a5a75cec8c71467faa393210046e741c1075b8f3482f6f3a4d9d69d843128756eb3b9bc455a856019645c97812bc81008b5dc7e8b562fa8e7a
+  metadata.gz: 624fdd200b83aeaceca5ea04fd4d11db18622ad21067fe05625492d2561f95841dafaef94a38798a4f09c4f50e3d56b18fc804e357a890ec97b5574e344dbda2
+  data.tar.gz: fed37a0fd1b775d710b1c71d47a2ff9952353a5fc347ae0f59251271d70fee4cda97c3ecafaec9c112ede2317ce8c8c98d9e3db69267e6aa4d016de2a1ca74a6

data/lib/dao/repository/scope.rb

@@ -9,9 +9,8 @@ module Dao
         @with = []
       end
 
-      def method_missing(method_name, *args, **options, &block)
-        with = extract_relations(options)
-        args << options if options.any?
+      def method_missing(method_name, *args, &block)
+        with = extract_with(args)
 
         add_relations(with) if with.any?
 
@@ -45,13 +44,29 @@ module Dao
         scope.respond_to?(method_name, include_private) || super
       end
 
-      def extract_relations(options)
-        if options[:with]
-          Array([options.delete(:with)]).flatten.compact
+      def extract_with(args)
+        if have_with_option?(args)
+          with = extract_with_option(args)
+
+          Array([with]).flatten.compact
         else
           []
         end
       end
+
+      def have_with_option?(args)
+        options = args.last
+
+        options.is_a?(Hash) && options[:with]
+      end
+
+      def extract_with_option(args)
+        options = args.pop
+
+        options.delete(:with).tap do
+          args << options unless options.empty?
+        end
+      end
     end
   end
 end

data/lib/dao/repository/version.rb

@@ -1,5 +1,5 @@
 module Dao
   module Repository
-    VERSION = '1.1.0'
+    VERSION = '1.1.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dao-repository
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - llxff
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-02 00:00:00.000000000 Z
+date: 2016-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dao-gateway