encapsulate_as_money 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 871fc3992a7bc06f07246f53da916ac9488782a5
-  data.tar.gz: cfb3f79877ec1b350bd984235f57126051840ef7
+  metadata.gz: 0c6b4e070f12e143adb39e5f507981a3962f35bc
+  data.tar.gz: 362cf15ef24f6f0424a02a309b43deb1a3391fbb
 SHA512:
-  metadata.gz: 11fd7c0c1ea70da59ea3ec0a19e6771cbcac143b63ea1e6c35fe81f2aaa4f3e0f058ecf64bc9a277d4a481c8f6a9be145a1482b99597395d6f59e42b0eaafc10
-  data.tar.gz: 9e2dd5dd3a400dea78ac0bf13c0c44d5b2ce1775fe824942e81d340d2580588f528597415764d996495122892fbb57f2e3a9c52be1c55fd1114f28a5e0b4c048
+  metadata.gz: 5bf283d26e20491e4be2a81500133f0cb2ebd909301fe6fb9ecd0e1deb30b2b7f622965e0d2f59f47db639452263bbbd8ff634f5627deec4fdf103d71898ffdb
+  data.tar.gz: 318dac26671a0b62d2651d399b575724c871b7e93a750e9d854e799c28d43335800588d10f0275996dc056cce5d147cacc4ba7539308473b86c2924728cf57fb

data/.gitignore

@@ -17,6 +17,7 @@ test/tmp
 test/version_tmp
 tmp
 *.bundle
+*.gemfile.lock
 *.so
 *.o
 *.a

data/.travis.yml

@@ -1,8 +1,13 @@
 language: ruby
 rvm:
-  - 2.1.1
+  - 2.1.2
   - 1.9.3
+before_install:
+  - gem update bundler
+gemfile:
+  - gemfiles/rails_3_2.gemfile
+  - gemfiles/rails_4_0.gemfile
 notifications:
   email:
     recipients:
-      - orien@envato.com
+      - financedev@envato.com

data/.yardopts

@@ -0,0 +1 @@
+- LICENSE.txt

data/Appraisals

@@ -0,0 +1,7 @@
+appraise 'rails-3_2' do
+  gem 'activemodel', '3.2.22.2'
+end
+
+appraise 'rails-4_0' do
+  gem 'activemodel', '4.0.13'
+end

data/README.md

@@ -1,4 +1,6 @@
 # EncapsulateAsMoney
