momm 1.0.1 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49188c9f9fe8e63f39ca27c846cdc2ad823ab600
-  data.tar.gz: 78119d09bbd3b29e366be6eca01cd8bf704ce8a8
+  metadata.gz: 2f8c123f9bcdbbb764e3fd54e535b680459832b3
+  data.tar.gz: 00ccc6dd8dcbac9c8fe9c86cae4edbfc19fbefbe
 SHA512:
-  metadata.gz: 90a91b4b43ddc53843c35bd9e660efcba4f41f91d7723a65bae7769fa8143681c5808c32953583bfa1534ff294a48d42e89b992e1b8857226a850c352715a772
-  data.tar.gz: e532d8336ad98898eaead87bf039270839b71dd4a1b429645262c9637d6232a0012dc2adf89c5c5436cb5071783492abc01f20ecbe7ac9171b1b1b6d12419b10
+  metadata.gz: 34f6a7c4b0efc62474ba01ff124f54468cc84247e542feb3a609f52c0e77d1caf84e9239c3f7134da58b3543a679aacd786743490a0cf344d5d332a5931d1a84
+  data.tar.gz: 400f36abfcfd4e82fc72890ed957ca18ad5e352539f47bfd12cd885120202e632ed506b8a8d1720c4663d7847d4325e6530d8698dbb2c05551808a7b8866cda5

