shopify_app 3.0.4 → 4.0.0

data/CHANGELOG

@@ -1,3 +1,4 @@
 * re-styled with Twitter Bootstrap css framework and updated docs [warren]
 * Require shopify_api gem via proper railtie setup [willem]
 * Don't require shopify.yml when using environment variables [cody]
+* Renamed instances of current_shop to shop_session to maintain logic

data/RELEASING

@@ -0,0 +1,16 @@
+Releasing ShopifyApp
+
+1. Check the Semantic Versioning page for info on how to version the new release: http://semver.org
+2. Update the version of ShopifyApp in lib/shopify_app/version.rb
+3. Add a CHANGELOG entry for the new release with the date
+4. Commit the changes with a commit message like "Packaging for release X.Y.Z"
+5. Tag the release with the version (Leave REV blank for HEAD or provide a SHA)
+  $ git tag vX.Y.Z REV
+6. Push out the changes
+  $ git push
+7. Push out the tags
+  $ git push --tags
+8. Build the new .gem from the updated .gemspec
+  $ gem build shopify_app.gemspec
+9. Publish the Gem to gemcutter
+  $ gem push shopify_app-X.Y.Z.gem

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

@@ -82,7 +82,7 @@
         </thead>
       <% @orders.each do |order| %>
         <tr>
-          <td><%= link_to order.name, "https://#{current_shop.url}/admin/orders/#{order.id}", :target => 'blank' %></td>
+          <td><%= link_to order.name, "https://#{shop_session.url}/admin/orders/#{order.id}", :target => 'blank' %></td>
           <td><%= order.billing_address.name %></td>
           <td>
             <span class="label  <% if order.financial_status  == 'paid' %>label-success<% end %> <% if order.financial_status  == 'pending' %>label-warning<% end %> <% if order.financial_status  == 'refunded' %>label-important<% end %>"><%= order.financial_status %>
@@ -123,7 +123,7 @@
             <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 %> <%= current_shop.shop.currency %></span>
+                <%= product.title %> <span class="pull-right muted"><%= product.price_range %> <%= shop_session.shop.currency %></span>
               </a>
             </div>
         
@@ -142,7 +142,7 @@
                 <% if product.published_at != nil %>
                 <p class="muted">Published at <%= Time.parse(product.published_at).strftime("%H:%M on %m/%d/%Y") %></p>
                 <% end %>
-                <p><%= link_to raw('View in your Shopify Admin <i class="icon-chevron-right" style="opacity:.25"></i>'), "https://#{current_shop.url}/admin/products/#{product.id}", :target => 'blank', :class => 'btn btn-primary' %></p>
+                <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>

data/lib/generators/shopify_app/templates/app/views/layouts/application.html.erb

@@ -35,7 +35,7 @@
         
         <%= link_to 'Shopify Demo App', '/', :class => 'brand' %>
         
-        <% if current_shop %>
+        <% if shop_session %>
           <div class="nav-collapse">
             <ul class="nav">
               <li class='<%= active_nav_class('home', 'index') %>'><%= link_to 'Where to Start', '/' %></li>
@@ -45,10 +45,10 @@
           
           <ul class="nav pull-right">
             <li class="dropdown">
-              <%= link_to raw(current_shop.url+' <b class="caret"></b>'), "https://#{current_shop.url}", :class => 'shop_name dropdown-toggle', :'data-toggle' => 'dropdown'  %>
+              <%= link_to raw(shop_session.url+' <b class="caret"></b>'), "https://#{shop_session.url}", :class => 'shop_name dropdown-toggle', :'data-toggle' => 'dropdown'  %>
               <ul class="dropdown-menu">
-                <li><%= link_to raw('<i class="icon-home"></i> Storefront'), "http://"+current_shop.url, :target => 'blank' %></li>
-                <li><%= link_to raw('<i class="icon-cog"></i> Shopify Admin'), "http://"+current_shop.url+"/admin", :target => 'blank' %></li>
+                <li><%= link_to raw('<i class="icon-home"></i> Storefront'), "http://"+shop_session.url, :target => 'blank' %></li>
+                <li><%= link_to raw('<i class="icon-cog"></i> Shopify Admin'), "http://"+shop_session.url+"/admin", :target => 'blank' %></li>
                 <li class="divider"></li>
                 <li><%= link_to raw('<i class="icon-off"></i> logout'), logout_path %></li>
               </ul>

data/lib/shopify_app/login_protection.rb

@@ -14,7 +14,7 @@ module ShopifyApp::LoginProtection
     end
   end
   
-  def current_shop
+  def shop_session
     session[:shopify]
   end
 end

data/lib/shopify_app/railtie.rb

@@ -8,7 +8,7 @@ class ShopifyApp::Railtie < ::Rails::Railtie
   
   initializer "shopify_app.action_controller_integration" do
     ActionController::Base.send :include, ShopifyApp::LoginProtection
-    ActionController::Base.send :helper_method, :current_shop
+    ActionController::Base.send :helper_method, :shop_session
   end
   
   initializer "shopify_app.setup_session" do

data/lib/shopify_app/version.rb

@@ -1,3 +1,3 @@
 module ShopifyApp
-  VERSION = "3.0.4"
+  VERSION = "4.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shopify_app
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 4.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-19 00:00:00.000000000 Z
+date: 2012-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70223159670160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70223159670160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: shopify_api
-  requirement: &70223159669660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,21 +37,31 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70223159669660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: omniauth-shopify-oauth2
-  requirement: &70223159669160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70223159669160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70223159668780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +69,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70223159668780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Creates a basic login controller for authenticating with your Shop and
   also a product controller which lets your edit your products easily.
 email:
@@ -69,6 +89,7 @@ files:
 - CHANGELOG
 - Gemfile
 - README.rdoc
+- RELEASING
 - Rakefile
 - install.rb
 - lib/generators/shopify_app/README
@@ -129,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: shopify-api
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: This gem is used to get quickly started with the Shopify API