HornsAndHooves-moribus 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc7f179d301fc0456db4d78a0d75d54b11a6d02e
-  data.tar.gz: 3e03e126a009c205683e710d5c5aee4c22bca363
+  metadata.gz: 78f55dc7ce48380cd5e0abab56ff669189a78720
+  data.tar.gz: e12ffe1c8b66b47b2d7fbebc420273dd4e91c755
 SHA512:
-  metadata.gz: fb9b09a579cb4e8c2265785d5f3f971ca73ee20cfda8f4cf129f970e837d6e3c9b6fb408f1a8a6e5935eb9975517e171dfcee4d00e2bb305d68a5e13db486ae6
-  data.tar.gz: 4d637e308246c0976a656386095fcd178b24c3532946be587fb3c6aae8f07328dd2ca4efc940fd96e46ee1e0ea8bbe366dcddba9558235d82a2ce195e67d28bd
+  metadata.gz: 38f92e8d95d1509b6f67b2d8e24242e352024746a989563edfc23c6b1e1fd8cbd5010fb408319b00a14d538a6dcac7821356c7e8093635e7239dedc332ffb2fa
+  data.tar.gz: dde51415193dae5676e4444bb12278871459ea3ef8693a3c87926a6333bd0428ea490681a46da1b0ef18ba83e1ce51e83edaed4426be997da04ddb69d762dfea

data/.simplecov

@@ -2,17 +2,17 @@ require "simplecov-rcov-text"
 require "colorized_text"
 include ColorizedText
 
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
   SimpleCov::Formatter::RcovTextFormatter,
   SimpleCov::Formatter::HTMLFormatter
-]
+])
 SimpleCov.start do
   add_filter "/spec/"
 
   # Fail the build when coverage is weak:
   at_exit do
     SimpleCov.result.format!
-    threshold, actual = 97.354, SimpleCov.result.covered_percent
+    threshold, actual = 96.875, SimpleCov.result.covered_percent
     if actual < threshold
       msg = "\nLow coverage: "
       msg << red("#{actual}%")

data/lib/moribus/macros.rb

@@ -92,8 +92,7 @@ module Moribus
       end
 
       reflection = has_one(name, scope, options)
-      # Rails 4.1 compatibility fix:
-      reflection = reflection["#{name}"] if reflection.respond_to? :[]
+      reflection = normalize_reflection(reflection, name)
       reflection.options[:is_current] = true
       accepts_nested_attributes_for name
       define_effective_reader_for name
@@ -108,8 +107,7 @@ module Moribus
     # Extensions::HasAggregatedExtension)
     def has_aggregated(name, options = {})
       reflection = belongs_to(name, options)
-      # Rails 4.1 compatibility fix:
-      reflection = reflection["#{name}"] if reflection.respond_to? :[]
+      reflection = normalize_reflection(reflection, name)
       reflection.options[:aggregated] = true
       accepts_nested_attributes_for name
       define_effective_reader_for name
@@ -118,6 +116,20 @@ module Moribus
     end
     private :has_aggregated
 
+    # Normalize reflection for Rails 4.1/4.2.
+    def normalize_reflection(reflection, name)
+      return reflection unless reflection.respond_to? :[]
+
+      if reflection.has_key?(name)
+        # Rails 4.1
+        reflection[name]
+      else
+        # Rails 4.2
+        reflection["#{name}"]
+      end
+    end
+    private :normalize_reflection
+
     # Declare a reader that will build associated object if it does not exist.
     # We can actually extend an association's readers like:
     #

data/lib/moribus/version.rb

@@ -1,3 +1,3 @@
 module Moribus # :nodoc:
-  VERSION = "0.4.0" # :nodoc:
+  VERSION = "0.4.1" # :nodoc:
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: HornsAndHooves-moribus
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - HornsAndHooves