administrate-field-money 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f1f82ffeea29422652064a2123eb5cf7aa3a27bb
-  data.tar.gz: 668b5225bae65c081c16ee21bc21ba2ddb7ed587
+SHA256:
+  metadata.gz: ec3c5ec2ef19074866c5e57896588510cc75f02da829250ff15b08ca820bb6df
+  data.tar.gz: b3227940894385e6ba5eb6c5eaf57b34f09477161e64dafe221117115f7fe8ce
 SHA512:
-  metadata.gz: acce5209e8e4d0d776d81278b7089f9eb7511f835c7ec32e728f77e42eda951975d3c8978c9eb0610598a0fc4f29badc5e8b6c6188bc3ff1f81d6b5742644189
-  data.tar.gz: b240a7f451766f00168039ab01301a60a2474c93497f00260164d8c19fac98846253fb723f2626ab61d596c14d3affce08d3bb92b60e545ad5d30c2570518721
+  metadata.gz: a43e143d31706668b58631c9cff5a549347b3eb0a649777a2bfbaae13d7fd6fc2ad6059ce5f1165d6ec5d2e6b940c2716a25a3f05d2b686d3acf2b1c246377db
+  data.tar.gz: e2c55340da2d34038f7ebc575ffd02bb2db9ef21008ea3278fee927a2d1d4e3e671349338d88f9ee7b6667e8cb06a145e3a9e559882bf195a23291d60153e74d

data/.gitignore

@@ -1 +1,2 @@
 *.gem
+Gemfile.lock

data/.rspec

@@ -0,0 +1,2 @@
+--format documentation
+--color

data/CHANGELOG.md

@@ -1,26 +1,37 @@
 # Changelog
 
+## [v0.1.0](https://github.com/zooppa/administrate-field-money/tree/v0.1.0) (2018-03-06)
+
+[Full Changelog](https://github.com/zooppa/administrate-field-money/compare/v0.0.6...v0.1.0)
+
+* Use smarter defaults (thanks @serradura)
+
 ## [v0.0.6](https://github.com/zooppa/administrate-field-money/tree/v0.0.6) (2017-08-01)
+
 [Full Changelog](https://github.com/zooppa/administrate-field-money/compare/v0.0.5...v0.0.6)
 
 * Upgrade money gem
 
 ## [v0.0.5](https://github.com/zooppa/administrate-field-money/tree/v0.0.5) (2017-04-03)
+
 [Full Changelog](https://github.com/zooppa/administrate-field-money/compare/v0.0.4...v0.0.5)
 
 * Bump up Administrate dependency
 
 ## [v0.0.4](https://github.com/zooppa/administrate-field-money/tree/v0.0.4) (2017-03-20)
+
 [Full Changelog](https://github.com/zooppa/administrate-field-money/compare/v0.0.3...v0.0.4)
 
 * Bump up Administrate dependency
 
 ## [v0.0.3](https://github.com/zooppa/administrate-field-money/tree/v0.0.3) (2016-11-22)
+
 [Full Changelog](https://github.com/zooppa/administrate-field-money/compare/v0.0.2...v0.0.3)
 
 * Bump up Administrate dependency
 
 ## [v0.0.2](https://github.com/zooppa/administrate-field-money/tree/v0.0.2) (2016-11-14)
+
 [Full Changelog](https://github.com/zooppa/administrate-field-money/compare/v0.0.1...v0.0.2)
 
 **Implemented enhancements**:
@@ -28,4 +39,5 @@
 * Allow customization of symbol, delimiter and separator via options
 
 ## [v0.0.1](https://github.com/zooppa/administrate-field-money/tree/v0.0.1) (2016-11-11)
+
 First release

data/LICENSE.md

@@ -1,6 +1,6 @@
-The MIT License (MIT)
+MIT License
 
-Copyright (c) 2015-2016 z.productions.
+Copyright (c) 2018 Zooppa
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -9,13 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -1,6 +1,7 @@
 # Administrate::Field::Money
 
 [![Code Climate](https://codeclimate.com/github/zooppa/administrate-field-money/badges/gpa.svg)](https://codeclimate.com/github/zooppa/administrate-field-money)
+[![Build Status](https://semaphoreci.com/api/v1/zooppa/administrate-field-money/branches/master/badge.svg)](https://semaphoreci.com/zooppa/administrate-field-money)
 
 A plugin to deal with money in [Administrate], with the help of [Money] gem.
 
@@ -13,7 +14,7 @@ A plugin to deal with money in [Administrate], with the help of [Money] gem.
 Add it to your `Gemfile`:
 
 ```ruby
-gem 'administrate-field-money', '~> 0.0.5'
+gem 'administrate-field-money', '~> 0.1.0'
 ```
 
 Run:
@@ -27,19 +28,20 @@ Add to your `FooDashboard`:
 ```ruby
 ATTRIBUTE_TYPES = {
   bar: Field::Money.with_options(
-    unit: 'USD', # EUR, CAD, GBP, AUD, JPY, ...
+    code: 'USD', # EUR, CAD, GBP, AUD, JPY, ...
     symbol: '$',
     delimiter: ',',
     separator: '.'
   ),
 }.freeze
 ```
+
 The field will figure out the appropriate thousand separator and decimal delimiter for the unit.
 
 ## About
 
-Administrate::Field::Money is maintained by [z.productions].
+Administrate::Field::Money is maintained by [Zooppa].
 
-[Administrate]: https://github.com/thoughtbot/administrate
-[Money]: https://github.com/RubyMoney/money
-[z.productions]: https://www.z.productions/
+[administrate]: https://github.com/thoughtbot/administrate
+[money]: https://github.com/RubyMoney/money
+[zooppa]: https://www.zooppa.com/

data/Rakefile

@@ -0,0 +1,6 @@
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task default: :spec

data/administrate-field-money.gemspec

@@ -2,12 +2,12 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name = 'administrate-field-money'
-  gem.version = '0.0.6'
+  gem.version = '0.1.0'
   gem.authors = ['Michele Gerarduzzi']
   gem.email = ['michele.gerarduzzi@gmail.com']
   gem.homepage = 'https://github.com/zooppa/administrate-field-money'
-  gem.summary = 'A plugin to deal with money in Administrate'
-  gem.description = gem.summary
+  gem.summary = 'Money field plugin for Administrate'
+  gem.description = 'A plugin to deal with money in Administrate'
   gem.license = 'MIT'
 
   gem.require_paths = ['lib']
@@ -15,6 +15,9 @@ Gem::Specification.new do |gem|
   gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
 
   gem.add_runtime_dependency 'administrate', '< 1.0.0'
-  gem.add_runtime_dependency 'rails', '>= 4.2'
+  gem.add_runtime_dependency 'rails', '>= 4.2', '< 6'
   gem.add_runtime_dependency 'money', '~> 6'
+
+  gem.add_development_dependency 'rake', '~> 12.3'
+  gem.add_development_dependency 'rspec', '~> 3.7'
 end

data/app/assets/javascripts/administrate-field-money/application.js

@@ -1,14 +1,38 @@
 //= require jquery.maskMoney.min
 
 $(function() {
-  $('.maskmoney').each(function() {
-    // Apply the mask and trigger it
-    $(this).maskMoney().trigger('mask');
-
-    // Sync unmasked value with hidden field
-    $(this).on('change keyup paste', function() {
-      var unmaskedMoneyCents = $(this).maskMoney('unmasked')[0] * 100;
-      $(this).siblings('[type="hidden"]').val(unmaskedMoneyCents);
-    })
-  });
+  var getUnmaskedMoneyCents,
+      updateSiblingHiddenFieldValueOf,
+      syncUnmaskedValueWithHiddenField,
+      $applyMaskMoneyTo,
+      setupMaskMoney,
+      EVENTS_TO_SYNC = 'change keyup paste';
+
+  getUnmaskedMoneyCents = function($el) {
+    return $el.maskMoney('unmasked')[0] * 100;
+  };
+
+  updateSiblingHiddenFieldValueOf = function($el, getNewValue) {
+    $el.siblings('[type="hidden"]').val(
+      getNewValue($el)
+    );
+  };
+
+  syncUnmaskedValueWithHiddenField = function() {
+    updateSiblingHiddenFieldValueOf($(this), getUnmaskedMoneyCents);
+  };
+
+  $applyMaskMoneyTo = function(el) {
+    return $(el).maskMoney().trigger('mask');
+  };
+
+  setupMaskMoney = function() {
+    $applyMaskMoneyTo(this)
+      .on(
+        EVENTS_TO_SYNC,
+        syncUnmaskedValueWithHiddenField
+      );
+  };
+
+  $('[data-maskmoney]').each(setupMaskMoney);
 });

data/app/views/fields/money/_form.html.erb

@@ -17,7 +17,11 @@ that gets submitted with the form.
   <%= f.label field.attribute %>
 </div>
 <div class="field-unit__field">
-  <%= text_field_tag field.attribute, field.data, class: 'maskmoney',
-      data: { prefix: field.symbol, thousands: field.delimiter, decimal: field.separator } %>
+  <%= text_field_tag field.attribute, field.data,
+      data: {
+        maskmoney: true,
+        thousands: field.delimiter,
+        decimal: field.separator,
+        prefix: field.symbol } %>
   <%= f.hidden_field field.attribute %>
 </div>

data/lib/administrate/field/money.rb

@@ -1,9 +1,12 @@
+require 'rails'
 require 'administrate/field/text'
 require 'administrate/engine'
 
 module Administrate
   module Field
     class Money < Administrate::Field::Text
+      delegate :currency, to: :money
+
       class Engine < ::Rails::Engine
         Administrate::Engine.add_javascript 'administrate-field-money/application'
       end
@@ -17,19 +20,19 @@ module Administrate
       end
 
       def code
-        options.fetch(:code, 'USD')
+        options.fetch(:code, ::Money.default_currency.iso_code)
       end
 
       def symbol
-        options.fetch(:symbol, money.symbol)
+        options.fetch(:symbol, currency.symbol)
       end
 
       def delimiter
-        options.fetch(:delimiter, money.delimiter)
+        options.fetch(:delimiter, currency.thousands_separator)
       end
 
       def separator
-        options.fetch(:separator, money.separator)
+        options.fetch(:separator, currency.decimal_mark)
       end
     end
   end

data/spec/lib/administrate/field/money_spec.rb

@@ -0,0 +1,125 @@
+require 'spec_helper'
+require 'money'
+
+describe Administrate::Field::Money do
+  subject { described_class.new(:money, data, :show) }
+
+  let(:data) { 1000 }
+  let(:options) { {} }
+
+  before { allow(subject).to receive(:options).and_return(options) }
+
+  describe '#to_partial_path' do
+    it 'returns a partial based on the page being rendered' do
+      path = subject.to_partial_path
+      expect(path).to eq('/fields/money/show')
+    end
+  end
+
+  describe '#money' do
+    let(:output) { subject.money }
+
+    it 'returns a Money object with default values' do
+      expect(output).to be_a(Money)
+      expect(output.fractional).to eq 1000
+      expect(output.currency).to eq 'USD'
+    end
+  end
+
+  describe '#to_s' do
+    let(:output) { subject.to_s }
+
+    context 'with nil' do
+      let(:data) { nil }
+
+      it 'returns a formatted, zero amount in the default currency' do
+        expect(output).to eq '$0.00'
+      end
+    end
+
+    context 'with a value' do
+      let(:data) { 199 }
+
+      it 'returns the formatted amount in the default currency' do
+        expect(output).to eq '$1.99'
+      end
+
+      it 'returns the formatted amount with the selected symbol' do
+        allow(subject).to receive(:symbol).and_return('€')
+        expect(output).to eq '€1.99'
+      end
+    end
+  end
+
+  describe '#code' do
+    let(:output) { subject.code }
+
+    context 'with nil' do
+      it 'returns USD' do
+        expect(output).to eq 'USD'
+      end
+    end
+
+    context 'with a valid option' do
+      let(:options) { { code: 'EUR' } }
+
+      it 'returns the value' do
+        expect(output).to eq 'EUR'
+      end
+    end
+  end
+
+  describe '#symbol' do
+    let(:output) { subject.symbol }
+
+    context 'with nil' do
+      it 'returns $' do
+        expect(output).to eq '$'
+      end
+    end
+
+    context 'with a valid option' do
+      let(:options) { { symbol: '¥' } }
+
+      it 'returns the value' do
+        expect(output).to eq '¥'
+      end
+    end
+  end
+
+  describe '#delimiter' do
+    let(:output) { subject.delimiter }
+
+    context 'with nil' do
+      it 'returns a comma' do
+        expect(output).to eq ','
+      end
+    end
+
+    context 'with a valid option' do
+      let(:options) { { delimiter: '.' } }
+
+      it 'returns the value' do
+        expect(output).to eq '.'
+      end
+    end
+  end
+
+  describe '#separator' do
+    let(:output) { subject.separator }
+
+    context 'with nil' do
+      it 'returns a dot' do
+        expect(output).to eq '.'
+      end
+    end
+
+    context 'with a valid option' do
+      let(:options) { { separator: ',' } }
+
+      it 'returns the value' do
+        expect(output).to eq ','
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,2 @@
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+require 'administrate/field/money'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: administrate-field-money
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - Michele Gerarduzzi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-01 00:00:00.000000000 Z
+date: 2018-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: administrate
@@ -31,6 +31,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +41,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: money
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +58,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.3'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.7'
 description: A plugin to deal with money in Administrate
 email:
 - michele.gerarduzzi@gmail.com
@@ -60,11 +94,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.md
 - README.md
+- Rakefile
 - administrate-field-money.gemspec
 - app/assets/javascripts/administrate-field-money/application.js
 - app/views/fields/money/_form.html.erb
@@ -72,6 +107,8 @@ files:
 - app/views/fields/money/_show.html.erb
 - demo.gif
 - lib/administrate/field/money.rb
+- spec/lib/administrate/field/money_spec.rb
+- spec/spec_helper.rb
 - vendor/assets/javascripts/jquery.maskMoney.min.js
 homepage: https://github.com/zooppa/administrate-field-money
 licenses:
@@ -93,8 +130,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
-summary: A plugin to deal with money in Administrate
-test_files: []
+summary: Money field plugin for Administrate
+test_files:
+- spec/lib/administrate/field/money_spec.rb
+- spec/spec_helper.rb

data/Gemfile.lock

@@ -1,162 +0,0 @@
-PATH
-  remote: .
-  specs:
-    administrate-field-money (0.0.6)
-      administrate (< 1.0.0)
-      money (~> 6)
-      rails (>= 4.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (5.0.2)
-      actionpack (= 5.0.2)
-      nio4r (>= 1.2, < 3.0)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.0.2)
-      actionpack (= 5.0.2)
-      actionview (= 5.0.2)
-      activejob (= 5.0.2)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (5.0.2)
-      actionview (= 5.0.2)
-      activesupport (= 5.0.2)
-      rack (~> 2.0)
-      rack-test (~> 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.2)
-      activesupport (= 5.0.2)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.0.2)
-      activesupport (= 5.0.2)
-      globalid (>= 0.3.6)
-    activemodel (5.0.2)
-      activesupport (= 5.0.2)
-    activerecord (5.0.2)
-      activemodel (= 5.0.2)
-      activesupport (= 5.0.2)
-      arel (~> 7.0)
-    activesupport (5.0.2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    administrate (0.4.0)
-      autoprefixer-rails (~> 6.0)
-      bourbon (~> 4.2)
-      datetime_picker_rails (~> 0.0.7)
-      jquery-rails (~> 4.0)
-      kaminari (~> 0.16)
-      momentjs-rails (~> 2.8)
-      neat (~> 1.1)
-      normalize-rails (~> 3.0)
-      rails (>= 4.2, < 5.1)
-      sass-rails (~> 5.0)
-      selectize-rails (~> 0.6)
-    arel (7.1.4)
-    autoprefixer-rails (6.7.7)
-      execjs
-    bourbon (4.3.3)
-      sass (~> 3.4)
-      thor (~> 0.19)
-    builder (3.2.3)
-    concurrent-ruby (1.0.5)
-    datetime_picker_rails (0.0.7)
-      momentjs-rails (>= 2.8.1)
-    erubis (2.7.0)
-    execjs (2.7.0)
-    globalid (0.3.7)
-      activesupport (>= 4.1.0)
-    i18n (0.8.1)
-    jquery-rails (4.2.2)
-      rails-dom-testing (>= 1, < 3)
-      railties (>= 4.2.0)
-      thor (>= 0.14, < 2.0)
-    kaminari (0.17.0)
-      actionpack (>= 3.0.0)
-      activesupport (>= 3.0.0)
-    loofah (2.0.3)
-      nokogiri (>= 1.5.9)
-    mail (2.6.4)
-      mime-types (>= 1.16, < 4)
-    method_source (0.8.2)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_portile2 (2.1.0)
-    minitest (5.10.1)
-    momentjs-rails (2.17.1)
-      railties (>= 3.1)
-    money (6.9.0)
-      i18n (>= 0.6.4, < 0.9)
-    neat (1.8.0)
-      sass (>= 3.3)
-      thor (~> 0.19)
-    nio4r (2.0.0)
-    nokogiri (1.7.1)
-      mini_portile2 (~> 2.1.0)
-    normalize-rails (3.0.3)
-    rack (2.0.1)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (5.0.2)
-      actioncable (= 5.0.2)
-      actionmailer (= 5.0.2)
-      actionpack (= 5.0.2)
-      actionview (= 5.0.2)
-      activejob (= 5.0.2)
-      activemodel (= 5.0.2)
-      activerecord (= 5.0.2)
-      activesupport (= 5.0.2)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.2)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.2)
-      activesupport (>= 4.2.0, < 6.0)
-      nokogiri (~> 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (5.0.2)
-      actionpack (= 5.0.2)
-      activesupport (= 5.0.2)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (12.0.0)
-    sass (3.4.23)
-    sass-rails (5.0.6)
-      railties (>= 4.0.0, < 6)
-      sass (~> 3.1)
-      sprockets (>= 2.8, < 4.0)
-      sprockets-rails (>= 2.0, < 4.0)
-      tilt (>= 1.1, < 3)
-    selectize-rails (0.12.4)
-    sprockets (3.7.1)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.0)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    thor (0.19.4)
-    thread_safe (0.3.6)
-    tilt (2.0.7)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    websocket-driver (0.6.5)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  administrate-field-money!
-
-BUNDLED WITH
-   1.14.6