openlibrary 2.0.2 → 2.1.0

data/.ruby-gemset

@@ -0,0 +1 @@
+openlibrary

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.0.0-p195

data/README.rdoc

@@ -1,4 +1,4 @@
-== Openlibrary 2.0.1
+== Openlibrary 2.1.0
 
 The openlibrary gem provides Ruby clients for the {Open Library REST API}[http://openlibrary.org/dev/docs/restful_api] and {Books API}[http://openlibrary.org/dev/docs/api/books].
 
@@ -7,7 +7,7 @@ For more information about Open Library development, visit the {Open Library Dev
 
 == Installation
 
-The gem is tested against Ruby 1.9.2 and runs smoothly with Rails 3.
+The gem is tested against Ruby 2.0.0 and runs smoothly with Rails 4.
 
   gem install openlibrary 
 
@@ -200,5 +200,12 @@ Other built-in finder methods:
 * Eric Larson https://github.com/ewlarson
 * Charles Horn https://github.com/hornc
 * Alex Grant https://github.com/grantovich
+<<<<<<< HEAD
 * Bryan L. Fordham https://github.com/bfordham
 * Kyle Corbitt https://github.com/kcorbitt
+=======
+
+== LICENSE
+
+This code is released under the {CC0 License}[http://creativecommons.org/publicdomain/zero/1.0/], and may be used for any purpose without restrictions.
+>>>>>>> 3e3db18144f8faad94b5c0353424e4207a795c88

data/lib/openlibrary.rb

@@ -1,9 +1,9 @@
-require 'openlibrary/version'
-require 'openlibrary/data'
-require 'openlibrary/view'
-require 'openlibrary/client'
-require 'openlibrary/errors'
-require 'openlibrary/request'
+require_relative 'openlibrary/version'
+require_relative 'openlibrary/data'
+require_relative 'openlibrary/view'
+require_relative 'openlibrary/client'
+require_relative 'openlibrary/errors'
+require_relative 'openlibrary/request'
 
 module Openlibrary
   # Create a new Openlibrary::Client instance

data/lib/openlibrary/client.rb

@@ -1,12 +1,12 @@
-require 'openlibrary/request'
-require 'openlibrary/client/books'
-require 'openlibrary/client/authors'
-require 'openlibrary/client/history'
-require 'openlibrary/client/recent'
-require 'openlibrary/client/editions'
-require 'openlibrary/client/search'
-require 'openlibrary/client/login'
-require 'openlibrary/client/save'
+require_relative 'request'
+require_relative 'client/books'
+require_relative 'client/authors'
+require_relative 'client/history'
+require_relative 'client/recent'
+require_relative 'client/editions'
+require_relative 'client/search'
+require_relative 'client/login'
+require_relative 'client/save'
 
 module Openlibrary
   class Client

data/lib/openlibrary/version.rb

@@ -1,3 +1,3 @@
 module Openlibrary
-  VERSION = "2.0.2"
+  VERSION = "2.1.0"
 end

data/openlibrary.gemspec

@@ -24,5 +24,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'json', '~> 1.7.7'
   s.add_runtime_dependency 'rest-client', '~> 1.6'
   s.add_runtime_dependency 'hashie', '~> 2.0.2'
-  s.add_runtime_dependency 'activesupport', '~> 3'
+  s.add_runtime_dependency 'activesupport', '~> 4'
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 2
+  - 1
   - 0
-  - 2
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors: 
 - Jay Fajardo
@@ -92,8 +92,8 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version 
         segments: 
-        - 3
-        version: "3"
+        - 4
+        version: "4"
   type: :runtime
   version_requirements: *id006
 description: Openlibrary.org API Interface
@@ -107,6 +107,8 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .ruby-gemset
+- .ruby-version
 - Gemfile
 - README.rdoc
 - Rakefile