disco_app 0.13.6 → 0.13.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dae34512a81a8694df5d876b932b0eb1ab76b03bb3b801f38ed5db0de148c1ed
-  data.tar.gz: 73a7380924331f105c5752ebdf38e9a008d099aeafad622b35a0e47c18e73906
+  metadata.gz: 5983b34e8629a83463ee62e1f91048a02c2e3828d15e4fe25bc692d82ea91ea4
+  data.tar.gz: 96b93719faed53ed578a03a7fc7c0352bae2fac7d79051708e8910863c8f10e8
 SHA512:
-  metadata.gz: fc169bc12200022540ddd73b93187b3d4bc10ec04138b9f9964c1437e819e2f1d128b755aed5d4665187dbaba770ecc2054c318da2f1437ac587377f51026402
-  data.tar.gz: 1cf145e45bb67337b41375e0b62cc05fa88fd968b1699521d69f339c9238fd5dc364cc4978dca82c964acdac28747e5c24a3eb4e7ca4bf77fb68d6746fa5193e
+  metadata.gz: 51ebc9ca906a78457968f99343b2c4baa2ead374ed8534cdbeeef2a25af93b9559a0d556a658697d3c40e960d1671df1f09506888026e2d003cb0aef57b5b846
+  data.tar.gz: ded7d2a2698176ec21f44fbd77def3e147c26ae1220301368ae4140122b1674a3a9a8ba51ae962424e3bec020a3d1019dad89d9dc662f5fb148928e102514cab

data/app/models/disco_app/concerns/can_be_liquified.rb

@@ -5,14 +5,15 @@ module DiscoApp::Concerns::CanBeLiquified
 
   included do
 
-    # Return this model as an array of Liquid {% assign %} statements.
+    # Return this model as a hash for use with `to_liquid`. Returns `as_json` by default but is provided here as a hook
+    # for potential overrides.
     def as_liquid
-      as_json.map { |k, v| "{% assign #{liquid_model_name}_#{k} = #{as_liquid_value(k, v)} %}" }
+      as_json
     end
 
-    # Render this model as a series of concatenated Liquid {% assign %} statements.
+    # Render this model as a series of concatenated Liquid {%- assign -%} statements.
     def to_liquid
-      as_liquid.join("\n")
+      as_liquid.map { |k, v| "{%- assign #{liquid_model_name}_#{k} = #{as_liquid_value(k, v)} -%}" }.join("\n")
     end
 
     # Method to allow override of the model name in Liquid. Useful for models

data/app/services/disco_app/partner_app_service.rb

@@ -0,0 +1,139 @@
+module DiscoApp
+  class PartnerAppService
+
+    def initialize(params)
+      @email = params[:email]
+      @password = params[:password]
+      @app_name = params[:app_name]
+      @app_url = params[:app_url]
+      @organization = params[:organization]
+
+      @agent = Mechanize.new do |a|
+        a.user_agent_alias = 'Mac Safari'
+        a.follow_meta_refresh = true
+        a.keep_alive = false
+        a.pre_connect_hooks << lambda do |_agent, request|
+          request['Accept'] = 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8'
+        end
+      end
+    end
+
+    def generate_partner_app
+      begin
+        # Login to Shopify Partners
+        login
+        # Access Partner dashboard
+        org_link = organizations
+        dashboard = dashboard_page(org_link)
+        # Create App
+        apps_page = refresh_page(dashboard)
+        create_partner_app(apps_page)
+        # Configure newly created app with embedded app use
+        apps_page = refresh_page(dashboard)
+        embedded_admin_app(apps_page)
+        # Fetch API credentials
+        apps_page = refresh_page(dashboard)
+        api_key, secret = api_credentials(apps_page)
+      rescue Mechanize::Error => e
+        puts 'Error while trying to create partner app'
+        puts "Error #{e}, message : #{e.message}"
+        return
+      end
+      # Add them to .env.local file
+      append_credentials(api_key, secret)
+      puts '#' * 80
+      puts 'New Partner App successfully created!'
+      puts 'API Credentials have been pasted to your .env.local file'
+      puts '#' * 80
+    end
+
+    private
+
+      def login
+        @agent.get('https://accounts.shopify.com/login') do |page|
+          page.form do |form|
+            form['account[email]'] = @email
+            form['account[password]'] = @password
+          end.submit
+        end
+      end
+
+      def organizations
+        organizations = @agent.get('https://partners.shopify.com/organizations/')
+        organizations.links.select { |link| link.text[/#{@organization}/] }.first.href
+      end
+
+      def dashboard_page(org_link)
+        @agent.get('https://partners.shopify.com' + org_link)
+      end
+
+      def create_partner_app(apps_page)
+        apps_page.form do |form|
+          # App name
+          form['create_form[title]'] = @app_name
+
+          # App URL
+          form['create_form[application_url]'] = @app_url
+
+          # Accept TOS
+          unless form['create_form[accepted]'].blank?
+            form['create_form[accepted]'] = '1'
+            form.hiddens.last.value = 1
+          end
+        end.submit
+      end
+
+      def api_credentials(apps_page)
+        app = apps_page.link_with(text: @app_name).click
+        app_info = app.link_with(text: 'App info').click
+        add_whitelist_url(app_info)
+        api_key = app_info.search('#api_key').first.values[3]
+        secret = app_info.search('#settings_form_secrets').first.values[3]
+        [api_key, secret]
+      end
+
+      def embedded_admin_app(apps_page)
+        app = apps_page.link_with(text: @app_name).click
+        extensions = app.link_with(text: 'Extensions').click
+        extensions.form do |form|
+          form['extensions_form[embedded]'] = '1'
+        end.submit
+      end
+
+      # Write credentials of newly created app to .env.local file
+      def append_credentials(api_key, secret)
+        original_file = '.env.local'
+        new_file = original_file + '.new'
+        File.open(new_file, 'w') do |file|
+          File.foreach(original_file) do |line|
+            if line.include?('SHOPIFY_APP_API_KEY')
+              file.puts "SHOPIFY_APP_API_KEY=#{api_key}"
+            elsif line.include?('SHOPIFY_APP_SECRET')
+              file.puts "SHOPIFY_APP_SECRET=#{secret}"
+            else
+              file.puts line
+            end
+          end
+        end
+        File.delete(original_file)
+        File.rename(new_file, original_file)
+      end
+
+      def add_whitelist_url(app_info)
+        app_info.form do |form|
+          form['info_form[redirect_url_whitelist]'] = callback_url
+        end.submit
+      end
+
+      # Access the "Apps" section of the dashboard, also used to reload the dashboard
+      # When an action has been taken
+      def refresh_page(dashboard)
+        dashboard.link_with(text: '  Apps').click
+      end
+
+      def callback_url
+        [@app_url + '/auth/shopify/callback', @app_url + '/auth/shopify_user/callback'].join("\n")
+      end
+
+  end
+end

data/lib/disco_app/version.rb

@@ -1,3 +1,3 @@
 module DiscoApp
-  VERSION = '0.13.6'
+  VERSION = '0.13.7'
 end

data/lib/generators/disco_app/disco_app_generator.rb

@@ -6,10 +6,11 @@ class DiscoAppGenerator < Rails::Generators::Base
   #
   #  - .env and .env.local for settings environment variables in development with dotenv-rails;
   #  - Slightly customised version of the default Rails .gitignore;
-  #  - Default simple Procfile for Heroku.
+  #  - Default simple Procfile for Heroku;
+  #  - .editorconfig to help enforce 2-space tabs, newlines and truncated whitespace for editors that support it.
   #
   def copy_root_files
-    %w(.env .env.local .gitignore .rubocop.yml .codeclimate.yml Procfile CHECKS).each do |file|
+    %w(.editorconfig .env .env.local .gitignore .rubocop.yml .codeclimate.yml Procfile CHECKS).each do |file|
       copy_file "root/#{file}", file
     end
   end
@@ -27,28 +28,28 @@ class DiscoAppGenerator < Rails::Generators::Base
     gsub_file 'Gemfile', /^# Use sqlite3 as the database for Active Record\ngem 'sqlite3'/m, ''
 
     # Add gem requirements.
-    gem 'shopify_app'
-    gem 'pg'
-    gem 'sidekiq'
-    gem 'rollbar'
-    gem 'newrelic_rpm'
-    gem 'react-rails'
-    gem 'classnames-rails'
-    gem 'premailer-rails'
-    gem 'rails-bigint-pk'
-    gem 'acts_as_singleton'
     gem 'active_link_to'
+    gem 'acts_as_singleton'
+    gem 'classnames-rails'
+    gem 'newrelic_rpm'
     gem 'nokogiri'
     gem 'oj'
+    gem 'pg'
+    gem 'premailer-rails'
+    gem 'rails-bigint-pk'
+    gem 'react-rails'
     gem 'render_anywhere'
+    gem 'rollbar'
+    gem 'shopify_app'
+    gem 'sidekiq'
 
     # Specify the threadsafe version of ActiveResource.
     gem 'activeresource', git: 'https://github.com/shopify/activeresource.git', tag: '4.2-threadsafe'
 
     # Indicate which gems should only be used in production.
     gem_group :production do
-      gem 'rails_12factor'
       gem 'mailgun_rails'
+      gem 'rails_12factor'
     end
 
     # Indicate which gems should only be used in development and test.
@@ -56,6 +57,7 @@ class DiscoAppGenerator < Rails::Generators::Base
       gem 'dotenv-rails'
       gem 'minitest-reporters'
       gem 'webmock'
+      gem 'mechanize'
     end
   end
 

data/lib/tasks/partner_app.rake

@@ -0,0 +1,26 @@
+require 'yaml'
+
+namespace :generate do
+  desc 'Generate new Shopify app from partner dashboard'
+  task partner_app: :environment do
+    begin
+      config_path = File.join(ENV['HOME'], '.disco_app.yml')
+      config = YAML.load_file(config_path)
+    rescue StandardError
+      abort("Could not load configuration file from #{config_path}, aborting.")
+    end
+
+    if config
+      params = {
+        email: config['params']['PARTNER_EMAIL'].to_s,
+        password: config['params']['PARTNER_PASSWORD'].to_s,
+        organization: config['params']['PARTNER_ORGANIZATION'].to_s,
+        app_name: ENV['SHOPIFY_APP_NAME'],
+        app_url: ENV['DEFAULT_HOST']
+      }
+
+      service = DiscoApp::PartnerAppService.new(params)
+      service.generate_partner_app
+    end
+  end
+end

data/test/fixtures/liquid/model.liquid

@@ -1,8 +1,8 @@
-{% assign model_numeric = 42 %}
-{% assign model_boolean = true %}
-{% assign model_empty = nil %}
-{% assign model_string = 'The cat's pyjamas are "great".' %}
-{% assign model_string_html = 'The cat&#39;s pyjamas are <strong style="color: red;">great</strong>.' %}
-{% assign model_array_of_numerics = '1@!@2@!@3' | split: '@!@' %}
-{% assign model_array_of_strings = 'A@!@B@!@C' | split: '@!@' %}
-{% assign model_hash = '{}' %}
+{%- assign model_numeric = 42 -%}
+{%- assign model_boolean = true -%}
+{%- assign model_empty = nil -%}
+{%- assign model_string = 'The cat&#39;s pyjamas are &quot;great&quot;.' -%}
+{%- assign model_string_html = 'The cat&#39;s pyjamas are <strong style="color: red;">great</strong>.' -%}
+{%- assign model_array_of_numerics = '1@!@2@!@3' | split: '@!@' -%}
+{%- assign model_array_of_strings = 'A@!@B@!@C' | split: '@!@' -%}
+{%- assign model_hash = '{}' -%}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: disco_app
 version: !ruby/object:Gem::Version
-  version: 0.13.6
+  version: 0.13.7
 platform: ruby
 authors:
 - Gavin Ballard
@@ -605,6 +605,7 @@ files:
 - app/resources/disco_app/admin/resources/shop_resource.rb
 - app/services/disco_app/carrier_request_service.rb
 - app/services/disco_app/charges_service.rb
+- app/services/disco_app/partner_app_service.rb
 - app/services/disco_app/proxy_service.rb
 - app/services/disco_app/request_validation_service.rb
 - app/services/disco_app/subscription_service.rb
@@ -673,6 +674,7 @@ files:
 - lib/tasks/api.rake
 - lib/tasks/carrier_service.rake
 - lib/tasks/database.rake
+- lib/tasks/partner_app.rake
 - lib/tasks/sessions.rake
 - lib/tasks/shops.rake
 - lib/tasks/start.rake