chop 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1135604264c973b4b42e5e47dba49d6887482a6d
-  data.tar.gz: 6fd23a8bc90f756d2e85be83f06791b7fea04384
+  metadata.gz: 9cc96c192b4724217ece419b28ba7f3e0cacf00f
+  data.tar.gz: 25e342b2afe607ac53764cee83cf625897c17c95
 SHA512:
-  metadata.gz: ac643b6fdd779b76c2b240661eb6dd899d7540a6ce4f8645effc721eb0d2988f44ed993c4b4ab79b3df9a1ae90bcd520a1129526604a393e91d36286d5a23483
-  data.tar.gz: 332ebe3878804ffba6f134036b7f048415fe4d1416c617c2a31360fe21124a3db0749aed3a4058d0d030b210bb95e6a6b6f29e6348916793135189a763731763
+  metadata.gz: 4f5db0423806ebc2092a37486ee2523ecf4e1ce9b494a890513aeab6bbdd303d4bc7dd931e80afcf86fda511c6a5f3f9cb4394ac1e4646a68890e3ba26ea0866
+  data.tar.gz: 013133adbdb80aad248c19ae365b70f8958e1a5b9884381e18a29aee06ab4b2a6d9f3fde97266439caa6a493b964d2b5459bfd4607bb32f238dda94d58aed08d

data/lib/chop/builder.rb

@@ -63,11 +63,10 @@ module Chop
     end
 
     def file *keys
-      if keys.last.is_a?(Hash) && keys.length > 1
-        options = keys.pop
-        path = options[:path]
-      end
-      path ||= "features/support/fixtures"
+      options = extract_options!(keys)
+      path = options.fetch(:path, "features/support/fixtures")
+
+      handle_renames! keys
 
       keys.each do |key|
         field key do |file|
@@ -77,13 +76,11 @@ module Chop
     end
 
     def files *keys
-      if keys.last.is_a?(Hash) && keys.length > 1
-        options = keys.pop
-        path = options[:path]
-        delimiter = options[:delimiter]
-      end
-      path ||= "features/support/fixtures"
-      delimiter ||= " "
+      options = extract_options!(keys)
+      path = options.fetch(:path, "features/support/fixtures")
+      delimiter = options.fetch(:delimiter, " ")
+
+      handle_renames! keys
 
       keys.each do |key|
         field key do |paths|
@@ -108,6 +105,23 @@ module Chop
       end
     end
     alias_method :belongs_to, :has_one
+
+    private
+
+    def extract_options! keys
+      if keys.last.is_a?(Hash) && keys.length > 1
+        keys.pop
+      else
+        {}
+      end
+    end
+
+    def handle_renames! keys
+      if keys.first.is_a?(Hash) && keys.length == 1
+        rename keys.first
+        keys.replace keys.first.values
+      end
+    end
   end
 end
 

data/lib/chop/version.rb

@@ -1,3 +1,3 @@
 module Chop
-  VERSION = "0.13.0"
+  VERSION = "0.13.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chop
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Micah Geisel