shopifydev 0.0.23 → 0.0.24

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OTQxYmJjYTU1Zjg1N2UzM2I4NGQ4YmM5ODk0ODY5Nzk0MmY2YTk4NA==
-  data.tar.gz: !binary |-
-    MjcxMTgxOWE2ZDNlOTcxOWRhMjYxN2I1YmMwYWYyY2I1MzA4YWFiMA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MDY3MjhhOTJlYjA2MzI5YzM3YzQyZDhjZjc4YTQzNGZkODFkZWRkYWZjNzhi
-    ZWY5MDdkNzgzOWIwNjhlZGI2NjY5ZTIzOTFhNWZkOGExNGYxOGMzYTAxNjc5
-    M2QzOWJhZTExY2FkMTk0YWM0MGUyNTY3YTlkODNlY2M5YzViNmM=
-  data.tar.gz: !binary |-
-    NWJkMTc1NWIxMjc0NDFjYWUwNTA0ZTg3MTAwMzE5YjMzMDAyZmI2YjQxZGEx
-    NjkzNTg5NDE0MzMwN2VmODgwMjA0MzY4OGZiOTQ3NTZlNGFmZGMwNjZhYzdi
-    NWNlZDM4YjBhMDQ2ODgxNDMzNGRlOWExNGRjYmNlMTA0NTJhZTg=
+SHA1:
+  metadata.gz: d3a379f60e7afc95834823f896746678afd4f905
+  data.tar.gz: 7d7108f548752db32fc5cbcceb2e954431004723
+SHA512:
+  metadata.gz: 719025171d807948b814a8b9a40e922d6c9a09584cd7a0a887761b29eaf094442feb82055b87bd73fc0e8a1c62fe35c8efd7ec4b57b4b3447dcb052f8281dac6
+  data.tar.gz: 2ec654364cbb14d18ca5a074c8bd5b1d81d8acd9288e37762f5c1c8123e09de42f19540e839c8748de67bb0a50b236dbc7c598ab16939d586a3b970204d52fd6

data/.ruby-version

@@ -1 +1 @@
-ruby-1.9.3
+ruby-2.1.0

data/lib/rails/generators/shopifydev/product_cache_generator.rb

@@ -6,7 +6,7 @@ module Shopifydev
     source_root File.expand_path('../templates', __FILE__)
 
     def generate_product_cache
-      generate 'model ProductCache shop:references shopify_product_id:integer shopify_title:string shopify_handle:string shopify_product_type:string shopify_vendor:string shopify_updated_at:datetime'
+      generate 'migration ProductCache shop:references shopify_product_id:integer shopify_title:string shopify_handle:string shopify_product_type:string shopify_vendor:string shopify_updated_at:datetime'
     end
     
     def generate_worker

data/lib/rails/generators/shopifydev/product_ui_generator.rb

@@ -0,0 +1,33 @@
+require 'rails/generators/base'
+
+module Shopifydev
+  class ProductUiGenerator < Rails::Generators::Base
+    desc "Creates a UI for editing product list (via ProductCache). Provides partials for adding custom fields."
+    source_root File.expand_path('../templates', __FILE__)
+
+    def generate_views
+      template "views/product_caches/_app_fields_header.html.slim", "app/views/product_caches/_app_fields_header.html.slim"
+      template "views/product_caches/_app_fields.html.slim", "app/views/product_caches/_app_fields.html.slim"
+      template "views/product_caches/index.html.slim", "app/views/product_caches/index.html.slim"
+    end
+    
+    def generate_controller
+      template "controllers/product_caches_controller.rb", "app/controllers/product_caches_controller.rb"
+    end
+    
+    def add_inline_error_helper
+      template "helpers/inline_error_helper.rb", "app/helpers/inline_error_helper.rb" 
+    end
+    
+    def routes
+      route %Q{
+  resources :product_caches, only: [:index] do
+    collection do
+      get 'page/:page', action: :index
+      put 'update_multiple'
+    end
+  end
+}
+    end
+  end
+end

data/lib/rails/generators/shopifydev/templates/controllers/product_caches_controller.rb

@@ -0,0 +1,49 @@
+class ProductCachesController < ApplicationController
+  around_filter :shopify_session
+
+  # GET /product_caches
+  # GET /product_caches.json
+  def index
+    @jid = ProductCacheUpdater.perform_async(current_shop.id)
+    params[:page] = 1 if params[:page] == ""
+    current_shop.product_caches.page params[:page]
+  end
+
+  # PATCH/PUT /product_caches/update_multiple
+  def update_multiple
+    
+    @product_caches = current_shop.product_caches.update(
+      params[:product_caches].keys, 
+      permitted_params(params[:product_caches].values)
+    ).reject { |p| p.errors.empty? }
+    if @product_caches.empty? 
+      flash[:success] = "Products updated"
+      redirect_to product_caches_page_path(page: params[:page])
+    else
+      flash.now[:error] = "The following entries had errors:"
+      @product_caches = []
+      render :index
+    end
+  end
+  
+  # GET
+  def status
+    data = Sidekiq::Status::get_all(params[:jid])
+    data[:created_ids] = data[:created_ids].split(',')
+    data[:updated_ids] = data[:updated_ids].split(',')
+    data[:status] = case data[:status]
+    when 'queued', 'working'
+      'updating cache...'
+    else
+      'product cache updated'
+    end
+    render json: data.to_json
+  end
+
+  private
+
+  # Never trust parameters from the scary internet, only allow the white list through.
+  def product_caches_params(arr)
+   arr.map{|h| h.permit(:custom, :fields)}
+  end
+end

data/lib/rails/generators/shopifydev/templates/helpers/inline_error_helper.rb

@@ -0,0 +1,6 @@
+module InlineErrorHelper
+  def inline_error(obj, attr)
+    return "" if obj.nil? || obj.errors[attr].empty
+    content_tag(:small, obj.errors[attr].join(', '), class: 'error')
+  end
+end

data/lib/rails/generators/shopifydev/templates/views/product_caches/_app_fields.html.slim

@@ -0,0 +1,4 @@
+/ shopify_handle is used as example so empty ui doesn't cause error
+td
+  = f.text_field(:shopify_handle, class: "radius")
+  = inline_error(product_cache, :shopify_handle) if show_errors

data/lib/rails/generators/shopifydev/templates/views/product_caches/_app_fields_header.html.slim

@@ -0,0 +1 @@
+th App Specific Field

data/lib/rails/generators/shopifydev/templates/views/product_caches/index.html.slim

@@ -0,0 +1,64 @@
+- title "Products"
+- show_errors = @product_caches.empty?
+= paginate(@product_caches) unless show_errors
+#product-status.alert.secondary.round Updating...
+= form_tag update_multiple_product_caches_path, method: :put
+  = hidden_field_tag 'page', params[:page]
+  table.product-caches-list
+    thead
+      tr
+        th Shopify ID
+        th Product
+        == render 'app_fields_header'
+    tbody
+      - @product_caches.each do |product_cache|
+        = fields_for "product_caches[]", product_cache do |f|
+          tr class="#{product_cache.errors.empty? ? 'valid' : 'error'}"
+            td.text-cell = product_cache.shopify_product_id
+            td.text-cell = product_cache.shopify_title
+            == render 'app_fields'
+      tr
+        td colspan='3'
+          ul.button-group.radius.right
+            - if @product_caches.empty?
+              = link_to "Cancel", product_caches_path(page: params[:page]), class: "button secondary"
+            = submit_tag "Save All", class: 'button'
+
+= paginate(@product_caches) unless show_errors
+javascript:
+  $('#product-status').on('click', function(){
+    var elm = $(this);
+    $.ajax({
+      type: 'GET',
+      url: '/product_caches/update_status',
+      data: {jid: elm.data('jid')},
+      statusCode: {
+        206: function(){
+          setTimeout(function(){
+            elm.trigger('click'), 2000
+          })
+        }
+      }
+    })
+    .done(function(data){
+      var h = data.status;
+      var warn = false;
+      if( data.created_ids.length > 0 ) {
+        h += " "+data.created_ids.length+" new"
+        warn = true;
+      }
+      if( data.updated_ids.length > 0 ) {
+        h += " "+data.updated_ids.length+" changed"
+        warn = true;
+      }
+      if( warn ) {
+        elm.removeClass('secondary');
+        elm.addClass('warning')
+      }
+      elm.html(h);
+    })
+  })
+  
+  $(function () {
+    $('#product-status').trigger('click');
+  });

data/lib/shopifydev/shopify_api/caches.rb

@@ -119,7 +119,7 @@ EOF
         obj.r(msg)
       elsif (obj.params != opts)
         msg = "reloading #{entity.collection_name} with new params..."
-        obj.params = opts
+        obj.params = opts.merge({limit: false})
         obj.r(msg)
       end
       obj

data/lib/shopifydev/version.rb

@@ -1,3 +1,3 @@
 module Shopifydev
-  VERSION = "0.0.23"
+  VERSION = "0.0.24"
 end

metadata

@@ -1,223 +1,223 @@
 --- !ruby/object:Gem::Specification
 name: shopifydev
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
 platform: ruby
 authors:
 - Michael Johnston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2014-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: activeresource
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: shopify_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: ruby-filemagic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.5.2
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: dalli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: shydra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: shopify_unlimited
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Abstracts out and port to ruby the functionality of the shopify textmate
@@ -232,11 +232,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .pryrc
-- .root.shopifydev.yaml.sample
-- .ruby-version
-- .shopifydev.yaml.sample
+- ".gitignore"
+- ".pryrc"
+- ".root.shopifydev.yaml.sample"
+- ".ruby-version"
+- ".shopifydev.yaml.sample"
 - Gemfile
 - LICENSE.txt
 - NEXTSTEPS.md
@@ -245,11 +245,18 @@ files:
 - bin/shopify_console
 - bin/shopifydev
 - lib/rails/generators/shopifydev/product_cache_generator.rb
+- lib/rails/generators/shopifydev/product_ui_generator.rb
 - lib/rails/generators/shopifydev/shops_generator.rb
 - lib/rails/generators/shopifydev/templates/cache_job_migration.rb
+- lib/rails/generators/shopifydev/templates/config/initializers/inflections.rb
+- lib/rails/generators/shopifydev/templates/config/initializers/sidekiq_status.rb
+- lib/rails/generators/shopifydev/templates/controllers/product_caches_controller.rb
+- lib/rails/generators/shopifydev/templates/helpers/inline_error_helper.rb
 - lib/rails/generators/shopifydev/templates/product_cache_updater.rb
 - lib/rails/generators/shopifydev/templates/shops.rake
-- lib/rails/generators/shopifydev/templates/sidekiq_status_initializer.rb
+- lib/rails/generators/shopifydev/templates/views/product_caches/_app_fields.html.slim
+- lib/rails/generators/shopifydev/templates/views/product_caches/_app_fields_header.html.slim
+- lib/rails/generators/shopifydev/templates/views/product_caches/index.html.slim
 - lib/rails/tasks/shops.rake
 - lib/shopifydev.rb
 - lib/shopifydev/asset.rb
@@ -289,17 +296,17 @@ require_paths:
 - lib
 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: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Tools for using SCM with shopify. Not Rails 4.0 ready.