data/README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/jaxi/momm.svg?branch=master)](https://travis-ci.org/jaxi/momm)
 
-Money on My Mind - An awesome gem for currency exchange.
+Money on My Mind - A pure Ruby gem for currency exchange.
 
 ```
                    __  __                                        __  __
@@ -71,12 +71,10 @@ After the gem is installed, momm provide you a command line tool. The storage en
 
   Momm.exchange_rate 'GBP', 'USD' # By default Today
   Momm.exchange_rate 'GBP', 'USD', date: Date.today
-  Momm.exchange_rate_from_gbp_to_usd, date: "2014-3-4"
 
   Momm.exchange 100, 'GBP', 'USD'
   Momm.exchange 100, 'GBP', 'USD', date: Date.today
   Momm.exchange_from_gbp_to_usd 100
-  Momm.exchange_from_gbp_to_usd 100, date: "2014-3-4"
 
   Momm.update! # Fetching the feeds from remote. Only do that if you find any abnormal.
 ```

data/lib/momm.rb

@@ -26,8 +26,7 @@ module Momm
 
     # delegate the exchange, :currencies, exchange_rate,
     # as well as meta programmed methods to module level
-    delegate [:currencies, :exchange, :exchange_rate,
-        :method_missing, :respond_to?, :update! ] => :calculator
+    delegate [:currencies, :exchange, :exchange_rate, :update! ] => :calculator
 
     delegate [:store, :source ] => :bridge
 
@@ -65,4 +64,4 @@ module Momm
             Keep calm bro. We'll calculate rate for you.
   EOS
 
-end
+end

data/lib/momm/bridge.rb

@@ -44,4 +44,4 @@ module Momm
 
     attr_reader :storage, :feed
   end
-end
+end

data/lib/momm/calculator.rb

@@ -122,26 +122,5 @@ module Momm
       update!
       get_rate_origin(from, date)
     end
-
-    # @TODO: Refactoring
-    def method_missing(meth, *args, &block)
-      meth = meth.to_s
-      case
-      when meth.match(/^exchange_rate_from_(\w+)_to_(\w+)/)
-        exchange_rate($1.upcase.to_sym, $2.upcase.to_sym, *args, &block)
-      when meth.match(/^exchange_from_(\w+)_to_(\w+)/)
-        money, *res = args
-        exchange(money, $1.upcase.to_sym, $2.upcase.to_sym, *res, &block)
-      else
-        super
-      end
-    end
-
-    def respond_to?(meth, include_private = false)
-      meth = meth.to_s
-      meth.match(/^exchange_rate_from_(\w+)_to_(\w+)/) ||
-        meth.match(/^exchange_from_(\w+)_to_(\w+)/) ||
-          super
-    end
   end
-end
+end

data/lib/momm/feeds/ecb.rb

@@ -1,11 +1,12 @@
-require 'httparty'
-require 'open-uri'
+require "net/http"
+require "uri"
+require "rexml/document"
 
 module Momm
   module Feeds
     class ECB
 
-      FETCHING_URL = "http://www.ecb.europa.eu/stats/eurofxref/eurofxref-hist-90d.xml".freeze
+      FETCHING_URL = "https://www.ecb.europa.eu/stats/eurofxref/eurofxref-hist-90d.xml".freeze
 
       #Hard coded for good
       CURRENCIES = %w{USD JPY BGN CZK DKK GBP HUF LTL PLN RON SEK CHF
@@ -24,39 +25,54 @@ module Momm
         end
       end
 
+      ConnectionError = Class.new(StandardError)
       # should be a singleton class
       private_class_method :new
 
-      # Parse the XML data by Nokogiri
+      # Request the feed and get the response
+      #
       # == Returns
-      # Nokogiri Object
+      # A Net::HTTPResponse response
       #
-      def parsed_content
-        # @TODO Refactoring Bad patterns
-        HTTParty.get(fetching_url, format: :xml)['Envelope']['Cube']['Cube']
+      def response
+        @response ||= Net::HTTP.start(fetching_url.host, fetching_url.port,
+          :use_ssl => fetching_url.scheme == "https",
+          :open_timeout => 5,
+          :read_timeout => 5) do |http|
+
+          http.request Net::HTTP::Get.new(fetching_url)
+        end
+      end
+
+      # Response body in xml format
+      def xml
+        @xml ||= begin
+          raise ConnectionError unless response.is_a? Net::HTTPOK
+          REXML::Document.new response.body
+        end
       end
 
-      # convert the nokogiri parsed data to array
+      # turn the xml data to array of currencies
       #
       # == Returns
       # looks like [{date: Date.now, currency: :CNY, rate: 1.23} ...]
       #
       def currency_rates
-        parsed_content.map do |content|
-          date = Date.parse(content["time"])
-          cubes = content["Cube"]
-          cubes.map do |cube|
+        daily_currencies = xml.elements["//Cube"].select{ |c| c.is_a? REXML::Element }
+        daily_currencies.map do |daily_currency|
+          date = Date.parse daily_currency.attributes["time"]
+          daily_currency.map do |cube|
             {
               date: date,
-              currency: cube["currency"].to_sym,
-              rate: cube["rate"].to_f
+              currency: cube.attributes["currency"].to_sym,
+              rate: cube.attributes["rate"].to_f
             }
           end
         end.flatten
       end
 
       def fetching_url
-        FETCHING_URL
+        URI(FETCHING_URL)
       end
 
       def currencies
@@ -64,4 +80,4 @@ module Momm
       end
     end
   end
-end
+end

data/lib/momm/version.rb

@@ -1,3 +1,3 @@
 module Momm
-  VERSION = "1.0.1"
+  VERSION = "2.0.1"
 end

data/lib/momm/web.rb

@@ -1,7 +1,7 @@
-require 'sinatra/base'
-require 'momm'
-require 'erb'
-
+require "sinatra/base"
+require "momm"
+require "erb"
+require "json"
 module Momm
   class Web < ::Sinatra::Base
 
@@ -34,11 +34,13 @@ module Momm
       to = (params[:to] || "GBP").to_sym
       date = params[:date] || Date.today
 
-      if money && from && to && date
-        Momm.exchange(money, from, to, date: date).to_json
+      rate = if money && from && to && date
+        Momm.exchange(money, from, to, date: date)
       else
         "N/A"
       end
+
+      {rate: rate}.to_json
     end
 
     # GET '/currencies'

data/momm.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Jingkai He"]
   spec.email         = ["jaxihe@gmail.com"]
   spec.summary       = %q{A Currency Exchange Calculator}
-  spec.description   = %q{A Currency Exchange Calculator}
+  spec.description   = %q{A currency exchange calculator build in pure Ruby.}
   spec.homepage      = "https://github.com/jaxi/momm"
   spec.license       = "MIT"
 
@@ -18,14 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "httparty", ">= 0.12.0"
-  spec.add_dependency "json"
-
-  spec.add_development_dependency "redis"
-  spec.add_development_dependency "dalli"
-  spec.add_development_dependency "redis-namespace"
-  spec.add_development_dependency "rack-test"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "sinatra"
+  spec.add_development_dependency "dalli", "2.7.6"
+  spec.add_development_dependency "redis-namespace", "1.5.2"
+  spec.add_development_dependency "rack-test", "0.6.3"
+  spec.add_development_dependency "rake", "10.5.0"
+  spec.add_development_dependency "sinatra", "1.4.7"
   spec.add_development_dependency "rspec", "3.4.0"
 end

data/spec/momm/feeds/ecb_spec.rb

@@ -23,7 +23,7 @@ describe Momm::Feeds::ECB do
 
   describe "#fetching_url" do
     it 'should not be nil' do
-      expect(Momm::Feeds::ECB.instance.fetching_url).to be_a String
+      expect(Momm::Feeds::ECB.instance.fetching_url).to be_a URI::HTTPS
     end
   end
 

data/spec/momm/momm_spec.rb

@@ -10,14 +10,6 @@ describe Momm do
       expect(Momm).to respond_to :exchange
     end
 
-    it "should respond to exchange_from_gbp_to_usd" do
-      expect(Momm).to respond_to :exchange_from_gbp_to_usd
-    end
-
-    it "should respond to exchange_rate_from_gbp_to_usd" do
-      expect(Momm).to respond_to :exchange_rate_from_gbp_to_usd
-    end
-
     it "should respond to update!" do
       expect(Momm).to respond_to :update!
     end

data/vendor/assets/javascripts/money-on-my-mind.js

@@ -15015,7 +15015,7 @@ jQuery(function(){
       money: $('.momm-money').val(),
       date: $('.momm-date').val()
     }, function(result){
-      $('.momm-exchange').text(result);
+      $('.momm-exchange').text(result.rate);
     });
   };
 
@@ -15027,4 +15027,4 @@ jQuery(function(){
   load_exchanged();
 
   $(".mom-ele").on('change', load_exchanged);
-});
+});

metadata

@@ -1,127 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: momm
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.1
 platform: ruby
 authors:
 - Jingkai He
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-14 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: httparty
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.12.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.12.0
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: redis
-  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: dalli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.7.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.7.6
 - !ruby/object:Gem::Dependency
   name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.5.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.7
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -136,7 +94,7 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.4.0
-description: A Currency Exchange Calculator
+description: A currency exchange calculator build in pure Ruby.
 email:
 - jaxihe@gmail.com
 executables: