economy 4.0.2.2 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 604ef31f6b464eba0d5b4d8c8a454df35fd71702
-  data.tar.gz: 8a1a64a988d2512cd3d9153a9fb546423a4f9119
+  metadata.gz: 62a2ca99ccecd9937ba2d6615de139271b036c69
+  data.tar.gz: a9cd3831673d998374028c65446e9d46a30d82ef
 SHA512:
-  metadata.gz: 10e15710522822f0a16ce3593d062f8fdcf3fe8f0a17bcb42726c3bc5b05c35d14b961bf275115c007f16ced00368facfc68eabf5350d82902d365de410923f9
-  data.tar.gz: eb8348a59397084bea84f35228b26b70dbe7d2128f0a2043b40fa9de4f1cce8f4456fa9e633ce006f42ecc3db932669f58d3139870eb373cbff1bcc83edaf8ae
+  metadata.gz: 25a6321fbe47283b149a902aeb3b9238dcfc58fbb1c1f6c4239ee88e33522cb23594f92a492871d09610fcef44c9a6523dd60ddf0c0975d3cd1b4a0a84a099a2
+  data.tar.gz: c1545860209426cdd85756b05c90e55fa03e8d390c167a03fbd79356d304c7818933cb5ee214e1c4aaa96afea85981be13b0f7b19379820b3e3804242fbdcab5

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2016 Mathías Montossi
+Copyright 2017 Museways
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,7 +1,7 @@
 [![Gem Version](https://badge.fury.io/rb/economy.svg)](http://badge.fury.io/rb/economy)
-[![Code Climate](https://codeclimate.com/github/mmontossi/economy/badges/gpa.svg)](https://codeclimate.com/github/mmontossi/economy)
-[![Build Status](https://travis-ci.org/mmontossi/economy.svg)](https://travis-ci.org/mmontossi/economy)
-[![Dependency Status](https://gemnasium.com/mmontossi/economy.svg)](https://gemnasium.com/mmontossi/economy)
+[![Code Climate](https://codeclimate.com/github/museways/economy/badges/gpa.svg)](https://codeclimate.com/github/museways/economy)
+[![Build Status](https://travis-ci.org/museways/economy.svg)](https://travis-ci.org/museways/economy)
+[![Dependency Status](https://gemnasium.com/museways/economy.svg)](https://gemnasium.com/museways/economy)
 
 # Economy
 
@@ -140,11 +140,11 @@ NOTE: You probably want to put the rake task into a cronjob.
 
 Any issue, pull request, comment of any kind is more than welcome!
 
-I will mainly ensure compatibility to PostgreSQL, AWS, Redis, Elasticsearch, FreeBSD and Memcached. 
+I will mainly ensure compatibility to Rails, AWS, PostgreSQL, Redis, Elasticsearch and FreeBSD. 
 
 ## Credits
 
-This gem is maintained and funded by [mmontossi](https://github.com/mmontossi).
+This gem is maintained and funded by [museways](https://github.com/museways).
 
 ## License
 

data/Rakefile

@@ -4,16 +4,14 @@ rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
-Bundler::GemHelper.install_tasks
+require 'bundler/gem_tasks'
 
 require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
   t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
   t.verbose = false
-  t.warning = false
 end
 
 task default: :test

data/lib/economy.rb

@@ -1,3 +1,5 @@
+require 'net/http'
+
 require 'economy/extensions/active_record/base'
 require 'economy/rates/base'
 require 'economy/rates/yahoo'

data/lib/economy/cache.rb

@@ -14,13 +14,13 @@ module Economy
     end
 
     def method_missing(name, *args, &block)
-      client.public_send name, *args, &block
+      redis.public_send name, *args, &block
     end
 
     private
 
-    def client
-      @client ||= begin
+    def redis
+      @redis ||= begin
         require 'redis'
         Redis.new YAML.load_file("#{Rails.root}/config/redis.yml")[Rails.env]
       end

data/lib/economy/configuration.rb

@@ -1,7 +1,7 @@
 module Economy
   class Configuration
 
-    attr_accessor :client, :rates, :default_currency
+    attr_accessor :rates, :default_currency
 
     def add_currency(*args)
       Economy.currencies.add *args

data/lib/economy/money.rb

@@ -59,7 +59,7 @@ module Economy
         other = other.exchange_to(currency)
         amount <=> other.amount
       else
-        raise "Only Numeric 0 and Money can be compared with Money"
+        raise "Can't compare #{other.class.name} with Money"
       end
     end
 
@@ -82,7 +82,10 @@ module Economy
     end
 
     def *(value)
-      if value.is_a?(Numeric)
+      case value
+      when Money
+        amount * value.exchange_to(currency).amount
+      when Numeric
         Money.new (amount * value), currency
       else
         raise "Can't multiply Money by #{value.class.name}"
@@ -136,7 +139,7 @@ module Economy
         if rate = Economy.rate(currency, new_currency)
           Money.new (amount * BigDecimal(rate)), new_currency
         else
-          raise "Exchange #{currency.iso_code} => #{new_currency.iso_code} not found"
+          raise "Rate #{currency.iso_code} => #{new_currency.iso_code} not found"
         end
       else
         self

data/lib/economy/version.rb

@@ -1,5 +1,5 @@
 module Economy
 
-  VERSION = '4.0.2.2'
+  VERSION = '5.1.0'
 
 end

data/lib/generators/economy/install/install_generator.rb

@@ -7,16 +7,16 @@ module Economy
 
       source_root File.expand_path('../templates', __FILE__)
 
-      def create_initializer_file
-        copy_file 'initializer.rb', 'config/initializers/economy.rb'
+      def add_economy_file
+        copy_file 'economy.rb', 'config/initializers/economy.rb'
       end
 
-      def create_configuration_file
-        copy_file 'configuration.yml', 'config/redis.yml'
+      def add_redis_file
+        copy_file 'redis.yml', 'config/redis.yml'
       end
 
-      def create_migration_file
-        migration_template 'migration.rb', 'db/migrate/create_exchanges.rb'
+      def add_create_exchanges_file
+        migration_template 'create_exchanges.rb', 'db/migrate/create_exchanges.rb'
       end
 
       def self.next_migration_number(path)

metadata

@@ -1,80 +1,74 @@
 --- !ruby/object:Gem::Specification
 name: economy
 version: !ruby/object:Gem::Version
-  version: 4.0.2.2
+  version: 5.1.0
 platform: ruby
 authors:
 - mmontossi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-14 00:00:00.000000000 Z
+date: 2017-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.21'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 description: High performance multicurrency money for rails.
 email:
-- mmontossi@gmail.com
+- hi@museways.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -96,66 +90,11 @@ files:
 - lib/economy/rates/yahoo.rb
 - lib/economy/version.rb
 - lib/generators/economy/install/install_generator.rb
-- lib/generators/economy/install/templates/configuration.yml
-- lib/generators/economy/install/templates/initializer.rb
-- lib/generators/economy/install/templates/migration.rb
+- lib/generators/economy/install/templates/create_exchanges.rb
+- lib/generators/economy/install/templates/economy.rb
+- lib/generators/economy/install/templates/redis.yml
 - lib/tasks/economy.rake
-- test/dummy/Rakefile
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/models/plan.rb
-- test/dummy/app/models/product.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/bin/bundle
-- test/dummy/bin/rails
-- test/dummy/bin/rake
-- test/dummy/bin/setup
-- test/dummy/config.ru
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/database.yml
-- test/dummy/config/database.yml.travis
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/assets.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/cookies_serializer.rb
-- test/dummy/config/initializers/economy.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/redis.yml
-- test/dummy/config/routes.rb
-- test/dummy/config/secrets.yml
-- test/dummy/db/migrate/20161115135521_create_exchanges.rb
-- test/dummy/db/migrate/20161115145905_create_products.rb
-- test/dummy/db/migrate/20161115150024_create_plans.rb
-- test/dummy/db/schema.rb
-- test/dummy/log/development.log
-- test/dummy/log/test.log
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/fixtures/yahoo/multiple.json
-- test/fixtures/yahoo/single.json
-- test/fixtures/yahoo/unknown.json
-- test/generator_test.rb
-- test/money_test.rb
-- test/rate_test.rb
-- test/record_test.rb
-- test/support/money_helper.rb
-- test/support/rate_helper.rb
-- test/task_test.rb
-- test/test_helper.rb
-homepage: https://github.com/mmontossi/economy
+homepage: https://github.com/museways/economy
 licenses:
 - MIT
 metadata: {}
@@ -167,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -175,63 +114,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Economy for Rails
-test_files:
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/models/plan.rb
-- test/dummy/app/models/product.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/bin/bundle
-- test/dummy/bin/rails
-- test/dummy/bin/rake
-- test/dummy/bin/setup
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/database.yml
-- test/dummy/config/database.yml.travis
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/assets.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/cookies_serializer.rb
-- test/dummy/config/initializers/economy.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/redis.yml
-- test/dummy/config/routes.rb
-- test/dummy/config/secrets.yml
-- test/dummy/config.ru
-- test/dummy/db/migrate/20161115135521_create_exchanges.rb
-- test/dummy/db/migrate/20161115145905_create_products.rb
-- test/dummy/db/migrate/20161115150024_create_plans.rb
-- test/dummy/db/schema.rb
-- test/dummy/log/development.log
-- test/dummy/log/test.log
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/Rakefile
-- test/fixtures/yahoo/multiple.json
-- test/fixtures/yahoo/single.json
-- test/fixtures/yahoo/unknown.json
-- test/generator_test.rb
-- test/money_test.rb
-- test/rate_test.rb
-- test/record_test.rb
-- test/support/money_helper.rb
-- test/support/rate_helper.rb
-- test/task_test.rb
-- test/test_helper.rb
+test_files: []

data/test/dummy/Rakefile

@@ -1,5 +0,0 @@
-# Add your own tasks in files placed in lib/tasks ending in .rake,
-# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
-
-require File.expand_path('../config/application', __FILE__)
-Rails.application.load_tasks

data/test/dummy/app/assets/javascripts/application.js

@@ -1,13 +0,0 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file.
-//
-// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
-// about supported directives.
-//
-//= require_tree .

data/test/dummy/app/assets/stylesheets/application.css

@@ -1,15 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any styles
- * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
- * file per style scope.
- *
- *= require_tree .
- *= require_self
- */

data/test/dummy/app/controllers/application_controller.rb

@@ -1,5 +0,0 @@
-class ApplicationController < ActionController::Base
-  # Prevent CSRF attacks by raising an exception.
-  # For APIs, you may want to use :null_session instead.
-  protect_from_forgery with: :exception
-end