jammed 0.1.1 → 0.1.2

data/Gemfile

@@ -1,11 +1,11 @@
 source 'https://rubygems.org'
 
-gem "httparty", ">= 0.8.2"
-gem "json"
+gem "httparty", "~> 0.8.2"
+gem "json", "~> 1.7.1"
 
 group :development do
-  gem "rake", ">= 0.8.7"
-  gem "jeweler", ">= 1.8.3"
-  gem "rspec", ">= 2.9.0"
-  gem "webmock", ">= 1.8.6"
+  gem "rake", "~> 0.9.2.2"
+  gem "jeweler", "~> 1.8.3"
+  gem "rspec", "~> 2.9.0"
+  gem "webmock", "~> 1.8.6"
 end

data/jammed.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "jammed"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sean Lerner", "Rob Young", "Mike Chlipala"]
-  s.date = "2012-05-07"
+  s.date = "2012-05-15"
   s.description = "Jammed wraps the This Is My Jam API. More information about the This Is My Jam API can be found on their website (http://www.thisismyjam.com/developers)."
   s.email = ["seanslerner@gmail.com"]
   s.extra_rdoc_files = [
@@ -89,27 +89,27 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<httparty>, [">= 0.8.2"])
-      s.add_runtime_dependency(%q<json>, [">= 0"])
-      s.add_development_dependency(%q<rake>, [">= 0.8.7"])
-      s.add_development_dependency(%q<jeweler>, [">= 1.8.3"])
-      s.add_development_dependency(%q<rspec>, [">= 2.9.0"])
-      s.add_development_dependency(%q<webmock>, [">= 1.8.6"])
+      s.add_runtime_dependency(%q<httparty>, ["~> 0.8.2"])
+      s.add_runtime_dependency(%q<json>, ["~> 1.7.1"])
+      s.add_development_dependency(%q<rake>, ["~> 0.9.2.2"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.9.0"])
+      s.add_development_dependency(%q<webmock>, ["~> 1.8.6"])
     else
-      s.add_dependency(%q<httparty>, [">= 0.8.2"])
-      s.add_dependency(%q<json>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0.8.7"])
-      s.add_dependency(%q<jeweler>, [">= 1.8.3"])
-      s.add_dependency(%q<rspec>, [">= 2.9.0"])
-      s.add_dependency(%q<webmock>, [">= 1.8.6"])
+      s.add_dependency(%q<httparty>, ["~> 0.8.2"])
+      s.add_dependency(%q<json>, ["~> 1.7.1"])
+      s.add_dependency(%q<rake>, ["~> 0.9.2.2"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+      s.add_dependency(%q<rspec>, ["~> 2.9.0"])
+      s.add_dependency(%q<webmock>, ["~> 1.8.6"])
     end
   else
-    s.add_dependency(%q<httparty>, [">= 0.8.2"])
-    s.add_dependency(%q<json>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0.8.7"])
-    s.add_dependency(%q<jeweler>, [">= 1.8.3"])
-    s.add_dependency(%q<rspec>, [">= 2.9.0"])
-    s.add_dependency(%q<webmock>, [">= 1.8.6"])
+    s.add_dependency(%q<httparty>, ["~> 0.8.2"])
+    s.add_dependency(%q<json>, ["~> 1.7.1"])
+    s.add_dependency(%q<rake>, ["~> 0.9.2.2"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+    s.add_dependency(%q<rspec>, ["~> 2.9.0"])
+    s.add_dependency(%q<webmock>, ["~> 1.8.6"])
   end
 end
 

data/lib/jammed/api.rb

@@ -14,7 +14,7 @@ module Jammed
     #
     #     Jammed::API.request(:get, /IFTFOM/followers.json, :query => {:key => 'api_key', :order => 'affinity'})
     def self.request(method, path, opts={})
-      base_uri = 'http://api.thisismyjam.com/1'
+      base_uri = opts[:https] ? 'https://api.thisismyjam.com/1' : 'http://api.thisismyjam.com/1'
 
       params = {}
       params[:path] = path

data/lib/jammed/base.rb

@@ -3,11 +3,12 @@ module Jammed
   class Base
 
     #Stores the API key to be used for all method calls on the Jammed::Base object
-    attr_reader :api_key
+    attr_reader :api_key, :https
 
     #Sets the API key + any options
     def initialize(api_key, opts={})
       @api_key = api_key
+      @https = opts[:https] ? opts[:https] : false
     end
 
     # Calls Jammed::Followers
@@ -26,6 +27,7 @@ module Jammed
     #     jammed = Jammed.new('08972935872035') 
     #     jammed.followers('IFTFOM', :order => :date)
     def followers(username, opts={})
+      opts = opts.merge({:https => @https})
       Followers.followers(username, @api_key, opts)
     end
 
@@ -45,6 +47,7 @@ module Jammed
     #     jammed = Jammed.new('08972935872035') 
     #     jammed.following('IFTFOM', :order => :date)
     def following(username, opts={})
+      opts = opts.merge({:https => @https})
       Following.following(username, @api_key, opts)
     end
 
@@ -64,6 +67,7 @@ module Jammed
     #     jammed = Jammed.new('08972935872035') 
     #     jammed.jams('IFTFOM', :show => :current)
     def jams(username, opts={})
+      opts = opts.merge({:https => @https})
       Jams.jams(username, @api_key, opts)
     end
 
@@ -83,6 +87,7 @@ module Jammed
     #     jammed = Jammed.new('08972935872035') 
     #     jammed.likes('IFTFOM', :show => :current)
     def likes(username, opts={})
+      opts = opts.merge({:https => @https})
       Likes.likes(username, @api_key, opts)
     end
 
@@ -93,7 +98,7 @@ module Jammed
     #     jammed = Jammed.new('08972935872035')
     #     jammed.popular_jams
     def popular_jams
-      PopularJams.popular_jams(@api_key)
+      PopularJams.popular_jams(@api_key, @https)
     end
 
     # Calls Jammed::Person.profile
@@ -107,7 +112,7 @@ module Jammed
     #     jammed = Jammed.new('08972935872035') 
     #     jammed.profile('IFTFOM')
     def profile(username)
-      Person.profile(username, @api_key)
+      Person.profile(username, @api_key, @https)
     end
 
     # Calls Jammed::RandomJam.jam
@@ -117,7 +122,7 @@ module Jammed
     #     jammed = Jammed.new('08972935872035')
     #     jammed.random
     def random
-      RandomJam.jam(@api_key)
+      RandomJam.jam(@api_key, @https)
     end
 
     # Calls Jammed::PeopleSearch.search_name
@@ -131,7 +136,7 @@ module Jammed
     #     jammed = Jammed.new('08972935872035')
     #     jammed.search_name('IFTFOM')
     def search_name(name)
-      PeopleSearch.search_name(name, @api_key)
+      PeopleSearch.search_name(name, @api_key, @https)
     end
 
     # Calls Jammed::PeopleSearch.search_artist
@@ -145,7 +150,7 @@ module Jammed
     #     jammed = Jammed.new('08972935872035')
     #     jammed.search_artist('IFTFOM')
     def search_artist(artist)
-      PeopleSearch.search_artist(artist, @api_key)
+      PeopleSearch.search_artist(artist, @api_key, @https)
     end
 
     # Calls Jammed::PeopleSearch.search_track
@@ -160,7 +165,7 @@ module Jammed
     #     jammed = Jammed.new('08972935872035')
     #     jammed.search_track('IFTFOM')
     def search_track(artist, track)
-      PeopleSearch.search_track(artist, track, @api_key)
+      PeopleSearch.search_track(artist, track, @api_key, @https)
     end
 
     # Calls Jammed::SuggestedPeople.people
@@ -170,7 +175,7 @@ module Jammed
     #     jammed = Jammed.new('08972935872035')
     #     jammed.suggest_people
     def suggested_people
-      SuggestedPeople.people(@api_key)
+      SuggestedPeople.people(@api_key, @https)
     end
 
     # Calls Jammed::User.new and creates a new User object for interacting with user specific data. It provides methods for interacting with user-specific data.
@@ -186,7 +191,7 @@ module Jammed
     #     ift.profile
     #     ift.jams(:show => :past)
     def user(username)
-      User.new(username, @api_key)
+      User.new(username, @api_key, @https)
     end
   end
 end

data/lib/jammed/followers.rb

@@ -1,3 +1,5 @@
+require_relative 'api'
+
 module Jammed #:nodoc: 
   # Provides methods for calling API endpoint /follower.json?
   class Followers < API
@@ -20,17 +22,17 @@ module Jammed #:nodoc:
     def self.followers(username, api_key, opts={})
       case(opts[:order])
       when nil
-        response = request(:get, "/#{username}/followers.json", 
-          :query => {:key => api_key})
+        response = request(:get, "/#{username}/followers.json", {:https => opts[:https], 
+          :query => {:key => api_key}})
       when :date
-        response = request(:get, "/#{username}/followers.json", 
-          :query => {:order => 'followedDate', :key => api_key})
+        response = request(:get, "/#{username}/followers.json", {:https => opts[:https],
+          :query => {:order => 'followedDate', :key => api_key}})
       when :affinity
-        response = request(:get, "/#{username}/followers.json", 
-          :query => {:order => 'affinity', :key => api_key})
+        response = request(:get, "/#{username}/followers.json", {:https => opts[:https],
+          :query => {:order => 'affinity', :key => api_key}})
       when :alpha
-        response = request(:get, "/#{username}/followers.json", 
-          :query => {:order => 'name', :key => api_key})
+        response = request(:get, "/#{username}/followers.json", {:https => opts[:https],
+          :query => {:order => 'name', :key => api_key}})
       else
         return "Cannot order Followers by #{opts[:order]}"
       end

data/lib/jammed/following.rb

@@ -1,3 +1,5 @@
+require_relative 'api'
+
 module Jammed #:nodoc:
   # Provides methods for calling API endpoint /following.json?
   class Following < API
@@ -20,17 +22,17 @@ module Jammed #:nodoc:
     def self.following(username, api_key, opts={})
       case(opts[:order])
       when nil
-        response = request(:get, "/#{username}/following.json", 
-          :query => {:key => api_key})
+        response = request(:get, "/#{username}/following.json", {:https => opts[:https],
+          :query => {:key => api_key}})
       when :date
-        response = request(:get, "/#{username}/following.json", 
-          :query => {:order => 'followedDate', :key => api_key})
+        response = request(:get, "/#{username}/following.json", {:https => opts[:https],
+          :query => {:order => 'followedDate', :key => api_key}})
       when :affinity
-        response = request(:get, "/#{username}/following.json", 
-          :query => {:order => 'affinity', :key => api_key})
+        response = request(:get, "/#{username}/following.json", {:https => opts[:https],
+          :query => {:order => 'affinity', :key => api_key}})
       when :alpha
-        response = request(:get, "/#{username}/following.json", 
-          :query => {:order => 'name', :key => api_key})
+        response = request(:get, "/#{username}/following.json", {:https => opts[:https],
+          :query => {:order => 'name', :key => api_key}})
       else
         return "Cannot order Followings by #{opts[:order]}"
       end

data/lib/jammed/jams.rb

@@ -1,3 +1,5 @@
+require_relative 'api'
+
 module Jammed #:nodoc:
   # Provides methods for calling API endpoint /jams.json?
   class Jams < API
@@ -20,16 +22,16 @@ module Jammed #:nodoc:
     def self.jams(username, api_key, opts={})
       case(opts[:show])
       when nil
-        response = request(:get, "/#{username}/jams.json", 
-          :query => {:key => api_key})
+        response = request(:get, "/#{username}/jams.json", {:https => opts[:https],
+          :query => {:key => api_key}})
         JSON.parse(response.body)['jams']
       when :past
-        response = request(:get, "/#{username}/jams.json", 
-          :query => {:show => 'past', :key => api_key})
+        response = request(:get, "/#{username}/jams.json", {:https => opts[:https],
+          :query => {:show => 'past', :key => api_key}})
         JSON.parse(response.body)['jams']
       when :current
-        response = request(:get, "/#{username}/jams.json", 
-          :query => {:key => api_key})
+        response = request(:get, "/#{username}/jams.json", {:https => opts[:https],
+          :query => {:key => api_key}})
         jams = JSON.parse(response.body)['jams'][0]
         jams['current'] ? jams : "No Current Jam"
       end

data/lib/jammed/likes.rb

@@ -1,3 +1,5 @@
+require_relative 'api'
+
 module Jammed #:nodoc:
   # Provides methods for calling API endpoint /likes.json?
   class Likes < API
@@ -20,14 +22,14 @@ module Jammed #:nodoc:
     def self.likes(username, api_key, opts={})
       case(opts[:show])
       when nil
-        response = request(:get, "/#{username}/likes.json", 
-          :query => {:key => api_key})
+        response = request(:get, "/#{username}/likes.json", {:https => opts[:https],
+          :query => {:key => api_key}})
       when :current
-        response = request(:get, "/#{username}/likes.json", 
-          :query => {:show => 'current', :key => api_key})
+        response = request(:get, "/#{username}/likes.json", {:https => opts[:https],
+          :query => {:show => 'current', :key => api_key}})
       when :past
-        response = request(:get, "/#{username}/likes.json", 
-          :query => {:show => 'past', :key => api_key})
+        response = request(:get, "/#{username}/likes.json", {:https => opts[:https],
+          :query => {:show => 'past', :key => api_key}})
       end
       JSON.parse(response.body)['jams']
     end

data/lib/jammed/people_search.rb

@@ -1,3 +1,4 @@
+require_relative 'api'
 require 'uri'
 
 module Jammed #:nodoc:
@@ -14,9 +15,9 @@ module Jammed #:nodoc:
     # ==== Examples
     #
     #     Jammed::PeopleSearch.search_name('IFTFOM', '08972935872035')
-    def self.search_name(name, api_key)
-      response = request(:get, "/search/person.json", 
-          :query => {:by => 'name', :q => "#{name.split.join('+')}", :key => api_key})
+    def self.search_name(name, api_key, https=false)
+      response = request(:get, "/search/person.json", {:https => https,
+          :query => {:by => 'name', :q => "#{name.split.join('+')}", :key => api_key}})
       JSON.parse(response.body)['people']
     end
 
@@ -30,9 +31,9 @@ module Jammed #:nodoc:
     # ==== Examples
     #
     #     Jammed::PeopleSearch.search_artist('beach boys', '08972935872035')
-    def self.search_artist(artist, api_key)
-      response = request(:get, "/search/person.json", 
-          :query => {:by => 'artist', :q => "#{artist.split.join('+')}", :key => api_key})
+    def self.search_artist(artist, api_key, https=false)
+      response = request(:get, "/search/person.json", {:https => https,
+          :query => {:by => 'artist', :q => "#{artist.split.join('+')}", :key => api_key}})
       JSON.parse(response.body)['people']
     end
 
@@ -47,11 +48,11 @@ module Jammed #:nodoc:
     # ==== Examples
     #
     #     Jammed::PeopleSearch.search_track('beach boys', 'good vibrations', '08972935872035')
-    def self.search_track(artist, track, api_key)
-      response = request(:get, "/search/person.json",
+    def self.search_track(artist, track, api_key, https=false)
+      response = request(:get, "/search/person.json", {:https => https,
           :query => {:by => 'track', 
                      :q => "#{artist.split.join('+')}|#{track.split.join('+')}",
-                     :key => api_key})
+                     :key => api_key}})
       JSON.parse(response.body)['people'] 
     end
 

data/lib/jammed/person.rb

@@ -1,3 +1,5 @@
+require_relative 'api'
+
 module Jammed #:nodoc:
   # Provides methods for calling API endpoint /username.json? and accessing user specific data
   class Person < API
@@ -6,8 +8,9 @@ module Jammed #:nodoc:
     # ==== Examples
     #
     #     Jammed::Person.profile('IFTFOM', '08972935872035') #returns IFTFOM's profile data
-    def self.profile(username, api_key)
-      response = request(:get, "/#{username}.json", :query => {:key => api_key})
+    def self.profile(username, api_key, https=false)
+      response = request(:get, "/#{username}.json", {:https => https,
+        :query => {:key => api_key}})
       JSON.parse(response.body)["person"]
     end
 

data/lib/jammed/popular_jams.rb

@@ -1,3 +1,5 @@
+require_relative 'api'
+
 module Jammed #:nodoc:
   # Provides method for calling API endpoint /popular.json?
   class PopularJams < API
@@ -6,8 +8,8 @@ module Jammed #:nodoc:
     # ==== Examples
     #
     #     Jammed::PopularJams.popular_jams('08972935872035') #returns a sample of popular jams
-    def self.popular_jams(api_key)
-      response = request(:get, "/popular.json", :query => {:key => api_key})
+    def self.popular_jams(api_key, https=false)
+      response = request(:get, "/popular.json", {:https => https, :query => {:key => api_key}})
       JSON.parse(response.body)['jams']
     end
   end

data/lib/jammed/random.rb

@@ -1,3 +1,5 @@
+require_relative 'api'
+
 module Jammed #:nodoc:
   # Provides method for calling API endpoint /random.json?
   class RandomJam < API
@@ -6,8 +8,9 @@ module Jammed #:nodoc:
     # ==== Examples
     #
     #     Jammed::RandomJam.jam('08972935872035') #returns a random jam + the profile of the user
-    def self.jam(api_key)
-      response = request(:get, "/random.json", :query => {:key => api_key})
+    def self.jam(api_key, https=false)
+      response = request(:get, "/random.json", {:https => https,
+        :query => {:key => api_key}})
       JSON.parse(response.body)
     end
   end

data/lib/jammed/suggested_people.rb

@@ -1,3 +1,5 @@
+require_relative 'api'
+
 module Jammed #:nodoc:
   # Provides method for calling API endpoint /suggestedPeople.json?
   class SuggestedPeople < API
@@ -6,8 +8,9 @@ module Jammed #:nodoc:
     # ==== Examples
     #
     #     Jammed::SuggestedPeople.people('08972935872035') #returns a list of users with many followers/likes
-    def self.people(api_key)
-      response = request(:get, "/suggestedPeople.json", :query => {:key => api_key})
+    def self.people(api_key, https=false)
+      response = request(:get, "/suggestedPeople.json", {:https => https,
+        :query => {:key => api_key}})
       JSON.parse(response.body)['people']
     end
   end

data/lib/jammed/user.rb

@@ -14,12 +14,14 @@ module Jammed #:nodoc:
     # ==== Examples
     #
     #       iftfom = Jammed::User.new('IFTFOM', '08972935872035')
-    def initialize(username, api_key)
+    def initialize(username, api_key, https=false)
       @username = username
       @api_key = api_key
+      @https = https
     end
 
     def followers(opts={})
+      opts = opts.merge({:https => @https})
       @followers ||= Jammed::Followers.followers(@username, @api_key, opts)
     end
 
@@ -39,10 +41,12 @@ module Jammed #:nodoc:
     #     user.followers #returns all followers of IFTFOM
     #     user.followers(:order => :date) #reutrns IFTFOM's followers ordered by date
     def followers!(opts={})
+      opts = opts.merge({:https => @https})
       @followers = Jammed::Followers.followers(@username, @api_key, opts)
     end
 
     def following(opts={})
+      opts = opts.merge({:https => @https})
       @following ||= Jammed::Following.following(@username, @api_key, opts)
     end
 
@@ -62,10 +66,12 @@ module Jammed #:nodoc:
     #     user.following #returns all followings of IFTFOM
     #     user.following(:order => :date) #returns IFTFOM's followings ordered by date
     def following!(opts={})
+      opts = opts.merge({:https => @https})
       @following = Jammed::Following.following(@username, @api_key, opts)
     end
 
     def jams(opts={})
+      opts = opts.merge({:https => @https})
       @jams ||= Jammed::Jams.jams(@username, @api_key, opts)
     end
 
@@ -85,10 +91,12 @@ module Jammed #:nodoc:
     #     user.jams #returns all jams of IFTFOM
     #     user.jams(:show => :past) #returns IFTFOM's past jams
     def jams!(opts={})
+      opts = opts.merge({:https => @https})
       @jams = Jammed::Jams.jams(@username, @api_key, opts)
     end
 
     def likes(opts={})
+      opts = opts.merge({:https => @https})
       @likes ||= Jammed::Likes.likes(@username, @api_key, opts)
     end
 
@@ -108,11 +116,12 @@ module Jammed #:nodoc:
     #     user.likes #returns all likes of IFTFOM
     #     user.likes(:show => :past) #returns IFTFOM's past likes
     def likes!(opts={})
+      opts = opts.merge({:https => @https})
       @likes = Jammed::Likes.likes(@username, @api_key, opts)
     end
     
     def profile
-      @profile ||= Jammed::Person.profile(@username, @api_key)
+      @profile ||= Jammed::Person.profile(@username, @api_key, @https)
     end
 
     # Clears cached Person data with a fresh call to Jammed::Person
@@ -122,7 +131,7 @@ module Jammed #:nodoc:
     #     user = Jammed::User.new('IFTFOM', '08972935872035')
     #     user.profile #returns entire profile of IFTFOM
     def profile!
-      @profile = Jammed::Person.profile(@username, @api_key)
+      @profile = Jammed::Person.profile(@username, @api_key, @https)
     end
 
     # Checks user's profile for attribute and returns value if attribute key is found.

data/lib/jammed/version.rb

@@ -1,4 +1,4 @@
 module Jammed
   #:nodoc:
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/jammed.rb

@@ -11,11 +11,15 @@ module Jammed
     # ==== Attributes
     #
     # * +api_key+ - Sets the API key to use for all calls made with object
-    # * +opts+ -Options hash. Does nothing at the moment.
+    # * +opts+ -Options hash
+    #
+    # ==== Options
+    #
+    # * +:https+ - Toggle use of HTTPS (defaults to false)
     #
     # ==== Examples
     #
-    #     jammed = Jammed.new('987bcab01b929eb2c07877b224215c92')
+    #     jammed = Jammed.new('987bcab01b929eb2c07877b224215c92', :https => true)
     def new(api_key='987bcab01b929eb2c07877b224215c92', opts={})
       Jammed::Base.new(api_key, opts)
     end

data/spec/jammed/api_spec.rb

@@ -14,6 +14,12 @@ module Jammed
         HTTParty.should_receive(:get).and_return(FakeResponse.new(200, 'this'))
         Jammed::API.request(:get, '/path')
       end
+      it "can use https" do
+        HTTParty.should_receive(:get).
+          with("https://api.thisismyjam.com/1/path", {:query=>nil, :body=>nil, :format=>:plain, :headers=>{"Accept"=>"application/json", "Content-Type"=>"application/json; charset=utf-8", "User-Agent"=>"Jammed/0.1.1"}}).
+          and_return(FakeResponse.new(200, 'this'))
+        Jammed::API.request(:get, '/path', :https => true)
+      end
     end
   end
 end

data/spec/jammed/base_spec.rb

@@ -8,6 +8,14 @@ module Jammed
     let(:user) {'IFTFOM'}
 
     describe "#initialize" do
+      it "sets @https" do
+        jam = Jammed::Base.new(api_key, :https => true)
+        jam.https.should be true
+      end
+
+      it "defaults @https to false" do
+        jammed.https.should be false
+      end
     end
 
     describe "#followers" do 
@@ -15,6 +23,11 @@ module Jammed
         Jammed::Followers.should_receive(:followers)
         jammed.followers(user)
       end
+
+      it "merges @https into opts" do
+        Jammed::Followers.should_receive(:followers).with(user, api_key, {:https => false})
+        jammed.followers(user)
+      end
     end
 
     describe "#following" do 
@@ -89,7 +102,7 @@ module Jammed
 
     describe "#user" do 
       it "calls Jammed::User.new" do
-        Jammed::User.should_receive(:new).with(user, api_key)
+        Jammed::User.should_receive(:new).with(user, api_key, false)
         jammed.user(user)
       end
     end

data/spec/jammed/popular_jams_spec.rb

@@ -12,11 +12,11 @@ module Jammed
       end
       
       it "parses the JSON return into an array of Jams" do
-        Jammed::PopularJams.popular_jams(api_key).should be_an_instance_of Array
+        Jammed::PopularJams.popular_jams(api_key, false).should be_an_instance_of Array
       end
 
       it "gets popular jams from the api" do
-        Jammed::PopularJams.popular_jams(api_key).should_not be_nil
+        Jammed::PopularJams.popular_jams(api_key, false).should_not be_nil
       end
     end
   end

data/spec/jammed/random_spec.rb

@@ -12,11 +12,11 @@ module Jammed
       end
       
       it "parses the JSON return into a hash" do
-        Jammed::RandomJam.jam(api_key).should be_an_instance_of Hash
+        Jammed::RandomJam.jam(api_key, false).should be_an_instance_of Hash
       end
 
       it "gets popular jams from the api" do
-        Jammed::RandomJam.jam(api_key).should_not be_nil
+        Jammed::RandomJam.jam(api_key, false).should_not be_nil
       end
     end
   end

data/spec/jammed/suggested_people_spec.rb

@@ -11,7 +11,7 @@ module Jammed
       end
       
       it "returns people from the API" do
-        Jammed::SuggestedPeople.people(api_key).should_not be_nil
+        Jammed::SuggestedPeople.people(api_key, false).should_not be_nil
       end
     end
   end

data/spec/jammed/user_spec.rb

@@ -22,7 +22,7 @@ module Jammed
           user.followers
         end
         it "sends @username + :order options to Jammed::Followers" do
-          Jammed::Followers.should_receive(:followers).with('IFTFOM', api_key, {:order => :date})
+          Jammed::Followers.should_receive(:followers).with('IFTFOM', api_key, {:order => :date, :https=> false})
           user.followers(:order => :date)
         end
         it "saves followers in @followers" do
@@ -56,7 +56,7 @@ module Jammed
           user.following
         end
         it "sends @username + :order options to Jammed::Following" do
-          Jammed::Following.should_receive(:following).with('IFTFOM', api_key, {:order => :date})
+          Jammed::Following.should_receive(:following).with('IFTFOM', api_key, {:order => :date, :https=> false})
           user.following(:order => :date)
         end
         it "saves followers in @following" do
@@ -89,7 +89,7 @@ module Jammed
           user.jams
         end
         it "sends @username + :show options to Jammed::Jams" do
-          Jammed::Jams.should_receive(:jams).with('IFTFOM', api_key, {:show => :past})
+          Jammed::Jams.should_receive(:jams).with('IFTFOM', api_key, {:show => :past, :https=> false})
           user.jams(:show => :past)
         end
         it "saves jams in @jams" do
@@ -122,7 +122,7 @@ module Jammed
           user.likes
         end
         it "sends @username + :show options to Jammed::Likes" do
-          Jammed::Likes.should_receive(:likes).with('IFTFOM', api_key, {:show => :past})
+          Jammed::Likes.should_receive(:likes).with('IFTFOM', api_key, {:show => :past, :https=> false})
           user.likes(:show => :past)
         end
         it "saves likes in @likes" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jammed
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,74 +11,74 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-07 00:00:00.000000000Z
+date: 2012-05-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70115760365280 !ruby/object:Gem::Requirement
+  requirement: &70267027504900 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.2
   type: :runtime
   prerelease: false
-  version_requirements: *70115760365280
+  version_requirements: *70267027504900
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70115760364640 !ruby/object:Gem::Requirement
+  requirement: &70267027503540 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.1
   type: :runtime
   prerelease: false
-  version_requirements: *70115760364640
+  version_requirements: *70267027503540
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70115760363900 !ruby/object:Gem::Requirement
+  requirement: &70267027502640 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70115760363900
+  version_requirements: *70267027502640
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70115760363120 !ruby/object:Gem::Requirement
+  requirement: &70267027501520 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70115760363120
+  version_requirements: *70267027501520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70115760350480 !ruby/object:Gem::Requirement
+  requirement: &70267027500280 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70115760350480
+  version_requirements: *70267027500280
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70115760349000 !ruby/object:Gem::Requirement
+  requirement: &70267027499040 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.6
   type: :development
   prerelease: false
-  version_requirements: *70115760349000
+  version_requirements: *70267027499040
 description: Jammed wraps the This Is My Jam API. More information about the This
   Is My Jam API can be found on their website (http://www.thisismyjam.com/developers).
 email:
@@ -164,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 756853401178736676
+      hash: -3697197467534343952
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: