google_spreadsheet_fetcher 1.8.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cff3e92433c66cea9ef0c7b38034a0a1dc8b60147d23b79b8fdd8c63b75d410b
-  data.tar.gz: 3990a45e68356829594c4efe28ca5e5d22930e960276a66787c85e8746aef0a8
+  metadata.gz: a3660f6d65df012ef4f8dab6b94a6546c5fff27c188728228af19733f21d5114
+  data.tar.gz: ac69095de2b42ca87b8f4cc94a1789ef06a6daed653864fc731f4c258fcaa4b8
 SHA512:
-  metadata.gz: a89913bd36f9d02448d8705e5b28e901306ab65d7abaa56879d1bfd961939e5a7978a4169a9e9b49ceee0b90b38fda03435e230fe00a25c3cfd05487161e7c18
-  data.tar.gz: 1378109ec133abfbb2caed2022cd3b31fe472a4ca9ec1ee7a9c4c3532df045f70c917e3adc38c00d47d4d56519aefc96f8d0a065d019de8c568163ab35f20cc2
+  metadata.gz: 5e384e728280389bc97dde41209c092f4a7fc5260b90fcbdbb98791265845d1873bddb4ddb30bf8dae170de548a32812ba7635e802beb5fec1e10aa4c2ab5473
+  data.tar.gz: 3e924a4be7fbef426b1ec35102145c9cb19148794ee1452256b8ddbaadfcdecb2be6cdc815064b5664478622f72c2e380a1ee0586fa57716212b68edcdcf91ee

data/.github/workflows/main.yml

@@ -0,0 +1,40 @@
+name: rspec
+
+on:
+  push:
+    branches:
+      - main
+
+  pull_request:
+    branches:
+      - main
+
+env:
+  RAILS_ENV: test
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+
+      matrix:
+        ruby:
+          - 2.6
+          - 2.7
+          - 3.0
+          - 3.1
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: Run tests
+        run: |
+          bundle exec rspec
+        continue-on-error: ${{ matrix.allow_failures == 'true' }}

data/.github/workflows/release.yml

@@ -0,0 +1,33 @@
+name: Release gem
+
+on:
+  workflow_dispatch:
+    inputs:
+      rubygems-otp-code:
+        description: RubyGems OTP code
+        required: true
+
+permissions:
+  contents: write
+
+jobs:
+  release-gem:
+    runs-on: ubuntu-latest
+    env:
+      GEM_HOST_API_KEY: ${{ secrets.RUBYGEMS_API_KEY }}
+      GEM_HOST_OTP_CODE: ${{ github.event.inputs.rubygems-otp-code }}
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0 # bundle exec rake release で git tag を見るため、tagをfetchするようにしている
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.1.1
+      - name: Bundle install
+        run: bundle install
+      - name: Setup git config # bundle exec rake release でgit tagが打たれていない場合、タグを打ってpushしてくれるため用意している
+        run: |
+          git config --global user.email "taka0125@gmail.com"
+          git config --global user.name "Takahiro Ooishi"
+      - name: Release gem
+        run: bundle exec rake release

data/.rspec

@@ -1,2 +1,3 @@
 --format documentation
 --color
+-r spec_helper

data/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022 Takahiro Ooishi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/google_spreadsheet_fetcher.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |spec|
   spec.summary       = %q{Google Spreadsheet fetcher}
   spec.description   = %q{Google Spreadsheet fetcher}
   spec.homepage      = "https://github.com/taka0125/google_spreadsheet_fetcher"
+  spec.licenses      = ['MIT']
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})

data/lib/google_spreadsheet_fetcher/error.rb

@@ -1,4 +1,5 @@
 module GoogleSpreadsheetFetcher
   class SpreadsheetNotFound < StandardError; end
   class SheetNotFound < StandardError; end
+  class InvalidSheetUrl < StandardError; end
 end

data/lib/google_spreadsheet_fetcher/sheet_url.rb

@@ -0,0 +1,58 @@
+require 'uri'
+
+module GoogleSpreadsheetFetcher
+  class SheetUrl
+    HOST = 'docs.google.com'.freeze
+    PATH_PATTERN = %r{spreadsheets/d/(?<spreadsheet_id>[^/]+)/edit}.freeze
+
+    attr_reader :spreadsheet_id, :sheet_id
+
+    private_class_method :new
+
+    def initialize(spreadsheet_id, sheet_id)
+      @spreadsheet_id = spreadsheet_id
+      @sheet_id = sheet_id
+      freeze
+    end
+
+    def url
+      "https://#{self.class::HOST}/spreadsheets/d/#{spreadsheet_id}/edit#gid=#{sheet_id}"
+    end
+
+    def ==(other)
+      return false unless other.class == self.class
+
+      other.hash == hash
+    end
+
+    alias eql? ==
+
+    def hash
+      [spreadsheet_id, sheet_id].join.hash
+    end
+
+    class << self
+      def parse!(url)
+        uri = URI.parse(url)
+        raise InvalidSheetUrl unless uri.host == HOST
+
+        path_matched_result = uri.path.match(PATH_PATTERN)
+        raise InvalidSheetUrl unless path_matched_result
+
+        spreadsheet_id = path_matched_result[:spreadsheet_id]
+        sheet_id = extract_sheet_id(uri.fragment)
+
+        new(spreadsheet_id, sheet_id)
+      end
+
+      private
+
+      def extract_sheet_id(fragment)
+        return 0 if fragment.blank?
+
+        results = Hash[*fragment.split('=')]
+        results.dig('gid')&.to_i || 0
+      end
+    end
+  end
+end

data/lib/google_spreadsheet_fetcher/sheets_service_builder.rb

@@ -14,7 +14,7 @@ module GoogleSpreadsheetFetcher
       @user_id = user_id
       @config = config || GoogleSpreadsheetFetcher.config
       @application_name = application_name
-      @token_store = config.token_store || Google::Auth::Stores::FileTokenStore.new(file: @config.credential_store_file)
+      @token_store = @config.token_store || Google::Auth::Stores::FileTokenStore.new(file: @config.credential_store_file)
     end
 
     def build

data/lib/google_spreadsheet_fetcher/version.rb

@@ -1,3 +1,3 @@
 module GoogleSpreadsheetFetcher
-  VERSION = "1.8.0"
+  VERSION = "1.9.1"
 end

data/lib/google_spreadsheet_fetcher.rb

@@ -1,9 +1,11 @@
+require "active_support"
 require "active_support/json"
 require "active_support/core_ext"
 require "google_spreadsheet_fetcher/version"
 require "google_spreadsheet_fetcher/config"
 require "google_spreadsheet_fetcher/error"
 require "google_spreadsheet_fetcher/fetcher"
+require "google_spreadsheet_fetcher/sheet_url"
 require "google_spreadsheet_fetcher/bulk_fetcher"
 require "google_spreadsheet_fetcher/sheets_service_builder"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google_spreadsheet_fetcher
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Takahiro Ooishi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-12 00:00:00.000000000 Z
+date: 2022-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client
@@ -89,10 +89,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/main.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - bin/console
@@ -103,10 +106,12 @@ files:
 - lib/google_spreadsheet_fetcher/config.rb
 - lib/google_spreadsheet_fetcher/error.rb
 - lib/google_spreadsheet_fetcher/fetcher.rb
+- lib/google_spreadsheet_fetcher/sheet_url.rb
 - lib/google_spreadsheet_fetcher/sheets_service_builder.rb
 - lib/google_spreadsheet_fetcher/version.rb
 homepage: https://github.com/taka0125/google_spreadsheet_fetcher
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -123,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Google Spreadsheet fetcher