measured-rails 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f2fda4ac8bc6a6fc40b01e377e1014cf78e006b
-  data.tar.gz: 098a3fbe2e9b4f511941401cba7e2d08d9185d6c
+  metadata.gz: 4d5f88adb6a1fc196acee3086445d1c4b006fba0
+  data.tar.gz: b5631f498609ac942c7d872979c9dc3b47e38ed3
 SHA512:
-  metadata.gz: c80dd3ba5391779b8e4321de6c272d6e8f0b2852ba50ec7314c27cb1527f15f5089f16b40229b8df74b6f81ec12245a58e8971a350d776e1791714c25d737a14
-  data.tar.gz: bb0356ddaaa957d83a356a528855399202d24b52e8a29cb66da25ef6cbed9df9696cd4bc0223c668351b8cb63cbf1e317aa8ffe90ce88c4dfe5ad5947f601949
+  metadata.gz: bcf37b722d81823b4f7d4aae41bc5252f3c10fc2f9ef2196f37a77c7c3ab304d3443c5eaf330ddbfbdb8db098ae128ec26ab66b7100392b6985754f0762d0908
+  data.tar.gz: 17848420192907297507c09746fb955978cccc84a5e07ab7c21812c499fc8a7d46078552b8d0e8bf71b763255b3d62dd7c8ff2a3c80a6fa50c5dab32eec26df8

data/.travis.yml

@@ -7,8 +7,8 @@ rvm:
   - 2.3.0
 gemfile:
   - Gemfile
-  - gemfiles/rails-5.0.gemfile
+  - gemfiles/rails-4.2.gemfile
 matrix:
   exclude:
-    - gemfile: gemfiles/rails-5.0.gemfile
+    - gemfile: Gemfile
       rvm: 2.1.8

data/Gemfile

@@ -1,6 +1,5 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in measured-rails.gemspec
 gemspec
 
 gem 'rails'

data/dev.yml

@@ -0,0 +1,22 @@
+name: measured-rails
+
+up:
+  - ruby:
+      version: 2.3.1
+  - bundler
+
+commands:
+  test:
+    syntax:
+      optional: file args...
+    desc: 'run all tests or a specific test file'
+    run: |
+      if [[ $# -eq 0 ]]; then
+        bundle exec rake test
+      else
+        bundle exec ruby -Itest "$@"
+      fi
+
+packages:
+  - git@github.com:Shopify/dev-shopify.git
+

data/gemfiles/rails-4.2.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'rails', '~> 4.2'
+gem 'rack', '< 2.0'

data/lib/measured/rails/validations.rb

@@ -16,8 +16,6 @@ class MeasuredValidator < ActiveModel::EachValidator
 
     return unless measurable_unit.present? || measurable_value.present?
 
-    record.errors.add(attribute, message("cannot be blank")) if [measurable_unit.blank?, measurable_value.blank?].any?
-
     record.errors.add(attribute, message("is not a valid unit")) unless measured_class.valid_unit?(measurable_unit)
 
     if options[:units]

data/lib/measured/rails/version.rb

@@ -1,5 +1,5 @@
 module Measured
   module Rails
-    VERSION = "1.4.0"
+    VERSION = "1.5.0"
   end
 end

data/measured-rails.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "railties", ">= 4.0"
   spec.add_runtime_dependency "activemodel", ">= 4.0"
-  spec.add_runtime_dependency "measured", "1.4.0"
+  spec.add_runtime_dependency "measured", "1.5.0"
 
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.5.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: measured-rails
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Kevin McPhillips
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-03 00:00:00.000000000 Z
+date: 2016-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -138,7 +138,8 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- gemfiles/rails-5.0.gemfile
+- dev.yml
+- gemfiles/rails-4.2.gemfile
 - lib/measured-rails.rb
 - lib/measured/rails/active_record.rb
 - lib/measured/rails/base.rb
@@ -170,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Rails adaptor for measured

data/gemfiles/rails-5.0.gemfile

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in measured-rails.gemspec
-gemspec path: '..'
-
-gem 'rails', github: 'rails/rails'