uwaterlooapi 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b964bbcdda67f37363b799315ce0c95b4aa7ac7
-  data.tar.gz: 44de178a290b03b0bc45634eb277764d5790b9fe
+  metadata.gz: 0c80d6d3357a1f8ff107de957c4658dd0f638969
+  data.tar.gz: d10287d3b38a0149093b855bfaf57aad194615de
 SHA512:
-  metadata.gz: 5aba26699122d38b24d90007c22cc0fcbdee824884e8a7291a3dbf064f1716100c53a0e08e117c3b60f078f5b8e29755a5eace703a795fb1e7c5d7d07d090feb
-  data.tar.gz: c14a5ba395d33a1475bbf81a7c09be6ca487c9a0984a8a8fb52f28981b74852d25575cd5c82b2bb4c4e98211889b4ce75daa3fa2e77e18820387c056005b7353
+  metadata.gz: dda02ad184753bd3aec01a2e03e0816af7dd647dd127477fa3eab4c3a9a7731df4854ceaefc6c9702486aab463ab5eeabd75db4251ff46a313a9032e9e1393be
+  data.tar.gz: c342610a4c54a140fa5321cbc503d37e3b7f28c770fe301c4c29c6a68a0819d070aba8f6ccea2896b5783a4d96c22e1acb584626eb5861a78996178be5d0f61c

data/.travis.yml

@@ -2,3 +2,7 @@ language: ruby
 rvm:
   - 2.0.0
   - 2.1.0
+addons:
+  code_climate:
+    repo_token:
+      secure: "XlPjPyevyIybmYS5dM85AuRq5PdF86frD20+yOUXqUzBjZIpeQZ7jFyZQRGG38gAK35eG4x6dbyY+nsI74H3XH4c/R/u73D22Jtb8wOxmwRCoKR1l5Kpd57bT1WcbER4l/x2XRoglceMeGalhYoIEh+9wy5F9c0f6wh4A6rVPN0="

data/Gemfile

@@ -1,5 +1,8 @@
 source 'https://rubygems.org'
 
-gem 'rake'
+group :test do
+  gem 'rake'
+  gem 'codeclimate-test-reporter'
+end
 
 gemspec

data/README.md

@@ -3,7 +3,9 @@ uwaterlooapi
 
 RubyGem wrapper for the University of Waterloo OpenData API
 
-[![Build Status](https://travis-ci.org/amsardesai/uwaterlooapi.svg?branch=master)](https://travis-ci.org/amsardesai/uwaterlooapi)
+[![Build Status](https://travis-ci.org/amsardesai/uwaterlooapi.svg)](https://travis-ci.org/amsardesai/uwaterlooapi)
+[![Code Climate](https://codeclimate.com/github/amsardesai/uwaterlooapi/badges/gpa.svg)](https://codeclimate.com/github/amsardesai/uwaterlooapi)
+[![Test Coverage](https://codeclimate.com/github/amsardesai/uwaterlooapi/badges/coverage.svg)](https://codeclimate.com/github/amsardesai/uwaterlooapi)
 
 ## Installation
 
@@ -17,7 +19,7 @@ Or install it in your system:
 
 ## Usage
 
-To use the API, you must first get an API key from http://api.uwaterloo.ca/.
+To use this gem, you must first get an API key from http://api.uwaterloo.ca/.
 
 ```ruby
 # Require the gem at the top of your ruby file

data/lib/helpers/uwaterlooapi_query.rb

@@ -2,7 +2,7 @@ require 'recursive-open-struct'
 
 class UWaterlooAPIQuery
   include Routes
-
+  
   def initialize(cur_route, cur_url, api_key)
     @api_key = api_key
     @cur_url = cur_url
@@ -10,36 +10,20 @@ class UWaterlooAPIQuery
     @retrieved_url = ''
     @response = @meta = nil
 
-    # Select only routes that may come next
-    routes = @@routes.select { |s| s.start_with?(cur_route) }.
-      map { |s| s[@cur_route.length..-1] }.
-      join.split('/').uniq.delete_if(&:empty?)
-
     # Define methods without parameters
-    routes.reject { |r| r =~ /^\{.*\}$/ }.
-      map(&:to_sym).each do |route|
-      
+    get_next_routes_without_params.each do |route|
       self.class.send :define_method, route do
-        if is_in_routes?("#{@cur_route}/#{route}")
-          UWaterlooAPIQuery.new "#{@cur_route}/#{route}", "#{@cur_url}/#{route}", api_key
-        else
-          raise NoMethodError
-        end
+        raise NoMethodError unless is_in_routes?("#{@cur_route}/#{route}")
+        UWaterlooAPIQuery.new "#{@cur_route}/#{route}", "#{@cur_url}/#{route}", @api_key
       end
     end
 
     # Define methods with parameters
-    routes.select { |r| r =~ /^\{.*\}$/ }.
-      map { |r| r.delete('{}') }.
-      map(&:to_sym).each do |route|
-
+    get_next_routes_with_params.each do |route|
       self.class.send :define_method, route do |value|
         raise ArgumentError if ["", 0].include? value
-        if is_in_routes?("#{@cur_route}/{#{route}}")
-          UWaterlooAPIQuery.new "#{@cur_route}/{#{route}}", "#{@cur_url}/#{value}", api_key
-        else
-          raise NoMethodError
-        end
+        raise NoMethodError unless is_in_routes?("#{@cur_route}/{#{route}}")
+        UWaterlooAPIQuery.new "#{@cur_route}/{#{route}}", "#{@cur_url}/#{value}", @api_key
       end
     end
   end
@@ -47,11 +31,8 @@ class UWaterlooAPIQuery
   # Get meta variables
   def meta(var)
     raise NoMethodError unless is_full_route? @cur_route
-    if @meta
-      @meta[var.to_s]
-    else
-      raise "No request has been made yet, so meta data is not available."
-    end
+    raise "No request has been made yet, so meta data is not available." unless @meta
+    @meta[var.to_s]
   end
 
   # Get data from server
@@ -90,12 +71,30 @@ class UWaterlooAPIQuery
     end
   end
 
-  private
+private
 
   def just_made_request
     @retrieved_url == @cur_url
   end
 
+  def get_next_routes
+    @next_routes ||= @@routes.
+      select { |s| s.start_with?(@cur_route) }.
+      map { |s| s[@cur_route.length..-1] }.
+      join.split('/').uniq.delete_if(&:empty?)
+  end
+
+  def get_next_routes_without_params
+    @next_routes_without_params ||= get_next_routes.
+      reject { |r| r =~ /^\{.*\}$/ }.map(&:to_sym)
+  end
+
+  def get_next_routes_with_params
+    @next_routes_with_params ||= get_next_routes.
+      select { |r| r =~ /^\{.*\}$/ }.
+      map { |r| r.delete('{}') }.map(&:to_sym)
+  end
+
   def is_in_routes?(substring)
     @@routes.any? { |s| s.start_with?(substring) }
   end

data/lib/uwaterlooapi.rb

@@ -7,11 +7,16 @@ class UWaterlooAPI
   include Routes
 
   def initialize(api_key)
-    @@routes.map { |r| r.split('/')[1] }.uniq.map(&:to_sym).each do |route|
+    get_base_routes.each do |route|
       self.class.send :define_method, route do
         UWaterlooAPIQuery.new "/#{route}", "/#{route}", api_key
       end
     end
   end
 
+private
+
+  def get_base_routes
+    @base_routes ||= @@routes.map { |r| r.split('/')[1] }.uniq.map(&:to_sym)
+  end
 end

data/spec/spec_helper.rb

@@ -1,8 +1,11 @@
+require 'codeclimate-test-reporter'
+CodeClimate::TestReporter.start
+
 require 'rspec'
 require 'webmock/rspec'
 require 'uwaterlooapi'
 
-WebMock.disable_net_connect! allow_localhost: true
+WebMock.disable_net_connect! allow_localhost: true, allow: 'codeclimate.com'
 Dir.chdir File.dirname __FILE__
 
 # This file was generated by the `rspec --init` command. Conventionally, all

data/uwaterlooapi.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |spec|
   spec.name        = 'uwaterlooapi'
-  spec.version     = '0.0.2'
+  spec.version     = '0.0.3'
   spec.date        = '2014-10-26'
   spec.summary     = "Ruby Gem wrapper for the University of Waterloo Open Data API"
   spec.description = "Ruby Gem wrapper for the University of Waterloo Open Data API"
@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.email       = 'me@ankitsardesai.ca'
   spec.files       = `git ls-files`.split("\n")
   spec.test_files  = `git ls-files spec`.split("\n")
-  spec.homepage    = 'http://rubygems.org/gems/uwaterlooapi'
+  spec.homepage    = 'https://rubygems.org/gems/uwaterlooapi'
   spec.license     = 'MIT'
   spec.require_paths = ['lib']
   spec.add_runtime_dependency 'httparty'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uwaterlooapi
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ankit Sardesai
@@ -86,7 +86,7 @@ files:
 - spec/spec_helper.rb
 - spec/uwaterlooapi_spec.rb
 - uwaterlooapi.gemspec
-homepage: http://rubygems.org/gems/uwaterlooapi
+homepage: https://rubygems.org/gems/uwaterlooapi
 licenses:
 - MIT
 metadata: {}
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Ruby Gem wrapper for the University of Waterloo Open Data API