+
+[![Gem Version](https://badge.fury.io/rb/encapsulate_as_money.svg)](http://badge.fury.io/rb/encapsulate_as_money)
 [![Build Status](https://travis-ci.org/envato/encapsulate_as_money.svg?branch=master)](https://travis-ci.org/envato/encapsulate_as_money)
 
 Want your model attribute to be a [Money](https://github.com/RubyMoney/money)

data/Rakefile

@@ -1,9 +1,9 @@
 require "bundler/gem_tasks"
-require "rake/testtask"
+require 'rspec/core/rake_task'
+require "yard"
 
 task :default => :spec
 
-Rake::TestTask.new(:spec) do |t|
-  t.libs << "spec"
-  t.test_files = Dir.glob("spec/**/*_spec.rb")
-end
+RSpec::Core::RakeTask.new(:spec)
+
+YARD::Rake::YardocTask.new

data/encapsulate_as_money.gemspec

@@ -19,8 +19,11 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "money", ">= 5.1.0"
 
-  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "minitest-given"
+  spec.add_development_dependency "rspec", "~> 2.0"
+  spec.add_development_dependency "rspec-given"
   spec.add_development_dependency "yard"
+  spec.add_development_dependency "appraisal"
+  spec.add_development_dependency "pry"
 end

data/gemfiles/rails_3_2.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activemodel", "3.2.22.2"
+
+gemspec :path => "../"

data/gemfiles/rails_4_0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activemodel", "4.0.13"
+
+gemspec :path => "../"

data/lib/encapsulate_as_money.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 require "encapsulate_as_money/version"
+require "encapsulate_as_money/activemodel_integration"
 require "money"
 
 module EncapsulateAsMoney
@@ -17,14 +18,19 @@ private
       define_method attribute do
         Money.new(super()) if super()
       end
+
+      define_method "#{attribute}=" do |money|
+        super(money && money.fractional)
+      end
     else
       define_method attribute do
         Money.new(super() || 0)
       end
-    end
 
-    define_method "#{attribute}=" do |money|
-      super(money && money.fractional)
+      define_method "#{attribute}=" do |money|
+        num = (money && money.fractional) || 0
+        super(num)
+      end
     end
   end
 

data/lib/encapsulate_as_money/activemodel_integration.rb

@@ -0,0 +1,24 @@
+begin
+  require 'active_model'
+
+  if ActiveModel::VERSION::MAJOR == 4
+    module ActiveModel::Validations::Clusivity
+      private
+
+      def inclusion_method(enumerable)
+        if enumerable.first.is_a?(Money)
+          :cover?
+        else
+          return :include? unless enumerable.is_a?(Range)
+          case enumerable.first
+          when Numeric, Time, DateTime
+            :cover?
+          else
+            :include?
+          end
+        end
+      end
+    end
+  end
+rescue LoadError
+end

data/lib/encapsulate_as_money/version.rb

@@ -1,3 +1,3 @@
 module EncapsulateAsMoney
-  VERSION = "0.1"
+  VERSION = '0.2'
 end

data/script/setup.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+echo "This command will setup your local dev environment, including"
+echo "  * bundle install"
+echo
+
+echo "Bundling..."
+bundle install --binstubs bin --path .bundle

data/spec/encapsulate_as_money_spec.rb

@@ -10,7 +10,6 @@ describe EncapsulateAsMoney do
     }
   }
   Given(:model_instance) { model_class.new }
-  Given!(:init_attr_value) { model_instance.instance_variable_set :@attribute, initial_attr_value }
 
   describe "encapsulating the attribute as money" do
     When(:model_class) {
@@ -19,19 +18,41 @@ describe EncapsulateAsMoney do
       }
     }
 
-    context "initial value is nil" do
-      Given(:initial_attr_value) { nil }
-      Then { model_instance.attribute == Money.new(0) }
-    end
+    describe "reading" do
+      Given!(:init_attr_value) { model_instance.instance_variable_set :@attribute, initial_attr_value }
+
+      context "initial value is nil" do
+        Given(:initial_attr_value) { nil }
+        Then { model_instance.attribute == Money.zero }
+      end
+
+      context "initial value is 0" do
+        Given(:initial_attr_value) { 0 }
+        Then { model_instance.attribute == Money.zero }
+      end
 
-    context "initial value is 0" do
-      Given(:initial_attr_value) { 0 }
-      Then { model_instance.attribute == Money.new(0) }
+      context "initial value is 1" do
+        Given(:initial_attr_value) { 1 }
+        Then { model_instance.attribute == Money.new(1) }
+      end
     end
 
-    context "initial value is 1" do
-      Given(:initial_attr_value) { 1 }
-      Then { model_instance.attribute == Money.new(1) }
+    describe "writing" do
+
+      context "a value of $1" do
+        When { model_instance.attribute = Money.new(1_00) }
+        Then { model_instance.instance_variable_get(:@attribute) == 1_00 }
+      end
+
+      context "a value of $0" do
+        When { model_instance.attribute = Money.zero }
+        Then { model_instance.instance_variable_get(:@attribute) == 0 }
+      end
+
+      context "a value of nil" do
+        When { model_instance.attribute = nil }
+        Then { model_instance.instance_variable_get(:@attribute) == 0 }
+      end
     end
   end
 
@@ -42,19 +63,41 @@ describe EncapsulateAsMoney do
       }
     }
 
-    context "initial value is nil" do
-      Given(:initial_attr_value) { nil }
-      Then { model_instance.attribute == nil }
-    end
+    describe "reading" do
+      Given!(:init_attr_value) { model_instance.instance_variable_set :@attribute, initial_attr_value }
+
+      context "initial value is nil" do
+        Given(:initial_attr_value) { nil }
+        Then { model_instance.attribute == nil }
+      end
+
+      context "initial value is 0" do
+        Given(:initial_attr_value) { 0 }
+        Then { model_instance.attribute == Money.zero }
+      end
 
-    context "initial value is 0" do
-      Given(:initial_attr_value) { 0 }
-      Then { model_instance.attribute == Money.new(0) }
+      context "initial value is 1" do
+        Given(:initial_attr_value) { 1 }
+        Then { model_instance.attribute == Money.new(1) }
+      end
     end
 
-    context "initial value is 1" do
-      Given(:initial_attr_value) { 1 }
-      Then { model_instance.attribute == Money.new(1) }
+    describe "writing" do
+
+      context "a value of $1" do
+        When { model_instance.attribute = Money.new(1_00) }
+        Then { model_instance.instance_variable_get(:@attribute) == 1_00 }
+      end
+
+      context "a value of $0" do
+        When { model_instance.attribute = Money.zero }
+        Then { model_instance.instance_variable_get(:@attribute) == 0 }
+      end
+
+      context "a value of nil" do
+        When { model_instance.attribute = nil }
+        Then { model_instance.instance_variable_get(:@attribute).nil? }
+      end
     end
   end
 end

data/spec/integration/activemodel_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe "ActiveModel integration", skip: !ENV['APPRAISAL_INITIALIZED'] && !ENV['TRAVIS'] do
+  describe '.validates_inclusion_of' do
+    it "validates money correctly" do
+      expect(Price.new(amount: Money.new(0))).not_to be_valid
+      expect(Price.new(amount: Money.new(1))).to be_valid
+      expect(Price.new(amount: Money.new(2))).to be_valid
+      expect(Price.new(amount: Money.new(3))).not_to be_valid
+    end
+
+    it "validates numbers correctly" do
+      expect(Price.new(qty: 0)).not_to be_valid
+      expect(Price.new(qty: 1)).to be_valid
+      expect(Price.new(qty: 2)).to be_valid
+      expect(Price.new(qty: 3)).not_to be_valid
+    end
+  end
+end

data/spec/integration_helper.rb

@@ -0,0 +1,38 @@
+require 'active_model'
+
+class Price
+  extend EncapsulateAsMoney
+
+  case ActiveModel::VERSION::MAJOR
+  when 3 then include ActiveModel::AttributeMethods
+  when 4 then include ActiveModel::Model
+  else raise NotImplementedError, ActiveModel::VERSION::MAJOR
+  end
+
+  include ActiveModel::Validations
+
+  encapsulate_as_money :amount
+  validates_inclusion_of :amount, in: Money.new(1)..Money.new(2), allow_nil: true
+  validates_inclusion_of :qty, in: 1..2, allow_nil: true
+
+  def initialize(attributes = {})
+    @amount = attributes[:amount]
+    @qty = attributes[:qty]
+  end
+
+  def amount
+    @amount
+  end
+
+  def amount=(amount)
+    @amount = amount
+  end
+
+  def qty
+    @qty
+  end
+
+  def qty=(qty)
+    @qty = qty
+  end
+end

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 # encoding: utf-8
-require "encapsulate_as_money"
-require "minitest/autorun"
-require "minitest/given"
-require "minitest/pride"
-Dir[File.expand_path("../support/**/*.rb", __FILE__)].each { |f| require f }
+require 'encapsulate_as_money'
+require 'rspec/given'
+require 'integration_helper' if ENV['APPRAISAL_INITIALIZED'] || ENV['TRAVIS']
+
+RSpec.configure do |config|
+  config.color = true
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: encapsulate_as_money
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Anthony Sellitti
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-01 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -33,16 +33,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -58,7 +58,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-given
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-given
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -85,6 +99,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - anthony.sellitti@envato.com
@@ -99,14 +141,22 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- ".yardopts"
+- Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - encapsulate_as_money.gemspec
+- gemfiles/rails_3_2.gemfile
+- gemfiles/rails_4_0.gemfile
 - lib/encapsulate_as_money.rb
+- lib/encapsulate_as_money/activemodel_integration.rb
 - lib/encapsulate_as_money/version.rb
+- script/setup.sh
 - spec/encapsulate_as_money_spec.rb
+- spec/integration/activemodel_spec.rb
+- spec/integration_helper.rb
 - spec/spec_helper.rb
 homepage: https://github.com/envato/encapsulate_as_money
 licenses:
@@ -128,11 +178,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Represent model attributes as Money instances
 test_files:
 - spec/encapsulate_as_money_spec.rb
+- spec/integration/activemodel_spec.rb
+- spec/integration_helper.rb
 - spec/spec_helper.rb
 has_rdoc: