shopify_app 5.0.1 → 5.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b63a99a31c373bfa53cba58497efffb6dcd68cd
-  data.tar.gz: 13a5639e78cc51a29c668f5fb15ebf9e48fa1c92
+  metadata.gz: 4074fe532a9c1606f958f24ce1c9ef8f07c58fb7
+  data.tar.gz: 8d9832af0f7999c33225fb4d2e1c83c151bff70e
 SHA512:
-  metadata.gz: b200f8785a3b3a1ec14a0f295339b812ab86dd968307ac6cd1cf1982e38ea82830b24cda724f55708e95d6662375c7669aaa80a68793dc78b3211c353b4fc796
-  data.tar.gz: 7403b965254769f35af83b07a74602b7ea7ce7483f8f9d1aaf183dc7f1919af370e86e8e355dee4918a0e12efe8c7a562e80e9571dda2a33cd70de63c827b9b5
+  metadata.gz: 00c8fffe2c5f445fe0ef959b62156d032bae66260df5704fb2fdbc566f853475f5a4f66d848733cb1233ce3c82e8e5898a997da350014bbb08716544e1ffb50e
+  data.tar.gz: a0178aeb4ac85acfd59d44d763a67de03ace96a0e426000b772db29f8f4c1e12ff3de68aac7fade16c715d335bddbdae298d7d8e76e91701ca1a8e7350d86268

data/lib/generators/shopify_app/templates/app/views/home/index.html.erb

@@ -11,21 +11,21 @@
 
 <div class="row">
   <div class="span3">
-    <div class="well">  
+    <div class="well">
       <h3>Check out the <code>home_controller</code></h3>
       <hr style="margin:2px 0 7px"/>
       <p>The controller in this demo application fetches the newest 5 orders and products and makes them available as instance variables <code>@orders</code> and <code>@products</code></p>
-    
+
       <br/>
-    
+
       <h3>Take a look at <code>index.html.erb</code></h3>
       <hr style="margin:2px 0 7px"/>
       <p>Index is the Ruby template you are currently viewing. Have a look at the markup and Ruby code to see how the Shopify API is being used. It's located at <code>views/home/index.html.erb</code></p>
     </div>
-    
+
     <h3>Additional Docs</h3>
     <p>You can become an expert pretty quickly by reading up on these docs:</p>
-    
+
     <ul>
       <li>
         <%= link_to 'API documentation', 'http://docs.shopify.com/api' %>
@@ -44,15 +44,15 @@
         <span class="note">Ask questions and see what others already wanted to know</span>
       </li>
     </ul>
-  
+
     <hr/>
-  
+
     <h3>Once you're ready</h3>
-  
+
     <p>We'd love to see what you create using the Shopify API. You can keep up to date on the latest and greatest via the <%= link_to 'Shopify Developers Twitter Account', 'https://twitter.com/shopifydevs' %>. You can also read the latest information on the <%= link_to 'Building a Shopify App', 'http://docs.shopify.com/partners/partner-resources/for-partners/building-a-shopify-app' %>.</p>
-    
+
     <br/>
-    
+
     <a href="https://twitter.com/shopifydevs" class="twitter-follow-button" data-show-count="false" data-size="large">Follow @ShopifyDevs</a>
     <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
   </div> <!-- span3 / left-column -->
@@ -60,16 +60,16 @@
 
   <div class="span8 offset1">
     <h2>Recent orders</h2>
-  
-    <% if @orders.blank? %>
+
+    <% if @orders.none? %>
       <table class="table table-striped">
         <tr>
           <td><em>There are no orders in your store.</em></td>
         </tr>
       </table>
-    
+
     <% else %>
-  
+
       <table class="table table-striped">
         <thead>
           <tr>
@@ -99,43 +99,43 @@
         </tr>
       <% end %>
       </table>
-      
+
     <% end %>
-    
+
     <br/>
-    
+
     <h2>New Products</h2>
-    
-    <div class="accordion" id="accordion">      
-      
-      <% if @products.blank? %>
-      
+
+    <div class="accordion" id="accordion">
+
+      <% if @products.none? %>
+
         <div class="accordion-group">
           <div class="accordion-heading">
             <em>There are no products in your store.</em>
           </div>
         </div>
-      
+
       <% else %>
-      
+
         <%  @products.each_with_index do |product, index| %>
           <div class="accordion-group">
             <div class="accordion-heading">
-              
+
               <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#<%= product.id %>">
                 <%= product.title %> <span class="pull-right muted"><%= product.price_range %> <%= shop_session.shop.currency %></span>
               </a>
             </div>
-        
+
             <div id="<%= product.id %>" class="accordion-body collapse <% if index == 1 %>in<% end %>">
               <div class="accordion-inner">
-                
+
                 <% if !product.images.empty? %>
                   <div class="polaroid">
                     <%= link_to image_tag(product.images.first.medium), '#modal-'+product.id.to_s, :'data-toggle' => 'modal' %>
                   </div>
                 <% end %>
-                
+
                 <p><strong>Type:</strong> <%= product.product_type %></p>
                 <p><strong>Vendor:</strong> <%= product.vendor %></p>
                 <p><%= raw(product.body_html) %></p><br/>
@@ -144,10 +144,10 @@
                 <% end %>
                 <p><%= link_to raw('View in your Shopify Admin <i class="icon-chevron-right" style="opacity:.25"></i>'), "https://#{shop_session.url}/admin/products/#{product.id}", :target => 'blank', :class => 'btn btn-primary' %></p>
               </div>
-              
+
             </div>
           </div>
-          
+
           <div class="modal hide fade" id="modal-<%= product.id %>" style="display:none;">
             <div class="modal-header">
               <a class="close" data-dismiss="modal">×</a>
@@ -160,9 +160,9 @@
             </div>
           </div>
         <% end %>
-      
+
       <% end %>
-      
+
     </div> <!-- accordion -->
   </div> <!-- span8 / right-column -->
 </div>

data/lib/generators/shopify_app/templates/config/initializers/shopify_session_repository.rb

@@ -1,8 +1,9 @@
 # You should replace InMemorySessionStore with what you will be using
-# in Production
+# in Production. For example a model called "Shop":
 #
-# Interface to implement are self.retrieve(id) and self.store(ShopifyAPI::Session)
+# ShopifySessionRepository.storage = 'Shop'
 #
+# Interface to implement are self.retrieve(id) and self.store(ShopifyAPI::Session)
 # Here is how you would add these functions to an ActiveRecord:
 #
 # class Shop < ActiveRecord::Base

data/lib/shopify_app/configuration.rb

@@ -1,5 +1,5 @@
 class ShopifyApp::Configuration
-  VALID_KEYS = [:api_key, :secret]
+  VALID_KEYS = [:api_key, :secret, :myshopify_domain]
   attr_writer *VALID_KEYS
 
   def initialize(params={})

data/lib/shopify_app/version.rb

@@ -1,3 +1,3 @@
 module ShopifyApp
-  VERSION = "5.0.1"
+  VERSION = "5.0.2"
 end

data/test/config/development_config_file.yml

@@ -5,3 +5,4 @@ common:
 development:
   api_key: development key
   secret: development secret
+  myshopify_domain: myshopify.com

data/test/config/other_config_file.yml

@@ -1,3 +1,4 @@
 common:
   api_key: api key from other file
   secret: secret from other file
+  myshopify_domain: example.com

data/test/config/shopify_app.yml

@@ -1,3 +1,4 @@
 common:
   api_key: api key from default file
   secret: secret from default file
+  myshopify_domain: myshopify.com

data/test/lib/shopify_app/configuration_test.rb

@@ -14,6 +14,7 @@ class ConfigurationTest < Minitest::Test
     config = ShopifyApp::Configuration.new
     config.respond_to?(:api_key)
     config.respond_to?(:secret)
+    config.respond_to?(:myshopify_domain)
   end
 
   def test_defaults_to_empty_string
@@ -21,6 +22,7 @@ class ConfigurationTest < Minitest::Test
 
     assert_equal '', config.api_key
     assert_equal '', config.secret
+    assert_equal '', config.myshopify_domain
   end
 
   def test_environment_has_precedence_over_common
@@ -28,6 +30,7 @@ class ConfigurationTest < Minitest::Test
 
     assert_equal 'development key', config.api_key
     assert_equal 'development secret', config.secret
+    assert_equal 'myshopify.com', config.myshopify_domain
   end
 
   def test_rails_has_precedence_over_environment
@@ -35,44 +38,54 @@ class ConfigurationTest < Minitest::Test
 
     assert_equal 'development key', config.api_key
     assert_equal 'development secret', config.secret
+    assert_equal 'myshopify.com', config.myshopify_domain
 
     config.api_key = 'rails key'
     config.secret = 'rails secret'
+    config.myshopify_domain = 'example.com'
 
     assert_equal 'rails key', config.api_key
     assert_equal 'rails secret', config.secret
+    assert_equal 'example.com', config.myshopify_domain
   end
 
   def test_env_has_precedence_over_rails
     config = ShopifyApp::Configuration.new
     config.api_key = 'rails key'
     config.secret = 'rails secret'
+    config.myshopify_domain = 'myshopify.com'
 
     assert_equal 'rails key', config.api_key
     assert_equal 'rails secret', config.secret
+    assert_equal 'myshopify.com', config.myshopify_domain
 
     ENV.expects(:[]).with('SHOPIFY_APP_API_KEY').returns('env key')
     ENV.expects(:[]).with('SHOPIFY_APP_SECRET').returns('env secret')
+    ENV.expects(:[]).with('SHOPIFY_APP_MYSHOPIFY_DOMAIN').returns('example.com')
 
     assert_equal 'env key', config.api_key
     assert_equal 'env secret', config.secret
+    assert_equal 'example.com', config.myshopify_domain
   end
 
   def test_reads_config_from_default_config_file
     config = ShopifyApp::Configuration.new
     assert_equal 'api key from default file', config.api_key
     assert_equal 'secret from default file', config.secret
+    assert_equal 'myshopify.com', config.myshopify_domain
   end
 
   def test_reads_config_from_specified_config_file
     config = ShopifyApp::Configuration.new(config_file: config_file('other_config_file.yml'))
     assert_equal 'api key from other file', config.api_key
     assert_equal 'secret from other file', config.secret
+    assert_equal 'example.com', config.myshopify_domain
   end
 
   def test_handles_missing_config_file
     config = ShopifyApp::Configuration.new(config_file: config_file('missing_config_file.yml'))
     assert_equal '', config.api_key
     assert_equal '', config.secret
+    assert_equal '', config.myshopify_domain
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shopify_app
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.0.2
 platform: ruby
 authors:
 - Shopify
@@ -30,7 +30,7 @@ cert_chain:
   fl3hbtVFTqbOlwL9vy1fudXcolIE/ZTcxQ+er07ZFZdKCXayR9PPs64heamfn0fp
   TConQSX2BnZdhIEYW+cKzEC/bLc=
   -----END CERTIFICATE-----
-date: 2014-12-19 00:00:00.000000000 Z
+date: 2015-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails