Merge pull request #4 from carpeliam/master

add support for API versioning, including v2 support for events

Author: Jason Berlinsky

.gitignore

@@ -1,2 +1,17 @@
-.DS_Store
-pkg/
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

Gemfile

@@ -1,3 +1,4 @@
-source :rubygems
-gem 'json'
-gem 'rspec'
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in rmeetup.gemspec
+gemspec

Gemfile.lock

@@ -1,8 +1,15 @@
+PATH
+  remote: .
+  specs:
+    rMeetup (1.1.0)
+      json
+
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     diff-lcs (1.1.3)
-    json (1.6.6)
+    json (1.8.1)
+    rake (10.1.1)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
       rspec-expectations (~> 2.8.0)
@@ -16,5 +23,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  json
+  bundler (~> 1.3)
+  rMeetup!
+  rake
   rspec

Rakefile

@@ -1,14 +1 @@
-require 'rubygems'
-require 'rake'
-require 'echoe'
-
-Echoe.new('rMeetup','1.0') do |p|
-  p.description = "A simple Ruby gem, providing access to the Meetup API"
-  p.url         = "https://github.com/Jberlinsky/rmeetup"
-  p.author      = "Jason Berlinsky"
-  p.email       = "jason@jasonberlinsky.com"
-  p.ignore_pattern  = ["tmp/*", "script/*"]
-  p.development_dependencies  = []
-end
-
-Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each { |ext| load ext }
+require "bundler/gem_tasks"

lib/rmeetup.rb

@@ -5,65 +5,74 @@
 require 'rmeetup/type'
 require 'rmeetup/collection'
 require 'rmeetup/fetcher'
+require 'rmeetup/version'
 
 module RMeetup
-  
+
   # RMeetup Errors
   class NotConfiguredError < StandardError
     def initialize
       super "Please provide your Meetup API key before fetching data."
     end
   end
-  
+
   class InvalidRequestTypeError < StandardError
     def initialize(type)
       super "Fetch type '#{type}' not a valid."
     end
   end
-  
+
   # == RMeetup::Client
-  # 
+  #
   # Essentially a simple wrapper to delegate requests to
   # different fetcher classes who are responsible for fetching
   # and parsing their own responses.
   class Client
     FETCH_TYPES = [:topics, :cities, :members, :rsvps, :events, :groups, :comments, :photos]
-    
+
     # Meetup API Key
     # Get one at http://www.meetup.com/meetup_api/key/
     # Needs to be the group organizers API Key
     # to be able to RSVP for other people
     @@api_key = nil
     def self.api_key; @@api_key; end;
     def self.api_key=(key); @@api_key = key; end;
-    
+
+    # requested Meetup API Version
+    # If set, the gem will attempt to use this
+    # version of the API. If not set, the maximum
+    # version for any particular type will be used.
+    @@api_version = nil
+    def self.api_version; @@api_version; end;
+    def self.api_version=(version); @@api_version = version; end;
+
     def self.fetch(type, options = {})
       check_configuration!
-      
+
       # Merge in all the standard options
       # Keeping whatever was passed in
       options = default_options.merge(options)
-      
+
       if FETCH_TYPES.include?(type.to_sym)
         # Get the custom fetcher used to manage options, api call to get a type of response
-        fetcher = RMeetup::Fetcher.for(type)
+        fetcher = RMeetup::Fetcher.for(type, api_version)
         return fetcher.fetch(options)
       else
         raise InvalidRequestTypeError.new(type)
       end
     end
-    
+
     protected
       def self.default_options
         {
           :key => api_key
         }
       end
-      
+
       # Raise an error if RMeetup has not been
       # provided with an api key
       def self.check_configuration!
         raise NotConfiguredError.new unless api_key
       end
   end
-end
+end

lib/rmeetup/fetcher.rb

@@ -12,25 +12,25 @@ module RMeetup
   module Fetcher
 
     class << self
-      # Return a fetcher for given type
-      def for(type)
+      # Return a fetcher for given type/API version
+      def for(type, api_version = nil)
         return  case type.to_sym
                 when :topics
-                  Topics.new
+                  Topics.new(api_version)
                 when :cities      
-                  Cities.new
+                  Cities.new(api_version)
                 when :members     
-                  Members.new
+                  Members.new(api_version)
                 when :rsvps       
-                  Rsvps.new
+                  Rsvps.new(api_version)
                 when :events      
-                  Events.new
+                  Events.new(api_version)
                 when :groups      
-                  Groups.new
+                  Groups.new(api_version)
                 when :comments    
-                  Comments.new
+                  Comments.new(api_version)
                 when :photos
-                  Photos.new
+                  Photos.new(api_version)
                 end
       end 
     end

lib/rmeetup/fetcher/base.rb

@@ -17,7 +17,13 @@ def initialize
     # Base fetcher class that other fetchers 
     # will inherit from.
     class Base
-      def initialize
+      MAX_API_VERSION = nil
+      def initialize(api_version = nil)
+        @api_version = if api_version
+          self.class::MAX_API_VERSION && [api_version, self.class::MAX_API_VERSION].min
+        else
+          self.class::MAX_API_VERSION
+        end
         @type = nil
       end
 
@@ -57,7 +63,8 @@ def build_url(options)
         end
 
         def base_url
-          "http://api.meetup.com/#{@type}.json/"
+          versioned_url = "#{@api_version}/" if @api_version.to_i > 1
+          "http://api.meetup.com/#{versioned_url}#{@type}.json/"
         end
 
         # Create a query string from an options hash

lib/rmeetup/fetcher/cities.rb

@@ -1,13 +1,14 @@
 module RMeetup
   module Fetcher
     class Cities < Base
-      def initialize
+      def initialize(api_version = nil)
+        super(api_version) # no support for API versioning yet
         @type = :cities
       end
 
       # Turn the result hash into a City Class
       def format_result(result)
-        RMeetup::Type::City.new(result)
+        RMeetup::Type::V1::City.new(result)
       end
     end
   end

lib/rmeetup/fetcher/comments.rb

@@ -1,13 +1,14 @@
 module RMeetup
   module Fetcher
     class Comments < Base
-      def initialize
+      def initialize(api_version = nil)
+        super(api_version) # no support for API versioning yet
         @type = :comments
       end
 
       # Turn the result hash into a Comment Class
       def format_result(result)
-        RMeetup::Type::Comment.new(result)
+        RMeetup::Type::V1::Comment.new(result)
       end
     end
   end

lib/rmeetup/fetcher/events.rb

@@ -1,13 +1,19 @@
 module RMeetup
   module Fetcher
     class Events < Base
-      def initialize
+      MAX_API_VERSION = 2
+      def initialize(api_version = nil)
+        super(api_version)
         @type = :events
       end
 
       # Turn the result hash into a Event Class
       def format_result(result)
-        RMeetup::Type::Event.new(result)
+        if @api_version == 1
+          RMeetup::Type::V1::Event.new(result)
+        else
+          RMeetup::Type::V2::Event.new(result)
+        end
       end
     end
   end