sheet_mapper 0.2.0 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5f12d8b4314a6dc93f71ffdb24ec7539013bf492
+  data.tar.gz: 5d39c055124f86dfef968581ab1b5740891a3f36
+SHA512:
+  metadata.gz: 2b22b600b938ae02d9f3e2c2877225b07edfab2f843ec12b0e7de5da18833b5bf47ea3859d72b1d29316997a7fb7a7041f6161defea9ba6feadd33240549d261
+  data.tar.gz: 7a16ac180735b6c9381b5085704c67fdb21b7861f4d4b0eac3711bc8b5308fa95e5c025bd62367c322c56e5217c080f35a19f0da94b1589e9873c70711841ec1

data/.travis.yml

@@ -4,7 +4,10 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - rbx
+  - rbx-19mode
+matrix:
+  allow_failures:
+    - rvm: 1.8.7
 notifications:
   recipients:
     - nesquena@gmail.com

data/lib/sheet_mapper.rb

@@ -2,7 +2,7 @@ $:.unshift File.dirname(__FILE__)
 
 require 'core_ext/hash_ext'   unless Hash.method_defined?(:symbolize_keys)
 require 'core_ext/object_ext' unless Object.method_defined?(:present?)
-require 'google_spreadsheet'
+require 'google_drive'
 require 'sheet_mapper/version'
 require 'sheet_mapper/collection'
 require 'sheet_mapper/spreadsheet'

data/lib/sheet_mapper/spreadsheet.rb

@@ -5,8 +5,8 @@ module SheetMapper
     # SheetMapper::Worksheet.new(:mapper => SomeMapper, :key => 'sheet_key', :login => 'user', :password => 'pass')
     def initialize(options={})
       @mapper   = options[:mapper]
-      @session = ::GoogleSpreadsheet.login(options[:login], options[:password])
-      @spreadsheet = @session.spreadsheet_by_key(options[:key])
+      @session = ::GoogleDrive.login(options[:login], options[:password])
+      @spreadsheet = find_spreadsheet(options[:key], options[:url], options[:title])
     end
 
     # Returns the first worksheet with given title
@@ -17,5 +17,14 @@ module SheetMapper
       raise CollectionNotFound, "No worksheet found '#{val}'! Please try again." unless worksheet
       Collection.new(self, worksheet)
     end
+
+    private
+    def find_spreadsheet(key, url, title)
+      raise ArgumentError, "No key, url or title specified for the spreadsheet" unless key || url || title
+      return @session.spreadsheet_by_url(url) if url
+      return @session.spreadsheet_by_title(title) if title
+      @session.spreadsheet_by_key(key)
+    end
+
   end
 end

data/lib/sheet_mapper/version.rb

@@ -1,3 +1,3 @@
 module SheetMapper
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/sheet_mapper.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'google-spreadsheet-ruby', '~> 0.2.1'
+  s.add_dependency 'google_drive', '>= 0.3.6'
 
   s.add_development_dependency 'minitest', "~> 2.11.0"
   s.add_development_dependency 'rake'

data/test/spreadsheet_test.rb

@@ -4,28 +4,26 @@ describe "Spreadsheet" do
   setup do
     @sheet_stub = stub(:sheet)
     @session_stub = stub(:session)
-    @session_stub.expects(:spreadsheet_by_key).with('foo').returns(@sheet_stub)
-    ::GoogleSpreadsheet.expects(:login).with('login', 'pass').returns(@session_stub)
+    ::GoogleDrive.expects(:login).with('login', 'pass').returns(@session_stub)
   end
 
-  context "for initialize" do
-    setup do
-      @sheet = SheetMapper::Spreadsheet.new(:mapper => Object, :key => 'foo', :login => 'login', :password => 'pass')
-    end
+  [:key, :url, :title].each do |identifier|
+    context "for initialize by #{identifier}" do
+      setup do
+        @session_stub.expects(:"spreadsheet_by_#{identifier}").with('foo').returns(@sheet_stub)
+        @sheet = SheetMapper::Spreadsheet.new(:mapper => Object, identifier => 'foo', :login => 'login', :password => 'pass')
+      end
 
-    should "return spreadsheet class" do
-      assert_kind_of SheetMapper::Spreadsheet, @sheet
-    end
+      should "not return spreadsheet class" do
+        assert_kind_of SheetMapper::Spreadsheet, @sheet
+      end
 
-    should "have access to readers" do
-      assert_equal Object, @sheet.mapper
-      assert_equal @session_stub, @sheet.session
-      assert_equal @sheet_stub, @sheet.spreadsheet
-    end
-  end # initialize
+    end # initialize
+  end
 
   context "for find_collection_by_title method" do
     setup do
+      @session_stub.expects(:spreadsheet_by_key).with('foo').returns(@sheet_stub)
       @sheet = SheetMapper::Spreadsheet.new(:mapper => Object, :key => 'foo', :login => 'login', :password => 'pass')
       @work_stub = stub(:worksheet)
       @work_stub.expects(:title).returns("FOO")

metadata

@@ -1,120 +1,106 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sheet_mapper
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+version: !ruby/object:Gem::Version
+  version: 0.3.0
 platform: ruby
-authors: 
+authors:
 - Nathan Esquenazi
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-08-07 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: google-spreadsheet-ruby
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 0
-        - 2
-        - 1
-        version: 0.2.1
+date: 2013-09-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: google_drive
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.6
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.6
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 35
-        segments: 
-        - 2
-        - 11
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.11.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.11.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: fakeweb
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: awesome_print
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Map google spreadsheets to ruby objects.
-email: 
+email:
 - nesquena@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -135,42 +121,33 @@ files:
 - test/spreadsheet_test.rb
 - test/test_config.rb
 - test/test_helpers/mini_shoulda.rb
-homepage: ""
+homepage: ''
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: sheet_mapper
-rubygems_version: 1.8.21
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Map google spreadsheets to ruby objects
-test_files: 
+test_files:
 - test/base_test.rb
 - test/collection_test.rb
 - test/spreadsheet_test.rb
 - test/test_config.rb
 - test/test_helpers/mini_shoulda.rb
+has_rdoc: