ruby_shopify_api 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16284ceb17acc8de7962b17a5d275d0d9fa04c961edac3f88b7d181451aba236
-  data.tar.gz: f1a050319f37174edb83bde2d7058727353d548cca1e881f50c4d3ccfb1f6af8
+  metadata.gz: b25fb63e832873266a3a05576f238e14340ac842458f3b3c0ab432cca2b7ad15
+  data.tar.gz: 610f7f8f3786f6389b8ca2c1ebd6f8c4994f322a261e041b688acb024c44249f
 SHA512:
-  metadata.gz: 9453469343e944df07bb66f784351a2c7f4604e52cf895fcc152e2c14f326978683fbf82325ebbd1c30a35126a461019995cfe590809b3054b954d423f582cf0
-  data.tar.gz: 99608e91ca32846e0765e9daf0df38cdf956b42324c31953738a80e0729a9f4f0e318f3c0bba15607135106972752b22cef2d0c087d58ab2f289d09b7e16a498
+  metadata.gz: 8325bb30bd072d0732b108f71ca28ff7461e797d0ea8dd71c4d0eb604a43eb2cd690c887d9187cbe89b992d13d1d5e75b9541a1e3216e98e75268049cec143be
+  data.tar.gz: fda7a92af08bf4dbef72246a2e6f4faafa89fb171ce6ee08e90704a6ab5a33fdf41454e6a52f0cfd98ece0be8948a31fda577204cb0b1682d5905b7c2973578d

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## Unreleased
 
+## Version 1.2.0
+
+* shopify_api => ruby_shopify_api
+
+## Version 1.1.0
+
+* Support ActiveResrouce v6
+
 ## Version 1.0.0
 
 * Keep using ShopifyAPI the old way. (Fork from Shopify's v9.5.1)

data/Gemfile

@@ -3,8 +3,10 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "activeresource", "~> 5.1"
-
-group :docs, optional: true do
-  gem "jekyll"
-end
+gem "activeresource"
+gem 'minitest-focus'
+gem 'mocha'
+gem 'webmock'
+gem 'minitest'
+gem 'rake'
+gem 'timecop'

data/Gemfile.lock

@@ -1,151 +1,85 @@
 PATH
   remote: .
   specs:
-    ruby_shopify_api (1.0.0)
-      activeresource (>= 4.1.0)
+    ruby_shopify_api (1.2.0)
+      activeresource
       graphql-client
       rack
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.3.1)
-      activesupport (= 6.0.3.1)
+    activemodel (7.1.3.2)
+      activesupport (= 7.1.3.2)
     activemodel-serializers-xml (1.0.2)
       activemodel (> 5.x)
       activesupport (> 5.x)
       builder (~> 3.1)
-    activeresource (5.1.1)
-      activemodel (>= 5.0, < 7)
+    activeresource (6.1.0)
+      activemodel (>= 6.0)
       activemodel-serializers-xml (~> 1.0)
-      activesupport (>= 5.0, < 7)
-    activesupport (6.0.3.1)
+      activesupport (>= 6.0)
+    activesupport (7.1.3.2)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.1)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      mutex_m
+      tzinfo (~> 2.0)
+    addressable (2.8.6)
+      public_suffix (>= 2.0.2, < 6.0)
+    base64 (0.2.0)
+    bigdecimal (3.1.7)
     builder (3.2.4)
-    byebug (11.1.3)
-    coderay (1.1.2)
-    colorator (1.1.0)
-    concurrent-ruby (1.1.6)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    em-websocket (0.5.1)
-      eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0.6.0)
-    eventmachine (1.2.7)
-    ffi (1.12.2)
-    forwardable-extended (2.6.0)
-    graphql (2.0.18)
-    graphql-client (0.18.0)
+    concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
+    crack (1.0.0)
+      bigdecimal
+      rexml
+    drb (2.2.1)
+    graphql (2.3.2)
+      base64
+    graphql-client (0.22.0)
       activesupport (>= 3.0)
-      graphql
-    hashdiff (1.0.1)
-    http_parser.rb (0.6.0)
-    i18n (1.8.2)
+      graphql (>= 1.13.0)
+    hashdiff (1.1.0)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
-    jekyll (4.1.0)
-      addressable (~> 2.4)
-      colorator (~> 1.0)
-      em-websocket (~> 0.5)
-      i18n (~> 1.0)
-      jekyll-sass-converter (~> 2.0)
-      jekyll-watch (~> 2.0)
-      kramdown (~> 2.1)
-      kramdown-parser-gfm (~> 1.0)
-      liquid (~> 4.0)
-      mercenary (~> 0.4.0)
-      pathutil (~> 0.9)
-      rouge (~> 3.0)
-      safe_yaml (~> 1.0)
-      terminal-table (~> 1.8)
-    jekyll-sass-converter (2.1.0)
-      sassc (> 2.0.1, < 3.0)
-    jekyll-watch (2.2.1)
-      listen (~> 3.0)
-    kramdown (2.3.1)
-      rexml
-    kramdown-parser-gfm (1.1.0)
-      kramdown (~> 2.0)
-    liquid (4.0.3)
-    listen (3.2.1)
-      rb-fsevent (~> 0.10, >= 0.10.3)
-      rb-inotify (~> 0.9, >= 0.9.10)
-    mercenary (0.4.0)
-    method_source (1.0.0)
-    minitest (5.14.4)
-    mocha (1.11.2)
-    parallel (1.19.2)
-    parser (2.7.2.0)
-      ast (~> 2.4.1)
-    pathutil (0.16.2)
-      forwardable-extended (~> 2.6)
-    pry (0.13.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    pry-byebug (3.9.0)
-      byebug (~> 11.0)
-      pry (~> 0.13.0)
-    public_suffix (4.0.6)
-    rack (3.0.6.1)
-    rainbow (3.0.0)
-    rake (13.0.1)
-    rb-fsevent (0.10.4)
-    rb-inotify (0.10.1)
-      ffi (~> 1.0)
-    regexp_parser (1.8.2)
-    rexml (3.2.5)
-    rouge (3.19.0)
-    rubocop (0.93.1)
-      parallel (~> 1.10)
-      parser (>= 2.7.1.5)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8)
-      rexml
-      rubocop-ast (>= 0.6.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.8.0)
-      parser (>= 2.7.1.5)
-    rubocop-shopify (1.0.6)
-      rubocop (>= 0.92, < 0.94)
-    ruby-progressbar (1.10.1)
-    safe_yaml (1.0.5)
-    sassc (2.3.0)
-      ffi (~> 1.9)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    thread_safe (0.3.6)
-    timecop (0.9.1)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.7.0)
-    webmock (3.8.3)
-      addressable (>= 2.3.6)
+    minitest (5.22.3)
+    minitest-focus (1.4.0)
+      minitest (>= 4, < 6)
+    mocha (2.2.0)
+      ruby2_keywords (>= 0.0.5)
+    mutex_m (0.2.0)
+    public_suffix (5.0.5)
+    rack (3.0.10)
+    rake (13.2.1)
+    rexml (3.2.6)
+    ruby2_keywords (0.0.5)
+    timecop (0.9.8)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    webmock (3.23.0)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.3.0)
 
 PLATFORMS
+  arm64-darwin-22
   ruby
 
 DEPENDENCIES
-  activeresource (~> 5.1)
-  jekyll
-  minitest (>= 5.14)
-  mocha (>= 1.4.0)
-  pry
-  pry-byebug
+  activeresource
+  minitest
+  minitest-focus
+  mocha
   rake
-  rubocop-shopify
   ruby_shopify_api!
   timecop
   webmock
 
 BUNDLED WITH
-   2.2.22
+   2.5.9

data/README.md

@@ -24,7 +24,7 @@ The REST API is implemented as JSON over HTTP using all four verbs (GET/POST/PUT
     - [4) Trading your `code` for an access token.](#4-trading-your-code-for-an-access-token)
     - [5) Activating the session](#5-activating-the-session)
     - [6A) Making requests to the GraphQL API](#6a-making-requests-to-the-graphql-api)
-          - [Note: the GraphQL client has improved and changed in version 9.0. See the client documentation for full usage details and a [migration guide](docs/graphql.md#migration-guide).](#note-the-graphql-client-has-improved-and-changed-in-version-90-see-the-client-documentation-for-full-usage-details-and-a-migration-guide)
+          - [Note: the GraphQL client has improved and changed in version 9.0. See the client documentation for full usage details and a migration guide.](#note-the-graphql-client-has-improved-and-changed-in-version-90-see-the-client-documentation-for-full-usage-details-and-a-migration-guide)
     - [6B) Making requests to the REST API](#6b-making-requests-to-the-rest-api)
   - [Console](#console)
   - [Thread safety](#thread-safety)
@@ -65,22 +65,22 @@ This gem requires Ruby 2.4 as of version 7.0.
 
 ## Installation
 
-Add `shopify_api` to your `Gemfile`:
+Add `ruby_shopify_api` to your `Gemfile`:
 
 ```ruby
-gem 'shopify_api'
+gem 'ruby_shopify_api'
 ```
 
 Or install via [gem](http://rubygems.org/)
 
 ```bash
-gem install shopify_api
+gem install ruby_shopify_api
 ```
 
 Once the gem is installed, it must be added to your project by placing the following line in your app :
 
 ```ruby
-require 'shopify_api'
+require 'ruby_shopify_api'
 ```
 
 ## Getting Started

data/Rakefile

@@ -1,55 +1,13 @@
 # frozen_string_literal: true
-require 'rake'
-require "bundler/gem_tasks"
-require 'rake/testtask'
-require 'rubocop/rake_task'
-
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/*_test.rb'
-  test.warning = false
-end
-
-RuboCop::RakeTask.new
-
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/*_test.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task(:rcov) do
-    abort("RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov")
-  end
-end
 
-task(default: [:test, :rubocop, :verify_docs])
-
-require 'verify_docs'
-task(:verify_docs) do
-  unless VerifyDocs.call
-    abort("\nWARNING: docs/index.md and README.md no longer have identical content. Please correct this.")
-  end
-end
-
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  if File.exist?('VERSION.yml')
-    config = YAML.load(File.read('VERSION.yml'))
-    version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
-  else
-    version = ""
-  end
+require "bundler/gem_tasks"
+require "rake/testtask"
 
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "shopify_api #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList["test/**/*_test.rb"]
+  t.warning = false
 end
 
-task(:docker) do
-  cmd = "docker-compose up -d && docker exec -i -t shopify_api bash"
-  exec(cmd, err: File::NULL)
-end
+task default: :test

data/lib/active_resource/connection_ext.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require 'shopify_api/connection'
+require 'ruby_shopify_api/connection'
 
 module ActiveResource
   class Connection

data/lib/{shopify_api → ruby_shopify_api}/graphql/railtie.rb

@@ -10,7 +10,7 @@ module ShopifyAPI
       end
 
       rake_tasks do
-        load 'shopify_api/graphql/task.rake'
+        load 'ruby_shopify_api/graphql/task.rake'
       end
     end
   end

data/lib/{shopify_api → ruby_shopify_api}/graphql.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 require 'graphql/client'
-require 'shopify_api/graphql/http_client'
+require 'ruby_shopify_api/graphql/http_client'
 
 module ShopifyAPI
   module GraphQL

data/lib/{shopify_api → ruby_shopify_api}/resources/base.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require 'shopify_api/version'
+require 'ruby_shopify_api/version'
 
 module ShopifyAPI
   class Base < ActiveResource::Base

data/lib/{shopify_api → ruby_shopify_api}/resources/customer_group.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require 'shopify_api/resources/customer_saved_search'
+require 'ruby_shopify_api/resources/customer_saved_search'
 
 module ShopifyAPI
   CustomerGroup = CustomerSavedSearch

data/lib/{shopify_api → ruby_shopify_api}/resources/customer_saved_search.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require 'shopify_api/resources/customer'
+require 'ruby_shopify_api/resources/customer'
 
 module ShopifyAPI
   class CustomerSavedSearch < Base

data/lib/{shopify_api → ruby_shopify_api}/resources.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
-require 'shopify_api/resources/base'
-require 'shopify_api/resources/array_base'
+require 'ruby_shopify_api/resources/base'
+require 'ruby_shopify_api/resources/array_base'
 Dir.glob("#{File.dirname(__FILE__)}/resources/*").each { |file| require(file) }

data/lib/{shopify_api → ruby_shopify_api}/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ShopifyAPI
-  VERSION = "1.0.0"
+  VERSION = "1.2.0"
 end

data/lib/{shopify_api.rb → ruby_shopify_api.rb}

@@ -5,12 +5,12 @@ require 'active_support/core_ext/class/attribute_accessors'
 require 'digest/md5'
 require 'base64'
 require 'active_resource/detailed_log_subscriber'
-require 'shopify_api/limits'
-require 'shopify_api/api_version'
-require 'shopify_api/meta'
+require 'ruby_shopify_api/limits'
+require 'ruby_shopify_api/api_version'
+require 'ruby_shopify_api/meta'
 require 'active_resource/json_errors'
-require 'shopify_api/paginated_collection'
-require 'shopify_api/disable_prefix_check'
+require 'ruby_shopify_api/paginated_collection'
+require 'ruby_shopify_api/disable_prefix_check'
 
 if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.6")
   puts("\nshopify_api: NOTE: Support for Ruby #{RUBY_VERSION} will be dropped in the next major release. Please update to Ruby 2.6 or newer before updating this gem.\n\n")
@@ -20,18 +20,18 @@ module ShopifyAPI
   include Limits
 end
 
-require 'shopify_api/events'
-require 'shopify_api/metafields'
-require 'shopify_api/countable'
-require 'shopify_api/resources'
-require 'shopify_api/session'
-require 'shopify_api/hmac_params'
-require 'shopify_api/api_access'
-require 'shopify_api/message_enricher'
-require 'shopify_api/connection'
-require 'shopify_api/pagination_link_headers'
-require 'shopify_api/graphql'
-require 'shopify_api/graphql/railtie' if defined?(Rails)
+require 'ruby_shopify_api/events'
+require 'ruby_shopify_api/metafields'
+require 'ruby_shopify_api/countable'
+require 'ruby_shopify_api/resources'
+require 'ruby_shopify_api/session'
+require 'ruby_shopify_api/hmac_params'
+require 'ruby_shopify_api/api_access'
+require 'ruby_shopify_api/message_enricher'
+require 'ruby_shopify_api/connection'
+require 'ruby_shopify_api/pagination_link_headers'
+require 'ruby_shopify_api/graphql'
+require 'ruby_shopify_api/graphql/railtie' if defined?(Rails)
 
 if ShopifyAPI::Base.respond_to?(:connection_class)
   ShopifyAPI::Base.connection_class = ShopifyAPI::Connection

data/shopify_api.gemspec

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-$:.push(File.expand_path("../lib", __FILE__))
-require "shopify_api/version"
+
+require_relative "lib/ruby_shopify_api/version"
 
 Gem::Specification.new do |s|
   s.name = %q{ruby_shopify_api}
@@ -32,16 +32,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 2.4"
 
-  s.add_runtime_dependency("activeresource", ">= 4.1.0")
+  s.add_runtime_dependency("activeresource")
   s.add_runtime_dependency("rack")
   s.add_runtime_dependency("graphql-client")
-
-  s.add_development_dependency("mocha", ">= 1.4.0")
-  s.add_development_dependency("webmock")
-  s.add_development_dependency("minitest", ">= 5.14")
-  s.add_development_dependency("rake")
-  s.add_development_dependency("timecop")
-  s.add_development_dependency("rubocop-shopify")
-  s.add_development_dependency("pry")
-  s.add_development_dependency("pry-byebug")
 end

data/test/detailed_log_subscriber_test.rb

@@ -74,27 +74,16 @@ class LogSubscriberTest < Test::Unit::TestCase
       ShopifyAPI::Page.find(2)
     end
 
-    if ar_version_before?('5.1.0')
-      assert_equal(4, @logger.logged(:info).size)
-      assert_equal(
-        "GET https://this-is-my-test-shop.myshopify.com:443/admin/api/2019-01/pages/2.json",
-        @logger.logged(:info)[0]
-      )
-      assert_match(/\-\-\> 404/, @logger.logged(:info)[1])
-      assert_equal(request_headers, @logger.logged(:info)[2])
-      assert_equal("Response:", @logger.logged(:info)[3])
-    else
-      assert_equal(2, @logger.logged(:error).size)
-      assert_equal(
-        "GET https://this-is-my-test-shop.myshopify.com:443/admin/api/2019-01/pages/2.json",
-        @logger.logged(:error)[0]
-      )
-      assert_match(/\-\-\> 404/, @logger.logged(:error)[1])
-
-      assert_equal(2, @logger.logged(:info).size)
-      assert_equal(request_headers, @logger.logged(:info)[0])
-      assert_equal("Response:", @logger.logged(:info)[1])
-    end
+    assert_equal(2, @logger.logged(:error).size)
+    assert_equal(
+      "GET https://this-is-my-test-shop.myshopify.com:443/admin/api/2019-01/pages/2.json",
+      @logger.logged(:error)[0]
+    )
+    assert_match(/\-\-\> 404/, @logger.logged(:error)[1])
+
+    assert_equal(2, @logger.logged(:info).size)
+    assert_equal(request_headers, @logger.logged(:info)[0])
+    assert_equal("Response:", @logger.logged(:info)[1])
   end
 
   test "warns when the server responds with a x-shopify-api-deprecated-reason header" do

data/test/test_helper.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 require 'rubygems'
 require 'minitest/autorun'
+require "minitest/focus"
 require 'webmock/minitest'
 require_relative 'lib/webmock_extensions/last_request'
 require 'mocha/minitest'
-require 'pry'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 WebMock.disable_net_connect!
-require 'shopify_api'
+require 'ruby_shopify_api'
 
 # setup ShopifyAPI with fake api_key and secret
 module Test
@@ -114,13 +114,6 @@ module Test
         )
       end
 
-      def ar_version_before?(version_string)
-        Gem::Version.new(ActiveResource::VERSION::STRING) < Gem::Version.new(version_string)
-      end
-
-      def ar_version_after?(version_string)
-        Gem::Version.new(version_string) < Gem::Version.new(ActiveResource::VERSION::STRING)
-      end
     end
   end
 end