numbers 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b8b7bed5200ac39ae4e1d5647e90a57c608d314
-  data.tar.gz: 98fec333fcf4d9296b4a299e6fa91ef52d206857
+  metadata.gz: db8c1de9daaba97a10f279eaeea2222297be5f75
+  data.tar.gz: 20431d1f5535d63573a5e4d39de39802ba03a5e3
 SHA512:
-  metadata.gz: a5ce0e01cbeeac63f59128f937292dda9c02d113571a975b59af74974e6162ae2f75412c6f5235bd6783e78d3e0c4f242c1e3a505f1bd1077329c780a2bb13fc
-  data.tar.gz: abeaafa8d0b1a0461df9288b388a0ffa233387914e355dbdf7132dd73cde33fb5b7f719ac55716b04c7281cb87a933908e3991efe177b531948ea00675ead6c4
+  metadata.gz: 6c5cb65606de982af21f72a5f7280be043b9bcf4817044168ca088771f7d4d2fa2bd5b97aca5e4b1a6a3623fe5b17d4632cb0c38118aa4a5dddeb2c01593771f
+  data.tar.gz: b77715fe000778eef4c410926e9279502574b7224f8c0baae2cf30e2580a937e644790a9fd0c5daf9872cb6ca280cdfafb680f8576d76fa29bdb924183183a3e

data/lib/numbers.rb

@@ -8,80 +8,80 @@ module Numbers
 
   class << self
 
-    attr_accessor :api_key
-
-    def get_date_fact(day, month)
+    def date(day, month)
       if day.is_a?(Integer) && month.is_a?(Integer)
-        response = Connection.connection.get do |req|
-          req.url "/#{day}/#{month}/date?json=true"
-          req.headers['X-Mashape-Key'] = @api_key 
-          req.headers['Accept']        = "text/plain"
-        end
+        response = get_response(day, month)
         JSON.parse(response.body)
       else
         puts "day and month must be integers"
-        JSON.parse(response.body)
       end
     end
 
-    def get_math_fact(int)
+    def math(int)
       if int.is_a?(Integer)  
-        response = Connection.connection.get do |req|
-          req.url "/#{int}/math?json=true"
-          req.headers['X-Mashape-Key'] = @api_key 
-          req.headers['Accept']        = "text/plain"
-        end
+        response = get_response(int)
         JSON.parse(response.body)
       else
         puts "must submit an integer"
-        JSON.parse(response.body)
       end
     end
 
-    def get_random_fact
+    def random 
       types = %w{trivia math date year}
-      response = Connection.connection.get do |req|
-        req.url "/random/#{types.sample}?json=true"
-        req.headers['X-Mashape-Key'] = @api_key 
-        req.headers['Accept']        = "text/plain"
-      end
+      response = get_response(types.sample)
       JSON.parse(response.body)
     end
 
-    def get_trivia_fact(int)
+    def trivia(int)
       if int.is_a?(Integer)
-        response = Connection.connection.get do |req|
-          req.url "/#{int}/trivia?json=true"
-          req.headers['X-Mashape-Key'] = @api_key 
-          req.headers['Accept']        = "text/plain"
-        end
+        response = get_response(int)
         JSON.parse(response.body)
       else
         puts "must submit an integer"
-        JSON.parse(response.body)
       end
     end
 
-    def get_year_fact(int)
+    def year(int)
       if int.is_a?(Integer)
-        response = Connection.connection.get do |req|
-          req.url "/#{int}/year?json=true"
-          req.headers['X-Mashape-Key'] = @api_key 
-          req.headers['Accept']        = "text/plain"
-        end
+        response = get_response(int)
         JSON.parse(response.body)
       else
         puts "must submit an integer"
-        JSON.parse(response.body)
       end
     end
-  end
-end
 
-#Numbers.api_key = ""
-#puts Numbers.get_date_fact(21,6)
-#puts Numbers.get_math_fact(100)
-#puts Numbers.get_random_fact
-#puts Numbers.get_trivia_fact(20)
-#puts Numbers.get_year_fact(-1)
+    private 
+      def get_response(*args)
+        type = caller[0][/`.*'/][1..-2]
+
+        if type == "date"
+          Connection.connection.get do |req|
+            req.url "/#{args[0]}/#{args[1]}/#{type}?json=true" 
+          end
+
+        elsif type == "math"
+          Connection.connection.get do |req|
+            req.url "/#{args[0]}/#{type}?json=true" 
+          end
+
+        elsif type == "random"
+          Connection.connection.get do |req|
+            req.url "/#{type}/#{args[0]}/?json=true" 
+          end
 
+        elsif type == "trivia"
+          Connection.connection.get do |req|
+            req.url "/#{args[0]}/#{type}?json=true" 
+          end
+        
+        elsif type == "year"
+          Connection.connection.get do |req|
+            req.url "/#{args[0]}/#{type}?json=true" 
+          end
+        
+        else
+          puts "what the hell did you do"
+        end
+      end
+  end
+end

data/lib/numbers/connect.rb

@@ -3,9 +3,8 @@ module Numbers
     class << self
       attr_reader :connection
     end
-    @connection = Faraday.new(:url => "https://numbersapi.p.mashape.com") do |faraday|
-      faraday.response :logger
-      faraday.adapter Faraday.default_adapter
+    @connection = Faraday.new(:url => "http://numbersapi.com") do |faraday|
+      faraday.adapter(Faraday.default_adapter)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: numbers
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
-- aaron cowan
+- Aaron Cowan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-29 00:00:00.000000000 Z
+date: 2015-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -66,8 +66,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: 'Ruby gem for the use of the numbers API found here: https://www.mashape.com/divad12/numbers-1'
+summary: 'Ruby gem for the use of the numbers API found here: https://www.numbersapi.com'
 test_files: []